Merge branch 'dev-cqy（1.5.9）' into wjc

wjc

2023-03-29 adf7df175e590b7d9e0f33c0c2ea1d2897da6301

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

@@ -44,20 +44,18 @@
        /// android,ios源生添加设备到云端成功后回调方法
        /// 再读取云端的上萤石设备列表
        /// <paramref name="spk"/>spk</param>
        /// </summary>
        public void SkipAddDeviceActivity(string spk)
        {

            this.InitializationAndroidData((isBools) =>
            {
                if (!isBools)

                this.MainThread(() =>
                {
                    this.MainThread(() =>
                    if (!isBools)
                    {
                        this.ShowTip("先获取萤石云子账号token失败。");

                    });
                }
                    }
#if __IOS__
                //跳转添加萤石设备
                ezsdkDelegate = new IosIHdlInterface();
@@ -97,6 +95,10 @@

                }));
#endif

                    });


            });


@@ -196,7 +198,7 @@
                //打开萤石临时密码界面
                EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
#else
                HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
                HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId); 
#endif

            });
@@ -279,21 +281,15 @@
        #endregion

        /// <summary>
        /// 萤石视频门锁的图标
        /// <param name="comerom">来自那里</param>
        /// 获取门锁型号列表
        /// </summary>
        public string GetVideoDoorLockIcon(Comerom comerom)
        /// <returns>返回结果不会为null</returns>
        public List<string> GetVideoDoorLockLockModelsList()
        {
            if (comerom == Comerom.collect)
            {
                return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
            }
            else
            {
                return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
            }

            return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
        }


        #region  --------- 功能文件保存，删除 --------
        /// <summary>
        /// 保存本地文件
@@ -320,6 +316,23 @@
        }
        #endregion
        /// <summary>
        /// 萤石视频门锁的图标
        /// <param name="comerom">来自那里</param>
        /// </summary>
        public string GetVideoDoorLockIcon(Comerom comerom)
        {
            if (comerom == Comerom.collect)
            {
                return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
            }
            else
            {
                return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
            }

        }
       
        /// <summary>
        /// 获取Loading对象
        /// </summary>
        /// <returns></returns>