1.关闭手动可以控制自动拉起主应用功能

2.优化下载功能

.gitignore

@@ -73,4 +73,5 @@ lint-results*.html
 .DS_Store
 
 # Windows thumbnail db
-Thumbs.db
+Thumbs.db
+/app/release/*

app/build.gradle

@@ -13,7 +13,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdk 28
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/xn/update/SettingActivity.java

@@ -74,14 +74,14 @@ public class SettingActivity extends AppCompatActivity {
             binding.fileBrowserBT.setOnClickListener(v -> Tool.INSTANCE.openFileBrowser());
             // 重启设备
             binding.rebootBT.setOnClickListener(v -> InfoSystemApi.reboot());
-            // 自动拉起主应用
-            binding.autoMasterSwitch.setChecked(SPUtils.getInstance().getBoolean(AppConstant.AUTO_MASTER, true));
-            binding.autoMasterSwitch.setOnCheckedChangeListener((buttonView, isChecked)
-                    -> SPUtils.getInstance().put(AppConstant.AUTO_MASTER, isChecked));
-            // 自动更新主应用
-            binding.autoUpdateSwitch.setChecked(SPUtils.getInstance().getBoolean(AppConstant.AUTO_UPDATE, true));
-            binding.autoUpdateSwitch.setOnCheckedChangeListener((buttonView, isChecked)
-                    -> SPUtils.getInstance().put(AppConstant.AUTO_UPDATE, isChecked));
+//            // 自动拉起主应用
+//            binding.autoMasterSwitch.setChecked(SPUtils.getInstance().getBoolean(AppConstant.AUTO_MASTER, true));
+//            binding.autoMasterSwitch.setOnCheckedChangeListener((buttonView, isChecked)
+//                    -> SPUtils.getInstance().put(AppConstant.AUTO_MASTER, isChecked));
+//            // 自动更新主应用
+//            binding.autoUpdateSwitch.setChecked(SPUtils.getInstance().getBoolean(AppConstant.AUTO_UPDATE, true));
+//            binding.autoUpdateSwitch.setOnCheckedChangeListener((buttonView, isChecked)
+//                    -> SPUtils.getInstance().put(AppConstant.AUTO_UPDATE, isChecked));
             // 系统设置
             binding.settingBT.setOnClickListener(v -> {
                 Tool.INSTANCE.openSetting();

app/src/main/java/xn/update/receiver/TimeTickReceiver.java

@@ -52,7 +52,6 @@ public class TimeTickReceiver extends BroadcastReceiver {
         Intent newIntent = new Intent("XN_ACTION");
         intent.putExtra("heartbeat", "heartbeat");
         context.sendBroadcast(newIntent);
-        LogUtils.d("分钟", isRunning, ActivityUtils.getActivityList());
         // 空闲中
         if (!isRunning && SPUtils.getInstance().getBoolean(AppConstant.AUTO_UPDATE, true)) {
             if (null == downloadManager) {
@@ -61,6 +60,7 @@ public class TimeTickReceiver extends BroadcastReceiver {
                     @Override
                     public void onReceive(Context context, Intent intent) {
                         long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
+                        LogUtils.d("下载成功", downloadId, task);
                         if (downloadId == id) {
                             if (null != task) {
                                 AsyncTask.execute(() -> {
@@ -82,6 +82,7 @@ public class TimeTickReceiver extends BroadcastReceiver {
                                     });
                                 } else {
                                     ShellUtils.CommandResult commandResult = ShellUtils.execCmd("pm install -d -g " + apkPath + apkName, true);
+                                    LogUtils.d("安装app", commandResult);
                                     if (commandResult.result == 0) {
                                         AsyncTask.execute(() -> {
                                             try {
@@ -96,6 +97,7 @@ public class TimeTickReceiver extends BroadcastReceiver {
                                     }
                                 }
                             }
+                            context.unregisterReceiver(downloadApkReceiver);
                             isRunning = false;
                         }
                     }
@@ -127,6 +129,7 @@ public class TimeTickReceiver extends BroadcastReceiver {
                                     request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_HIDDEN);
                                     context.registerReceiver(downloadApkReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
                                     downloadId = downloadManager.enqueue(request);
+                                    LogUtils.d("发起下载", downloadId);
                                     return true;
                                 }
                             } else {

app/src/main/res/layout/activity_setting.xml

@@ -258,37 +258,37 @@
 
                 </androidx.cardview.widget.CardView>
 
-                <androidx.cardview.widget.CardView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp">
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/auto_master_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:paddingHorizontal="10dp"
-                        android:text="自动唤醒主应用"
-                        app:switchPadding="10dp" />
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp">
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/auto_update_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:paddingHorizontal="10dp"
-                        android:text="自动更新"
-                        app:switchPadding="10dp" />
-
-                </androidx.cardview.widget.CardView>
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_margin="5dp">-->
+
+<!--                    <androidx.appcompat.widget.SwitchCompat-->
+<!--                        android:id="@+id/auto_master_switch"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_gravity="center"-->
+<!--                        android:paddingHorizontal="10dp"-->
+<!--                        android:text="自动唤醒主应用"-->
+<!--                        app:switchPadding="10dp" />-->
+
+<!--                </androidx.cardview.widget.CardView>-->
+
+<!--                <androidx.cardview.widget.CardView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_margin="5dp">-->
+
+<!--                    <androidx.appcompat.widget.SwitchCompat-->
+<!--                        android:id="@+id/auto_update_switch"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_gravity="center"-->
+<!--                        android:paddingHorizontal="10dp"-->
+<!--                        android:text="自动更新"-->
+<!--                        app:switchPadding="10dp" />-->
+
+<!--                </androidx.cardview.widget.CardView>-->
 
             </com.google.android.flexbox.FlexboxLayout>