优化

app/src/main/AndroidManifest.xml

@@ -42,6 +42,7 @@
             android:value="600"/>
 
         <activity android:name="com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity"
+            android:launchMode="singleInstance"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 2
+    ext.app_version_code = 3
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.2"
+    ext.app_version = "1.1.3"
 
     /**
      * 项目依赖库

callingdoor/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
 
         <activity android:name="com.wdkl.app.ncs.callingdoor.activity.AppUpdateActivity"
             android:screenOrientation="landscape"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleInstance"/>
 
         <service
             android:name=".sip.WdklSipService"

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/AppUpdateHelper.java

@@ -85,6 +85,8 @@ public class AppUpdateHelper {
             return;
         }*/
 
+        restartAppLater(context, 60000);
+
         String path = FILE_APK_PATH + "/" + FILE_APK_NAME;
         //if (installApp(context.getPackageName(), path)) {
         if (rootSilenceInstall(path)) {
@@ -228,6 +230,16 @@ public class AppUpdateHelper {
         }
     }
 
+    public static void restartAppLater(Context context, int time) {
+        //重新启动app
+        Intent mStartActivity = new Intent(context.getApplicationContext(), WelcomeActivity.class);
+        mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        int mPendingIntentId = 123456;
+        PendingIntent mPendingIntent = PendingIntent.getActivity(context.getApplicationContext(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager mgr = (AlarmManager) context.getApplicationContext().getSystemService(Context.ALARM_SERVICE);
+        mgr.set(AlarmManager.RTC, System.currentTimeMillis() + time, mPendingIntent);
+    }
+
     public static void reboot(Context context) {
         Log.e(TAG, "start reboot device...");
         try {

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/UpdateTipsDialogHelper.java

@@ -29,7 +29,7 @@ public class UpdateTipsDialogHelper {
         builder.setView(contentView);
         Button buttonCancel = contentView.findViewById(R.id.cancel_button);
         Button buttonConfirm = contentView.findViewById(R.id.confirm_button);
-        final CountDownTimer timer = new CountDownTimer(15000, 1000) {
+        final CountDownTimer timer = new CountDownTimer(30000, 1000) {
 
             @Override
             public void onTick(long millisUntilFinished) {

welcome/src/main/AndroidManifest.xml

@@ -5,9 +5,6 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
-        <activity android:name="com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity"
-            >
-        </activity>
     </application>
 </manifest>
 

welcome/src/main/ApkBuildDir/AndroidManifest.xml

@@ -8,15 +8,6 @@
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"
         android:name="apkbuild.WelcomeApplication"
         android:supportsRtl="true">
-        <activity android:name="com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity"
-            android:theme="@style/AppSplash"
-            >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
     </application>
 </manifest>