~wxr/OnPro.git - Gitblit

			@@ -140,6 +140,7 @@
			// return;
			//}

			//return;

			try
			{
			@@ -236,7 +237,6 @@




			//===================读取可视对讲数据==========================
			//判断是否有可视对讲数据，有则显示可视对讲icon
			//var flVideoInfo = HttpRequest.CheckFlVideo();
			@@ -282,6 +282,7 @@
			}
			}


			//======================获取Sip账号并且初始化SDK可视对讲设备列表====================
			//如果检测线程没启动，才继续下面操作因为App有可能刚启动马上收到推送了，然后才执行到这里
			if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
			@@ -297,6 +298,7 @@
			}
			else if (isInterphoneType_FREEVIEW)
			{

			//HDLLinphone可视对讲,获取Sip账号并初始化SDK
			HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
			callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
			@@ -311,21 +313,25 @@
			}
			}



			//======================登录全视通====================
			if (isInterphoneType_FREEVIEW)
			{

			#if __IOS__
			var extUserResult = Ins.HttpRequest.GetExtUserId(DB_ResidenceData.Instance.CurrentRegion.id);
			if (extUserResult.Code == StateCode.SUCCESS)
			List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
			Dictionary<string, object> dictionary = new Dictionary<string, object>();
			dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
			var requestJson = HttpUtil.GetSignRequestJson(dictionary);
			ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
			if(pack!= null)
			{
			var data = JsonConvert.DeserializeObject<extUserInfo>(deviceResult.Data.ToString());

			var data = Newtonsoft.Json.JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
			//登录全视通
			//Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
			Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");

			}


			#endif
			}

			@@ -343,12 +349,78 @@
			complateDevice = true;
			MainPage.Log($"============设备============完成" + FunctionList.List.Functions.Count);
			}
			})
			{ IsBackground = true }.Start();

			//===================场景==========================
			new System.Threading.Thread(() =>
			{

			#if DEBUG
			DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl = true;
			#endif
			if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
			{
			var pack = Ins.HttpRequest.GetGroupControlList();
			if (pack != null)
			{
			if (pack.Code == StateCode.SUCCESS)
			{
			try
			{
			var groupControlList = JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
			var readSidList = new List<string>();
			foreach(var temp in groupControlList)
			{
			FunctionList.List.groupControls.Clear();
			readSidList.Add(temp.userDeviceGroupControlId);
			if (readSidList.Count >= 20)
			{
			var data = Ins.httpRequest.GetGroupControInfo(readSidList);
			if(data != null)
			{
			if(data.Code == StateCode.SUCCESS)
			{
			var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
			FunctionList.List.groupControls.AddRange(groupControlInfoList);
			}
			else
			{
			IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
			}
			}
			readSidList.Clear();
			}
			}
			if (readSidList.Count > 0)
			{
			var data = Ins.httpRequest.GetGroupControInfo(readSidList);
			if (data != null)
			{
			if (data.Code == StateCode.SUCCESS)
			{
			var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
			FunctionList.List.groupControls.AddRange(groupControlInfoList);
			}
			else
			{
			IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
			}
			}
			readSidList.Clear();
			}
			}
			catch (Exception ex)
			{
			MainPage.Log($"读取组控列表失败:{ex.Message}");
			}
			}
			else
			{
			IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
			}
			}
			}


			//})
			//{ IsBackground = true }.Start();

			try
			{
			complateScene = false;