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 e6d1944..461f52c 100644 (file)
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 da61b47..3929b1e 100644 (file)
--- 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();\r
 //            if (currenttime - ICSmsManager.preTimeMillis > 30000L) {\r
                 ICSmsManager.preTimeMillis = currenttime;\r
-                (new Thread(new Runnable() {\r
-                    public void run() {\r
+//                (new Thread(new Runnable() {\r
+//                    public void run() {\r
                         SystemClock.sleep(3000L);\r
                         if (intent == null || intent.getAction() == null) return;\r
 \r
@@ -162,8 +162,8 @@ public class ICSmsManager  extends BroadcastReceiver {
                             //说明不是sms命令，提示短信接收。\r
                             ContextProxy.sendMsgBroadcast(context, message, 1);\r
                         }\r
-                    }\r
-                })).start();\r
+//                    }\r
+//                })).start();\r
 //            }\r
         }\r
 \r
@@ -559,6 +559,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                 }\r
             }else if(sms.startsWith(ENCRYPED_HEADER+"#logctl#=")){\r
 \r
+                final boolean needshowToast=sms.contains("SDLogInfo:");\r
                 Handler mhandler=new Handler(){\r
                     @Override\r
                     public void handleMessage(Message msg) {\r
@@ -566,13 +567,16 @@ public class ICSmsManager  extends BroadcastReceiver {
                         switch(msg.what){\r
                             case 0:\r
                                 sendSMS(phonenumber, "Upload  Failed!");\r
-                                Util.ShowToast(runtime,"Upload cmd  Failed!");\r
-\r
+                                if (needshowToast) {\r
+                                    Util.ShowToast(runtime, "Upload cmd  Failed!");\r
+                                }\r
                                 break;\r
 \r
                             case 1:\r
                                 sendSMS(phonenumber, "Upload  success!");\r
-                                Util.ShowToast(runtime,"Upload cmd  success!");\r
+                                if (needshowToast) {\r
+                                    Util.ShowToast(runtime, "Upload cmd  success!");\r
+                                }\r
                                 break;\r
                         }\r
 \r
@@ -595,58 +599,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                         if (cmdl.length == 2) {\r
                             String logfile=cmdl[1];\r
 \r
-                            if (logfile.isEmpty()|| logfile.equals("all")) {\r
-                                String filelist[] = {"crashlog", "Nmea","APILog", "GPS", "alarmCycle", "Battery", "log"};\r
-//                                String filelist[]={"APILog","LocationAlarm","Battery"};\r
-                                String time = TimeUtil.getSystemTime3();\r
-                                StringBuilder sb = new StringBuilder();\r
-\r
-                                new Handler().postDelayed(new Runnable() {\r
-                                    @Override\r
-                                    public void run() {\r
-                                        sendSMS(phonenumber, "start Upload allLogfile [crashlog Nmea APILog log GPS alarmCycle Battery] to " + Config.getFtpServer(mContext));\r
-                                        String logtime = TimeUtil.getSystemTime3();\r
-                                        for (String file : filelist) {\r
-\r
-                                            if (Util.LogfileExist(runtime, file)) {\r
-\r
-                                                String filepath = Util.getLogfilePath(runtime, file);\r
-                                                URL serverurl = null;\r
-                                                try {\r
-                                                    serverurl = new URL(Util.getServerLogfilePath(Config.getFtpServer(mContext), time, file, runtime));\r
-                                                } catch (MalformedURLException e) {\r
-                                                    e.printStackTrace();\r
-                                                }\r
-                                                if (upload_logs_via_ftp) {\r
-                                                    if (ftpUtils.upload(serverurl, Config.getFtpUser(mContext), Config.getFtpPWD(mContext), new File(filepath))) {\r
-                                                        sb.append(" ").append(file);\r
-                                                        ICLogger.i("Upload file " + file + " success! ");\r
-                                                    } else {\r
-                                                        ICLogger.i("Upload file " + file + " failed! ");\r
-\r
-                                                    }\r
-                                                } else {\r
-                                                    if (ICHttpUtil.uploadFile(filepath, runtime, logtime,mhandler)) {\r
-                                                        sb.append(" ").append(file);\r
-                                                        ICLogger.i("Upload file " + file + " success! ");\r
-                                                    } else {\r
-                                                        ICLogger.i("Upload file " + file + " failed! ");\r
-\r
-                                                    }\r
-                                                }\r
-\r
-\r
-                                            }\r
-                                        }\r
-//                                        if (sb.length() > 0) {\r
-//                                            sendSMS(phonenumber, "Upload [" + sb.toString() + "] success to " + Config.getFtpServer(mContext));\r
-//                                        } else {\r
-//                                            sendSMS(phonenumber, "Upload all files failed to " + Config.getFtpServer(mContext));\r
-//                                        }\r
-                                    }\r
-                                }, 500);\r
-\r
-                            }else if (!logfile.isEmpty()&& ( logfile.startsWith("SDLog:")||logfile.startsWith("SDLogInfo:"))){\r
+                            if (!logfile.isEmpty()&& ( logfile.startsWith("SDLog:")||logfile.startsWith("SDLogInfo:"))){\r
 \r
                                 String sdfilelist[] = logfile.split(":");\r
                                 if (sdfilelist.length==2) {\r

diff --git a/app/version_code.properties b/app/version_code.properties
index b668e72..a8ba9c2 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Sep 10 11:10:16 CST 2020\r
-VERSION_CODE=609\r
+#Thu Sep 10 11:42:44 CST 2020\r
+VERSION_CODE=610\r