Browse Source

重启系统(蚂蚁OS待测试)

dt-9690807782-gp7GC 1 year ago
parent
commit
93922bd7d5

+ 0 - 1
SeriaApp/build/.transforms/9acf47e7c5cf86018463b54463792e0f.bin

@@ -1 +0,0 @@
-o/classes

BIN
SeriaApp/build/.transforms/9acf47e7c5cf86018463b54463792e0f/classes/classes.dex


+ 1 - 1
SeriaApp/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Nov 22 19:02:52 CST 2023
+#Thu Nov 23 17:22:56 CST 2023
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\generated\\res\\pngs\\debug\\drawable-xxxhdpi\\ic_launcher_background.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\debug\\drawable-xxxhdpi-v4\\ic_launcher_background.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\src\\main\\res\\mipmap-hdpi\\icon_return_black.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\icon_return_black.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\generated\\res\\pngs\\debug\\drawable-hdpi\\ic_launcher_background.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_launcher_background.png

+ 1 - 1
SeriaApp/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Nov 23 08:57:45 CST 2023
+#Thu Nov 23 17:23:09 CST 2023
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\generated\\res\\pngs\\release\\drawable-xxxhdpi\\ic_launcher_background.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\release\\drawable-xxxhdpi-v4\\ic_launcher_background.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\src\\main\\res\\mipmap-hdpi\\icon_return_black.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\release\\mipmap-hdpi-v4\\icon_return_black.png
 D\:\\AndroidApp\\FaceScenic\\SeriaApp\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=D\:\\AndroidApp\\FaceScenic\\SeriaApp\\build\\intermediates\\packaged_res\\release\\mipmap-xhdpi-v4\\ic_launcher.png

+ 0 - 0
app/platform.jks


+ 15 - 7
app/src/main/java/com/telpo/faceSuZhouPark/activity/PassWordActivity.java

@@ -19,10 +19,12 @@ import com.common.pos.api.util.ShellUtils;
 import com.telpo.faceSuZhouPark.R;
 import com.telpo.faceSuZhouPark.utile.Config;
 import com.telpo.faceSuZhouPark.utile.FaceScenicUtile;
+import com.telpo.faceSuZhouPark.utile.loacat.AppLogUtils;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -173,11 +175,18 @@ public class PassWordActivity extends BaseActivity {
             public void onClick(View v) {
                 popupWindow.dismiss();
                 if (Type.equals("reboot")){
-                    Intent intent = new Intent(Intent.ACTION_REBOOT);
-                    intent.putExtra("nowait",1);
-                    intent.putExtra("interval",1);
-                    intent.putExtra("window",0);
-                    sendBroadcast(intent);
+//                    Intent intent = null;
+//                    intent = new Intent(Intent.ACTION_REBOOT);
+//                    intent.putExtra("nowait",1);
+//                    intent.putExtra("interval",1);
+//                    intent.putExtra("window",0);
+//                    sendBroadcast(intent);
+                    exec("reboot");
+//                    try {
+//                        ShellUtils.execCommand("reboot", true);
+//                    } catch (Exception e) {
+//                        e.printStackTrace();
+//                    }
                 }else {//退出应用
                     Config.mSessionId="";
                     finish();
@@ -188,13 +197,12 @@ public class PassWordActivity extends BaseActivity {
         });
     }
     private String exec(String command) {
-
         Process process = null;
         BufferedReader reader = null;
         InputStreamReader is = null;
         DataOutputStream os = null;
-
         try {
+            //"/system/bin/sh"
             process = Runtime.getRuntime().exec("su");
             is = new InputStreamReader(process.getInputStream());
             reader = new BufferedReader(is);

+ 6 - 7
app/src/main/java/com/telpo/faceSuZhouPark/activity/SetUpActivity.java

@@ -192,13 +192,12 @@ public class SetUpActivity extends BaseActivity {
             public void onClick(View v) {
                 popupWindow.dismiss();
                 if (Type.equals("reboot")){
-                    exec("reboot");
-//                    ShellUtils.execCommand("reboot", true);
-                    Intent intent = new Intent(Intent.ACTION_REBOOT);
-                    intent.putExtra("nowait",1);
-                    intent.putExtra("interval",1);
-                    intent.putExtra("window",0);
-                    sendBroadcast(intent);
+//                    exec("reboot");
+                    try {
+                        ShellUtils.execCommand("reboot", true);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }else {//退出应用
                     Config.mSessionId="";
                     finish();