From ce6059a78372f8c362cfe2c96c019540ca1d96b8 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期日, 30 十一月 2025 15:04:02 +0800
Subject: [PATCH] 1.加一个sim卡号字段
---
app/src/main/java/com/anyun/h264/H264EncodeService.java | 15 ++++++++++-----
app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java | 4 ++--
app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl | 4 ++--
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl b/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl
index e7878d3..3ae93a7 100644
--- a/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl
+++ b/app/src/main/aidl/com/anyun/h264/IH264EncodeService.aidl
@@ -10,8 +10,8 @@
/**
* 鎺у埗H264缂栫爜
* @param action 鎿嶄綔绫诲瀷锛�0-寮�鍚痟264鏂囦欢鍐欏叆锛�1-鍋滄h264缂栫爜骞跺仠姝㈠啓鍏ユ枃浠讹紝2-寮�鍚綉缁滄帹閫乭264锛堜笉鍐欏叆鏂囦欢锛夛紝3-鍋滄h264缂栫爜骞跺仠姝㈢綉缁滄帹閫�
- * @param jsonConfig JSON鏍煎紡鐨勯厤缃弬鏁帮紝鍖呭惈锛歩p锛堟湇鍔″櫒IP锛夈�乸ort锛堟湇鍔″櫒绔彛锛夈�亀idth锛堣棰戝搴︼級銆乭eight锛堣棰戦珮搴︼級銆乫ramerate锛堝抚鐜囷級
- * 绀轰緥锛歿"ip":"192.168.1.100","port":8888,"width":640,"height":480,"framerate":25}
+ * @param jsonConfig JSON鏍煎紡鐨勯厤缃弬鏁帮紝鍖呭惈锛歩p锛堟湇鍔″櫒IP锛夈�乸ort锛堟湇鍔″櫒绔彛锛夈�亀idth锛堣棰戝搴︼級銆乭eight锛堣棰戦珮搴︼級銆乫ramerate锛堝抚鐜囷級銆乻imPhone锛圫IM鍗″彿锛�
+ * 绀轰緥锛歿"ip":"192.168.1.100","port":8888,"width":640,"height":480,"framerate":25,"simPhone":"013120122580"}
* 濡傛灉action涓�1鎴�3锛堝仠姝㈡搷浣滐級锛屾鍙傛暟鍙负绌烘垨null
* @return 0-鎴愬姛锛�1-澶辫触
*/
diff --git a/app/src/main/java/com/anyun/h264/H264EncodeService.java b/app/src/main/java/com/anyun/h264/H264EncodeService.java
index 2ab37cb..8844cdb 100644
--- a/app/src/main/java/com/anyun/h264/H264EncodeService.java
+++ b/app/src/main/java/com/anyun/h264/H264EncodeService.java
@@ -93,6 +93,7 @@
int width;
int height;
int framerate;
+ String simPhone;
// 浠嶫SON瑙ｆ瀽閰嶇疆
static EncodeConfig fromJson(String jsonConfig) throws JSONException {
@@ -104,6 +105,7 @@
config.framerate = DEFAULT_FRAME_RATE;
config.ip = null;
config.port = 0;
+ config.simPhone = null;
return config;
}
@@ -113,6 +115,7 @@
config.framerate = json.optInt("framerate", DEFAULT_FRAME_RATE);
config.ip = json.optString("ip", null);
config.port = json.optInt("port", 0);
+ config.simPhone = json.optString("simPhone", null);
return config;
}
@@ -121,7 +124,7 @@
/**
* 鎺у埗H264缂栫爜
* @param action 鎿嶄綔绫诲瀷锛�0-寮�鍚痟264鏂囦欢鍐欏叆锛�1-鍋滄h264缂栫爜骞跺仠姝㈠啓鍏ユ枃浠讹紝2-寮�鍚綉缁滄帹閫乭264锛堜笉鍐欏叆鏂囦欢锛夛紝3-鍋滄h264缂栫爜骞跺仠姝㈢綉缁滄帹閫�
- * @param jsonConfig JSON鏍煎紡鐨勯厤缃弬鏁帮紝鍖呭惈锛歩p銆乸ort銆亀idth銆乭eight銆乫ramerate
+ * @param jsonConfig JSON鏍煎紡鐨勯厤缃弬鏁帮紝鍖呭惈锛歩p銆乸ort銆亀idth銆乭eight銆乫ramerate銆乻imPhone
* @return 0-鎴愬姛锛�1-澶辫触
*/
private synchronized int controlEncode(int action, String jsonConfig) {
@@ -135,7 +138,8 @@
try {
config = EncodeConfig.fromJson(jsonConfig);
Log.d(TAG, "Parsed config - width: " + config.width + ", height: " + config.height +
- ", framerate: " + config.framerate + ", ip: " + config.ip + ", port: " + config.port);
+ ", framerate: " + config.framerate + ", ip: " + config.ip + ", port: " + config.port +
+ ", simPhone: " + config.simPhone);
} catch (JSONException e) {
Log.e(TAG, "Failed to parse JSON config: " + jsonConfig, e);
return 1; // 澶辫触
@@ -253,9 +257,10 @@
h264Encoder.setEnableNetworkTransmission(true);
h264Encoder.setServerAddress(config.ip, config.port);
- // 璁剧疆鍗忚鍙傛暟锛堜娇鐢ㄩ粯璁ゅ�硷紝鍙牴鎹渶瑕佷粠閰嶇疆涓坊鍔狅級
- // TODO: 濡傛灉闇�瑕佸湪JSON閰嶇疆涓坊鍔爏imCardNumber鍜宭ogicalChannelNumber锛屽彲浠ュ湪杩欓噷瑙ｆ瀽
- h264Encoder.setProtocolParams("013120122580", (byte)1);
+ // 璁剧疆鍗忚鍙傛暟锛堜娇鐢ㄩ厤缃腑鐨剆imPhone锛屽鏋滄湭鎻愪緵鍒欎娇鐢ㄩ粯璁ゅ�硷級
+ String simPhone = config.simPhone != null && !config.simPhone.trim().isEmpty()
+ ? config.simPhone : "013120122580";
+ h264Encoder.setProtocolParams(simPhone, (byte)1);
// 鍒濆鍖栧苟鍚姩锛堜娇鐢ㄩ厤缃腑鐨勫垎杈ㄧ巼锛�
int[] resolution = {width, height};
diff --git a/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java b/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java
index aa22112..728d4de 100644
--- a/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java
+++ b/app/src/main/java/com/anyun/h264/service/H264EncodeServiceClient.java
@@ -149,8 +149,8 @@
/**
* 鎺у埗H264缂栫爜
* @param action 鎿嶄綔绫诲瀷锛�0-寮�鍚痟264鏂囦欢鍐欏叆锛�1-鍋滄h264缂栫爜骞跺仠姝㈠啓鍏ユ枃浠讹紝2-寮�鍚綉缁滄帹閫乭264锛堜笉鍐欏叆鏂囦欢锛夛紝3-鍋滄h264缂栫爜骞跺仠姝㈢綉缁滄帹閫�
- * @param jsonConfig JSON鏍煎紡鐨勯厤缃弬鏁帮紝鍖呭惈锛歩p锛堟湇鍔″櫒IP锛夈�乸ort锛堟湇鍔″櫒绔彛锛夈�亀idth锛堣棰戝搴︼級銆乭eight锛堣棰戦珮搴︼級銆乫ramerate锛堝抚鐜囷級
- * 绀轰緥锛歿"ip":"192.168.1.100","port":8888,"width":640,"height":480,"framerate":25}
+ * @param jsonConfig JSON鏍煎紡鐨勯厤缃弬鏁帮紝鍖呭惈锛歩p锛堟湇鍔″櫒IP锛夈�乸ort锛堟湇鍔″櫒绔彛锛夈�亀idth锛堣棰戝搴︼級銆乭eight锛堣棰戦珮搴︼級銆乫ramerate锛堝抚鐜囷級銆乻imPhone锛圫IM鍗″彿锛�
+ * 绀轰緥锛歿"ip":"192.168.1.100","port":8888,"width":640,"height":480,"framerate":25,"simPhone":"013120122580"}
* 濡傛灉action涓�1鎴�3锛堝仠姝㈡搷浣滐級锛屾鍙傛暟鍙负null
* @return 0-鎴愬姛锛�1-澶辫触
*/
--
Gitblit v1.8.0