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 @@