From 8b004066992c3ff21348a7bfa44042d44d0b7088 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期三, 28 一月 2026 17:30:09 +0800
Subject: [PATCH] 1.p2摄像头 跨进程服务，未测试
---
app/src/main/java/com/safeluck/floatwindow/MediaArgu.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/safeluck/floatwindow/MediaArgu.java b/app/src/main/java/com/safeluck/floatwindow/MediaArgu.java
index dff6790..359464b 100644
--- a/app/src/main/java/com/safeluck/floatwindow/MediaArgu.java
+++ b/app/src/main/java/com/safeluck/floatwindow/MediaArgu.java
@@ -14,8 +14,8 @@
private boolean isPush;//鏄惁鎺ㄦ祦 true-鏄�
private boolean usedOutCamera;//榛樿false 浣跨敤鍐呯疆鎽勫儚澶达紝 true浣跨敤澶栫疆鎽勫儚澶�
-
-
+ private int usbCameraId;//鏍囪鏄敤1- P1 usb鎽勫儚澶� 2-P2鎽勫儚澶�
+ private String jsonconfig ; //浠ュ悗鍙兘浼氱敤鍒帮紝鐩墠鐢ㄤ笉鍒�
private int codeRate = 0;// 鐮佺巼
private int frameRate = 0;// 甯х巼
private ScreenSolution m_screen;
@@ -24,8 +24,23 @@
private String pwd;//ftp涓婁紶瀵嗙爜
private int recordTime;//鍒嗛挓
+ public int getUsbCameraId() {
+ return usbCameraId;
+ }
-private int tfCardFlag =0; //0-鍐呴儴flash 1- 澶栫疆tfcard
+ public String getJsonconfig() {
+ return jsonconfig;
+ }
+
+ public void setJsonconfig(String jsonconfig) {
+ this.jsonconfig = jsonconfig;
+ }
+
+ public void setUsbCameraId(int usbCameraId) {
+ this.usbCameraId = usbCameraId;
+ }
+
+ private int tfCardFlag =0; //0-鍐呴儴flash 1- 澶栫疆tfcard
public int getTfCardFlag() {
return tfCardFlag;
@@ -181,6 +196,7 @@
public void writeToParcel(Parcel dest, int flags) {
dest.writeByte(this.isPush ? (byte) 1 : (byte) 0);
dest.writeByte(this.usedOutCamera ? (byte) 1 : (byte) 0);
+ dest.writeInt(this.usbCameraId);
dest.writeInt(this.codeRate);
dest.writeInt(this.frameRate);
@@ -198,6 +214,7 @@
protected MediaArgu(Parcel in) {
this.isPush = in.readByte() != 0;
this.usedOutCamera = in.readByte() != 0;
+ this.usbCameraId = in.readInt();
this.codeRate = in.readInt();
this.frameRate = in.readInt();
this.m_screen = in.readParcelable(ScreenSolution.class.getClassLoader());
--
Gitblit v1.8.0