wxr
2023-05-30 b07d4f6ffbbc942c2e00fbedee5203bbec8d52fb
IOS门锁开锁二次确认弹窗,LC Sdk更新
6个文件已修改
9 ■■■■■ 已修改文件
DLL/Shared.Droid.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.IOS.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid.dll
Binary files differ
DLL/Shared.IOS.dll
Binary files differ
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -238,10 +238,8 @@
                        doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.IpCam_Imou:
#if __IOS__
                        if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null)
                        {//未初始化摄像头
                        if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null){//未初始化摄像头
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
@@ -251,6 +249,7 @@
                        //跳转大华摄像头
                        Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
                        Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name, Shared.Application.currentVC);
                        Shared.Application.currentVC.NavigationController.NavigationBar.Hidden = false;
#else
                        FunctionList.List.GetIpCamImouList();
                        if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
@@ -76,6 +76,7 @@
            btnText.TextAlignment = TextAlignment.TopLeft;
            btnText.TextColor = UI.CSS.CSS_Color.MainColor;
            btnText.Text = textValue;
            btnText.Enable = false;
#if __Android__
            btnText.Foucs = false;
#endif
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -35,7 +35,6 @@
            bodyView = this;
            functionList = new List<Function>();
            throw new ArgumentNullException();
        }
        public void LoadPage(int titleId_out)
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -159,7 +159,7 @@
                { IsBackground = true }.Start();
                function.trait_on_off.curValue = "off";
                function.SetAttrState(FunctionAttributeKey.Percent, 0);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                var d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                DriverLayer.Control.Ins.SendWriteCommand(function, d);
                //CurtainAnimation(100);