From 6ee2b06f2e100cf26063e50fe6d40a77b2ac4ae7 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Tue, 5 Nov 2024 18:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zj365/dc/fragment/HealthHomeFrag.kt | 48 ++++++++++++++----- .../java/com/xty/base/h5/CloudJSBridge.kt | 1 + .../main/java/com/xty/base/utils/PayUtils.kt | 2 + .../health/act/HealthSkyHourReportAct.kt | 14 ++++-- .../act/HealthWeekMonthHourReportAct.kt | 10 ++-- 5 files changed, 55 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt index 6d89c3a..562dd5a 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -124,10 +124,16 @@ HealthHomeFrag : BaseVmFrag() { } 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() { } 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() { } 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 ->{ //视频跳转 diff --git a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt index 4ac83eb..574d712 100644 --- a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt +++ b/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 diff --git a/base/src/main/java/com/xty/base/utils/PayUtils.kt b/base/src/main/java/com/xty/base/utils/PayUtils.kt index 03093d2..331beba 100644 --- a/base/src/main/java/com/xty/base/utils/PayUtils.kt +++ b/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(R.id.llDuihuan) + llDuihuan.visibility = View.GONE llDuihuan.setOnClickListener { tvWeixin.isSelected = false tvZhifubao.isSelected = false diff --git a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt index 648bf04..1abd765 100644 --- a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt @@ -96,6 +96,7 @@ class HealthSkyHourReportAct : BaseVmAct() { 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() { 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() { 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() { 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() { 10 ) } 11:00" + text = "$yestDay1 11:00:00" } } } @@ -1993,21 +2001,21 @@ class HealthSkyHourReportAct : BaseVmAct() { 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) } } diff --git a/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt index 58783b0..b430a59 100644 --- a/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt @@ -2643,13 +2643,13 @@ class HealthWeekMonthHourReportAct : BaseVmAct() { 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() { 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 -> {}