From f4cbfd7cdaa666b66c9e37b7c13adfe4eae79f2d Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Thu, 27 Feb 2025 18:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=A0=E9=80=92=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/xypower/mpremote/DeviceActivity.java | 4 ++++
 app/src/main/java/com/xypower/mpremote/StreamActivity.java | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/com/xypower/mpremote/DeviceActivity.java b/app/src/main/java/com/xypower/mpremote/DeviceActivity.java
index 1673613..74636af 100644
--- a/app/src/main/java/com/xypower/mpremote/DeviceActivity.java
+++ b/app/src/main/java/com/xypower/mpremote/DeviceActivity.java
@@ -650,6 +650,7 @@ public class DeviceActivity extends AppCompatActivity {
         int rotation = -1;
         int usb = 0;
         int netCamera = 0;
+        int vendor = 0;
         Integer chVal = Integer.valueOf(channel);
         if (mChannelCfgs.containsKey(chVal)) {
             JSONObject jsonChannel = mChannelCfgs.get(chVal);
@@ -662,6 +663,8 @@ public class DeviceActivity extends AppCompatActivity {
                 int cameraType = jsonChannel.optInt("cameraType", 0);
                 usb = (cameraType == 1) ? 1 : 0;
                 netCamera = (cameraType == 2 || cameraType == 4) ? 1 : 0;
+
+                vendor = jsonChannel.optInt("vendor", 0);
             }
         }
 
@@ -673,6 +676,7 @@ public class DeviceActivity extends AppCompatActivity {
         intent.putExtra("channel", channel);
         intent.putExtra("rotation", rotation);
         intent.putExtra("netCamera", netCamera);
+        intent.putExtra("vendor", vendor);
         intent.putExtra("usb", usb);
         intent.putExtra("cmdid", TextUtils.isEmpty(mAppConfig.cmdid) ? "" : mAppConfig.cmdid);
         // intent.putExtra("info", info);
diff --git a/app/src/main/java/com/xypower/mpremote/StreamActivity.java b/app/src/main/java/com/xypower/mpremote/StreamActivity.java
index 2779b04..a68a462 100644
--- a/app/src/main/java/com/xypower/mpremote/StreamActivity.java
+++ b/app/src/main/java/com/xypower/mpremote/StreamActivity.java
@@ -62,6 +62,7 @@ public class StreamActivity extends AppCompatActivity {
         int channel = intent.getIntExtra("channel", 1);
         int rotation = intent.getIntExtra("rotation", -1);
         int netCamera = intent.getIntExtra("netCamera", 0);
+        int vendor = intent.getIntExtra("vendor", 0);
 
         actionBar.setTitle(getResources().getString(R.string.channel) + Integer.toString(channel));
 
@@ -71,6 +72,7 @@ public class StreamActivity extends AppCompatActivity {
                 + " --ei cameraId " + Integer.toString(cameraId)
                 + " --ei rotation " + Integer.toString(rotation)
                 + " --ei netCamera " + Integer.toString(netCamera)
+                + " --ei vendor " + Integer.toString(vendor)
                 + " --ei autoStart 1"
                 + " --es url \"" + url + "\"";