Просмотр исходного кода

同步修改脉诊依赖 [7a3e561]

支持 OSS agency
cc12458 10 месяцев назад
Родитель
Сommit
df0b93e12f

+ 1 - 1
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.03")
+  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")

+ 10 - 0
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
+  )
 }

+ 3 - 0
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> -->

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


+ 30 - 0
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>

+ 4 - 3
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.03</latest>
-    <release>1.1.0-alpha.03</release>
+    <latest>1.1.0-alpha.04</latest>
+    <release>1.1.0-alpha.04</release>
     <versions>
       <version>1.1.0-alpha.03</version>
+      <version>1.1.0-alpha.04</version>
     </versions>
-    <lastUpdated>20250707103156</lastUpdated>
+    <lastUpdated>20250709130533</lastUpdated>
   </versioning>
 </metadata>