From 4ff52c04659919df3589bf6c0e831e09b6fef4bc Mon Sep 17 00:00:00 2001 From: zhanglei <350328959@qq.com> Date: Fri, 17 Apr 2026 11:23:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(web):=20=E6=94=AF=E6=8C=81WebActivity?= =?UTF-8?q?=E6=A8=AA=E7=AB=96=E5=B1=8F=E5=88=87=E6=8D=A2=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E5=BB=BA=E5=8F=8A=E5=A4=9A=E9=A1=B9=E5=8A=9F=E8=83=BD=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - WebActivity 改为 configChanges 处理横竖屏，不再重走生命周期，并启用 onConfigurationChanged 切换状态栏样式 - WatchBindDialog 已绑定状态下禁用确认按钮并降低透明度，隐藏解绑功能 - HomeFragment 注释掉解绑设备调用逻辑 - UrlConfig 更新测试环境地址及健康体检 H5 地址 - activity_archives_detail.xml 修复 include 布局缺少宽高属性问题 - 版本升级至 1.0.13（versionCode 1013） --- app/src/main/AndroidManifest.xml | 2 +- .../healthyclients/fragment/HomeFragment.kt | 4 ++-- .../xjjk/healthyclients/retrofit/UrlConfig.kt | 8 ++++++-- .../healthyclients/ui/activity/WebActivity.kt | 17 +++++++++-------- .../xjjk/healthyclients/view/WatchBindDialog.kt | 8 +++++--- .../res/layout/activity_archives_detail.xml | 3 +++ config.gradle | 4 ++-- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6e7b124..1256b79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,7 @@ android:screenOrientation="portrait" /> + android:configChanges="orientation|screenSize|keyboardHidden" /> diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/HomeFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/HomeFragment.kt index b24ba79..7d7affd 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/HomeFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/HomeFragment.kt @@ -78,8 +78,8 @@ class HomeFragment : // 0 绑定 1 解绑 if (type == 0) { mViewModel.getBindDevice(watchName) - } else { - mViewModel.getUnbundleDevice(watchName) +// } else { +// mViewModel.getUnbundleDevice(watchName) } } diff --git a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt index aae748e..cc9914b 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt +++ b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt @@ -14,7 +14,8 @@ object UrlConfig { private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://192.168.1.47" // 开发环境 // private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://api-xj.tri.dt.io/" // 开发环境 - private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://xj-api.mcrm.vip:8888" // 测试环境 +// private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://xj-api.mcrm.vip:8888" // 测试环境 + private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://xjxc-api.mcrm.vip:8888" // 测试环境 // private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api.xjygjk.com" // 正式环境 private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api-jkglpt.iosp.ydpt.tech" // 正式环境 @@ -31,8 +32,11 @@ object UrlConfig { //健康银行 private const val TEST_HOME_BANK_H5 = "https://gstest.superwx.cn/healthbank/index.html" private const val PRODUCT_HOME_BANK_H5 = "https://console-jkglpt.iosp.ydpt.tech/hb/healthweb/index.html" + //健康体检 private const val PRODUCT_HOME_HEALTH_CHECK_H5 = "https://console-jkglpt.iosp.ydpt.tech/hb/healthcheckweb/index.html" + private const val TEST_HOME_HEALTH_CHECK_H5 = "https://gstest.superwx.cn/healthcheckweb/index.html" + //手机银行 const val SECRET_KEY = "XJp3EHpcnwReXc1A" @@ -111,7 +115,7 @@ object UrlConfig { fun getHealthCheckH5Url(baseUrlType: BaseUrlType = BaseUrlType.PRODUCT): String { return when (baseUrlType) { BaseUrlType.DEBUG, BaseUrlType.TEST-> { - PRODUCT_HOME_HEALTH_CHECK_H5 + TEST_HOME_HEALTH_CHECK_H5 } BaseUrlType.PRODUCT -> { PRODUCT_HOME_HEALTH_CHECK_H5 diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt index 03bd194..3bbc1fb 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/WebActivity.kt @@ -1,6 +1,7 @@ package com.xjjk.healthyclients.ui.activity import android.content.pm.ActivityInfo +import android.content.res.Configuration import android.graphics.Bitmap import android.os.Bundle import android.text.TextUtils @@ -96,14 +97,14 @@ class WebActivity : BaseVMBActivity(R.layout.a /** * 监听横竖屏切换改变状态栏，页面本身设置为强制竖屏模式，触发切换只存在于H5中视频的全屏播放，全屏播放时需要为透明状态栏 */ -// override fun onConfigurationChanged(newConfig: Configuration) { -// super.onConfigurationChanged(newConfig) -// if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {//横屏 -// setTransparentStatusBar(isTransparent = true, isStatusBarDarkFont = false) -// } else {//竖屏 -// setTransparentStatusBar(isTransparent = false, isStatusBarDarkFont = false) -// } -// } + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {//横屏 + setTransparentStatusBar(isTransparent = true, isStatusBarDarkFont = false) + } else {//竖屏 + setTransparentStatusBar(isTransparent = false, isStatusBarDarkFont = false) + } + } override fun onBackEvent() { if (!mAgentWeb.back()) { diff --git a/app/src/main/java/com/xjjk/healthyclients/view/WatchBindDialog.kt b/app/src/main/java/com/xjjk/healthyclients/view/WatchBindDialog.kt index d7163c3..ff6e710 100644 --- a/app/src/main/java/com/xjjk/healthyclients/view/WatchBindDialog.kt +++ b/app/src/main/java/com/xjjk/healthyclients/view/WatchBindDialog.kt @@ -65,9 +65,11 @@ class WatchBindDialog(context: Context, var listener: (String,Int) -> Unit) : Al type = 0 } else { binding.etWatchid.isEnabled = false - binding.confirm.setText("解绑") - type = 1 - + binding.confirm.isEnabled = false + binding.confirm.alpha = 0.3F +// binding.confirm.setText("解绑") +// type = 1 +// } } diff --git a/app/src/main/res/layout/activity_archives_detail.xml b/app/src/main/res/layout/activity_archives_detail.xml index d7db577..d864479 100644 --- a/app/src/main/res/layout/activity_archives_detail.xml +++ b/app/src/main/res/layout/activity_archives_detail.xml @@ -212,6 +212,9 @@