同步心理咨询首页

config.gradle

@@ -44,7 +44,7 @@ ext {
             //第三步 若干
 
             "m-confide"       : "0.0.41.2",
-            "m-consultant"    : "0.0.51.4",
+            "m-consultant"    : "0.0.51.5",
             "m-fm"            : "0.0.23.4",
             "m-user"          : "0.0.41.1",
             "m-home"          : "0.0.6.20",
@@ -52,7 +52,7 @@ ext {
             "m-muse"          : "0.0.20.4",
             "m-tests"         : "0.0.15.3",
             "m-course"        : "0.0.34.4",
-            "m-im"            : "0.0.3.3",
+            "m-im"            : "0.0.3.5",
             "m-dynamic"       : "0.0.1.2",
 
 
@@ -66,7 +66,7 @@ ext {
             "m-tests-api"     : "0.0.1",
             "m-user-api"      : "0.0.9",
             "m-home-api"      : "0.0.3",
-            "m-im-api"        : "0.0.4",
+            "m-im-api"        : "0.0.5",
             "m-dynamic-api"   : "0.0.1",
             //-------------- 功能组件 --------------
 
@@ -74,7 +74,7 @@ ext {
             "ydl-platform"    : "0.0.29.3",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.28.9",
+            "ydl-webview"     : "0.0.28.11",
             "ydl-media"       : "0.0.14.4",
             "ydl-pay"         : "0.0.11.5",
             "m-audioim"       : "0.0.40.4",
@@ -111,7 +111,7 @@ ext {
             "m-tests-api"     : "0.0.1",
             "m-user-api"      : "0.0.9",
             "m-home-api"      : "0.0.3",
-            "m-im-api"        : "0.0.4",
+            "m-im-api"        : "0.0.5",
             "m-dynamic-api"   : "0.0.1",
             //-------------- 功能组件 --------------
 
@@ -119,7 +119,7 @@ ext {
             "ydl-platform"    : "0.0.29.3",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.28.6",
+            "ydl-webview"     : "0.0.28.9",
             "ydl-media"       : "0.0.14.4",
             "ydl-pay"         : "0.0.11.5",
             "m-audioim"       : "0.0.40.4",

m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

@@ -63,10 +63,12 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
      * tablayou上次选中的tab下标
      */
     private var confideLastSelectPosition = 0
+    private var confideLastSelectType = ""
     /**
      * 咨询tablayout上次选中的西边
      */
     private var consultLastSelectPosition = 0
+    private var consultLastSelectType= ""
     /**
      * 悬浮tablayout监听事件
      */
@@ -177,11 +179,13 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
      */
     override fun getConfideData(type: String, selectPosition: Int) {
         confideLastSelectPosition = selectPosition
+        confideLastSelectType = type
         mPresenter?.getConfideData(type, selectPosition)
     }
 
     override fun getConsultData(type: String, selectPosition: Int) {
         consultLastSelectPosition = selectPosition
+        consultLastSelectType = type
         mPresenter?.getConsultData(type, selectPosition)
     }
 
@@ -261,6 +265,13 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
         //每次全局更新后重置下标位
         confideLastSelectPosition = 0
         consultLastSelectPosition = 0
+
+        for (bean in list) {
+            //咨询模块
+            if (bean.type == YdlHomeViewHolderConstract.BUTTON_BANNER_VIEW) {
+                consultLastSelectType = bean.headerBean!!.consultCategoryData!![0].id.toString()
+            }
+        }
     }
 
     private fun initHeader(list: MutableList<HomePagerDataBean>) {
@@ -388,7 +399,10 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
     override fun onResume() {
         super.onResume()
         if (userVisibleHint) {
-            mPresenter?.loadHomeData()
+
+            mPresenter?.getConsultData(consultLastSelectType, consultLastSelectPosition)
+            mPresenter?.getConfideData(confideLastSelectType, confideLastSelectPosition)
+
             mPresenter?.prepareCoupon(activity)
 
             //走咨询助理浮层展示逻辑，是否展示由内部条件与接口判断

m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

@@ -294,7 +294,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
         consultLastSelectPosition = 0
         //初始化fragment中的tablayout布局，悬停效果使用
         for (bean in list) {
-            //倾述模块
+            //咨询模块
             if (bean.type == YdlHomeViewHolderConstract.PAGER_BANNER_VIEW) {
                 initTabLayout(bean.headerBean!!.listenCategoryDate)
                 initConsultTabLayout(bean.headerBean!!.consultCategoryData)

m-im/modular.gradle

@@ -24,7 +24,7 @@ modular {
             groupId = "com.ydl"
             artifactId = "m-im-api"
             //开发时注释掉版本号，发布api时打开
-//            version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
+            version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
             // API 层打包时需要引入的依赖
             apiDependencies {
                 implementation "com.google.code.gson:gson:2.8.2"

m-im/src/main/java/com/yidianling/im/helper/MsgReceiveHelper.java

@@ -58,7 +58,7 @@ public class MsgReceiveHelper {
         int sum = 0;
         for (int i=0;i<list.length;i++) {
             try {
-                sum += Integer.parseInt(list[0].toString());
+                sum += Integer.parseInt(list[i].toString());
             }catch (Exception e) {
                 sum += 0;
             }

ydl-webview/src/main/java/com/ydl/view/MoreClickView.kt

@@ -45,8 +45,13 @@ class MoreClickView @JvmOverloads constructor(private val mContext: Context, att
             msg_new.setVisibility(View.INVISIBLE)
         }*/
 
-        un_read_num.text = ModularServiceManager.provide(IImService::class.java).getAllUnReadNum().toString()
-
+        var unreadNum = ModularServiceManager.provide(IImService::class.java).getAllUnReadNum()
+        if (unreadNum <= 0) {
+            un_read_num.visibility = View.GONE
+        }
+        else {
+            un_read_num.text = unreadNum.toString()
+        }
 
     }
 

ydl-webview/src/main/res/layout/web_ui_new_more.xml

@@ -38,6 +38,7 @@
                 android:id="@+id/un_read_num"
                 android:layout_width="wrap_content"
                 android:layout_height="14dp"
+                android:minWidth="14dp"
                 android:textSize="10dp"
                 tools:text="10"
                 android:textColor="#ffffff"