Merge branch 'dev' into dev-temp

hxb

2022-08-29 9a4629512ccf8359efd88671c9317c3cc7faf0c8

 ZigbeeApp/Shared/Phone/VideoPhone/ESVideo.cs

old mode 100755
new mode 100644
@@ -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);//室外机UUID，例: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);//室外机UUID，例: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
        }
    }