From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp
---
ZigbeeApp/Shared/Phone/VideoPhone/ESVideo.cs | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/VideoPhone/ESVideo.cs b/ZigbeeApp/Shared/Phone/VideoPhone/ESVideo.cs
old mode 100755
new mode 100644
index 9c9c214..dcddfce
--- a/ZigbeeApp/Shared/Phone/VideoPhone/ESVideo.cs
+++ b/ZigbeeApp/Shared/Phone/VideoPhone/ESVideo.cs
@@ -17,15 +17,7 @@
public static void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
{
#if Android
- Android.Content.Intent intent = new Android.Content.Intent(Application.Activity, typeof(GateWay.Droid.VideoActivity));
- intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);//瀹ゅ鏈虹殑鍚嶇О锛屼緥锛屽澶栨満
- intent.PutExtra("ESRoomID", mESVideoInfo.ESRoomID);//褰撳墠鐢ㄦ埛鐨勬埧闂� ID
- intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);//瀹ゅ鏈篣UID锛屼緥:JJY000007FSEYX
- intent.PutExtra("IsCollect", mESVideoInfo.IsCollect);//鏄惁鏀惰棌
- intent.PutExtra("RoomName", mESVideoInfo.RoomName);//鎴块棿鍛藉悕锛屼緥 8鏍�1鍗曞厓0801
- intent.AddFlags(Android.Content.ActivityFlags.NewTask);
- intent.PutExtra("Type", 0);//绫诲瀷锛�0 鐩戞帶锛�1鍙嶅懠
- Application.Activity.StartActivity(intent);
+ //
#endif
}
@@ -36,14 +28,7 @@
public static void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
{
#if Android
- Android.Content.Intent intent = new Android.Content.Intent(Application.Activity, typeof(GateWay.Droid.VideoActivity));
- intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);//瀹ゅ鏈虹殑鍚嶇О锛屼緥锛屽澶栨満
- intent.PutExtra("ESRoomID", mESVideoInfo.ESRoomID);//褰撳墠鐢ㄦ埛鐨勬埧闂� ID
- intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);//瀹ゅ鏈篣UID锛屼緥:JJY000007FSEYX
- intent.PutExtra("IsCollect", mESVideoInfo.IsCollect);//鏄惁鏀惰棌
- intent.PutExtra("RoomName", mESVideoInfo.RoomName);//鎴块棿鍛藉悕锛屼緥 8鏍�1鍗曞厓0801
- intent.PutExtra("Type", 1);//绫诲瀷锛�0 鐩戞帶锛�1鍙嶅懠
- Application.Activity.StartActivity(intent);
+ //
#endif
}
}
--
Gitblit v1.8.0