From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs b/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs
index 983b35a..d93069d 100644
--- a/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs
+++ b/HDL-ON_Android/FengLinVideo/Form/MonitorFragment.cs
@@ -38,7 +38,7 @@
private TextView unlockText;
// 鏇存柊绾跨▼
- private Thread thread = null;
+ public static Thread thread = null;
public MonitorFragment(VideoPhone phone)
{
@@ -80,7 +80,7 @@
unlockImag.Selected = true;
JSONObject ht = new JSONObject();
ht.Put("command", "open");//鍥哄畾鍙傛暟
- ht.Put("room_id", 123);
+ ht.Put("room_id", VideoActivity.Roomno);
ht.Put("devType", 7);
mPhone.SendCustomData(ht.ToString());
}
--
Gitblit v1.8.0