中建365-bug修复

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

@@ -124,10 +124,16 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                 }
 
                 5 -> { //内部跳转
+//                    bundle.clear()
+//                    bundle.putString("title", bannerBean.title)
+//                    bundle.putString("url", bannerBean.linkAddress)
+//                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
                     bundle.clear()
-                    bundle.putString("title", bannerBean.title)
-                    bundle.putString("url", bannerBean.linkAddress)
-                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
+                    bundle.putString(
+                        "web_site_url",
+                        "${bannerBean.linkAddress}"
+                    )
+                    RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
                 }
 
                 15 ->{ //视频跳转
@@ -135,10 +141,16 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                 }
 
                 10 -> {//web 跳转
+//                    bundle.clear()
+//                    bundle.putString("title", bannerBean.title)
+//                    bundle.putString("url", bannerBean.linkAddress)
+//                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
                     bundle.clear()
-                    bundle.putString("title", bannerBean.title)
-                    bundle.putString("url", bannerBean.linkAddress)
-                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
+                    bundle.putString(
+                        "web_site_url",
+                        "${bannerBean.linkAddress}"
+                    )
+                    RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
                 }
                 20 ->{
                     val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID
@@ -180,17 +192,29 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
                 }
 
                 5 -> { //内部跳转
+//                    bundle.clear()
+//                    bundle.putString("title", bannerBean.title)
+//                    bundle.putString("url", bannerBean.linkAddress)
+//                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
                     bundle.clear()
-                    bundle.putString("title", bannerBean.title)
-                    bundle.putString("url", bannerBean.linkAddress)
-                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
+                    bundle.putString(
+                        "web_site_url",
+                        "${bannerBean.linkAddress}"
+                    )
+                    RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
                 }
 
                 10 -> {//web 跳转
+//                    bundle.clear()
+//                    bundle.putString("title", bannerBean.title)
+//                    bundle.putString("url", bannerBean.linkAddress)
+//                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
                     bundle.clear()
-                    bundle.putString("title", bannerBean.title)
-                    bundle.putString("url", bannerBean.linkAddress)
-                    RouteManager.goAct(ARouterUrl.WEB_ACT, bundle)
+                    bundle.putString(
+                        "web_site_url",
+                        "${bannerBean.linkAddress}"
+                    )
+                    RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
                 }
 
                 15 ->{ //视频跳转

base/src/main/java/com/xty/base/h5/CloudJSBridge.kt

@@ -176,6 +176,7 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) {
     @JavascriptInterface
     fun jumpWallet(str: String?){
         str?.let {
+            LogUtils.e("eeeee",it)
             var wxBean = GsonUtils.fromJson(it, OpenWXBean::class.java)
 
             val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID

base/src/main/java/com/xty/base/utils/PayUtils.kt

@@ -6,6 +6,7 @@ import android.os.Looper
 import android.os.Message
 import android.text.TextUtils
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -137,6 +138,7 @@ open class PayUtils(var context: Context) {
                 tvZhifu.text = "确认支付"
             }
             val llDuihuan = view.findViewById<LinearLayout>(R.id.llDuihuan)
+            llDuihuan.visibility = View.GONE
             llDuihuan.setOnClickListener {
                 tvWeixin.isSelected = false
                 tvZhifubao.isSelected = false

health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt

@@ -96,6 +96,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
     private var user: ReportBean.User? = null
     private var isfirst: Boolean = true
     private var isX1X2 = false
+    private var startEventTime:Long=0L
 
     private var isSelectTable = false
     private var isScrollTable = false
@@ -192,6 +193,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
 
     override fun initData() {
         super.initData()
+        startEventTime = System.currentTimeMillis()
         isX1X2 = MMkvHelper.getBoolean(Const.X1_X2_Device, false)
         isEstimate = intent.getBooleanExtra("isEstimate", false)
 
@@ -764,6 +766,10 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
                         timeMill - (24 * 60 * 60 * 1000),
                         SimpleDateFormat("MM-dd")
                     )
+                    val yestDay1 = RxTimeTool.milliseconds2String(
+                        timeMill - (24 * 60 * 60 * 1000),
+                        SimpleDateFormat("yyyy-MM-dd")
+                    )
                     if (isDemonstrate) {
                         if (isfirst) {
                             binding.mTvTime.text = yestDay
@@ -771,6 +777,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
                             binding.mTvTime.text = timSelect.selectTime
                         }
                         isfirst = false
+                        text = "$yestDay1 11:00:00"
                     } else {
                         binding.mTvTime.text = "$yestDay 11:00 至 ${
                             it.data.healthy.createTime.substring(
@@ -778,6 +785,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
                                 10
                             )
                         } 11:00"
+                        text = "$yestDay1 11:00:00"
                     }
                 }
             }
@@ -1993,21 +2001,21 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
         val time = if (nowTime == showTime) {
             RxTimeTool.curTimeString
         } else {
-            "$showTime 12:00:00"
+            showTime
         }
 
         if (isEstimate) {
             user?.let {
                 val aesId = AESCrypt.encrypt("${it.id}")
                 val subtitle = "${it.name}的24小时健康评估"
-                val url = "${BuildConfig.image_prefix}/shareApi/reportDaily/$aesId/${time}"
+                val url = "${BuildConfig.image_prefix}shareApi/reportDaily/$aesId/${time}"
                 WxUtils.shareWebPage("24小时健康评估", subtitle, this, url)
             }
         } else {
             user?.let {
                 val aesId = AESCrypt.encrypt("${it.id}")
                 val subtitle = "${it.name}的日报数据"
-                val url = "${BuildConfig.image_prefix}/shareApi/reportDaily/$aesId/${time}"
+                val url = "${BuildConfig.image_prefix}shareApi/reportDaily/$aesId/${time}"
                 WxUtils.shareWebPage("日报分享", subtitle, this, url)
             }
         }

health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt

@@ -2643,13 +2643,13 @@ class HealthWeekMonthHourReportAct : BaseVmAct<ReportVm>() {
                     shareTitle = "近30天健康评估分享"
                     title = "${it.name}近30天健康评估"
                     url =
-                        "${BuildConfig.image_prefix}/shareApi/reportWeekly/$aesId/$myTime"
+                        "${BuildConfig.image_prefix}shareApi/reportWeekly/$aesId/$myTime"
                 } else {
                     //近七天分享
                     shareTitle = "近7天健康评估分享"
                     title = "${it.name}近7天健康评估"
                     url =
-                        "${BuildConfig.image_prefix}/shareApi/reportWeekly/$aesId/$myTime"
+                        "${BuildConfig.image_prefix}shareApi/reportWeekly/$aesId/$myTime"
                 }
             } else {
                 when (index) {
@@ -2662,19 +2662,19 @@ class HealthWeekMonthHourReportAct : BaseVmAct<ReportVm>() {
                             myTime = "${times[0].trim()}/${times[1]}"
                         }
                         url =
-                            "${BuildConfig.image_prefix}/shareApi/reportWeekly/$aesId/$myTime"
+                            "${BuildConfig.image_prefix}shareApi/reportWeekly/$aesId/$myTime"
                     }
 
                     ReportVm.ReportInfoType.Month -> {
                         shareTitle = "月报分享"
                         title = "${it.name}月健康状态趋势"
-                        url = "${BuildConfig.image_prefix}/shareApi/reportMonthly/$aesId/$time"
+                        url = "${BuildConfig.image_prefix}shareApi/reportMonthly/$aesId/$time"
                     }
 
                     ReportVm.ReportInfoType.Year -> {
                         shareTitle = "年报分享"
                         title = "${it.name}本年健康状态趋势"
-                        url = "${BuildConfig.image_prefix}/shareApi/reportYear/$aesId/$time"
+                        url = "${BuildConfig.image_prefix}shareApi/reportYear/$aesId/$time"
                     }
 
                     else -> {}