新增sim卡切换

新增短信监听

app/src/main/cpp/CMakeLists.txt

@@ -55,8 +55,8 @@ find_package(ncnn REQUIRED)
 
 SET(YAMC_INC_DIR ${CMAKE_SOURCE_DIR})
 
-#SET(TERM_CORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../xymp/Core)
+SET(TERM_CORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../xymp/Core)
-SET(TERM_CORE_ROOT D:/Workspace/xymp/Core)
+#SET(TERM_CORE_ROOT D:/Workspace/xymp/Core)
 
 SET(JSONCPP_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp)
 SET(JSONCPP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/include)

app/src/main/java/com/xinyingpower/microphoto/MainActivity.java

@@ -62,18 +62,22 @@ public class MainActivity extends AppCompatActivity {
     static {
         System.loadLibrary("microphoto");
     }
+
     private ActivityMainBinding binding;
     private int defaultDataSubId;
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
     }
+
     protected class AppConfig {
         public String cmdid;
         public String server;
         public int port;
         public int protocol;
     }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -102,14 +106,9 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
 
-                String[] accessPermissions = new String[]{
+                String[] accessPermissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.FOREGROUND_SERVICE, Manifest.permission.READ_PHONE_STATE,
-                        Manifest.permission.CAMERA,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.FOREGROUND_SERVICE,
-                        Manifest.permission.READ_PHONE_STATE,
                         /*Manifest.permission.PACKAGE_USAGE_STATS,*/
-                        /*Manifest.permission.SET_TIME,*/
+                        /*Manifest.permission.SET_TIME,*/};
-                };
                 boolean needRequire = false;
                 for (String access : accessPermissions) {
                     int curPermission = ActivityCompat.checkSelfPermission(MainActivity.this, access);
@@ -119,10 +118,7 @@ public class MainActivity extends AppCompatActivity {
                     }
                 }
                 if (needRequire) {
-                    ActivityCompat.requestPermissions(
+                    ActivityCompat.requestPermissions(MainActivity.this, accessPermissions, MY_PERMISSIONS_REQUEST_FOREGROUND_SERVICE);
-                            MainActivity.this,
-                            accessPermissions,
-                            MY_PERMISSIONS_REQUEST_FOREGROUND_SERVICE);
                     return;
                 }
 
@@ -377,8 +373,7 @@ public class MainActivity extends AppCompatActivity {
             e.printStackTrace();
         } catch (JSONException e) {
             e.printStackTrace();
-        }
+        } finally {
-        finally {
             if (inputStreamReader != null) {
                 try {
                     inputStreamReader.close();
@@ -412,8 +407,7 @@ public class MainActivity extends AppCompatActivity {
             e.printStackTrace();
         } catch (JSONException e) {
             e.printStackTrace();
-        }
+        } finally {
-        finally {
             if (outputStreamWriter != null) {
                 try {
                     outputStreamWriter.close();

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

@@ -154,6 +154,7 @@
         android:text="TP 4"
         app:layout_constraintStart_toEndOf="@+id/takePhotoBtn3"
         app:layout_constraintTop_toBottomOf="@+id/simchange" />
+
     <Button
         android:id="@+id/gps"
         android:layout_width="wrap_content"
@@ -195,11 +196,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="48dp"
-        app:constraint_referenced_ids="startServBtn,stopServBtn,takePhotoBtn,takePhotoBtn2,simchange,simchange2,gps,netgps,tcpudp,tcpudpsend,video,video2"
+        app:constraint_referenced_ids="gps,netgps,tcpudp,tcpudpsend,video,video2"
         app:flow_horizontalGap="20dp"
         app:flow_wrapMode="chain"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/port" />
+        app:layout_constraintTop_toBottomOf="@+id/takePhotoBtn4" />
 
     <TextView