From 813aee559e544e6bf7777404612a4712cad184c8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 01 四月 2021 16:31:38 +0800
Subject: [PATCH] 2021-04-01 1.更新丰林iOS最新SDK

---
 HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs |  480 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 233 insertions(+), 247 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
index 9ec50bf..329407c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
@@ -5,7 +5,6 @@
 using HDL_ON.Stan;
 using ZXing.QrCode.Internal;
 using static HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod;
-using HDL_ON.Entity;
 
 namespace HDL_ON.UI.UI2.FuntionControlView.Video
 {
@@ -17,10 +16,8 @@
         /// <param name="listVideo">闂ㄥ彛鏈哄垪琛�</param>
         /// <param name="listCall">閫氳瘽璁板綍鍒楄〃</param>
         /// <param name="video">褰撳墠鐨勫彲瑙嗗璁�</param>
-        //public void Show(List<VideoMethod.FlVideo> listVideo, List<CallView> listCall, VideoClouds video)
-        public void Show()
+        public void Show(List<VideoMethod.FlVideo> listVideo, List<CallView> listCall, VideoClouds video)
         {
-
             #region 甯冨眬鐣岄潰
             this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
@@ -42,8 +39,8 @@
             pageView.AddChidren(view1);
             var view2 = new FrameLayout();
             pageView.AddChidren(view2);
-            View1(view1);
-            View2(view2);
+            View1(view1, listVideo, video);
+            View2(view2, listCall, video);
             Button btn11 = new Button
             {
                 X = Application.GetRealWidth(170),
@@ -108,196 +105,191 @@
         /// <param name="view1">鐖舵帶浠�</param>
         /// <param name="list">闂ㄥ彛鏈哄垪琛�</param>
         /// <param name="videoClouds">褰撳墠鐨勫彲瑙嗗璁�</param>
-        void View1(FrameLayout view1)
+        void View1(FrameLayout view1, List<VideoMethod.FlVideo> list, VideoClouds videoClouds)
         {
-
-            new System.Threading.Thread(() =>
+            #region 甯冨眬鐣岄潰
+            var bjFl = new FrameLayout
             {
-                var list = VideoSend.GetVideoInfoList(FunctionList.List.videoIntercom);
-                Application.RunOnMainThread(() =>
+                Y = Application.GetRealHeight(24),
+                X = Application.GetRealWidth(24),
+                Height = Application.GetRealHeight(526),
+                Width = Application.GetRealWidth(327),
+                BackgroundImagePath = "MusicIcon/playBj.png",
+            };
+            view1.AddChidren(bjFl);
+            /// <summary>
+            ///  姹夊瓧
+            /// </summary>
+            Button nameBtn = new Button
+            {
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(16),
+                Width = Application.GetRealWidth(100),
+                Height = Application.GetRealHeight(33),
+                TextColor = MusicColor.MusicTxet14Color,
+                TextSize = TextSize.Text24,
+                TextAlignment = TextAlignment.CenterLeft,
+                //Text = "鍙瀵硅",
+                TextID = StringId.keshiduijiang,
+            };
+            bjFl.AddChidren(nameBtn);
+            /// <summary>
+            ///  鍖哄煙鍚嶇О
+            /// </summary>
+            Button regionBtn = new Button
+            {
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(53),
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(17),
+                TextColor = MusicColor.MusicNoTxetColor,
+                TextSize = TextSize.Text12,
+                TextAlignment = TextAlignment.CenterLeft,
+                Text = "123456"
+            };
+            // bjFl.AddChidren(regionBtn);
+            /// <summary>
+            ///鏀惰棌鍥炬爣
+            /// </summary>
+            Button collectIconBtn = new Button
+            {
+                X = Application.GetRealWidth(273),
+                Y = Application.GetRealHeight(14),
+                Width = Application.GetRealWidth(40),
+                Height = Application.GetRealWidth(40),
+                UnSelectedImagePath = "MusicIcon/collect.png",
+                SelectedImagePath = "MusicIcon/collectSelected.png",
+            };
+            // bjFl.AddChidren(collectIconBtn);
+            ///鍙瀵硅鍥炬爣
+            Button intercomBtnIcon = new Button
+            {
+                X = Application.GetRealWidth(84),
+                Y = Application.GetRealHeight(118),
+                Width = Application.GetRealWidth(160),
+                Height = Application.GetRealWidth(160),
+                UnSelectedImagePath = "VideoIcon/keshiduijiang.png",
+
+            };
+            bjFl.AddChidren(intercomBtnIcon);
+
+            var vv = new VerticalScrolViewLayout
+            {
+                Y = Application.GetRealHeight(306),
+                Height = Application.GetRealHeight(220),
+                Width = Application.GetRealWidth(327),
+            };
+            bjFl.AddChidren(vv);
+            if (list.Count > 0)
+            {
+                //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
+                list.Add(new VideoMethod.FlVideo { aliasName = Language.StringByID(StringId.menjinerweima), devType = "100" });
+            }
+            //鏁扮粍涓暟
+            //int value = 15;
+            //鍏堣绠楁暟鎹墍闇�瑕佺殑寰堥珮搴︼紱
+            int l = 0;
+            if (list.Count % 3 == 0)
+            {
+                l = list.Count / 3;
+            }
+            else
+            {
+
+                l = (list.Count / 3) + 1;
+            }
+            var fL = new FrameLayout
+            {
+                Height = Application.GetRealHeight((48 + 24) * l),
+
+            };
+            vv.AddChidren(fL);
+            int line = 0;
+            #endregion
+            for (int i = 1, j = 0; i <= list.Count; i++, j++)
+            {
+                var video = list[i - 1];
+                #region
+                var fLayout = new FrameLayout
                 {
-                    #region 甯冨眬鐣岄潰
-                    var bjFl = new FrameLayout
-                    {
-                        Y = Application.GetRealHeight(24),
-                        X = Application.GetRealWidth(24),
-                        Height = Application.GetRealHeight(526),
-                        Width = Application.GetRealWidth(327),
-                        BackgroundImagePath = "MusicIcon/playBj.png",
-                    };
-                    view1.AddChidren(bjFl);
-                    /// <summary>
-                    ///  姹夊瓧
-                    /// </summary>
-                    Button nameBtn = new Button
-                    {
-                        X = Application.GetRealWidth(16),
-                        Y = Application.GetRealHeight(16),
-                        Width = Application.GetRealWidth(100),
-                        Height = Application.GetRealHeight(33),
-                        TextColor = MusicColor.MusicTxet14Color,
-                        TextSize = TextSize.Text24,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        //Text = "鍙瀵硅",
-                        TextID = StringId.keshiduijiang,
-                    };
-                    bjFl.AddChidren(nameBtn);
-                    /// <summary>
-                    ///  鍖哄煙鍚嶇О
-                    /// </summary>
-                    Button regionBtn = new Button
-                    {
-                        X = Application.GetRealWidth(16),
-                        Y = Application.GetRealHeight(53),
-                        Width = Application.GetRealWidth(270),
-                        Height = Application.GetRealHeight(17),
-                        TextColor = MusicColor.MusicNoTxetColor,
-                        TextSize = TextSize.Text12,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        Text = "123456"
-                    };
-                    bjFl.AddChidren(regionBtn);
-                    /// <summary>
-                    ///鏀惰棌鍥炬爣
-                    /// </summary>
-                    Button collectIconBtn = new Button
-                    {
-                        X = Application.GetRealWidth(273),
-                        Y = Application.GetRealHeight(14),
-                        Width = Application.GetRealWidth(40),
-                        Height = Application.GetRealWidth(40),
-                        UnSelectedImagePath = "MusicIcon/collect.png",
-                        SelectedImagePath = "MusicIcon/collectSelected.png",
-                    };
-                    bjFl.AddChidren(collectIconBtn);
-                    ///鍙瀵硅鍥炬爣
-                    Button intercomBtnIcon = new Button
-                    {
-                        X = Application.GetRealWidth(84),
-                        Y = Application.GetRealHeight(118),
-                        Width = Application.GetRealWidth(160),
-                        Height = Application.GetRealWidth(160),
-                        UnSelectedImagePath = "VideoIcon/keshiduijiang.png",
+                    Width = Application.GetRealWidth(50),
+                    Height = Application.GetRealWidth(48),
+                    X = Application.GetRealWidth(31 + (58 + 50) * j),
+                    Y = Application.GetRealHeight(20 + (48 + 24) * line),
 
-                    };
-                    bjFl.AddChidren(intercomBtnIcon);
+                };
+                fL.AddChidren(fLayout);
 
-                    var vv = new VerticalScrolViewLayout
+                var iconBtn = new Button
+                {
+                    X = Application.GetRealWidth(11),
+                    Width = Application.GetRealWidth(28),
+                    Height = Application.GetRealWidth(28),
+                    UnSelectedImagePath = "VideoIcon/weiqiangji.png",
+                };
+                fLayout.AddChidren(iconBtn);
+
+                var deviceNameBtn = new Button
+                {
+                    Y = iconBtn.Bottom + Application.GetRealHeight(6),
+                    Width = Application.GetRealWidth(50),
+                    Height = Application.GetRealHeight(14),
+                    TextSize = TextSize.Text10,
+                    TextColor = CSS.CSS_Color.TextualColor,
+                    TextAlignment = TextAlignment.Center,
+                    Text = video.aliasName,
+                };
+                fLayout.AddChidren(deviceNameBtn);
+
+                var clickBtn = new Button { Tag = video };
+
+                fLayout.AddChidren(clickBtn);
+                if (i % 3 == 0)
+                {
+                    //婊′竴琛岄噸缃甹=0鍊�;
+                    j = -1;
+                    line += 1;
+                }
+                getIconAndText(video, iconBtn);
+                #endregion
+                //闂ㄥ彛鏈虹殑鐐瑰嚮浜嬩欢
+                clickBtn.MouseUpEventHandler += (sender, e) =>
+                {
+                    var flVideo = clickBtn.Tag as FlVideo;
+                    if (flVideo.devType == "100")
                     {
-                        Y = Application.GetRealHeight(306),
-                        Height = Application.GetRealHeight(220),
-                        Width = Application.GetRealWidth(327),
-                    };
-                    bjFl.AddChidren(vv);
-                    if (list.Count > 0)
-                    {
-                        //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
-                        list.Add(new VideoMethod.FlVideo { aliasName = Language.StringByID(StringId.menjinerweima), devType = "100" });
-                    }
-                    //鏁扮粍涓暟
-                    //int value = 15;
-                    //鍏堣绠楁暟鎹墍闇�瑕佺殑寰堥珮搴︼紱
-                    int l = 0;
-                    if (list.Count % 3 == 0)
-                    {
-                        l = list.Count / 3;
+                        //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
+                        VideoSend.GetQRcode(this, videoClouds, (tag, paw) =>
+                        {
+                            if (tag)
+                            {
+                                //娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥
+                                View.ShowDialog showDialog = new View.ShowDialog();
+                                showDialog.QRcode(paw);
+                            }
+                        });
                     }
                     else
                     {
-                        l = (list.Count / 3) + 1;
-                    }
-                    var fL = new FrameLayout
-                    {
-                        Height = Application.GetRealHeight((48 + 24) * l),
-                    };
-                    vv.AddChidren(fL);
-                    int line = 0;
-                    #endregion
-                    for (int i = 1, j = 0; i <= list.Count; i++, j++)
-                    {
-                        var video = list[i - 1];
-                        #region
-                        var fLayout = new FrameLayout
+                        if (string.IsNullOrEmpty(flVideo.uuid))
                         {
-                            Width = Application.GetRealWidth(50),
-                            Height = Application.GetRealWidth(48),
-                            X = Application.GetRealWidth(31 + (58 + 50) * j),
-                            Y = Application.GetRealHeight(20 + (48 + 24) * line),
-
-                        };
-                        fL.AddChidren(fLayout);
-
-                        var iconBtn = new Button
-                        {
-                            X = Application.GetRealWidth(11),
-                            Width = Application.GetRealWidth(28),
-                            Height = Application.GetRealWidth(28),
-                            UnSelectedImagePath = "VideoIcon/weiqiangji.png",
-                        };
-                        fLayout.AddChidren(iconBtn);
-
-                        var deviceNameBtn = new Button
-                        {
-                            Y = iconBtn.Bottom + Application.GetRealHeight(6),
-                            Width = Application.GetRealWidth(50),
-                            Height = Application.GetRealHeight(14),
-                            TextSize = TextSize.Text10,
-                            TextColor = CSS.CSS_Color.TextualColor,
-                            TextAlignment = TextAlignment.Center,
-                            Text = video.aliasName,
-                        };
-                        fLayout.AddChidren(deviceNameBtn);
-
-                        var clickBtn = new Button { Tag = video };
-
-                        fLayout.AddChidren(clickBtn);
-                        if (i % 3 == 0)
-                        {
-                            //婊′竴琛岄噸缃甹=0鍊�;
-                            j = -1;
-                            line += 1;
+                            new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
                         }
-                        getIconAndText(video, iconBtn);
-                        #endregion
-                        //闂ㄥ彛鏈虹殑鐐瑰嚮浜嬩欢
-                        clickBtn.MouseUpEventHandler += (sender, e) =>
+                        ESVideoInfo eSVideoInfo = new ESVideoInfo
                         {
-                            var flVideo = clickBtn.Tag as VideoMethod.FlVideo;
-                            if (flVideo.devType == "100")
-                            {
-                                //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
-                                VideoSend.GetQRcode(this, FunctionList.List.videoIntercom, (tag, paw) =>
-                                        {
-                                            if (tag)
-                                            {
-                                                //娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥
-                                                View.ShowDialog showDialog = new View.ShowDialog();
-                                                showDialog.QRcode(paw);
-                                            }
-                                        });
-                            }
-                            else
-                            {
-                                if (string.IsNullOrEmpty(flVideo.uuid))
-                                {
-                                    new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
-                                }
-                                ESVideoInfo eSVideoInfo = new ESVideoInfo
-                                {
-                                    ESVideoUUID = getUuid(flVideo.uuid),
-                                    DeviceName = flVideo.aliasName,
-                                    roomno = FunctionList.List.videoIntercom.flRoomId,
-                                    unitno = FunctionList.List.videoIntercom.flBuildingId,
-                                };
-                                ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo);
-                            }
-
-
+                            ESVideoUUID = getUuid(flVideo.uuid),
+                            DeviceName = flVideo.aliasName,
+                            roomno = videoClouds.flRoomId,
+                            unitno = videoClouds.flBuildingId,
                         };
+                        ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo);
                     }
-                });
-            })
-            { IsBackground = true }.Start();
+
+
+                };
+            }
+
+
         }
         /// <summary>
         /// 绗簩涓晫闈�
@@ -305,73 +297,67 @@
         /// <param name="view2">鐖舵帶浠�</param>
         /// <param name="listCall">閫氳瘽璁板綍鍒楄〃</param>
         /// <param name="video">褰撳墠鐨勫彲瑙嗗璁�</param>
-        void View2(FrameLayout view2)
+        void View2(FrameLayout view2, List<CallView> listCall, VideoClouds video)
         {
-            new System.Threading.Thread(() =>
-            {
-                var listCall = new HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod().getCall(FunctionList.List.videoIntercom.id);
-                Application.RunOnMainThread(() =>
-                {
-                    var bjFl = new FrameLayout
-                    {
-                        Y = Application.GetRealHeight(24),
-                        X = Application.GetRealWidth(24),
-                        Height = Application.GetRealHeight(526),
-                        Width = Application.GetRealWidth(327),
-                        BackgroundImagePath = "MusicIcon/playBj.png",
-                    };
-                    view2.AddChidren(bjFl);
-                    /// <summary>
-                    ///  姹夊瓧
-                    /// </summary>
-                    Button nameBtn = new Button
-                    {
-                        X = Application.GetRealWidth(16),
-                        Y = Application.GetRealHeight(16),
-                        Width = Application.GetRealWidth(100),
-                        Height = Application.GetRealHeight(33),
-                        TextColor = MusicColor.MusicTxet14Color,
-                        TextSize = TextSize.Text24,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        TextID = StringId.tonghuajilu,
-                    };
-                    bjFl.AddChidren(nameBtn);
-                    /// <summary>
-                    ///  浜戠鐓х墖鍙繚鐣�30澶�
-                    /// </summary>
-                    Button regionBtn = new Button
-                    {
-                        X = Application.GetRealWidth(16),
-                        Y = Application.GetRealHeight(53),
-                        Width = Application.GetRealWidth(270),
-                        Height = Application.GetRealHeight(17),
-                        TextColor = MusicColor.SelectedColor,
-                        TextSize = TextSize.Text12,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        TextID = StringId.baolu30,
-                    };
-                    bjFl.AddChidren(regionBtn);
 
-                    var vv = new VerticalRefreshLayout
-                    {
-                        X = Application.GetRealWidth(16),
-                        Y = Application.GetRealHeight(58),
-                        Height = Application.GetRealHeight(458),
-                        Width = Application.GetRealWidth(295),
-                    };
-                    bjFl.AddChidren(vv);
-                    vv.BeginHeaderRefreshingAction += () =>
-                    {
-                        VideoMethod videoMethod = new VideoMethod();
-                        var list = videoMethod.getCall(FunctionList.List.videoIntercom.id);
-                        RefreshView(vv, list);
-                        //鍏抽棴鍒锋柊View锛�
-                        vv.EndHeaderRefreshing();
-                    };
-                    //RefreshView(vv, listCall);
-                });
-            })
-            { IsBackground = true }.Start();
+            var bjFl = new FrameLayout
+            {
+                Y = Application.GetRealHeight(24),
+                X = Application.GetRealWidth(24),
+                Height = Application.GetRealHeight(526),
+                Width = Application.GetRealWidth(327),
+                BackgroundImagePath = "MusicIcon/playBj.png",
+            };
+            view2.AddChidren(bjFl);
+            /// <summary>
+            ///  姹夊瓧
+            /// </summary>
+            Button nameBtn = new Button
+            {
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(16),
+                Width = Application.GetRealWidth(100),
+                Height = Application.GetRealHeight(33),
+                TextColor = MusicColor.MusicTxet14Color,
+                TextSize = TextSize.Text24,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = StringId.tonghuajilu,
+            };
+            bjFl.AddChidren(nameBtn);
+            /// <summary>
+            ///  浜戠鐓х墖鍙繚鐣�30澶�
+            /// </summary>
+            Button regionBtn = new Button
+            {
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(53),
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(17),
+                TextColor = MusicColor.SelectedColor,
+                TextSize = TextSize.Text12,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = StringId.baolu30,
+            };
+            bjFl.AddChidren(regionBtn);
+
+            var vv = new VerticalRefreshLayout
+            {
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(58),
+                Height = Application.GetRealHeight(458),
+                Width = Application.GetRealWidth(295),
+            };
+            bjFl.AddChidren(vv);
+            vv.BeginHeaderRefreshingAction += () =>
+            {
+                VideoMethod videoMethod = new VideoMethod();
+                var list = videoMethod.GetCall(video.id);
+                RefreshView(vv, list);
+                //鍏抽棴鍒锋柊View锛�
+                vv.EndHeaderRefreshing();
+            };
+            RefreshView(vv, listCall);
+
         }
         /// <summary>
         /// 閫氳瘽璁板綍鍒锋柊鐣岄潰

--
Gitblit v1.8.0