Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

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

@@ -16,6 +16,7 @@
    /// </summary>
    public class CommonMethod
    {
        
        private Loading loading;
        /// <summary>
        /// 记录当前界面索引值
@@ -54,6 +55,7 @@
                this.SunThread(() =>
                {
                    var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");

                    this.MainThread(() =>
                    {
#if __IOS__
@@ -127,11 +129,12 @@
        /// <param name="isDialog">是否需要弹框</param>
        public void SkipRTVActivity(string deviceSerial, string deviceId, string spk, bool isDialog)
        {

            this.Loading.Start();
            this.InitializationAndroidData((isEzChildAccessToken) =>
            {
                this.MainThread(() =>
                {
                    this.Loading.Hide();
                    if (isDialog)
                    {
                        Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
@@ -214,6 +217,7 @@
        public void InitializationAndroidData(Action<bool> action)
        {
            bool isBool = true;
            //this.Loading.Start();
            this.SunThread(() =>
            {
                try
@@ -226,14 +230,21 @@
                        {
                            //Token
                            isBool = false;
                            this.ShowTip("先获取萤石云子账号token失败。");
                            //this.ShowTip("获取萤石云子账号token失败。");
                            return;
                        }

                        string appKey = "1aa98a90489b4838b966b57018b4b04b";//正式服务器
                        //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
                        //{
                        //    appKey = "941b1b72b6294998acfd36c14931b675";//用在测试服务器推送的
                        //}


#if __IOS__
                        //iOS
                        //初始化萤石云SDK，中文国内key、英文海外key 开发者账号使用应用包名申请的APPKEY，不同包名应用需配置不同的APPKEY
                        EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
                        EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey(appKey, appKey);
                        //1.设置所需河东的AccessToken和RefreshToken、域名地址
                        EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
                        EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
@@ -245,7 +256,8 @@
                        //info.de
                        //EZSDK.IOS.EZSDK.Play(info);
#else
                            HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);

                            HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, appKey, 1, DB_ResidenceData.Instance.CurrentRegion.id);

#endif

@@ -260,6 +272,7 @@
                {
                    this.MainThread(() =>
                    {
                        //this.Loading.Hide();
                        action?.Invoke(isBool);
                    });
                }
@@ -288,7 +301,15 @@
        /// <returns>返回结果不会为null</returns>
        public List<string> GetVideoDoorLockLockModelsList(string mode = "lockModels")
        {
            return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList(mode);
            var lockModels = VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
            if (mode == "lockModels")
            {
                return lockModels.lockModels;
            }
            else
            {
                return lockModels.notAllowedConfigNetworkModels;
            }
        }
        /// <summary>
        /// 门锁推送
@@ -393,13 +414,14 @@
        /// </summary>
        public string GetVideoDoorLockIcon(Comerom comerom)
        {

            if (comerom == Comerom.collect)
            {
                return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
                return "FunctionIcon/DoorLock/VideoDoorLockOpen1.png";
            }
            else
            {
                return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
                return "FunctionIcon/DoorLock/VideoDoorlockClose1.png";
            }

        }
@@ -542,13 +564,13 @@
            collect,//收藏
            room,//房间
            push,//推送
            sanfan,//三方
            sanfan,//添加第三方设备
        }

#if __IOS__
        IosIHdlInterface ezsdkDelegate;
        /// <summary>
        /// 专门定义给Ios回调用着,没有特殊含义
        /// 专门定义给Ios回调用,没有特殊含义
        /// </summary>
        public class IosIHdlInterface : EZSDK.IOS.EZSDKDelegate
        {
@@ -569,7 +591,7 @@
        }
#else
        /// <summary>
        /// 专门定义给安卓回调用着,没有特殊含义
        /// 专门定义给安卓回调用,没有特殊含义
        /// </summary>
        public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
        {