Merge branch 'feature/userinfo_collect' of…

Merge branch 'feature/userinfo_collect' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/userinfo_collect

 Conflicts:
	config.gradle

config.gradle

@@ -45,7 +45,7 @@ ext {
             "m-confide"       : "0.0.48.6",
             "m-consultant"    : "0.0.57.4",
             "m-fm"            : "0.0.29.3",
-            "m-user"          : "0.0.59.23",
+            "m-user"          : "0.0.59.28",
             "m-home"          : "0.0.19.1",
             "m-im"            : "0.0.16.11",
             "m-dynamic"       : "0.0.6.1",
@@ -72,7 +72,7 @@ ext {
             "ydl-platform"    : "0.0.39.16",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.38.15",
+            "ydl-webview"     : "0.0.38.24",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
             "m-audioim"       : "0.0.48.1",
@@ -118,7 +118,7 @@ ext {
             "ydl-platform"    : "0.0.39.16",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.38.15",
+            "ydl-webview"     : "0.0.38.24",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
             "m-audioim"       : "0.0.48.1",

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

@@ -2,6 +2,7 @@ package com.yidianling.user.ui.collect
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
 import android.view.KeyEvent
 import android.view.ViewGroup
 import android.widget.LinearLayout
@@ -13,6 +14,7 @@ import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.base.config.HttpConfig
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.router.IYDLRouterConstant
+import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.view.dialog.YDLCommonDialog
 import com.yidianling.common.tools.RxImageTool
@@ -40,8 +42,23 @@ class CollectFocusActivity : BaseActivity() {
     private var selectedNumber: Int = 0
     private var mList: ArrayList<CollectFocusItemBean> = ArrayList()
 
+    private var isYfd: Boolean = false //是否是云凤蝶
+
+
+    companion object {
+        private const val IS_YFD = "is_yfd" //是否是云凤蝶key
+
+        fun start(context: Context, isYFD: Boolean) {
+            val intent = Intent(context, CollectFocusActivity::class.java)
+            intent.putExtra(IS_YFD, isYFD)
+            context.startActivity(intent)
+        }
+    }
+
     override fun initDataAndEvent() {
 
+        isYfd = intent.getBooleanExtra(IS_YFD, false)
+
         ActionCountUtils.count(UserBIConstants.COLLECT_TOPIC_PAGE + "|" + UserBIConstants.COLLECT_TOPIC_PAGE_VISIT)
 
         // 获取关注数据
@@ -124,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()
                 }
             }, {
@@ -234,8 +251,13 @@ class CollectFocusActivity : BaseActivity() {
                     upload_focus_info_btn.postDelayed({
                         completeDialog?.dismiss()
                         if (!isFinishing) {
-                            val h5Params = H5Params("$it?cateIds=$cateIds", H5Params.BackLimit.NewUserBackLimit)
+                            val h5Params = H5Params(
+                                "$it?cateIds=$cateIds?barHeight=" + StatusBarUtils.getStatusBarHeight(
+                                    this
+                                ).toString(), H5Params.BackLimit.NEW_USER_PAGE, true
+                            )
                             NewH5Activity.start(this, h5Params)
+                            finish()
                         }
                     }, 1000)
                 }

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

@@ -15,6 +15,7 @@ import com.ydl.ydl_router.manager.YDLRouterParams
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.data.http.RxUtils
 import com.ydl.ydlcommon.router.IYDLRouterConstant
+import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.view.dialog.YDLCommonDialog
 import com.yidianling.common.tools.RxImageTool
@@ -38,7 +39,8 @@ class CollectSexAndBirthActivity : BaseActivity() {
 
     private var selectedSex = -1 // 1 男 2 女
     private var selectedYear = 1995
-    private var originYear =1900
+    private var originYear = 1900
+    private var nowYear: Int = 0
     private var collectOutDialog: YDLCommonDialog? = null
     private var yearList: ArrayList<String> = ArrayList()
 
@@ -59,49 +61,64 @@ class CollectSexAndBirthActivity : BaseActivity() {
             if (selectedSex != 1) {
                 selectedSex = 1
                 checkUpSelect()
-                ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_MAN_CLICK, "1")
-            }else {
+                ActionCountUtils.count(
+                    UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_MAN_CLICK,
+                    "1"
+                )
+            } else {
                 selectedSex = -1
                 checkUpSelect()
-                ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_MAN_CLICK, "2")
+                ActionCountUtils.count(
+                    UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_MAN_CLICK,
+                    "2"
+                )
             }
         }
         female_rl.setOnClickListener {
             if (selectedSex != 2) {
                 selectedSex = 2
                 checkUpSelect()
-                ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_FEMALE_CLICK, "1")
+                ActionCountUtils.count(
+                    UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_FEMALE_CLICK,
+                    "1"
+                )
 
-            }else {
+            } else {
                 selectedSex = -1
                 checkUpSelect()
-                ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_FEMALE_CLICK, "2")
+                ActionCountUtils.count(
+                    UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_SEX_FEMALE_CLICK,
+                    "2"
+                )
             }
         }
 
         sex_and_birth_out.setOnClickListener {
             ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_EXIT_CLICK)
             if (null == collectOutDialog) {
-                collectOutDialog = YDLCommonDialog(this, object : YDLCommonDialog.OnYDLCommonDialogListener {
-                    override fun onCancel() {
-                        // 这是左侧按钮 - 确定
-                        collectOutDialog?.dismiss()
-                        jumpToNewUserH5()
-                    }
-
-                    override fun onSure() {
-                        // 这是右侧按钮 - 取消
-                        collectOutDialog?.dismiss()
-                    }
-
-                }).setNullTitleDesc("确定要退出吗？\n" +
-                        "很多人在这里得到了帮助哦").setCancelText("确定").setSureText("取消")
+                collectOutDialog =
+                    YDLCommonDialog(this, object : YDLCommonDialog.OnYDLCommonDialogListener {
+                        override fun onCancel() {
+                            // 这是左侧按钮 - 确定
+                            collectOutDialog?.dismiss()
+                            jumpToNewUserH5()
+                        }
+
+                        override fun onSure() {
+                            // 这是右侧按钮 - 取消
+                            collectOutDialog?.dismiss()
+                        }
+
+                    }).setNullTitleDesc(
+                        "确定要退出吗？\n" +
+                                "很多人在这里得到了帮助哦"
+                    ).setCancelText("确定").setSureText("取消")
             }
             collectOutDialog?.show()
         }
         //年份选择器
         val date = Calendar.getInstance()
-        val nowYear: Int = date.get(Calendar.YEAR)
+        nowYear = date.get(Calendar.YEAR)
         while (originYear <= nowYear) {
             yearList.add("$originYear")
             originYear++
@@ -112,7 +129,10 @@ class CollectSexAndBirthActivity : BaseActivity() {
 
         user_collect_date_pick.post {
             if (user_collect_date_pick.measuredHeight > RxImageTool.dp2px(175f)) {
-                val param = RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RxImageTool.dp2px(175f))
+                val param = RelativeLayout.LayoutParams(
+                    RelativeLayout.LayoutParams.MATCH_PARENT,
+                    RxImageTool.dp2px(175f)
+                )
                 user_collect_date_pick.layoutParams = param
 
                 user_collect_date_pick?.value = selectedYear
@@ -123,7 +143,8 @@ class CollectSexAndBirthActivity : BaseActivity() {
         user_collect_date_pick.displayedValues = yearList.toTypedArray()
         user_collect_date_pick.minValue = 1900
         user_collect_date_pick.maxValue = nowYear
-        user_collect_date_pick.descendantFocusability = NumberPicker.FOCUS_BLOCK_DESCENDANTS // 关闭编辑功能
+        user_collect_date_pick.descendantFocusability =
+            NumberPicker.FOCUS_BLOCK_DESCENDANTS // 关闭编辑功能
         user_collect_date_pick.wrapSelectorWheel = false // 关闭循环
 
         user_collect_date_pick.value = selectedYear
@@ -135,18 +156,26 @@ class CollectSexAndBirthActivity : BaseActivity() {
     @SuppressLint("CheckResult")
     private fun uploadSexAndBirth() {
 
-        ActionCountUtils.count(UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_NEXT_CLICK, "$selectedYear")
+        ActionCountUtils.count(
+            UserBIConstants.COLLECT_USER_INFO_PAGE + "|" + UserBIConstants.COLLECT_USER_INFO_NEXT_CLICK,
+            "$selectedYear"
+        )
         val userInfoBean = UserInfoCollectUploadParam()
         userInfoBean.userInfoList = ArrayList()
-        userInfoBean.userInfoList.add(UserInfoCollectParam(if (selectedSex == 1) "男" else "女", "gener"))
+        userInfoBean.userInfoList.add(
+            UserInfoCollectParam(
+                if (selectedSex == 1) "男" else "女",
+                "gener"
+            )
+        )
         userInfoBean.userInfoList.add(UserInfoCollectParam("$selectedYear", "age"))
         UserHttpImpl.getInstance().userInfoCollectUpload(userInfoBean)
             .compose(RxUtils.resultJavaData())
             .subscribeOn(Schedulers.newThread())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
-                var intent = Intent(this, CollectFocusActivity::class.java)
-                startActivity(intent)
+                CollectFocusActivity.start(this, nowYear - selectedYear <= 16)
+                finish()
             }, {
                 Log.i("上传数据异常", it.toString())
             })
@@ -160,8 +189,13 @@ class CollectSexAndBirthActivity : BaseActivity() {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 if (!isFinishing) {
-                    val h5Params = H5Params(it, "mainPage")
+                    val h5Params = H5Params(
+                        "$it?barHeight=" + StatusBarUtils.getStatusBarHeight(
+                            this
+                        ).toString(), H5Params.BackLimit.NEW_USER_PAGE, true
+                    )
                     NewH5Activity.start(this, h5Params)
+                    finish()
                 }
             }, {
             })
@@ -174,12 +208,12 @@ class CollectSexAndBirthActivity : BaseActivity() {
             female_rl.setBackgroundResource(R.drawable.user_collect_unselect_bg)
             male_img.setImageResource(R.drawable.user_male_selected)
             female_img.setImageResource(R.drawable.user_female_unselected)
-            male_txt.setTextColor(Color.parseColor("#1DA1F2"))
-            female_txt.setTextColor(ContextCompat.getColor(mContext, R.color.user_main_theme))
+            male_txt.setTextColor(ContextCompat.getColor(mContext, R.color.user_main_theme))
+            female_txt.setTextColor(Color.parseColor("#242424"))
 
             sex_and_birth_upload_btn.setBackgroundResource(R.drawable.user_collect_bottom_btn_bg)
         } else if (selectedSex == 2) {
-             male_rl.setBackgroundResource(R.drawable.user_collect_unselect_bg)
+            male_rl.setBackgroundResource(R.drawable.user_collect_unselect_bg)
             female_rl.setBackgroundResource(R.drawable.user_collect_select_bg)
             male_img.setImageResource(R.drawable.user_male_unselected)
             female_img.setImageResource(R.drawable.user_female_selected)

ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt

 package com.channel.ydl_flutter_base.plugin
 
+import android.app.Activity
 import android.text.TextUtils
 import com.channel.ydl_flutter_base.base.BaseFlutterFragment
 import com.ydl.burypointlib.BuryPointHelper
@@ -99,7 +100,17 @@ class YDLCommonPlugin : MethodChannel.MethodCallHandler {
                         field.isAccessible = true
                         val property = field.get(ownerClass)
                         if (property is Boolean && property) {
-                            BuryPointHelper.showEditDialog(mActivity, MD5Util.md5(clickPath), null)
+                            var activity: Activity?= mActivity
+                            if (mActivity==null&&mFragment!=null){
+                                activity = mFragment?.activity!!
+                            }
+                            activity?.let {
+                                BuryPointHelper.showEditDialog(
+                                    activity,
+                                    MD5Util.md5(clickPath),
+                                    null
+                                )
+                            }
                         }
                     } catch (e: Exception) {
 

ydl-webview/src/main/java/com/ydl/webview/H5Params.kt

@@ -14,9 +14,9 @@ class H5Params : Serializable {
         this.title = title
     }
 
-    constructor(url: String, backLimit: BackLimit, boolean: Boolean = true): super() {
+    constructor(url: String, backLimit: BackLimit, hasBackLimit: Boolean): super() {
         this.url =url
-        if (boolean) {
+        if (hasBackLimit) {
             this.backLimit = backLimit
         }
     }
@@ -68,12 +68,12 @@ class H5Params : Serializable {
      */
     var phone: String? = null
     /**
-     * h5页面返回按钮限制（根据传入的backLimit判断返回至哪个页面）
+     * h5页面返回按钮限制
      */
-    var backLimit: BackLimit = BackLimit.NewUserBackLimit
+    var backLimit: BackLimit? = null
 
-    enum class BackLimit{
-        NewUserBackLimit //新用户H5页面返回拦截
+    enum class BackLimit {
+        NEW_USER_PAGE  // 新用户引导页面
     }
 
 }
\ No newline at end of file

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -819,7 +819,8 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
                         tb_title.setImageListener(v -> {
                             if (wv_content.canGoBack()) {
                                 wv_content.goBack();
-                            } else {
+                            }
+                            else {
                                 finish();
                             }
                         });
@@ -833,7 +834,8 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
                             if (h5Params.getShowUrlTitle()) {
                                 WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
                                 finish();
-                            } else {
+                            }
+                            else {
                                 if (ActivityManager.Companion.getInstance().getActivitys().size() == 1) {
                                     WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
                                 }
@@ -1127,7 +1129,8 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
                     if (h5Params.isSplash()) {
                         WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
                         finish();
-                    } else {
+                    }
+                    else {
                         if (ActivityManager.Companion.getInstance().getActivitys().size() == 1) {
                             WebModularServiceUtils.Companion.startMain(NewH5Activity.this);
                         }
@@ -1261,21 +1264,19 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
             }
 
             /**
-             * 增加逻辑：在高级题测试页面，按物理返回键直接finish当前页面，不走webview.goback()逻辑
+             * 新用户侧滑按钮限制
              */
-            if (h5Params.isControlBack()) {
-                finish();
+            if (h5Params.getBackLimit() != null && h5Params.getBackLimit() == H5Params.BackLimit.NEW_USER_PAGE) {
+                return true;
             }
-            back("key");
 
             /**
-             * 如果进行返回按钮限制，则判断限制类型
+             * 增加逻辑：在高级题测试页面，按物理返回键直接finish当前页面，不走webview.goback()逻辑
              */
-            if (H5Params.BackLimit.NewUserBackLimit.equals(h5Params.getBackLimit())) {
-                callJSFunc("showGuideModal");
-                return false;
+            if (h5Params.isControlBack()) {
+                finish();
             }
-
+            back("key");
 
             return true;
         }