rc

SonicCloudOrg · May 30, 2022 · 715fca1 · 715fca1
1 parent 18ecad6
commit 715fca1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/plugins/sonic-ios-bridge b/plugins/sonic-ios-bridge
diff --git a/plugins/sonic-ios-bridge.exe b/plugins/sonic-ios-bridge.exe
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>sonic-agent</artifactId>
-    <version>1.4.0-beta</version>
+    <version>1.4.0-rc</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/src/main/docker/docker-compose.yml b/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.4.0-beta"
+    image: "registry.cn-hangzhou.aliyuncs.com/sonic-cloud/sonic-agent-linux:v1.4.0-rc"
     environment:
       - ZOOKEEPER_HOST=192.168.1.1
       - ZOOKEEPER_PORT=2181

diff --git a/src/main/docker/docker-compose2.yml b/src/main/docker/docker-compose2.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   sonic-agent:
-    image: "sonicorg/sonic-agent-linux:v1.4.0-beta"
+    image: "sonicorg/sonic-agent-linux:v1.4.0-rc"
     environment:
       - ZOOKEEPER_HOST=192.168.1.1
       - ZOOKEEPER_PORT=2181

diff --git a/src/main/java/org/cloud/sonic/agent/websockets/AndroidWSServer.java b/src/main/java/org/cloud/sonic/agent/websockets/AndroidWSServer.java
@@ -122,7 +122,8 @@ public void onOpen(Session session, @PathParam("key") String secretKey,
             }
             try {
                 iDevice.installPackage("plugins/sonic-android-apk.apk",
-                        true, new InstallReceiver(), 180L, 180L, TimeUnit.MINUTES);
+                        true, new InstallReceiver(), 180L, 180L, TimeUnit.MINUTES
+                        , "-r", "-t", "-g");
                 logger.info("Sonic插件安装完毕");
             } catch (InstallException e) {
                 e.printStackTrace();
@@ -533,7 +534,8 @@ public void onMessage(String message, Session session) {
                             try {
                                 File localFile = DownloadTool.download(msg.getString("apk"));
                                 iDevice.installPackage(localFile.getAbsolutePath()
-                                        , true, new InstallReceiver(), 180L, 180L, TimeUnit.MINUTES);
+                                        , true, new InstallReceiver(), 180L, 180L, TimeUnit.MINUTES
+                                        , "-r", "-t", "-g");
                                 result.put("status", "success");
                             } catch (IOException | InstallException e) {
                                 result.put("status", "fail");