Merge tag '2.1.2' into develop

.idea/vcs.xml

@@ -2,5 +2,7 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/module/taiyi-pulse" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/module/webview-upgrade" vcs="Git" />
   </component>
 </project>

app/src/aio-CQ/res/values/pulse.xml

@@ -2,4 +2,7 @@
 <resources>
   <bool name="taiyi_skip_report">true</bool>
   <integer name="taiyi_delay_disconnect">300</integer>
+  <string name="taiyi_oss_agency_url">http://10.227.137.2:80/liuzhi/manager2/fdhb-tablet/analysisManage/upload</string>
+  <string name="taiyi_oss_agency_method">POST</string>
+  <!-- <bool name="taiyi_oss_agency_header2query">true</bool> -->
 </resources>

app/src/aio-prod/res/values/application.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_id">AIO</string>
+  <string name="app_name">中医健康辨识仪</string>
+  <string name="app_screen">browser/kiosk?url=https://wx.hzliuzhi.com/aio/</string>
+</resources>

app/src/aio-prod/res/values/browser_proxy.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="browser_http_proxy_enabled">true</bool>
+  <string-array name="browser_proxy_pool">
+    <item>https://hybrid.reborn-tech.com -> https://wx.hzliuzhi.com/mz/hybrid</item>
+    <item>https://api.reborn-tech.com -> https://wx.hzliuzhi.com/mz/api</item>
+    <item>https://taiyi.oss-accelerate.aliyuncs.com -> https://wx.hzliuzhi.com/mz/oss</item>
+    <item>https://taiyi.oss-cn-beijing.aliyuncs.com -> https://wx.hzliuzhi.com/mz/oss</item>
+    <item>https://oss-accelerate.aliyuncs.com/taiyi -> https://wx.hzliuzhi.com/mz/oss</item>
+    <item>https://oss-cn-beijing.aliyuncs.com/taiyi -> https://wx.hzliuzhi.com/mz/oss</item>
+  </string-array>
+</resources>

app/src/aio-prod/res/values/pulse.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="taiyi_skip_report">true</bool>
+  <integer name="taiyi_delay_disconnect">300</integer>
+</resources>

app/src/aio-test/res/values/browser_proxy.xml

@@ -2,11 +2,11 @@
 <resources>
   <bool name="browser_http_proxy_enabled">true</bool>
   <string-array name="browser_proxy_pool">
-    <item>https://hybrid.reborn-tech.com -> https://wx.hzliuzhi.com/mz/hybrid</item>
-    <item>https://api.reborn-tech.com -> https://wx.hzliuzhi.com/mz/api</item>
-    <item>https://taiyi.oss-accelerate.aliyuncs.com -> https://wx.hzliuzhi.com/mz/oss</item>
-    <item>https://taiyi.oss-cn-beijing.aliyuncs.com -> https://wx.hzliuzhi.com/mz/oss</item>
-    <item>https://oss-accelerate.aliyuncs.com/taiyi -> https://wx.hzliuzhi.com/mz/oss</item>
-    <item>https://oss-cn-beijing.aliyuncs.com/taiyi -> https://wx.hzliuzhi.com/mz/oss</item>
+    <item>https://hybrid.reborn-tech.com -> http://115.236.184.102:62007/mz/hybrid</item>
+    <item>https://api.reborn-tech.com -> http://115.236.184.102:62007/mz/api</item>
+    <item>https://taiyi.oss-accelerate.aliyuncs.com -> http://115.236.184.102:62007/mz/oss</item>
+    <item>https://taiyi.oss-cn-beijing.aliyuncs.com -> http://115.236.184.102:62007/mz/oss</item>
+    <item>https://oss-accelerate.aliyuncs.com/taiyi -> http://115.236.184.102:62007/mz/oss</item>
+    <item>https://oss-cn-beijing.aliyuncs.com/taiyi -> http://115.236.184.102:62007/mz/oss</item>
   </string-array>
 </resources>

library/device/pulse/build.gradle.kts

@@ -46,7 +46,7 @@ dependencies {
   implementation(project(":core"))
   implementation(libs.gson)
 
-  implementation("com.taiyi.sdk.pulse:ble:1.1.0-alpha.02")
+  implementation("com.taiyi.sdk.pulse:ble:1.1.0-alpha.04")
   implementation("com.android.volley:volley:1.2.1")
   implementation("com.opencsv:opencsv:5.6")
   implementation("com.aliyun.dpa:oss-android-sdk:2.9.21")

library/device/pulse/src/main/java/com/hzliuzhi/applet/device/pulse/util/TaiYiUtil.kt

@@ -2,6 +2,7 @@ package com.hzliuzhi.applet.device.pulse.util
 
 import android.app.Activity
 import android.app.Application
+import android.content.res.Resources
 import com.hzliuzhi.applet.core.shared.Payload
 import com.hzliuzhi.applet.core.util.proxy
 import com.hzliuzhi.applet.device.pulse.PulseResult
@@ -24,6 +25,7 @@ object TaiYiUtil {
         skipReport = resources.getBoolean(R.bool.taiyi_skip_report)
         delayDisconnect = resources.getInteger(R.integer.taiyi_delay_disconnect)
         this.proxy = resources.proxy(R.array.browser_proxy_pool)
+        this.agencyOfOSS = resources.OSSAgency()
       }
     },
   )
@@ -52,4 +54,12 @@ object TaiYiUtil {
       })
     }
   }
+}
+
+private fun Resources.OSSAgency(): TaiyiConfig.OSSAgency {
+  return TaiyiConfig.OSSAgency(
+    runCatching { getString(R.string.taiyi_oss_agency_url) }.getOrNull()?.trim(),
+    runCatching { getString(R.string.taiyi_oss_agency_method) }.getOrNull()?.trim(),
+    runCatching { getBoolean(R.bool.taiyi_oss_agency_header2query) }.getOrNull() ?: false
+  )
 }

library/device/pulse/src/main/res/values/taiyi.xml

@@ -4,6 +4,9 @@
   <string name="taiyi_app_secret">0f0d450226f316d668d6eb8bcfbb4acca4ccc47f</string>
   <bool name="taiyi_skip_report">false</bool>
   <integer name="taiyi_delay_disconnect">0</integer>
+  <string name="taiyi_oss_agency_url" />
+  <string name="taiyi_oss_agency_method" />
+  <bool name="taiyi_oss_agency_header2query">false</bool>
 
   <string-array name="browser_proxy_pool">
     <!-- <item>https://hybrid.reborn-tech.com -> </item> -->

local-repo/com/taiyi/sdk/pulse/ble/1.1.0-alpha.02/ble-1.1.0-alpha.02.pom → local-repo/com/taiyi/sdk/pulse/ble/1.1.0-alpha.03/ble-1.1.0-alpha.03.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.taiyi.sdk.pulse</groupId>
   <artifactId>ble</artifactId>
-  <version>1.1.0-alpha.02</version>
+  <version>1.1.0-alpha.03</version>
   <packaging>aar</packaging>
   <name>ble</name>
   <description>six.pulse:packag</description>

local-repo/com/taiyi/sdk/pulse/ble/1.1.0-alpha.04/ble-1.1.0-alpha.04.pom

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.taiyi.sdk.pulse</groupId>
+  <artifactId>ble</artifactId>
+  <version>1.1.0-alpha.04</version>
+  <packaging>aar</packaging>
+  <name>ble</name>
+  <description>six.pulse:packag</description>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.appcompat</groupId>
+      <artifactId>appcompat</artifactId>
+      <version>1.4.1</version>
+      <scope>implementation</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android.material</groupId>
+      <artifactId>material</artifactId>
+      <version>1.5.0</version>
+      <scope>implementation</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.constraintlayout</groupId>
+      <artifactId>constraintlayout</artifactId>
+      <version>2.1.3</version>
+      <scope>implementation</scope>
+    </dependency>
+  </dependencies>
+</project>

local-repo/com/taiyi/sdk/pulse/ble/maven-metadata.xml

@@ -3,11 +3,12 @@
   <groupId>com.taiyi.sdk.pulse</groupId>
   <artifactId>ble</artifactId>
   <versioning>
-    <latest>1.1.0-alpha.02</latest>
-    <release>1.1.0-alpha.02</release>
+    <latest>1.1.0-alpha.04</latest>
+    <release>1.1.0-alpha.04</release>
     <versions>
-      <version>1.1.0-alpha.02</version>
+      <version>1.1.0-alpha.03</version>
+      <version>1.1.0-alpha.04</version>
     </versions>
-    <lastUpdated>20250622165951</lastUpdated>
+    <lastUpdated>20250709130533</lastUpdated>
   </versioning>
 </metadata>