update停止appium server的脚本和开始的逻辑

Commands/stopAppium.sh

@@ -1,14 +1,22 @@
-result=$(echo `netstat -nlp 2>/dev/null | grep node | grep $1`)
-arr=(${result//,/ })  
-for i in ${arr[@]}  
-do  
-	if [[ $i == *node ]]
-	then
-		tmp=$i
-	fi
-done
-process_id=${tmp%/*}
-if [ -n $process_id ]
+#result=$(echo `netstat -nlp 2>/dev/null | grep node | grep $1`)
+#arr=(${result//,/ })
+#echo $arr
+#for i in ${arr[@]}
+#do
+#	if [[ $i == *node ]]
+#	then
+#		tmp=$i
+#	fi
+#done
+#process_id=${tmp%/*}
+#if [ -n $process_id ]
+#then
+#	kill $process_id 2>/dev/null	#不显示标准错误输出
+#fi
+#
+pid=$(echo `ps -ef | grep appium | grep $1 | grep node | awk '{print $2}'`)
+echo $pid
+if [ $pid ]
 then
-	kill $process_id 2>/dev/null	#不显示标准错误输出
+  kill -9 $pid 2>/dev/null
 fi

src/main/java/net/mooctest/www/android_auto_test/common/constant/Consts.java

@@ -11,7 +11,7 @@ public class Consts {
 
     public static final String DAEMON_THREAD_NAME_PREFIX = "DAEMON_THREAD_";
 
-    public static final String[] ANDROID_ALERT_LABELS = {"确定", "确认", "允许", "始终允许", "同意", "继续", "同意并继续", "始终", "下一步", "取消", "继续使用", "android:id/button1"};
+    public static final String[] ANDROID_ALERT_LABELS = {"确定", "确认", "允许", "总是允许", "始终允许", "同意", "继续", "同意并继续", "始终", "下一步", "取消", "继续使用", "android:id/button1"};
 
     public static final String TRACE_DATA_PATH = "trace_data/";
 

src/main/java/net/mooctest/www/android_auto_test/utils/CoverageTest.java

@@ -162,12 +162,14 @@ public class CoverageTest extends Thread{
     }
 
     private void startAppiumServerAndLogcat(){
-        String port = AppiumManager.getInstance().checkDevicePort(udid);
-        if (port == null){
-            startServer();
-        }else {
-            this.port = port;
-        }
+//        String port = AppiumManager.getInstance().checkDevicePort(udid);
+//        this.port = port;
+        startServer();
+//        if (port == null){
+//            startServer();
+//        }else {
+//            this.port = port;
+//        }
         PrintUtil.print("Device " + udid + ", the port is " + this.port, TAG, udid);
         checkDeviceOnline();
         OsUtil.runCommand("adb -s " + udid + "logcat -c");
@@ -354,6 +356,7 @@ public class CoverageTest extends Thread{
         capabilities.setCapability("unicodeKeyboard","true");
         capabilities.setCapability("resetKeyboard","true");
         capabilities.setCapability("noSign", "true");
+//        capabilities.setCapability("automationName", "UiAutomator2");
         boolean success = false;
         int index = 0;
         while (! success && index <= Consts.INIT_DRIVER_TIMES) {

src/main/java/net/mooctest/www/android_auto_test/utils/TraceDaemon.java

@@ -125,19 +125,15 @@ public class TraceDaemon extends Thread{
         }
         try {
             if ("BugReport".equals(reportType)) {
-                PrintUtil.print("Generate bug report by AllenTian's docker", TAG);
-                String command = "java -jar tasks/AutoTestReportGenerator.jar " + traceId;
+                PrintUtil.print(String.format("Generate bug report by %s's docker", reportType), TAG);
+                String command = String.format("java -jar tasks/%s.jar %s", reportType, traceId);
                 String result = OsUtil.runCommand(command);
-                // TODO 这里在田老师改了生成逻辑后，就可以删掉了
-                if (!"success\n".equals(result)){
-                    PrintUtil.print(result, TAG);
-                    PrintUtil.print("Generate bug report failed, use default report.", TAG);
-                    FileUtils.copyFile(new File(AddressUtil.getMockDataJsonPath()), new File(AddressUtil.getDataJsonPath(traceId)));
-                }
+                PrintUtil.print(result, TAG);
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+        PrintUtil.print(String.format("Upload report json file"), TAG);
         // 上传data.json文件
         File data = new File(AddressUtil.getDataJsonPath(traceId));
         String path = ossService.uploadFileToTraceDir(data, traceId, Consts.REPORT_FILE_NAME);
@@ -176,20 +172,6 @@ public class TraceDaemon extends Thread{
     }
 
     /**
-     * 解析报告内容，上传截图
-     * @param dataJson data.json文件
-     */
-    private void parseDataJson(File dataJson, String traceId){
-        try {
-            String content = FileUtils.readFileToString(dataJson, "UTF-8");
-            JSONObject json = JSON.parseObject(content);
-            JSONArray bugList = json.getJSONArray("bugList");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
      * @return 该trace下所有任务是否都已完成
      */
     private boolean allTaskEnd(){