Merge branch 'feat/diamond_category_zl' into 'release'

feat:权限弹窗拒绝了不在弹出修改

See merge request app_android_lib/YDL-Component!308

m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt

@@ -1039,16 +1039,29 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
                     ) {
                         //同意定位授权
                         showAreaPopupWindow(true)
+                    } else if (MMKV.defaultMMKV()
+                            .decodeBool(ConsultBIConstants.ConsultantLocationAuth.REFUSE_ALREADY)
+                    ) {
+                        showAreaPopupWindow(false)
                     } else {
                         val dialog = CommonDialog(mContext)
                             .setTitle("温馨提示")
                             .setMessage("建议您授权定位权限，就能轻松获取周边优秀咨询师和其他服务")
                             .setLeftOnclick("暂不") { v1 ->
-                                //埋点
-                                ActionCountUtils.count(POPUP_ICON_CLICK, "暂不")
+                                ActionCountUtils.count(
+                                    POPUP_ICON_CLICK,
+                                    "暂不"
+                                )
+                                MMKV.defaultMMKV().encode(
+                                    ConsultBIConstants.ConsultantLocationAuth.REFUSE_ALREADY,
+                                    true
+                                )
                                 showAreaPopupWindow(false)
                             }.setRightClick("授权") { v12 ->
-                                ActionCountUtils.count(POPUP_ICON_CLICK, "授权")
+                                ActionCountUtils.count(
+                                    POPUP_ICON_CLICK,
+                                    "授权"
+                                )
                                 MMKV.defaultMMKV().encode(
                                     ConsultBIConstants.ConsultantLocationAuth.WHETHER_LOCATION_AUTH,
                                     true