Merge remote-tracking branch 'origin/main' into dev_second

# Conflicts:
#	app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt
#	app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
#	app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt
#	app/src/main/java/com/zj365/dc/fragment/MineFrag.kt
#	config.gradle

app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt

@@ -26,6 +26,7 @@ class HomeTopLayoutAdapter(var mContext: Context): BaseAdapter<HomeLayoutBean.Ho
             layoutParam.width = screenWidth /data.size
 
         }
+
         holder.getView<LinearLayout>(R.id.root).layoutParams = layoutParam
 
         holder.getView<ImageView>(R.id.img_top).setImage(context,item.imageUrl)

app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt

@@ -130,6 +130,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                     RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
                 }
 
+                15 ->{ //视频跳转
+
+                }
+
                 10 -> {//web 跳转
                     bundle.clear()
                     bundle.putString("title", bannerBean.title)
@@ -139,7 +143,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                 20 ->{
                     val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
 
-                    val api = WXAPIFactory.createWXAPI(ApplicationContext.context, appId)
+                    val api = WXAPIFactory.createWXAPI(requireContext(), appId)
 
                     val req = WXLaunchMiniProgram.Req()
                     req.userName = bannerBean.wxId// 填小程序原始id
@@ -156,6 +160,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
 
                     api.sendReq(req)
                 }
+
+                else ->{
+
+                }
             }
         }
 
@@ -185,6 +193,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                     RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
                 }
 
+                15 ->{ //视频跳转
+
+                }
+
                 20 ->{
                     val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
 
@@ -205,6 +217,9 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
 
                     api.sendReq(req)
                 }
+                else ->{
+
+                }
             }
         }
         setOnClickListener()
@@ -284,6 +299,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                 4 ->{
                     CommonToastUtils.showToast("敬请期待")
                 }
+
+                else ->{
+
+                }
             }
         }
 
@@ -373,6 +392,10 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                     4 ->{
                         CommonToastUtils.showToast("敬请期待")
                     }
+
+                    else ->{
+
+                    }
                 }
         }
 

app/src/main/java/com/zj365/dc/weight/PrevDialog.kt

@@ -41,8 +41,8 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
                 val bundle = Bundle()
                 bundle.clear()
                 bundle.putString("title", "用户协议")
-                bundle.putInt("type", Const.AGREEMENT_1)
+                bundle.putString("url","https://dc.zhongjian365.com/agreement.html")
-                RouteManager.goAct(ARouterUrl.RICH_TEXT, bundle)
+                RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
 
             override fun updateDrawState(ds: TextPaint) {
@@ -56,7 +56,7 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
             override fun onClick(widget: View) {
                 val bundle = Bundle()
                 bundle.putString("title", "隐私政策")
-                bundle.putString("url", "https://auprty.com/app/static/app/privacy.html")
+                bundle.putString("url", "https://dc.zhongjian365.com/privacy.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
 
@@ -72,7 +72,7 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
             override fun onClick(widget: View) {
                 val bundle = Bundle()
                 bundle.putString("title", "中健三六五健康 APP 权限列表")
-                bundle.putString("url", "https://auprty.com/app/static/app/permission.html")
+                bundle.putString("url", "https://dc.zhongjian365.com/permission.html")
                 RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
 
@@ -89,8 +89,8 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
                 val bundle = Bundle()
                 bundle.clear()
                 bundle.putString("title", "用户协议")
-                bundle.putInt("type", Const.AGREEMENT_1)
+                bundle.putString("url","https://dc.zhongjian365.com/agreement.html")
-                RouteManager.goAct(ARouterUrl.RICH_TEXT, bundle)
+                RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
             }
 
             override fun updateDrawState(ds: TextPaint) {