From: snickersun <scy@incartech.cn>
Date: Thu, 10 Sep 2020 03:44:15 +0000 (+0800)
Subject: release V610
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=170fe1143212874b5c4d0d84db9585931b7c9aca;p=protocol_srv.git

release V610
解决 短信命令日志上传以及mail 发送的 thread问题。
---

diff --git a/app/release/ICSer_V609_2009101110_release.apk b/app/release/ICSer_V610_2009101142_release.apk
similarity index 78%
rename from app/release/ICSer_V609_2009101110_release.apk
rename to app/release/ICSer_V610_2009101142_release.apk
index e6d19447..461f52c6 100644
Binary files a/app/release/ICSer_V609_2009101110_release.apk and b/app/release/ICSer_V610_2009101142_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index da61b474..3929b1ec 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -139,8 +139,8 @@ public class ICSmsManager  extends BroadcastReceiver {
             long currenttime = System.currentTimeMillis();
 //            if (currenttime - ICSmsManager.preTimeMillis > 30000L) {
                 ICSmsManager.preTimeMillis = currenttime;
-                (new Thread(new Runnable() {
-                    public void run() {
+//                (new Thread(new Runnable() {
+//                    public void run() {
                         SystemClock.sleep(3000L);
                         if (intent == null || intent.getAction() == null) return;
 
@@ -162,8 +162,8 @@ public class ICSmsManager  extends BroadcastReceiver {
                             //说明不是sms命令，提示短信接收。
                             ContextProxy.sendMsgBroadcast(context, message, 1);
                         }
-                    }
-                })).start();
+//                    }
+//                })).start();
 //            }
         }
 
@@ -559,6 +559,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                 }
             }else if(sms.startsWith(ENCRYPED_HEADER+"#logctl#=")){
 
+                final boolean needshowToast=sms.contains("SDLogInfo:");
                 Handler mhandler=new Handler(){
                     @Override
                     public void handleMessage(Message msg) {
@@ -566,13 +567,16 @@ public class ICSmsManager  extends BroadcastReceiver {
                         switch(msg.what){
                             case 0:
                                 sendSMS(phonenumber, "Upload  Failed!");
-                                Util.ShowToast(runtime,"Upload cmd  Failed!");
-
+                                if (needshowToast) {
+                                    Util.ShowToast(runtime, "Upload cmd  Failed!");
+                                }
                                 break;
 
                             case 1:
                                 sendSMS(phonenumber, "Upload  success!");
-                                Util.ShowToast(runtime,"Upload cmd  success!");
+                                if (needshowToast) {
+                                    Util.ShowToast(runtime, "Upload cmd  success!");
+                                }
                                 break;
                         }
 
@@ -595,58 +599,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                         if (cmdl.length == 2) {
                             String logfile=cmdl[1];
 
-                            if (logfile.isEmpty()|| logfile.equals("all")) {
-                                String filelist[] = {"crashlog", "Nmea","APILog", "GPS", "alarmCycle", "Battery", "log"};
-//                                String filelist[]={"APILog","LocationAlarm","Battery"};
-                                String time = TimeUtil.getSystemTime3();
-                                StringBuilder sb = new StringBuilder();
-
-                                new Handler().postDelayed(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        sendSMS(phonenumber, "start Upload allLogfile [crashlog Nmea APILog log GPS alarmCycle Battery] to " + Config.getFtpServer(mContext));
-                                        String logtime = TimeUtil.getSystemTime3();
-                                        for (String file : filelist) {
-
-                                            if (Util.LogfileExist(runtime, file)) {
-
-                                                String filepath = Util.getLogfilePath(runtime, file);
-                                                URL serverurl = null;
-                                                try {
-                                                    serverurl = new URL(Util.getServerLogfilePath(Config.getFtpServer(mContext), time, file, runtime));
-                                                } catch (MalformedURLException e) {
-                                                    e.printStackTrace();
-                                                }
-                                                if (upload_logs_via_ftp) {
-                                                    if (ftpUtils.upload(serverurl, Config.getFtpUser(mContext), Config.getFtpPWD(mContext), new File(filepath))) {
-                                                        sb.append(" ").append(file);
-                                                        ICLogger.i("Upload file " + file + " success! ");
-                                                    } else {
-                                                        ICLogger.i("Upload file " + file + " failed! ");
-
-                                                    }
-                                                } else {
-                                                    if (ICHttpUtil.uploadFile(filepath, runtime, logtime,mhandler)) {
-                                                        sb.append(" ").append(file);
-                                                        ICLogger.i("Upload file " + file + " success! ");
-                                                    } else {
-                                                        ICLogger.i("Upload file " + file + " failed! ");
-
-                                                    }
-                                                }
-
-
-                                            }
-                                        }
-//                                        if (sb.length() > 0) {
-//                                            sendSMS(phonenumber, "Upload [" + sb.toString() + "] success to " + Config.getFtpServer(mContext));
-//                                        } else {
-//                                            sendSMS(phonenumber, "Upload all files failed to " + Config.getFtpServer(mContext));
-//                                        }
-                                    }
-                                }, 500);
-
-                            }else if (!logfile.isEmpty()&& ( logfile.startsWith("SDLog:")||logfile.startsWith("SDLogInfo:"))){
+                            if (!logfile.isEmpty()&& ( logfile.startsWith("SDLog:")||logfile.startsWith("SDLogInfo:"))){
 
                                 String sdfilelist[] = logfile.split(":");
                                 if (sdfilelist.length==2) {
diff --git a/app/version_code.properties b/app/version_code.properties
index b668e72c..a8ba9c26 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 10 11:10:16 CST 2020
-VERSION_CODE=609
+#Thu Sep 10 11:42:44 CST 2020
+VERSION_CODE=610