移除失效的 Activity & 添加默认主题 & 优化方法调用

TYUsbSDK/src/main/AndroidManifest.xml

@@ -16,33 +16,20 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage"/>
 
-    <application
-        android:requestLegacyExternalStorage="true"
-        android:theme="@style/AppTheme.NoActionBar"
-        tools:replace="android:theme">
+    <application android:requestLegacyExternalStorage="true">
         <service
             android:name=".TYUsbDeviceService"
             android:enabled="true" />
 
         <activity
             android:name=".TYUsbDeviceActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/AppTheme.NoActionBar"/>
 
         <activity
             android:name=".pulse.ui.SuccessActivity"
-            android:exported="true"/>
-        <activity
-            android:name=".pulse.ui.HelpActivity"
-            android:exported="false"/>
-        <activity
-            android:name=".pulse.ui.MeasureFlowActivity"
-            android:exported="false"/>
-        <activity
-            android:name=".pulse.ui.Measure3DFlowActivity"
-            android:exported="false"/>
-        <activity
-            android:name=".pulse.ui.MeasureHandsActivity"
-            android:exported="false"/>
+            android:exported="true"
+            android:theme="@style/AppTheme.NoActionBar"/>
     </application>
 
 </manifest>

TYUsbSDK/src/main/java/com/taiyi/tyusbsdk/pulse/ProxyManager.java

@@ -35,9 +35,9 @@ public class ProxyManager {
   private ProxyManager() {
   }
 
-  public HashMap<String, String> pool = new HashMap<>();
+  public Map<String, String> pool = new HashMap<>();
 
-  public void init(HashMap<String, String> pool) {
+  public void init(Map<String, String> pool) {
     this.pool = pool;
     this.client = new OkHttpClient();
 

TYUsbSDK/src/main/java/com/taiyi/tyusbsdk/pulse/TaiyiConfig.java

@@ -6,13 +6,14 @@ import android.content.res.Resources;
 import com.taiyi.tyusbsdk.R;
 
 import java.util.HashMap;
+import java.util.Map;
 
 public class TaiyiConfig {
   private final String appId;
   private final String appSecret;
   public boolean skipReport = false;
   public int delayDisconnect = 0;
-  public HashMap<String, String> proxy = new HashMap<>();
+  public Map<String, String> proxy;
 
   public static TaiyiConfig getDefault(Context context) {
     return new TaiyiConfig(context);

TYUsbSDK/src/main/java/com/taiyi/tyusbsdk/pulse/TaiyiManager.java

@@ -10,6 +10,7 @@ import android.os.Build;
 import androidx.annotation.Nullable;
 
 import com.taiyi.tyusbsdk.ResultListener;
+import com.taiyi.tyusbsdk.pulse.net.HttpImpl;
 import com.taiyi.tyusbsdk.pulse.net.HttpUtil;
 import com.taiyi.tyusbsdk.pulse.ui.SuccessActivity;
 import com.taiyi.tyusbsdk.pulse.util.AppManager;
@@ -74,6 +75,21 @@ public class TaiyiManager {
         return "https://hybrid.reborn-tech.com/report.html#/?mid=" + measureId + "&access_session=" + HttpUtil.AuthorizationValue + "&appId=" + appId;
     }
 
+    public void getAsyncUrl(String measureId, final HttpImpl<String> callback) {
+        HttpUtil.getInstance().webViewCheck(new HttpImpl<String>() {
+            @Override
+            public void showError(String error) {
+                callback.showError(error);
+            }
+
+            @Override
+            public void showResponse(String response) {
+                HttpUtil.AuthorizationValue = response;
+                callback.showResponse(getUrl(measureId));
+            }
+        });
+    }
+
     private TaiyiManager() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
             closeAndroid10Dialog();

ble/gradle.properties

@@ -1,3 +1,3 @@
 MAVEN_LIB_ARTIFACTID=ble
-MAVEN_LIB_VERSION=1.1.0-alpha.01
+MAVEN_LIB_VERSION=1.1.0-alpha.02
 MAVEN_LIB_DESCRIPTION=six.pulse:packag

ble/src/main/AndroidManifest.xml

@@ -23,13 +23,16 @@
         <activity
             android:screenOrientation="landscape"
             android:name=".ui.activity.measure.BleMeasureFlowActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.activity.MeasureMainActivity"
-            android:exported="false" />
+            android:exported="true"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ui.activity.measure.Measure3Activity"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/AppTheme.NoActionBar" />
     </application>
 
 </manifest>