删除H5返回按钮拦截，增加新用户侧滑返回拦截

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -45,6 +45,7 @@ import com.ydl.ydlcommon.modular.ModularServiceManager;
 import com.ydl.ydlcommon.utils.LogUtil;
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
+import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils;
 import com.ydl.ydlcommon.utils.log.LogHelper;
 import com.ydl.ydlcommon.view.CircleImageView;
 import com.ydl.ydlcommon.view.dialog.CommonDialog;
@@ -1257,10 +1258,17 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
 
     private void showCheckAgeDialog() {
         CommonDialog.create(getActivity())
-                .setLeftOnclick("返回", v -> getActivity().finish())
-                .setRightClick("继续", v -> SharedPreferencesEditor.putString("chat_age_ensure_" + ImIn.INSTANCE.getUserInfo().getUid(), "ensure"))
+                .setLeftOnclick("返回", v ->  {
+                    getActivity().finish();
+                    ActionCountUtils.Companion.count("under_age_alert_page|under_age_alert_return_click");
+                })
+                .setRightClick("继续", v -> {
+                    SharedPreferencesEditor.putString("chat_age_ensure_" + ImIn.INSTANCE.getUserInfo().getUid(), "ensure");
+                    ActionCountUtils.Companion.count("under_age_alert_page|under_age_alert_continue_clcik");})
                 .setMessage("由于您未满16周岁，如需咨询需要在家长陪同下进行")
                 .setCancelAble(false)
                 .show();
+
+        ActionCountUtils.Companion.count("under_age_alert_page|under_age_alert_page_visit");
     }
 }

m-im/src/main/java/com/yidianling/uikit/business/session/view/CollectUserInformationView.kt

@@ -20,6 +20,7 @@ import android.widget.ScrollView
 import android.widget.TextView
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.Utils
+import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.view.dialog.CommonDialog
 import com.yidianling.common.tools.RxImageTool
 import com.yidianling.common.tools.ToastUtil
@@ -344,6 +345,7 @@ class CollectUserInformationView(
                 .setLeftOnclick("返回") {
                     backEvent()
                     ensureAgeDialog!!.dismiss()
+                    ActionCountUtils.count("under_age_alert_page|under_age_alert_return_click")
                 }
                 .setRightClick("继续") {
                     SharedPreferencesEditor.putString(
@@ -352,6 +354,7 @@ class CollectUserInformationView(
                     )
                     sendMsgEvent(content, list)
                     ensureAgeDialog!!.dismiss()
+                    ActionCountUtils.count("under_age_alert_page|under_age_alert_continue_clcik")
                 }
                 .setMessage("由于您未满16周岁，如需咨询需要在家长陪同下进行")
                 .setTitle_color(R.color.im_color_242424)
@@ -359,6 +362,7 @@ class CollectUserInformationView(
         }
         if (!ensureAgeDialog!!.isShowing) {
             ensureAgeDialog!!.show()
+            ActionCountUtils.count("under_age_alert_page|under_age_alert_page_visit")
         }
     }
 

m-user/src/main/java/com/yidianling/user/ui/collect/CollectFocusActivity.kt

@@ -141,9 +141,9 @@ class CollectFocusActivity : BaseActivity() {
             .compose(RxUtils.resultJavaData())
             .subscribeOn(Schedulers.newThread())
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({
-                if (it.isNotEmpty()) {
-                    mList.addAll(it)
+            .subscribe({res ->
+                if (res.isNotEmpty()) {
+                    mList.addAll(res.filter { it.des.isNotEmpty() })
                     initScrollViewData()
                 }
             }, {