2023年03月28日14:08:30

wjc

2023-03-28 a40579c795d6fd67a53dcdc04a0cbc2371b14301

2023年03月28日14:08:30

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

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

@@ -2,7 +2,10 @@
using HDL_ON.Entity;
using System.Collections.Generic;
using Shared;
#if __IOS__
#else
using Com.Videogo.Hdl;
#endif

namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
{
@@ -36,13 +39,16 @@

        }

        #region  --------- 跳转到Android那边的方法(萤石视频门锁) --------
#region  --------- 跳转到Android那边的方法(萤石视频门锁) --------
        /// <summary>
        /// 读取云端的上设备列表(android源生添加设备到云端成功后)
        /// <paramref name="devSerial"/>设备序列号</param>
        /// </summary>
        public void SkipAddDeviceActivity(string devSerial)
        {
#if __IOS__

#else
            this.InitializationAndroidData((isBools) =>
            {
                if (!isBools) {
@@ -73,9 +79,7 @@
                }));
            });

#if __IOS__

#else

#endif

@@ -88,7 +92,8 @@
        /// <param name="spk">设备spk(云雀上定义好的)</param>
        public void SkipRTVActivity(string deviceSerial, string deviceId, string spk)
        {

#if __IOS__
#else
            this.InitializationAndroidData((isBools) =>
            {
                if (!isBools)
@@ -109,8 +114,7 @@
               
            });
          
#if __IOS__
#else

#endif
        }
        /// <summary>
@@ -120,8 +124,10 @@
        {
            this.InitializationAndroidData((s)=> {


#if __IOS__
#else
                HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
#endif

            });
            //未实现
@@ -145,7 +151,10 @@

                    });
                }
#if __IOS__
#else
                HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif

            });
        }
@@ -170,7 +179,7 @@
                        {
                            //Token
                            isBool = false;
                            return;
                            return; 
                        }
                        Application.RunOnMainThread(() =>
                        {
@@ -179,7 +188,7 @@
                                //初始化萤石云SDK，中文国内key、英文海外key 开发者账号使用应用包名申请的APPKEY，不同包名应用需配置不同的APPKEY
                                EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
                                //1.设置所需河东的AccessToken和RefreshToken、域名地址
                                EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserVideoDoorLockInfo.Current.LoginTokenString, UserVideoDoorLockInfo.Current.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);
                                //2.设置萤石子账号的AccessToken到SDK
                                EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
@@ -219,7 +228,7 @@
            if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;

        }
        #endregion
#endregion

        /// <summary>
        /// 萤石视频门锁的图标
@@ -237,7 +246,7 @@
            }

        }
        #region  --------- 功能文件保存，删除 --------
#region  --------- 功能文件保存，删除 --------
        /// <summary>
        /// 保存本地文件
        /// </summary>
@@ -261,7 +270,7 @@
            FunctionList.List.DeleteFunction(function);
            MainPage.Log($"文件删除->{function.name}-->{function.spk}");
        }
        #endregion
#endregion
        /// <summary>
        /// 获取Loading对象
        /// </summary>
@@ -308,7 +317,7 @@
#endif
            return list;
        }
        #region  ---------自定义线程(子线程，主线程)--------
#region  ---------自定义线程(子线程，主线程)--------
        /// <summary>
        /// 子线程
        /// </summary>
@@ -350,8 +359,8 @@
            });

        }
        #endregion
        #region  --------- 提示框，确认框 --------
#endregion
#region  --------- 提示框，确认框 --------
        /// <summary>
        /// 对话框(只要程序报错的时候才用到)
        /// </summary>
@@ -391,7 +400,7 @@
                new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
            });
        }
        #endregion
#endregion
        /// <summary>
        /// 弹框类型
        /// </summary>
@@ -411,8 +420,9 @@
            room,//房间
            push,//推送
        }
       

#if __IOS__
#else
        /// <summary>
        /// 
        /// </summary>
@@ -436,6 +446,7 @@

           
        }
#endif


    }