照片按设备分目录存放

app/src/main/java/com/xypower/mpremote/DeviceActivity.java

@@ -88,10 +88,6 @@ public class DeviceActivity extends AppCompatActivity {
 
     private static final int ADB_SERVER_PORT = 5555;
 
-    private static final String WIFI_IP_PREFIX = "192.168.";
-    // private static final String WIFI_IP_DEVIDE = "192.168.50.1";
-    private static final String WIFI_IP_DEVICE = "192.168.50.92";
-
     // [vendor.ril.nw.signalstrength.lte.1]: [-85,27]
     //[vendor.ril.nw.signalstrength.lte.2]: [-86,27]
 
@@ -102,8 +98,8 @@ public class DeviceActivity extends AppCompatActivity {
     private AdbKeyPair mAdbKeyPair;
 
     private Map<String, String> mProps = new HashMap<>();
-
     private Map<Integer, JSONObject> mChannelCfgs = new HashMap();
+    private String mSerialNo = "";
 
     private MicroPhotoContext.AppConfig mAppConfig;
     private int mBatteryVoltage = -1;
@@ -204,6 +200,7 @@ public class DeviceActivity extends AppCompatActivity {
                     return;
                 }
 
+                Log.d(TAG, mDeviceIp + " Connected");
                 boolean res = false;
 
                 File appConfigFile = new File(fileTmp, "App.json");
@@ -267,6 +264,9 @@ public class DeviceActivity extends AppCompatActivity {
                     }
                 }
 
+                if (mProps.containsKey(KEY_RO_SERIALNO)) {
+                    mSerialNo = (String)mProps.get(KEY_RO_SERIALNO);
+                }
                 // adb shell pm dump com.xypower.mpremote | grep "versionName"
                 adbShellResponse = null;
                 try {
@@ -399,7 +399,12 @@ public class DeviceActivity extends AppCompatActivity {
                             }
                         }
 
-                        File localFilePath = new File(getFilesDir(), localFileName);
+                        File localDevicePath = new File(getFilesDir(), "Photos" + File.separator + mSerialNo);
+                        if (!localDevicePath.exists()) {
+                            localDevicePath.mkdirs();
+                        }
+
+                        final File localFilePath = new File(localDevicePath, localFileName);
 
                         for (int idx = 0; idx < 10; idx++) {
 
@@ -616,7 +621,6 @@ public class DeviceActivity extends AppCompatActivity {
             appendKeyValue(stringBuilder, "系统版本", val, true);
         }
 
-
         int numberOfSimcard = 0;
         if (mProps.containsKey(KEY_RO_MODEMS_MAX_COUNT)) {
             String val = (String)mProps.get(KEY_RO_MODEMS_MAX_COUNT);

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

@@ -11,11 +11,22 @@
         android:id="@+id/imageView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="fitCenter"
+        android:scaleType="fitStart"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@android:drawable/screen_background_light_transparent" />
 
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHeight_default="percent"
+        app:layout_constraintHeight_percent="0.5"
+        />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>