代码备份

wjc

2023-03-13 198304dd3870ffa96a5211bcb0afa1fbeadf4462

代码备份

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -3,6 +3,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;

namespace HDL_ON.UI
{

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -1205,7 +1205,7 @@
                }
                else if (function.spk == SPK.VideoDoorLock)
                {
                    btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(Comerom.collect);
                    btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
                    //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                }
                else
@@ -1243,7 +1243,7 @@
                };


                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone,Comerom.collect,()=> {
                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect,()=> {
                    this.LoadDeviceFunctionControlZone();//删除设备后重新刷新UI
                });
                view.MouseUpEventHandler = skipControlPageEvent;

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

@@ -194,7 +194,7 @@
            }
            else if (function.spk == SPK.VideoDoorLock)
            {
                btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(Comerom.function);
                btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
            }
            else if (function.spk == SPK.HvacCac)
            {

 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs

@@ -405,7 +405,7 @@
        /// </summary>
        void LoadEvent_DivSkipEvent()
        {
            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor,Comerom.room,this.action);
            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action);
            this.MouseUpEventHandler = eventHandler;
            btnName.MouseUpEventHandler = eventHandler;
            btnFromFloor.MouseUpEventHandler = eventHandler;

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -1115,19 +1115,19 @@
                try
                {
                    var userList =FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device);
                    List<string> userIdList = new List<string>();
                    List<string> userNameList = new List<string>();
                    for (int i = 0; i < userList.Count; i++)
                    {
                        var user = userList[i];
                        userIdList.Add(user.extUserId);
                        userNameList.Add(user.extUserName);
                    }
                    Application.RunOnMainThread(() =>
                    {
                        loading.Hide();
                        PublicInterface publicInterface = new PublicInterface();//用户界面
                        publicInterface.FrameOrVv(this, userIdList, new List<string> { btnState.Text }, device.name, (index) =>
                        publicInterface.FrameOrVv(this, userNameList, new List<string> { btnState.Text }, device.name, (index) =>
                        {
                            var userId = userIdList[index];
                            var userId = userNameList[index];
                            //界面显示选中值
                            btnState.Text = userId;
                            //数据封装

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs

@@ -182,7 +182,7 @@
                            break;
                        case SPK.VideoDoorLock: {
                                //跳转到android那边去
                                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipActivity();
                                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity();
                            }
                            break;
                    }

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs

@@ -29,9 +29,36 @@
        /// <summary>
        /// 跳转到Android那边去
        /// </summary>
        public void SkipActivity()
        public void SkipAddDeviceActivity()
        {
            //未实现
        }
        /// <summary>
        /// 跳转到Android(实时视频)那边去
        /// </summary>
        public void SkipRTVActivity()
        {
            //未实现
            HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog();
            showDialog.ClickBox("", (s) => { }, (s1) => { });
        }
        /// <summary>
        /// 跳转到Android(历史记录)那边去
        /// </summary>
        public void SkipRecordActivity()
        {
            //未实现
            HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog();
            showDialog.ClickBox("", (s) => { }, (s1) => { });
        }
        /// <summary>
        /// 跳转到Android(临时密码)那边去
        /// </summary>
        public void SkipPSWActivity()
        {
            //未实现
            HDL_ON.UI.UI2.FuntionControlView.Video.View.ShowDialog showDialog = new UI2.FuntionControlView.Video.View.ShowDialog();
            showDialog.ClickBox("", (s) => { }, (s1) => { });
        }
        /// <summary>
        /// 萤石视频门锁的图标
@@ -82,7 +109,7 @@
        {
            var list = FunctionList.List.GetVideoDoorLockList();
#if DEBUG
            //list.Add(new Function { name = "视频门锁一", sid = "23456789", spk = SPK.VideoDoorLock });
            list.Add(new Function { name = "视频门锁一", sid = "23456789", spk = SPK.VideoDoorLock });
            //list.Add(new Function { name = "视频门锁二", sid = "2345678922", spk = SPK.VideoDoorLock });
#endif
            return list;
@@ -97,5 +124,14 @@
            flicker,//闪烁框
            confirmation//确认框
        }
        /// <summary>
        /// 表示来自那个界面
        /// </summary>
        public enum Comerom
        {
            function,//功能
            collect,//收藏
            room,//房间
        }
    }
}

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs

@@ -171,7 +171,7 @@
            this.dicBatteryContr[i_device.sid] = btnBattery;
            frameBack.ButtonClickEvent += (sender, e) =>
            {
                var form = new VideoDoorLockPage(i_device, btnName, btnRoom,Comerom.function,()=> {
                var form = new VideoDoorLockPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function,()=> {
                    this.CloseForm();
                });
                MainPage.BasePageView.AddChidren(form);
@@ -191,7 +191,7 @@
        #endregion


        public void SkipViewPage(Comerom comerom) {
        public void SkipViewPage(CommonMethod.Comerom comerom) {
            //var form = new VideoDoorLockPage(i_device, btnName, btnRoom, Comerom.function);
            //MainPage.BasePageView.AddChidren(form);
            //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs

@@ -71,7 +71,7 @@
        /// <summary>
        /// 表示来自那个界面
        /// </summary>
        private Comerom Comerom;
        private UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom Comerom;
        /// <summary>
        /// 删除设备后需要更新界面的回调
        /// </summary>
@@ -85,7 +85,7 @@
        /// <param name="function">设备</param>
        /// <param name="btnDeviceName">上一级界面的设备名字控件</param>
        /// <param name="btnRoomName">上一级界面的房间名字控件</param> 
        public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, Comerom comerom, Action action)
        public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom comerom, Action action)
        {
            this.device = function;
            this.btnDeviceName = btnDeviceName;
@@ -277,6 +277,8 @@
            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
            {
                RemoveFromParent();

              
            };
            //设置
            this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
@@ -490,14 +492,6 @@


    }
    /// <summary>
    /// 表示来自那个界面
    /// </summary>
    public enum Comerom
    {
        function,//功能
        collect,//收藏
        room,//房间
    }
   

}