~wxr/OnPro.git - Gitblit

parent: ee928471 | 补丁 | 提交 | ignore whitespace

wxr

2022-12-27 c9cf816402cd7981315b658601a17ea1e1890f1e

备份

5个文件已修改

	HDL-ON_Android/Properties/AndroidManifest.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/Common/ApiUtlis.cs	166 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/DAL/Server/HttpUtil.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI1-Login/LoginPage.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SiriIntents/Server/HttpUtil.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202212081">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202212271">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

 HDL_ON/Common/ApiUtlis.cs

@@ -232,6 +232,93 @@
                                    FunctionList.List.IniFunctionList(newFunction.savePath);
                                    MainPage.Log($"============设备============{iiii++}");
                                }




                                //===================读取可视对讲数据==========================
                                //判断是否有可视对讲数据，有则显示可视对讲icon
                                //var flVideoInfo = HttpRequest.CheckFlVideo();
                                //if(flVideoInfo.Code == StateCode.SUCCESS)
                                //{
                                //    FunctionList.List.videoIntercom1111 = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
                                //}

                                //======================获取可视对讲设备列表====================
                                bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
                                bool isInterphoneType_FREEVIEW = false;//是否为全视通可视对讲
                                var videoInfo = VideoSend.GetVideoInfoList();
                                if (videoInfo.Code == StateCode.SUCCESS)
                                {
                                    string videoList = videoInfo.Data.ToString();
                                    FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);

                                    foreach (var video in FunctionList.List.videoIntercom)
                                    {
                                        if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
                                        {
                                            UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
                                        }
                                        else if (video.interphoneType == InterphoneType.HDL.ToString())
                                        {
                                            isInterphoneType_HDL = true;
                                            DB_ResidenceData.Instance.SupportFacePass = true;
                                            DB_ResidenceData.Instance.SaveResidenceData();

                                            Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
                                        }
                                        else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
                                        {
                                            //为全视通可视对讲
                                            DB_ResidenceData.Instance.SupportFacePass = true;
                                            Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
                                            Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

                                            //isInterphoneType_HDL = true;
                                            isInterphoneType_FREEVIEW = true;

                                        }
                                    }
                                }

                                //======================获取Sip账号并且初始化SDK可视对讲设备列表====================
                                //如果检测线程没启动，才继续下面操作 因为App有可能刚启动马上收到推送了，然后才执行到这里
                                if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
                                {
                                    //当前住宅是HDL可视对讲类型的设备
                                    if (isInterphoneType_HDL)
                                    {
                                        //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                                        HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                                        callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                                        callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
                                        HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
                                    }
                                    else if (isInterphoneType_FREEVIEW)
                                    {
                                        //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                                        HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                                        callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                                        callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
                                        HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
                                    }
                                    else
                                    {
                                        Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
                                        //当前住宅不支持HDL可视对讲
                                        HDLLinphone.Current.LogoutAllAccount();
                                    }
                                }

                                //======================登录全视通====================
                                if (isInterphoneType_FREEVIEW)
                                {
#if __IOS__
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
#endif
                                }

                            }
                            else
                            {
@@ -319,85 +406,6 @@
                    Logic.LogicList.Clear();//主页下拉强制刷新自动化列表
                    //UI.UI2.Intelligence.Automation.MainView.GetLogicList();

                    //===================读取可视对讲数据==========================
                    //判断是否有可视对讲数据，有则显示可视对讲icon
                    //var flVideoInfo = HttpRequest.CheckFlVideo();
                    //if(flVideoInfo.Code == StateCode.SUCCESS)
                    //{
                    //    FunctionList.List.videoIntercom1111 = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
                    //}

                    //======================获取可视对讲设备列表====================
                    bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
                    bool isInterphoneType_FREEVIEW = false;//是否为全视通可视对讲
                    var videoInfo = VideoSend.GetVideoInfoList();
                    if (videoInfo.Code == StateCode.SUCCESS)
                    {
                        string videoList = videoInfo.Data.ToString();
                        FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);

                        foreach (var video in FunctionList.List.videoIntercom)
                        {
                            if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
                            {
                                UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
                            } else if (video.interphoneType == InterphoneType.HDL.ToString()) {
                                isInterphoneType_HDL = true;
                                DB_ResidenceData.Instance.SupportFacePass = true;
                                DB_ResidenceData.Instance.SaveResidenceData();

                                Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
                            }
                            else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
                            {
                                //为全视通可视对讲
                                DB_ResidenceData.Instance.SupportFacePass = true;
                                Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
                                Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

                                //isInterphoneType_HDL = true;
                                isInterphoneType_FREEVIEW = true;

                            }
                        }
                    }

                    //======================获取Sip账号并且初始化SDK可视对讲设备列表====================
                    //如果检测线程没启动，才继续下面操作 因为App有可能刚启动马上收到推送了，然后才执行到这里
                    if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) {
                        //当前住宅是HDL可视对讲类型的设备
                        if (isInterphoneType_HDL)
                        {
                            //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                            HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                            callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                            callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
                        }
                        else if (isInterphoneType_FREEVIEW)
                        {
                            //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                            HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                            callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                            callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
                        }
                        else
                        {
                            Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
                            //当前住宅不支持HDL可视对讲
                            HDLLinphone.Current.LogoutAllAccount();
                        }
                    }

                    //======================登录全视通====================
                    if (isInterphoneType_FREEVIEW)
                    {
#if __IOS__
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
#endif
                    }


                    //======================安防====================

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -17,8 +17,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        /// <summary>
        /// RegionMark
        /// </summary>

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -226,6 +226,7 @@
                    //etAccount.Text = "13288623489";//罗晓东
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "13143792049";
                    etAccount.Text = "18688414428";
                }
                else
                {
@@ -269,9 +270,9 @@
                }else if(etAccount.Text == "13288623489")
                {
                    etPassword.Text = "luoxiaodong";
                }else if(etAccount.Text == "13143792049")
                }else if(etAccount.Text == "18688414428")
                {
                    etPassword.Text = "BVVBQATD";
                    etPassword.Text = "HDL1985000";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;

 SiriIntents/Server/HttpUtil.cs

@@ -16,8 +16,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
        /// <summary>
        /// RegionMark
        /// </summary>

			@@ -1,5 +1,5 @@
			<?xml version="1.0" encoding="utf-8"?>
			<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202212081">
			<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202212271">
			<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
			<!--友盟-->
			<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

			@@ -232,6 +232,93 @@
			FunctionList.List.IniFunctionList(newFunction.savePath);
			MainPage.Log($"============设备============{iiii++}");
			}




			//===================读取可视对讲数据==========================
			//判断是否有可视对讲数据，有则显示可视对讲icon
			//var flVideoInfo = HttpRequest.CheckFlVideo();
			//if(flVideoInfo.Code == StateCode.SUCCESS)
			//{
			// FunctionList.List.videoIntercom1111 = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
			//}

			//======================获取可视对讲设备列表====================
			bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
			bool isInterphoneType_FREEVIEW = false;//是否为全视通可视对讲
			var videoInfo = VideoSend.GetVideoInfoList();
			if (videoInfo.Code == StateCode.SUCCESS)
			{
			string videoList = videoInfo.Data.ToString();
			FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);

			foreach (var video in FunctionList.List.videoIntercom)
			{
			if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
			{
			UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
			}
			else if (video.interphoneType == InterphoneType.HDL.ToString())
			{
			isInterphoneType_HDL = true;
			DB_ResidenceData.Instance.SupportFacePass = true;
			DB_ResidenceData.Instance.SaveResidenceData();

			Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
			}
			else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
			{
			//为全视通可视对讲
			DB_ResidenceData.Instance.SupportFacePass = true;
			Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
			Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

			//isInterphoneType_HDL = true;
			isInterphoneType_FREEVIEW = true;

			}
			}
			}

			//======================获取Sip账号并且初始化SDK可视对讲设备列表====================
			//如果检测线程没启动，才继续下面操作因为App有可能刚启动马上收到推送了，然后才执行到这里
			if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
			{
			//当前住宅是HDL可视对讲类型的设备
			if (isInterphoneType_HDL)
			{
			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
			callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
			HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
			}
			else if (isInterphoneType_FREEVIEW)
			{
			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
			callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
			HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
			}
			else
			{
			Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
			//当前住宅不支持HDL可视对讲
			HDLLinphone.Current.LogoutAllAccount();
			}
			}

			//======================登录全视通====================
			if (isInterphoneType_FREEVIEW)
			{
			#if __IOS__
			//登录全视通
			Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
			#endif
			}

			}
			else
			{
			@@ -319,85 +406,6 @@
			Logic.LogicList.Clear();//主页下拉强制刷新自动化列表
			//UI.UI2.Intelligence.Automation.MainView.GetLogicList();

			//===================读取可视对讲数据==========================
			//判断是否有可视对讲数据，有则显示可视对讲icon
			//var flVideoInfo = HttpRequest.CheckFlVideo();
			//if(flVideoInfo.Code == StateCode.SUCCESS)
			//{
			// FunctionList.List.videoIntercom1111 = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
			//}

			//======================获取可视对讲设备列表====================
			bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
			bool isInterphoneType_FREEVIEW = false;//是否为全视通可视对讲
			var videoInfo = VideoSend.GetVideoInfoList();
			if (videoInfo.Code == StateCode.SUCCESS)
			{
			string videoList = videoInfo.Data.ToString();
			FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);

			foreach (var video in FunctionList.List.videoIntercom)
			{
			if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
			{
			UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
			} else if (video.interphoneType == InterphoneType.HDL.ToString()) {
			isInterphoneType_HDL = true;
			DB_ResidenceData.Instance.SupportFacePass = true;
			DB_ResidenceData.Instance.SaveResidenceData();

			Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
			}
			else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
			{
			//为全视通可视对讲
			DB_ResidenceData.Instance.SupportFacePass = true;
			Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
			Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

			//isInterphoneType_HDL = true;
			isInterphoneType_FREEVIEW = true;

			}
			}
			}

			//======================获取Sip账号并且初始化SDK可视对讲设备列表====================
			//如果检测线程没启动，才继续下面操作因为App有可能刚启动马上收到推送了，然后才执行到这里
			if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) {
			//当前住宅是HDL可视对讲类型的设备
			if (isInterphoneType_HDL)
			{
			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
			callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
			HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
			}
			else if (isInterphoneType_FREEVIEW)
			{
			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
			callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
			HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
			}
			else
			{
			Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
			//当前住宅不支持HDL可视对讲
			HDLLinphone.Current.LogoutAllAccount();
			}
			}

			//======================登录全视通====================
			if (isInterphoneType_FREEVIEW)
			{
			#if __IOS__
			//登录全视通
			Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
			#endif
			}


			//======================安防====================

			@@ -17,8 +17,8 @@
			/// 固定域名,正式环境
			/// 公共域名就近解析
			/// </summary>
			public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
			//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
			//public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
			public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
			/// <summary>
			/// RegionMark
			/// </summary>

			@@ -226,6 +226,7 @@
			//etAccount.Text = "13288623489";//罗晓东
			//etAccount.Text = "18244942707";
			//etAccount.Text = "13143792049";
			etAccount.Text = "18688414428";
			}
			else
			{
			@@ -269,9 +270,9 @@
			}else if(etAccount.Text == "13288623489")
			{
			etPassword.Text = "luoxiaodong";
			}else if(etAccount.Text == "13143792049")
			}else if(etAccount.Text == "18688414428")
			{
			etPassword.Text = "BVVBQATD";
			etPassword.Text = "HDL1985000";
			}
			//etPassword.Text = "Hdl85521566";
			btnLogin.IsSelected = true;

			@@ -16,8 +16,8 @@
			/// 固定域名,正式环境
			/// 公共域名就近解析
			/// </summary>
			public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
			//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
			//public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
			public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
			/// <summary>
			/// RegionMark
			/// </summary>