From 4e223d8105db26074a6d6e230a0c24cc362c2f7d Mon Sep 17 00:00:00 2001
From: BlueMatthew <wakinchau@msn.com>
Date: Fri, 5 Jan 2024 10:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4APP=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mpmaster/src/main/AndroidManifest.xml         | 16 +++-
 .../com/xypower/mpmaster/HotSpotService.java  | 16 ++++
 .../com/xypower/mpmaster/MainActivity.java    | 11 +++
 .../com/xypower/mpmaster/MpMasterService.java | 78 +++----------------
 .../src/main/res/layout/activity_main.xml     | 11 ++-
 5 files changed, 60 insertions(+), 72 deletions(-)
 create mode 100644 mpmaster/src/main/java/com/xypower/mpmaster/HotSpotService.java

diff --git a/mpmaster/src/main/AndroidManifest.xml b/mpmaster/src/main/AndroidManifest.xml
index 29c7be69..2e0fbb11 100644
--- a/mpmaster/src/main/AndroidManifest.xml
+++ b/mpmaster/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     package="com.xypower.mpmaster">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -27,7 +27,7 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission
         android:name="android.permission.REBOOT"
         tools:ignore="ProtectedPermissions" />
@@ -61,6 +61,9 @@
         tools:ignore="ProtectedPermissions" />
     <uses-permission
         android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"
+        tools:ignore="ProtectedPermissions" /> <!-- WiFi AP startTethering -->
+    <uses-permission
+        android:name="android.permission.TETHER_PRIVILEGED"
         tools:ignore="ProtectedPermissions" />
 
     <application
@@ -68,16 +71,21 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/Theme.MpMaster"
         tools:targetApi="28">
         <service
-            android:name=".MpMasterService"
+            android:name=".HotSpotService"
             android:enabled="true"
+            android:process=":hotspot"
             android:exported="true"></service>
+        <service
+            android:name=".MpMasterService"
+            android:enabled="true"
+            android:exported="true" />
 
         <activity
             android:name=".MainActivity"
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/HotSpotService.java b/mpmaster/src/main/java/com/xypower/mpmaster/HotSpotService.java
new file mode 100644
index 00000000..7d8c53d3
--- /dev/null
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/HotSpotService.java
@@ -0,0 +1,16 @@
+package com.xypower.mpmaster;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class HotSpotService extends Service {
+    public HotSpotService() {
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        // TODO: Return the communication channel to the service.
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+}
\ No newline at end of file
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java
index 7cb7f110..9617805e 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java
@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.StrictMode;
@@ -64,6 +65,16 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+        findViewById(R.id.btnTurnAppOn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // SysApi.enableApp(v.getContext(), "abcd1234");
+
+
+
+            }
+        });
+
         startMicroPhotoService(getApplicationContext());
     }
 
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
index 4bcb9fc9..bc88433d 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
@@ -66,13 +66,14 @@ public class MpMasterService extends Service {
     // public static final int NOTIFICATION_ID_FOREGROUND_SERVICE = 0;
     public static final String ACTION_MSG_BROADCAST = "ACT_MSG_BROADCAST";
 
-    public static final String ACTION_START = "ACT_START";
-    public static final String ACTION_STOP = "ACT_STOP";
-    public static final String ACTION_MAIN = "ACT_MAIN";
-    private static final String ACTION_HEARTBEAT = "ACT_HB";
-    private static final String ACTION_TAKE_PHOTO = "ACT_TP";
-    private static final String ACTION_TAKE_PHOTO_MANUALLY = "ACT_TP_M";
-    private static final String ACTION_TIMEOUT = "ACT_TIMEOUT";
+    public static final String ACTION_START = "com.xypower.mpmaster.ACT_START";
+    public static final String ACTION_STOP = "com.xypower.mpmaster.ACT_STOP";
+    public static final String ACTION_MAIN = "com.xypower.mpmaster.ACT_MAIN";
+
+    private static final String ACTION_HEARTBEAT = "com.xypower.mpmaster.ACT_HB";
+    private static final String ACTION_TAKE_PHOTO = "com.xypower.mpapp.ACT_TP";
+    //private static final String ACTION_TAKE_PHOTO_MANUALLY = "ACT_TP_M";
+    //private static final String ACTION_TIMEOUT = "ACT_TIMEOUT";
     private static final String EXTRA_PARAM_CHANNEL = "Channel";
     private static final String EXTRA_PARAM_PRESET = "Preset";
     private static final String EXTRA_PARAM_PHOTO_OR_VIDEO = "PhotoOrVideo";
@@ -148,9 +149,9 @@ public class MpMasterService extends Service {
         {
             mAlarmReceiver = new AlarmReceiver(this);
             IntentFilter intentFilter = new IntentFilter(ACTION_HEARTBEAT);
-            intentFilter.addAction(ACTION_TAKE_PHOTO);
-            intentFilter.addAction(ACTION_TIMEOUT);
-            intentFilter.addAction(ACTION_TAKE_PHOTO_MANUALLY);
+            // intentFilter.addAction(ACTION_TAKE_PHOTO);
+            // intentFilter.addAction(ACTION_TIMEOUT);
+            // intentFilter.addAction(ACTION_TAKE_PHOTO_MANUALLY);
             intentFilter.addAction(ACTION_MSG_BROADCAST);
             registerReceiver(mAlarmReceiver, intentFilter);
         }
@@ -225,16 +226,6 @@ public class MpMasterService extends Service {
         }
     }
 
-    public static void sendMessage(Context context, int what, int data) {
-        Intent intent = new Intent(ACTION_MSG_BROADCAST);
-        intent.putExtra("what", what);
-        intent.putExtra("data", data);
-        intent.setPackage(context.getPackageName());
-        // String typeName = AlarmReceiver.class.getTypeName();
-        // intent.setComponent( new ComponentName(context.getPackageName(), AlarmReceiver.class.getTypeName()) );
-        // context.sendBroadcast(intent);
-    }
-
     private void startMaster() {
         String masterUrl = MicroPhotoContext.DEFAULT_MASTER_URL;
 
@@ -326,54 +317,7 @@ public class MpMasterService extends Service {
 
         alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + timeout, pendingIntent);
     }
-    private void registerPhotoTimer(int channel, int preset, long ts, long timeout, List<Long> schedules) {
-
-        registerPhotoTimer(this.getApplicationContext(), channel, preset, ts, timeout, schedules);
-    }
-
-    // private HashMap<Long, Integer> mTimers = new HashMap<Long, Integer>();
-    public boolean registerTimer(long uid, int timeout, long times) {
-
-        // 创建延迟意图
-        Intent alarmIntent = new Intent();
-        alarmIntent.setAction(ACTION_TIMEOUT);
-        alarmIntent.putExtra(EXTRA_PARAM_TIMER_UID, uid);
-        alarmIntent.putExtra(EXTRA_PARAM_TIMEOUT, timeout);
-        alarmIntent.putExtra(EXTRA_PARAM_TIMES, times);
-        alarmIntent.putExtra(EXTRA_PARAM_ELASPED_TIMES, 0L);
-
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        mTimers.put(Long.valueOf(uid), pendingIntent);
-        return registerTimer(pendingIntent, uid, timeout);
-    }
-
-
-    public boolean registerTimer(PendingIntent pendingIntent, long uid, int timeout) {
-
-        AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
-
-        alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + timeout, pendingIntent);
-
-        Log.i(TAG, "RegTimer:" + uid + " timeout=" + timeout);
-        return true;
-    }
-
-    public boolean unregisterTimer(long uid) {
 
-        Long uidObj = Long.valueOf(uid);
-        PendingIntent pendingIntent = mTimers.get(uidObj);
-        if (pendingIntent != null) {
-            AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
-
-            alarmManager.cancel(pendingIntent);
-
-            mTimers.remove(uidObj);
-            Log.i(TAG, "UnregTimer:" + uid);
-        }
-
-        return true;
-    }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
diff --git a/mpmaster/src/main/res/layout/activity_main.xml b/mpmaster/src/main/res/layout/activity_main.xml
index 7eaff4ce..611c13a8 100644
--- a/mpmaster/src/main/res/layout/activity_main.xml
+++ b/mpmaster/src/main/res/layout/activity_main.xml
@@ -51,9 +51,18 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
-
         android:text="OTG Off"
         app:layout_constraintStart_toEndOf="@+id/btnTurnOtgOn"
         app:layout_constraintTop_toTopOf="@+id/btnTurnOtgOn" />
 
+    <Button
+        android:id="@+id/btnTurnAppOn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="12dp"
+        android:text="APP On"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnTurnOtgOn" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file