视频的拍摄和播放

app/src/main/AndroidManifest.xml

@@ -22,6 +22,9 @@
         android:theme="@style/Theme.MpRemote"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".VideoActivity"
+            android:exported="false" />
         <activity
             android:name=".WifiScanActivity"
             android:exported="false" />
@@ -34,7 +37,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".ImageActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"

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

@@ -14,6 +14,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowInsets;
@@ -73,6 +74,9 @@ public class ImageActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+
         binding = ActivityImageBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
@@ -106,6 +110,17 @@ public class ImageActivity extends AppCompatActivity {
 
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return false;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
     private boolean loadImage(String path) {
 
         binding.imageViewOpt.setVisibility(View.GONE);

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

@@ -9,36 +9,26 @@ import android.content.res.Resources;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.Html;
 import android.text.TextUtils;
 import android.text.format.Formatter;
+import android.util.Log;
 import android.view.View;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.xypower.common.FileUtils;
 import com.xypower.common.MicroPhotoContext;
 import com.xypower.mpremote.databinding.ActivityMainBinding;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.net.Socket;
-import java.security.PrivateKey;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import dadb.AdbKeyPair;
 import dadb.AdbShellResponse;
-import dadb.AdbShellStream;
-import dadb.AdbStream;
 import dadb.Dadb;
 
 public class MainActivity extends AppCompatActivity {
@@ -48,6 +38,10 @@ public class MainActivity extends AppCompatActivity {
         System.loadLibrary("mpremote");
     }
 
+    private static final String TAG = "ADB";
+
+    private static final boolean DEBUG = true;
+
     private static final String PACKAGE_NAME_MP = "com.xypower.mpapp";
     private static final String REMOTE_PATH_ROOT = "/sdcard/" + PACKAGE_NAME_MP + "/";
     private static final String REMOTE_PATH_DATA = REMOTE_PATH_ROOT + "data/";
@@ -58,11 +52,13 @@ public class MainActivity extends AppCompatActivity {
     private static final String KEY_APP_BCV = "app.bcv";
     private static final String KEY_RO_SERIALNO = "ro.serialno";
 
+    private static final String KEY_APP_MP_VERSION = "mpapp.version";
+
     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_DEVIDE = "192.168.50.137";
+    private static final String WIFI_IP_DEVICE = "192.168.50.137";
 
     // [vendor.ril.nw.signalstrength.lte.1]: [-85,27]
     //[vendor.ril.nw.signalstrength.lte.2]: [-86,27]
@@ -73,6 +69,7 @@ public class MainActivity extends AppCompatActivity {
 
     private Map<String, String> mProps = new HashMap<>();
 
+    private MicroPhotoContext.AppConfig mAppConfig;
     private int mBatteryVoltage = -1;
     private int mBatteryChargingVoltage = -1;
 
@@ -118,11 +115,14 @@ public class MainActivity extends AppCompatActivity {
                 if (ipAddressByWifi.contains(WIFI_IP_PREFIX)) {
 
 
-                    String deviceId = Formatter.formatIpAddress(wifiManager.getDhcpInfo().gateway);
+                    String deviceIP = Formatter.formatIpAddress(wifiManager.getDhcpInfo().gateway);
+                    if (DEBUG) {
+                        deviceIP = WIFI_IP_DEVICE;
+                    }
 
                     Socket mSocket = null;
                     try {
-                        mSocket = new Socket(WIFI_IP_DEVIDE, ADB_SERVER_PORT);
+                        mSocket = new Socket(deviceIP, ADB_SERVER_PORT);
                         if (mSocket.isConnected()) {
                             mSocket.close();
                         }
@@ -130,7 +130,7 @@ public class MainActivity extends AppCompatActivity {
                         ex.printStackTrace();
                     }
 
-                    Dadb adb = Dadb.discover(WIFI_IP_DEVIDE, adbKeyPair);
+                    Dadb adb = Dadb.discover(deviceIP, adbKeyPair);
 
                     if (adb != null) {
 
@@ -155,6 +155,26 @@ public class MainActivity extends AppCompatActivity {
                             }
                         }
 
+
+                        // adb shell pm dump com.xypower.mpremote | grep "versionName"
+                        adbShellResponse = null;
+                        try {
+                            adbShellResponse = mAdb.shell("pm dump " + PACKAGE_NAME_MP + " | grep \"versionName\"");
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
+                        }
+
+                        if (adbShellResponse.getExitCode() == 0) {
+                            String[] lines = FileUtils.splitLines(adbShellResponse.getAllOutput());
+                            for (String line : lines) {
+                                int pos = line.indexOf("versionName=");
+                                if (pos != -1) {
+                                    String val = line.substring(pos + 12);
+                                    mProps.put(KEY_APP_MP_VERSION, val);
+                                }
+                            }
+                        }
+
                         String remoteFilePath = REMOTE_PATH_TMP + "bv.txt";
                         String cmd = "am start -n " + PACKAGE_NAME_MP + "/" + PACKAGE_NAME_MP + ".BridgeActivity --es action \"query_bv\" --es path \"" + remoteFilePath + "\"";
                         adbShellResponse = null;
@@ -214,10 +234,12 @@ public class MainActivity extends AppCompatActivity {
                         if (res) {
 
                             final MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(context, appConfigFile.getAbsolutePath());
+                            mAppConfig = appConfig;
+
                             MainActivity.this.mHandler.post(new Runnable() {
                                 @Override
                                 public void run() {
-                                    MainActivity.this.showAppInfo(appConfig);
+                                    MainActivity.this.showAppInfo();
                                 }
                             });
                         }
@@ -248,15 +270,22 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+        binding.takeVideo1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                takeVideo(1, 255, false);
             }
+        });
 
-
+    }
 
     protected boolean pullFile(Dadb adb, String remoteFilePath, File localFilePath) {
         if (localFilePath.exists()) {
             localFilePath.delete();
         }
 
+        Log.i(TAG, "PULL: " + remoteFilePath);
+
         boolean res = false;
         try {
             adb.pull(localFilePath, remoteFilePath);
@@ -268,27 +297,17 @@ public class MainActivity extends AppCompatActivity {
         return res && localFilePath.exists();
     }
 
-    protected long takePhoto(int channel, int preset, boolean photoOrVideo) {
+    protected void takePhotoImpl(final String cmd, final int channel, final int preset, final String localFileName, final String remoteFilePath, final boolean photoOrVideo, long sleepTime) {
-        if (mAdb == null) {
+        Thread th = new Thread(new Runnable() {
-            return 0;
-        }
-
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
-        Date dt = new Date();
-        int cameraId = channel - 1;
-
-        final String fileName = "IMG-" + Integer.toString(channel) + simpleDateFormat.format(dt) + ".jpg";
-        final String remoteFilePath = REMOTE_PATH_TMP + fileName;
-
-        String usb = (channel == 4) ? "true" : "false";
-        final String cmd = "am start -n " + PACKAGE_NAME_MP + "/" + PACKAGE_NAME_MP + ".BridgeActivity --es action \"take_photo\" --es path \""
-                + remoteFilePath + "\" --ez usb " + usb + " --ei cameraId " + Integer.toString(cameraId) + " --ei channel "
-                + Integer.toString(channel) + " --ei preset " + Integer.toString(preset);
-        // adbShellResponse = null;
-
-        (new Thread(new Runnable() {
             @Override
             public void run() {
+                if (sleepTime > 0) {
+                    try {
+                        Thread.sleep(sleepTime);
+                    } catch (Exception ex) {
+                    }
+                }
+
                 AdbShellResponse adbShellResponse = null;
                 try {
                     adbShellResponse = mAdb.shell(cmd);
@@ -299,7 +318,7 @@ public class MainActivity extends AppCompatActivity {
                 if (adbShellResponse != null) {
                     if (adbShellResponse.getExitCode() == 0) {
 
-                        File localFilePath = new File(getFilesDir(), fileName);
+                        File localFilePath = new File(getFilesDir(), localFileName);
 
                         for (int idx = 0; idx < 10; idx++) {
 
@@ -310,7 +329,11 @@ public class MainActivity extends AppCompatActivity {
                                 mHandler.post(new Runnable() {
                                     @Override
                                     public void run() {
+                                        if (photoOrVideo) {
                                             showPhoto(localFilePath.getAbsolutePath());
+                                        } else {
+                                            showVideo(localFilePath.getAbsolutePath());
+                                        }
                                     }
                                 });
                                 break;
@@ -324,7 +347,7 @@ public class MainActivity extends AppCompatActivity {
                         }
 
                         try {
-                            mAdb.shell("rm " + remoteFilePath);
+                            // mAdb.shell("rm " + remoteFilePath);
                         } catch (Exception ex) {
                             ex.printStackTrace();
                         }
@@ -332,7 +355,85 @@ public class MainActivity extends AppCompatActivity {
                     }
                 }
             }
-        })).start();
+        });
+
+        th.start();
+    }
+
+    protected long takePhoto(int channel, int preset, final boolean photoOrVideo) {
+        if (mAdb == null) {
+            return 0;
+        }
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
+        Date dt = new Date();
+        int cameraId = channel - 1;
+
+        final String fileName = "IMG-" + Integer.toString(channel) + "-" + simpleDateFormat.format(dt) + (photoOrVideo ? ".jpg" : ".mp4");
+        final String remoteFilePath = REMOTE_PATH_TMP + fileName;
+
+        String leftTopOsd = "";
+        if (mAppConfig != null) {
+            leftTopOsd += mAppConfig.cmdid + " ";
+        }
+        SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        leftTopOsd += simpleDateFormat2.format(dt) + " ";
+        leftTopOsd += "CH:" + Integer.toString(channel) + " ";
+
+        String usb = (channel == 4) ? "true" : "false";
+        final String cmd = "am start -n " + PACKAGE_NAME_MP + "/" + PACKAGE_NAME_MP + ".BridgeActivity --es action \"take_photo\" --es path \""
+                + remoteFilePath + "\" --ez usb " + usb + " --ei cameraId " + Integer.toString(cameraId) + " --ei channel "
+                + Integer.toString(channel) + " --ei preset " + Integer.toString(preset) + " --es leftTopOsd \"" + leftTopOsd + "\"";
+        // adbShellResponse = null;
+
+        takePhotoImpl(cmd, channel, preset, fileName, remoteFilePath, photoOrVideo, 0);
+
+        return 0;
+    }
+
+    protected long takeVideo(int channel, int preset, final boolean photoOrVideo) {
+        if (mAdb == null) {
+            return 0;
+        }
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
+        Date dt = new Date();
+        int cameraId = channel - 1;
+        int duration = 5;
+
+        String leftTopOsd = "";
+        if (mAppConfig != null) {
+            leftTopOsd += mAppConfig.cmdid + " ";
+        }
+        SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        leftTopOsd += simpleDateFormat2.format(dt) + " ";
+        leftTopOsd += "CH:" + Integer.toString(channel) + " ";
+
+        final String fileName = "IMG-" + Integer.toString(channel) + "-" + simpleDateFormat.format(dt) + (photoOrVideo ? ".jpg" : ".mp4");
+        final String remoteFilePath = REMOTE_PATH_TMP + fileName;
+
+        //                int quality = intent.getIntExtra("quality", 0);
+        //                int width = intent.getIntExtra("width", 1280);
+        //                int height = intent.getIntExtra("height", 720);
+        //                int duration = intent.getIntExtra("duration", 15);
+        //                int orientation = intent.getIntExtra("orientation", 0);
+        //                long videoId = System.currentTimeMillis() / 1000;
+        //
+        //                String leftTopOsd = intent.getStringExtra("leftTopOsd");
+        //                String rightTopOsd = intent.getStringExtra("rightTopOsd");
+        //                String rightBottomOsd = intent.getStringExtra("rightBottomOsd");
+        //                String leftBottomOsd = intent.getStringExtra("leftBottomOsd");
+
+        String usb = (channel == 4) ? "true" : "false";
+        final String cmd = "am start -n " + PACKAGE_NAME_MP + "/" + PACKAGE_NAME_MP + ".BridgeActivity --es action \"recording\" --es path \""
+                + remoteFilePath + "\" --ez usb " + usb + " --ei cameraId " + Integer.toString(cameraId) + " --ei channel "
+                + Integer.toString(channel) + " --ei preset " + Integer.toString(preset) + " --ei duration " + Integer.toString(duration)
+                + " --el videoId " + Long.toString(dt.getTime() / 1000) + " --es leftTopOsd \"" + leftTopOsd + "\"";
+        // adbShellResponse = null;
+
+        Log.d(TAG, cmd);
+
+        takePhotoImpl(cmd, channel, preset, fileName, remoteFilePath, photoOrVideo, duration * 1000);
 
         return 0;
     }
@@ -345,10 +446,13 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void showVideo(final String filePath) {
-
+        Intent intent = new Intent(MainActivity.this, VideoActivity.class);
+        intent.putExtra("path", filePath);
+        // intent.putExtra("info", info);
+        startActivity(intent);
     }
 
-    private void showAppInfo(final MicroPhotoContext.AppConfig appConfig) {
+    private void showAppInfo() {
         ActionBar actionBar = getSupportActionBar();
 
         // 视频浏览，拍照，设备信息及状态查询(编号，版本，双SIM卡状态，电池及太阳能电压等)，可以参考东视
@@ -359,8 +463,8 @@ public class MainActivity extends AppCompatActivity {
         // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         String title = resources.getString(R.string.app_name);
-        if (!TextUtils.isEmpty(appConfig.cmdid)) {
+        if (!TextUtils.isEmpty(mAppConfig.cmdid)) {
-            title += " - " + appConfig.cmdid;
+            title += " - " + mAppConfig.cmdid;
         }
         actionBar.setTitle(title);
 
@@ -368,25 +472,33 @@ public class MainActivity extends AppCompatActivity {
 
         if (mProps.containsKey(KEY_RO_SERIALNO)) {
             String val = (String)mProps.get(KEY_RO_SERIALNO);
-            stringBuilder.append("序列号：" + val);
+            appendKeyValue(stringBuilder, "序列号", val);
-            stringBuilder.append("\r\n");
         }
 
-        stringBuilder.append("主站：" + appConfig.server + ":" + Integer.toString(appConfig.port));
+        appendKeyValue(stringBuilder, "CMDID", mAppConfig.cmdid);
-        stringBuilder.append("\r\n");
+
-        stringBuilder.append("通道数：" + Integer.toString(appConfig.channels));
+        appendKeyValue(stringBuilder, "主站", mAppConfig.server + ":" + Integer.toString(mAppConfig.port));
-        stringBuilder.append("\r\n");
+
+        appendKeyValue(stringBuilder, "通道数", Integer.toString(mAppConfig.channels));
+
+        if (mProps.containsKey(KEY_APP_MP_VERSION)) {
+            String val = (String)mProps.get(KEY_APP_MP_VERSION);
+            appendKeyValue(stringBuilder, "APP版本", val);
+        }
 
         if (mBatteryVoltage != -1) {
-            stringBuilder.append("电池电压：" + Integer.toString(mBatteryVoltage / 1000) + "." + Integer.toString((mBatteryVoltage % 1000) / 100));
+            appendKeyValue(stringBuilder, "电池电压", Integer.toString(mBatteryVoltage / 1000) + "." + Integer.toString((mBatteryVoltage % 1000) / 100));
-            stringBuilder.append("\r\n");
         }
         if (mBatteryChargingVoltage != -1) {
-            stringBuilder.append("充电电压：" + Integer.toString(mBatteryChargingVoltage / 1000) + "." + Integer.toString((mBatteryChargingVoltage % 1000) / 100));
+            appendKeyValue(stringBuilder, "充电电压", Integer.toString(mBatteryChargingVoltage / 1000) + "." + Integer.toString((mBatteryChargingVoltage % 1000) / 100));
-            stringBuilder.append("\r\n");
+        }
+
+        binding.deviceInfo.setText(Html.fromHtml(stringBuilder.toString()));
     }
 
-        binding.deviceInfo.setText(stringBuilder.toString());
+    private void appendKeyValue(StringBuilder stringBuilder, String key, String val) {
+        stringBuilder.append(key + "：<font color=\"red\"><b>" + val + "</b></font>");
+        stringBuilder.append("<br>");
     }
 
     /**

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

@@ -0,0 +1,55 @@
+package com.xypower.mpremote;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.widget.MediaController;
+import android.widget.VideoView;
+
+public class VideoActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_video);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        //加载指定的视频文件
+        // String path = Environment.getExternalStorageDirectory().getPath()+"/20180730.mp4";
+
+        Intent intent = getIntent();
+        String path = intent.getStringExtra("path");
+        if (path != null) {
+            VideoView videoView = (VideoView)findViewById(R.id.videoView);
+
+
+            videoView.setVideoPath(path);
+
+            //创建MediaController对象
+            MediaController mediaController = new MediaController(this);
+
+            //VideoView与MediaController建立关联
+            videoView.setMediaController(mediaController);
+
+            //让VideoView获取焦点
+            videoView.requestFocus();
+            videoView.start();
+        }
+
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return false;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+}

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

@@ -13,6 +13,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="24dp"
         android:singleLine="false"
+        android:lineSpacingMultiplier="1.25"
+        android:textSize="16sp"
         android:text=""
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -22,9 +24,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginBottom="24dp"
+        android:layout_marginBottom="8dp"
         android:text="通道1"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/takeVideo1" />
+
+    <Button
+        android:id="@+id/takeVideo1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="24dp"
+        android:text="视频1"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".VideoActivity">
+
+    <VideoView
+        android:id="@+id/videoView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>