Merge pull request #249 from SonicCloudOrg/1.5.0-rc

1.5.0 rc

.github/workflows/deploy.yml

@@ -1,7 +1,8 @@
 name: deploy to Dockerhub
 
 on:
-  workflow_dispatch:
+  release:
+    types: [published]
 
 jobs:
 
@@ -21,6 +22,8 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: maven
+      - name: replace version
+        run: ver=${{ steps.previoustag.outputs.tag }} && new_ver=${ver:1} && sed -i "s/SONIC_VERSION/${new_ver}/g" pom.xml
       - name: login docker hub
         run: echo "${{ secrets.ACCESS_TOKEN }}" | docker login -u zhouyixun --password-stdin
       - name: sgm-download

.github/workflows/maven.yml

@@ -0,0 +1,19 @@
+name: maven-compile-test
+
+on: [pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Validate and Compile with Maven
+      run: mvn validate compile

.github/workflows/release.yml

@@ -1,7 +1,8 @@
 name: release to github
 
 on:
-  workflow_dispatch:
+  release:
+    types: [published]
 
 jobs:
 
@@ -21,6 +22,8 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: maven
+      - name: replace version
+        run: ver=${{ steps.previoustag.outputs.tag }} && new_ver=${ver:1} && sed -i "s/SONIC_VERSION/${new_ver}/g" pom.xml && sed -i "s/SONIC_VERSION/${{ steps.previoustag.outputs.tag }}/g" src/main/docker/docker-compose*.yml
       - name: mkdir
         run: mkdir -p sonic-agent-${{ steps.previoustag.outputs.tag }}-linux_x86/plugins sonic-agent-${{ steps.previoustag.outputs.tag }}-linux_x86_64/plugins sonic-agent-${{ steps.previoustag.outputs.tag }}-macosx_x86_64/plugins sonic-agent-${{ steps.previoustag.outputs.tag }}-windows_x86/plugins sonic-agent-${{ steps.previoustag.outputs.tag }}-windows_x86_64/plugins
       - name: package-linux86

config/application-sonic-agent.yml

@@ -28,7 +28,7 @@ modules:
     enable: true
   webview:
     # 是否开启在线webView调试功能
-    enable: false
+    enable: true
     # 谷歌调试端口，一般不需要修改（默认0使用随机端口，如果需要开启防火墙给外部使用，请设置固定端口如7778）
     chrome-driver-debug-port: 0
     # 替换为Agent机器上的chrome浏览器的driver路径，可以去http://npm.taobao.org/mirrors/chromedriver/下载

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.cloud.sonic</groupId>
     <artifactId>sonic-agent</artifactId>
-    <version>1.5.0-beta</version>
+    <version>SONIC_VERSION</version>
     <packaging>jar</packaging>
 
     <properties>

src/main/docker/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   sonic-agent:
-    image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-agent-linux:v1.5.0-beta"
+    image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-agent-linux:SONIC_VERSION"
     environment:
       # 对应server的env配置，注意防火墙关闭对应端口
       - SONIC_SERVER_HOST=192.168.1.1

src/main/docker/docker-compose2.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   sonic-agent:
-    image: "sonicorg/sonic-agent-linux:v1.5.0-beta"
+    image: "sonicorg/sonic-agent-linux:SONIC_VERSION"
     environment:
       # 对应server的env配置，注意防火墙关闭对应端口
       - SONIC_SERVER_HOST=192.168.1.1

src/main/java/org/cloud/sonic/agent/bridge/android/AndroidDeviceStatusListener.java

@@ -19,6 +19,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.android.ddmlib.AndroidDebugBridge;
 import com.android.ddmlib.IDevice;
+import org.cloud.sonic.agent.common.interfaces.IsHMStatus;
 import org.cloud.sonic.agent.common.interfaces.PlatformType;
 import org.cloud.sonic.agent.common.maps.AndroidDeviceManagerMap;
 import org.cloud.sonic.agent.common.maps.DevicesBatteryMap;
@@ -50,12 +51,13 @@ private void send(IDevice device) {
         deviceDetail.put("name", device.getProperty("ro.product.name"));
         deviceDetail.put("model", device.getProperty(IDevice.PROP_DEVICE_MODEL));
         deviceDetail.put("status", device.getState() == null ? null : device.getState().toString());
-        if(device.getProperty("hw_sc.build.os.enable") != null){
+        deviceDetail.put("platform", PlatformType.ANDROID);
+        if (device.getProperty("ro.config.ringtone") != null && device.getProperty("ro.config.ringtone").contains("Harmony")) {
             deviceDetail.put("version", device.getProperty("hw_sc.build.platform.version"));
-            deviceDetail.put("platform", PlatformType.HARMONYOS);
-        }else{
+            deviceDetail.put("isHm", IsHMStatus.IS_HM);
+        } else {
             deviceDetail.put("version", device.getProperty(IDevice.PROP_BUILD_VERSION));
-            deviceDetail.put("platform", PlatformType.ANDROID);
+            deviceDetail.put("isHm", IsHMStatus.IS_ANDROID);
         }
 
         deviceDetail.put("size", AndroidDeviceBridgeTool.getScreenSize(device));

src/main/java/org/cloud/sonic/agent/common/interfaces/IsHMStatus.java

@@ -0,0 +1,11 @@
+package org.cloud.sonic.agent.common.interfaces;
+
+/**
+ * @author maomeng
+ * @des 鸿蒙系统标识
+ * @date 2022/8/23 12:22
+ */
+public interface IsHMStatus {
+    int IS_ANDROID = 0;
+    int IS_HM = 1;
+}

src/main/java/org/cloud/sonic/agent/common/interfaces/PlatformType.java

@@ -8,8 +8,6 @@
 public interface PlatformType {
     int ANDROID = 1;
     int IOS = 2;
-    // HarmonyOs
-    int HARMONYOS = 6;
     int WINDOWS = 3;
     int MAC = 4;
     int WEB = 5;

src/main/java/org/cloud/sonic/agent/transport/TransportClient.java

@@ -179,7 +179,9 @@ public void onClose(int i, String s, boolean b) {
         if (TransportWorker.isKeyAuth) {
             log.info("Server disconnected. Retry in 10s...");
         }
-        TransportWorker.client = null;
+        if(TransportWorker.client == this) {
+            TransportWorker.client = null;
+        }
     }
 
     @Override

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
 
 sonic:
   saa: 2.0.1
-  sgm: 0.1.9
+  sgm: 1.3.1
   sib: 1.1.8
 
 logging: