纠正错误的打开连接的方法

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

@@ -3,18 +3,16 @@ package com.xypower.mpremote;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.database.Cursor;
 import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
-import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
-import android.telephony.ims.ImsMmTelManager;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.format.Formatter;
@@ -30,6 +28,7 @@ import com.xypower.common.JSONUtils;
 import com.xypower.common.MicroPhotoContext;
 import com.xypower.mpremote.databinding.ActivityDeviceBinding;
 import com.xypower.mpremote.databinding.ActivityMainBinding;
+import com.xypower.mpremote.utils.AdbUtils;
 
 import org.json.JSONObject;
 
@@ -87,6 +86,11 @@ public class DeviceActivity extends AppCompatActivity {
 
     private static final String KEY_APP_MP_VERSION = "mpapp.version";
 
+    private static final String KEY_PREFIX_GLOBAL_SETTING = "settings.global.";
+
+    private static final String KEY_IMEI = KEY_PREFIX_GLOBAL_SETTING + "dev_imei";
+    private static final String KEY_IMEI2 = KEY_PREFIX_GLOBAL_SETTING + "dev_imei2";
+
     private static final int ADB_SERVER_PORT = 5555;
 
     // [vendor.ril.nw.signalstrength.lte.1]: [-85,27]
@@ -192,8 +196,12 @@ public class DeviceActivity extends AppCompatActivity {
             }
 
             private void runImpl() {
-                Dadb adb = Dadb.discover(mDeviceIp, mAdbKeyPair);
+                Log.d(TAG, "Adb discovering " + mDeviceIp);
+                // Dadb adb = Dadb.discover(mDeviceIp, mAdbKeyPair);
 
+                Dadb adb = Dadb.create(mDeviceIp, AdbUtils.DEFAULT_ADB_PORT, mAdbKeyPair);
+
+                Log.d(TAG, "Adb Connected");
                 if (adb == null) {
                     mHandler.postDelayed(new Runnable() {
                         @Override
@@ -222,6 +230,8 @@ public class DeviceActivity extends AppCompatActivity {
                     });
                 }
 
+                Log.d(TAG, "App.json Pulled");
+
                 final int numberOfChannels = (mAppConfig != null) ? mAppConfig.channels : 0;
                 mHandler.post(new Runnable() {
                     @Override
@@ -249,7 +259,30 @@ public class DeviceActivity extends AppCompatActivity {
                     }
                 }
 
+                Log.d(TAG, "Channel config Pulled");
+
                 AdbShellResponse adbShellResponse = null;
+                try {
+                    adbShellResponse = adb.shell("settings list global");
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+
+                if (adbShellResponse.getExitCode() == 0) {
+                    String[] lines = FilesUtils.splitLines(adbShellResponse.getAllOutput());
+                    for (String line : lines) {
+                        int pos = line.indexOf("=");
+                        if (pos != -1) {
+                            String key = line.substring(0, pos);
+                            String val = line.substring(pos + 1);
+                            mProps.put(KEY_PREFIX_GLOBAL_SETTING + key, val);
+                        }
+                    }
+                }
+
+                Log.d(TAG, "Global settings Pulled");
+
+                adbShellResponse = null;
                 try {
                     adbShellResponse = adb.shell("getprop");
                 } catch (Exception ex) {
@@ -268,6 +301,8 @@ public class DeviceActivity extends AppCompatActivity {
                     }
                 }
 
+                Log.d(TAG, "getprop Finished");
+
                 if (mProps.containsKey(KEY_RO_SERIALNO)) {
                     mSerialNo = (String)mProps.get(KEY_RO_SERIALNO);
                 }
@@ -291,8 +326,9 @@ public class DeviceActivity extends AppCompatActivity {
                     }
                 }
 
-                String remoteFilePath = REMOTE_PATH_TMP + "bv.txt";
+                Log.d(TAG, "Dump App version Finished");
-                String cmd = "am start -n " + PACKAGE_NAME_MP + "/" + PACKAGE_NAME_MP + ".BridgeActivity --es action \"query_bv\" --es path \"" + remoteFilePath + "\"";
+
+                String cmd = "content query --uri content://com.xypower.mpapp.provider/queryBatVol";
                 adbShellResponse = null;
                 try {
                     adbShellResponse = adb.shell(cmd);
@@ -301,22 +337,11 @@ public class DeviceActivity extends AppCompatActivity {
                 }
 
                 if (adbShellResponse.getExitCode() == 0) {
-                    File localFilePath = new File(fileTmp, "bv.txt");
+                    Cursor cursor = AdbUtils.parseContentResponse(adbShellResponse.getAllOutput());
-                    if (localFilePath.exists()) {
+                    if (cursor != null && cursor.getCount() > 0) {
-                        localFilePath.delete();
+                        cursor.moveToFirst();
-                    }
+                        @SuppressLint("Range") String bv = cursor.getString(cursor.getColumnIndex("bv"));
-
+                        @SuppressLint("Range") String bcv = cursor.getString(cursor.getColumnIndex("bcv"));
-                    for (int idx = 0; idx < 10; idx++) {
-
-                        res = pullFile(adb, remoteFilePath, localFilePath);
-
-                        if (res) {
-                            String content = FilesUtils.readTextFile(localFilePath.getAbsolutePath());
-                            if (!TextUtils.isEmpty(content)) {
-                                int pos = content.indexOf(" ");
-                                if (pos != -1) {
-                                    String bv = content.substring(0, pos);
-                                    String bcv = content.substring(pos + 1);
 
                         if (!TextUtils.isEmpty(bv)) {
                             mBatteryVoltage = Integer.parseInt(bv);
@@ -327,23 +352,7 @@ public class DeviceActivity extends AppCompatActivity {
                     }
                 }
 
-                            localFilePath.delete();
+                Log.d(TAG, "queryBatVol Finished");
-                            break;
-                        }
-
-                        try {
-                            Thread.sleep(1000);
-                        } catch (Exception ex) {
-                            ex.printStackTrace();
-                        }
-                    }
-
-                    try {
-                        adb.shell("rm " + remoteFilePath);
-                    } catch (Exception ex) {
-                        ex.printStackTrace();
-                    }
-                }
             }
         })).start();
     }
@@ -371,8 +380,13 @@ public class DeviceActivity extends AppCompatActivity {
             @Override
             public void run() {
 
-                Dadb adb = Dadb.discover(mDeviceIp, mAdbKeyPair);
+                Dadb adb = null;
+
+                try {
+                    Log.i(TAG, "Start connecting " + mDeviceIp);
+                    adb = Dadb.create(mDeviceIp, AdbUtils.DEFAULT_ADB_PORT, mAdbKeyPair);
 
+                    Log.i(TAG, "Finish connecting " + mDeviceIp);
                     if (adb == null) {
                         mHandler.postDelayed(new Runnable() {
                             @Override
@@ -441,6 +455,16 @@ public class DeviceActivity extends AppCompatActivity {
 
                         }
                     }
+                } finally {
+                    try {
+                        if (adb != null) {
+                            adb.close();
+                        }
+                    } catch (Exception ex) {
+                        ex.printStackTrace();
+                    }
+                }
+
             }
         });
 
@@ -678,6 +702,16 @@ public class DeviceActivity extends AppCompatActivity {
             appendKeyValue(stringBuilder, "ICCID", iccid);
         }
 
+        if (mProps.containsKey(KEY_IMEI)) {
+            String val = (String)mProps.get(KEY_IMEI);
+            appendKeyValue(stringBuilder, "IMEI1", val);
+        }
+
+        if (mProps.containsKey(KEY_IMEI2)) {
+            String val = (String)mProps.get(KEY_IMEI2);
+            appendKeyValue(stringBuilder, "IMEI2", val);
+        }
+
         if (mBatteryVoltage != -1) {
             appendKeyValue(stringBuilder, "电池电压", Integer.toString(mBatteryVoltage / 1000) + "." + Integer.toString((mBatteryVoltage % 1000) / 100));
         }

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

@@ -5,24 +5,38 @@ import android.annotation.SuppressLint;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
 
 import com.xypower.mpremote.databinding.ActivityImageBinding;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.
@@ -48,6 +62,12 @@ public class ImageActivity extends AppCompatActivity {
     private static final int UI_ANIMATION_DELAY = 300;
     private final Handler mHideHandler = new Handler(Looper.myLooper());
 
+    private String mSerialNo = "";
+
+    private List<File> mImageFiles = new ArrayList<>();
+    private ImagesAdaper mAdapter;
+    private List<Map<String, Object>> mItems = new ArrayList<Map<String, Object>>();
+
     /**
      * Touch listener to use for in-layout UI controls to delay hiding the
      * system UI. This is to prevent the jarring behavior of controls going away
@@ -151,4 +171,74 @@ public class ImageActivity extends AppCompatActivity {
         return drawable;
     }
 
+    protected void loadAllImages() {
+        File localDevicePath = new File(getFilesDir(), "Photos" + File.separator + mSerialNo);
+        if (!localDevicePath.exists()) {
+            localDevicePath.mkdirs();
+        }
+
+        // binding.imagesView.
+    }
+
+    private List<Map<String, Object>> getData() {
+        mItems.clear();
+
+        WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+
+        String ssid = "";
+        if (wifiInfo != null) {
+            ssid = wifiInfo.getSSID();
+            if (!TextUtils.isEmpty(ssid)) {
+                if (ssid.startsWith("\"") && ssid.endsWith("\"")) {
+                    ssid = ssid.substring(1, ssid.length() - 1);
+                }
+            }
+        }
+
+        for (File file : mImageFiles) {
+            Map map = new HashMap<String, Object>();
+
+
+            // Bitmap bm =
+            map.put("img", null);
+            // if (scanR)
+            map.put("text", file.getName());
+            mItems.add(map);
+        }
+        return mItems;
+    }
+
+    private void refreshListView() {
+        mAdapter = new ImagesAdaper(this, getData(), R.layout.list_item, new String[] { "img", "text" },
+                new int[] { R.id.id_img, R.id.id_text });
+
+        binding.imagesView.setAdapter(mAdapter);
+    }
+
+    public class ImagesAdaper extends SimpleAdapter {
+        public ImagesAdaper(Context context, List<Map<String, Object>> items, int resource, String[] from, int[] to) {
+            super(context, items, resource, from, to);
+
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent){
+            convertView = super.getView(position, convertView, parent);
+
+            TextView textView = (TextView)convertView.findViewById(R.id.id_channel);
+
+            File file = mImageFiles.get(position);
+            // if (scanResult.)
+            String text = (String)mItems.get(position).get("text");
+            if (text.startsWith("XY") || text.startsWith("xy")) {
+                textView.setTextColor(Color.RED);
+                textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+            } else {
+                textView.setTextColor(Color.BLACK);
+                textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
+            }
+
+            return convertView;
+        }
+    }
 }

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

@@ -27,7 +27,6 @@ import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiNetworkSpecifier;
 import android.net.wifi.WifiNetworkSuggestion;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
@@ -64,8 +63,6 @@ public class MainActivity extends AppCompatActivity {
     private static final int REQUEST_CODE_SETTINGS = SettingsActivity.REQUEST_CODE_SETTINGS;
 
     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";
 
     private ActivityMainBinding binding;
     private Handler mHandler;

app/src/main/java/com/xypower/mpremote/utils/AdbUtils.java

@@ -0,0 +1,69 @@
+package com.xypower.mpremote.utils;
+
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.text.TextUtils;
+
+import com.xypower.common.FilesUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AdbUtils {
+
+    public final static int DEFAULT_ADB_PORT = 5555;
+
+    public static Cursor parseContentResponse(String output) {
+
+        if (TextUtils.isEmpty(output) || output.startsWith("No result found")) {
+            return null;
+        }
+
+        String[] rows = FilesUtils.splitLines(output);
+        if (rows == null) {
+            return null;
+        }
+
+        MatrixCursor cursor = null;
+        boolean firstRow = true;
+        List<String> columns = new ArrayList<>();
+        List<String> values = new ArrayList<>();
+
+        for (String row : rows) {
+            int pos = row.indexOf(' ', 5);
+
+            if (pos == -1) {
+                continue;
+            }
+
+            values.clear();
+
+            String rowContent = row.substring(pos + 1);
+
+            String[] fields = TextUtils.split(rowContent, ", ");
+            if (fields == null || fields.length == 0) {
+                continue;
+            }
+
+            for (String field : fields) {
+                pos = field.indexOf('=');
+
+                if (firstRow) {
+                    columns.add(field.substring(0, pos));
+                }
+                values.add(field.substring(pos + 1));
+            }
+
+            if (firstRow) {
+                String[] cs = new String[columns.size()];
+                columns.toArray(cs);
+                cursor = new MatrixCursor(cs);
+                firstRow = false;
+            }
+
+            cursor.addRow(values);
+        }
+
+        return cursor;
+    }
+}

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

@@ -10,7 +10,7 @@
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:scaleType="fitStart"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -19,14 +19,13 @@
         app:srcCompat="@android:drawable/screen_background_light_transparent" />
 
     <ListView
+        android:id="@+id/imagesView"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView"
-        app:layout_constraintHeight_default="percent"
-        app:layout_constraintHeight_percent="0.5"
         />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:orientation="horizontal" >
+
+    <TextView
+        android:id="@+id/id_channel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="2dp"
+        android:text="" />
+
+    <TextView
+        android:id="@+id/id_datetime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="2dp"
+        android:text="" />
+
+</LinearLayout>