feat(web): 支持WebActivity横竖屏切换不重建及多项功能调整

- WebActivity 改为 configChanges 处理横竖屏,不再重走生命周期,并启用 onConfigurationChanged 切换状态栏样式
- WatchBindDialog 已绑定状态下禁用确认按钮并降低透明度,隐藏解绑功能
- HomeFragment 注释掉解绑设备调用逻辑
- UrlConfig 更新测试环境地址及健康体检 H5 地址
- activity_archives_detail.xml 修复 include 布局缺少宽高属性问题
- 版本升级至 1.0.13(versionCode 1013)
This commit is contained in:
zhanglei
2026-04-17 11:23:41 +08:00
parent f4578f94b1
commit 4ff52c0465
7 changed files with 28 additions and 18 deletions
+1 -1
View File
@@ -102,7 +102,7 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.WebActivity" android:name=".ui.activity.WebActivity"
android:screenOrientation="portrait" /> android:configChanges="orientation|screenSize|keyboardHidden" />
<activity <activity
android:name=".ui.activity.UserInfoSettingActivity" android:name=".ui.activity.UserInfoSettingActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
@@ -78,8 +78,8 @@ class HomeFragment :
// 0 绑定 1 解绑 // 0 绑定 1 解绑
if (type == 0) { if (type == 0) {
mViewModel.getBindDevice(watchName) mViewModel.getBindDevice(watchName)
} else { // } else {
mViewModel.getUnbundleDevice(watchName) // mViewModel.getUnbundleDevice(watchName)
} }
} }
@@ -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://192.168.1.47" // 开发环境
// private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://api-xj.tri.dt.io/" // 开发环境 // 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.xjygjk.com" // 正式环境
private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api-jkglpt.iosp.ydpt.tech" // 正式环境 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 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_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 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" const val SECRET_KEY = "XJp3EHpcnwReXc1A"
@@ -111,7 +115,7 @@ object UrlConfig {
fun getHealthCheckH5Url(baseUrlType: BaseUrlType = BaseUrlType.PRODUCT): String { fun getHealthCheckH5Url(baseUrlType: BaseUrlType = BaseUrlType.PRODUCT): String {
return when (baseUrlType) { return when (baseUrlType) {
BaseUrlType.DEBUG, BaseUrlType.TEST-> { BaseUrlType.DEBUG, BaseUrlType.TEST-> {
PRODUCT_HOME_HEALTH_CHECK_H5 TEST_HOME_HEALTH_CHECK_H5
} }
BaseUrlType.PRODUCT -> { BaseUrlType.PRODUCT -> {
PRODUCT_HOME_HEALTH_CHECK_H5 PRODUCT_HOME_HEALTH_CHECK_H5
@@ -1,6 +1,7 @@
package com.xjjk.healthyclients.ui.activity package com.xjjk.healthyclients.ui.activity
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.content.res.Configuration
import android.graphics.Bitmap import android.graphics.Bitmap
import android.os.Bundle import android.os.Bundle
import android.text.TextUtils import android.text.TextUtils
@@ -96,14 +97,14 @@ class WebActivity : BaseVMBActivity<WebViewModel, ActivityWebBinding>(R.layout.a
/** /**
* 监听横竖屏切换改变状态栏,页面本身设置为强制竖屏模式,触发切换只存在于H5中视频的全屏播放,全屏播放时需要为透明状态栏 * 监听横竖屏切换改变状态栏,页面本身设置为强制竖屏模式,触发切换只存在于H5中视频的全屏播放,全屏播放时需要为透明状态栏
*/ */
// override fun onConfigurationChanged(newConfig: Configuration) { override fun onConfigurationChanged(newConfig: Configuration) {
// super.onConfigurationChanged(newConfig) super.onConfigurationChanged(newConfig)
// if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {//横屏 if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {//横屏
// setTransparentStatusBar(isTransparent = true, isStatusBarDarkFont = false) setTransparentStatusBar(isTransparent = true, isStatusBarDarkFont = false)
// } else {//竖屏 } else {//竖屏
// setTransparentStatusBar(isTransparent = false, isStatusBarDarkFont = false) setTransparentStatusBar(isTransparent = false, isStatusBarDarkFont = false)
// } }
// } }
override fun onBackEvent() { override fun onBackEvent() {
if (!mAgentWeb.back()) { if (!mAgentWeb.back()) {
@@ -65,9 +65,11 @@ class WatchBindDialog(context: Context, var listener: (String,Int) -> Unit) : Al
type = 0 type = 0
} else { } else {
binding.etWatchid.isEnabled = false binding.etWatchid.isEnabled = false
binding.confirm.setText("解绑") binding.confirm.isEnabled = false
type = 1 binding.confirm.alpha = 0.3F
// binding.confirm.setText("解绑")
// type = 1
//
} }
} }
@@ -212,6 +212,9 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<include <include
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:id="@+id/lay_question_for_help" android:id="@+id/lay_question_for_help"
layout="@layout/view_text_question" layout="@layout/view_text_question"
app:title="@{@string/archives_detail_question_for_help}" app:title="@{@string/archives_detail_question_for_help}"
+2 -2
View File
@@ -2,8 +2,8 @@ ext {
minSdkVersion = 26 minSdkVersion = 26
targetSdkVersion = 32 targetSdkVersion = 32
compileSdkVersion = 33 compileSdkVersion = 33
versionCode = 1012 versionCode = 1013
versionName = "1.0.12" versionName = "1.0.13"
//Dependencies //Dependencies
junitVersion = "4.12" junitVersion = "4.12"
lifecycleVersion = "2.6.0-alpha01" lifecycleVersion = "2.6.0-alpha01"