Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

mpmaster/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 def AppMajorVersion = 1
 def AppMinorVersion = 1
-def AppBuildNumber = 4
+def AppBuildNumber = 5
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

mpmaster/src/main/java/com/xypower/mpmaster/sms/SmsReceiver.java

@@ -21,7 +21,7 @@ import java.util.Date;
 public class SmsReceiver extends BroadcastReceiver {
 
     public static final String SMS_BUNDLE = "pdus";
-    public static long mLastSmsTime = System.currentTimeMillis();
+    public static long mLastSmsTime = 0;
     private static final SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Override
@@ -34,10 +34,9 @@ public class SmsReceiver extends BroadcastReceiver {
 
                     // Log.i("SMS", "RECV " + mSimpleDateFormat.format(dt) + " " + smsMessage.getMessageBody());
 
-                    if (smsMessage.getTimestampMillis() < mLastSmsTime) {
+                    if (mLastSmsTime!= 0 &&smsMessage.getTimestampMillis() < mLastSmsTime) {
-
                         Date dt = new Date(smsMessage.getTimestampMillis());
-                        Log.i("SMS", "MSG @" + mSimpleDateFormat.format(dt) + " Dropped: " + smsMessage.getMessageBody());
+                        Log.e("SMS", "MSG @" + mSimpleDateFormat.format(dt) + " Dropped: " + smsMessage.getMessageBody()+" mLastSmsTime:"+mLastSmsTime+" "+mSimpleDateFormat.format(mLastSmsTime));
                         SimUtil.setSmsMessageRead(context, smsMessage);
                         continue;
                     }

mpmaster/src/main/java/com/xypower/mpmaster/sms/UpdateSysConfigUtil.java

@@ -343,23 +343,23 @@ public class UpdateSysConfigUtil {
     //重启应用
     public static void restartApp(Context context) {
 
-        Intent intent = new Intent(MicroPhotoContext.ACTION_RESTART_MP);
+//        Intent intent = new Intent(MicroPhotoContext.ACTION_RESTART_MP);
-        intent.putExtra("noDelay", 1);
+//        intent.putExtra("noDelay", 1);
-        intent.setPackage(MicroPhotoContext.PACKAGE_NAME_MPAPP);
+//        intent.setPackage(MicroPhotoContext.PACKAGE_NAME_MPAPP);
-
+//
-        context.sendBroadcast(intent);
+//        context.sendBroadcast(intent);
-        try {
+//        try {
-            Thread.sleep(200);
+//            Thread.sleep(200);
-        } catch (Exception ex) {
+//        } catch (Exception ex) {
-            ex.printStackTrace();
+//            ex.printStackTrace();
-        }
+//        }
 
         PackageManager packageManager = context.getPackageManager();
 
-        intent = packageManager.getLaunchIntentForPackage(MicroPhotoContext.PACKAGE_NAME_MPAPP);
+        Intent intent = packageManager.getLaunchIntentForPackage(MicroPhotoContext.PACKAGE_NAME_MPAPP);
         intent.putExtra("noDelay", 1);
         // intent.putExtra("reboot", 1);
-        intent.addFlags(/*Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | */Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK );
         context.startActivity(intent);
     }