~xm/HomeApp.git

old mode 100755 new mode 100644

			@@ -57,7 +57,7 @@
			Instance = this;

			//先初始化左滑房间列表界面(在反射里面初始化)
			if (ListRoomViewFrom.Instance == null) { }
			if (LeftListRoomViewFrom.Instance == null) { }

			//整个背景的上下滑动控件
			if (this.listBodyContr == null)
			@@ -82,6 +82,10 @@
			this.AddNormalDeviceReportEvent();
			//添加传感器状态上报事件
			this.AddSensorDeviceReportEvent();
			//开启传感器状态还原的线程
			this.StartRecoverSenorStatuThread();
			//显示App公告
			this.ShowAppNotice();
			}

			/// <summary>
			@@ -129,6 +133,9 @@
			this.ShowSelectFloorForm(btnFloorName);
			};
			}

			//可视对讲快捷方式
			Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);
			//安防快捷方式
			if (UserCenterResourse.ResidenceOption.SafetyShortcut)
			{
			@@ -153,7 +160,7 @@
			btnHouseName.TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor;
			btnHouseName.IsBold = true;
			btnHouseName.Text = Config.Instance.Home.Name;
			btnHouseName.Width = btnHouseName.GetRealWidthByText();
			btnHouseName.Width = btnHouseName.GetRealWidthByText() + Application.GetRealWidth(100);
			this.listBodyContr.frameTable.AddChidren(btnHouseName);

			//切换住宅
			@@ -316,7 +323,7 @@
			this.listBodyContr.frameTable.AddChidren(bg);

			var tip = new NormalViewControl(this.GetPictrueRealSize(717), this.GetPictrueRealSize(58), false);
			tip.Y = Application.GetRealHeight(815);
			tip.Y = bg.Bottom + Application.GetRealHeight(35);
			tip.Gravity = Gravity.CenterHorizontal;
			tip.TextID = R.MyInternationalizationString.NewAccountNeedBingGW;
			tip.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
			@@ -324,13 +331,13 @@
			this.listBodyContr.frameTable.AddChidren(tip);

			var addBG = new PicViewControl(971, 366);
			addBG.Y = Application.GetRealHeight(1048);
			addBG.Y = tip.Bottom + Application.GetRealHeight(176);
			addBG.UnSelectedImagePath = "Item/VirtualFrame.png";
			addBG.Gravity = Gravity.CenterHorizontal;
			this.listBodyContr.frameTable.AddChidren(addBG);

			var addGatewayBtn = new IconViewControl(89);
			addGatewayBtn.Y = Application.GetRealHeight(1143);
			addGatewayBtn.Y = tip.Bottom + Application.GetRealHeight(271);
			addGatewayBtn.UnSelectedImagePath = "Item/Add_GW.png";
			addGatewayBtn.Gravity = Gravity.CenterHorizontal;
			this.listBodyContr.frameTable.AddChidren(addGatewayBtn);
			@@ -341,7 +348,7 @@
			};

			var addTip = new PicViewControl(717, 58);
			addTip.Y = Application.GetRealHeight(1256);
			addTip.Y = addGatewayBtn.Bottom + Application.GetRealHeight(23);
			addTip.Gravity = Gravity.CenterHorizontal;
			addTip.TextID = R.MyInternationalizationString.AddSmartGW;
			addTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor;
			@@ -403,10 +410,9 @@
			roomPageView.SetLeftAndRightImageView(mLeftImageView, mRightImageView);

			//当前房间
			var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
			var listRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
			if (HdlRoomLogic.Current.NowMainPageRoom == null)
			{
			//设置第一个为初始房间
			HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];
			}
			var curIndex = 0;
			@@ -506,7 +512,7 @@
			//当没有绑定有网关,左滑时,点击房间列表,则不鸟它
			return;
			}
			var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
			var listRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
			for (int i = 0; i < listRoom.Count; i++)
			{
			if (room.Id == listRoom[i].Id)
			@@ -522,7 +528,7 @@
			//重置一下楼层名字
			if (this.btnFloorName != null)
			{
			btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);
			btnFloorName.Text = Config.Instance.Home.GetCurrentFloorName;
			}
			}

			@@ -539,8 +545,8 @@
			bodyFrameLayout.RemoveAll();
			bodyFrameLayout.Height = Application.GetRealHeight(750);
			this.listBodyContr.RecoverTableHeight();
			this.dicSceneCardControl.Clear();
			this.dicDeviceCardControl.Clear();
			this.dicSceneCardControl = new Dictionary<int, Controls.SceneCardControl>();
			this.dicDeviceCardControl = new Dictionary<string, Controls.DeviceCardCommon>();

			var listDevice = new List<CommonDevice>();
			foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
			@@ -621,6 +627,16 @@
			{
			cardContr = new Controls.DeviceFreshAirCardControl();
			}
			// PM2.5
			else if (device.Type == DeviceType.PMSensor)
			{
			cardContr = new Controls.DevicePmSensorCardControl();
			}
			// 晾衣架
			else if (device.Type == DeviceType.Airer)
			{
			cardContr = new Controls.DeviceAirerCardControl();
			}
			//彩灯(调光器)
			else if (device.Type == DeviceType.DimmableLight)
			{
			@@ -634,7 +650,17 @@
			//温湿度
			else if (device.Type == DeviceType.TemperatureSensor)
			{
			cardContr = new Controls.DeviceTemperatureCardControl();
			//空气质量传感器
			//获取设备类型
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			cardContr = new Controls.DeviceAirQualitySensorCardControl();
			}
			else
			{
			cardContr = new Controls.DeviceTemperatureCardControl();
			}
			}
			//门锁
			else if (device.Type == DeviceType.DoorLock)
			@@ -647,7 +673,7 @@
			cardContr = new Controls.DeviceColorTemperatureCardControl();
			}
			//无法识别
			else
			if (cardContr == null)
			{
			cardContr = new Controls.DeviceCardCommon();
			}
			@@ -688,17 +714,38 @@
			}
			HdlThreadLogic.Current.RunThread(() =>
			{
			for (int i = 0; i < listContr.Count; i++)
			int sendCount = 0;
			while (listDeviceBackContr.Parent != null)
			{
			if (listDeviceBackContr.Parent == null)
			bool hadSend = false;
			for (int i = 0; i < listContr.Count; i++)
			{
			return;
			if (listDeviceBackContr.Parent == null)
			{
			return;
			}
			//如果还没有接收到数据,则再次发送
			if (listContr[i].ReceiveResponeResultStatu() == false)
			{
			//发送获取状态的命令
			listContr[i].SendStatuComand();
			hadSend = true;
			System.Threading.Thread.Sleep(300);
			}
			}
			System.Threading.Thread.Sleep(200);
			//发送获取状态的命令
			listContr[i].SendStatuComand();
			if (hadSend == false)
			{
			//如果已经全部回路都接收了网关回复,则不再二次发送
			break;
			}
			sendCount++;
			if (sendCount == 2)
			{
			//就发2次
			break;
			}
			System.Threading.Thread.Sleep(5000);
			}

			}, ShowErrorMode.NO);
			}
			});
			@@ -799,8 +846,8 @@
			bodyFrameLayout.RemoveAll();
			bodyFrameLayout.Height = Application.GetRealHeight(750);
			this.listBodyContr.RecoverTableHeight();
			this.dicSceneCardControl.Clear();
			this.dicDeviceCardControl.Clear();
			this.dicSceneCardControl = new Dictionary<int, Controls.SceneCardControl>();
			this.dicDeviceCardControl = new Dictionary<string, Controls.DeviceCardCommon>();

			var listScene = new List<SceneUI>();
			foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)
			@@ -1061,13 +1108,15 @@
			this.ShowProgressBar();

			//切换住宅
			HdlResidenceLogic.Current.SwitchResidence(home.Id);
			var result = HdlResidenceLogic.Current.SwitchResidence(home.Id);

			HdlThreadLogic.Current.RunMain(() =>
			{
			//刷新界面
			this.ShowForm();

			if (result == true)
			{
			//刷新界面
			this.ShowForm();
			}
			this.CloseProgressBar();
			});
			});
			@@ -1089,6 +1138,18 @@
			{
			//处理一般设备的上报数据
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);

			//晾衣架上报需要特殊处理，其他上报的回路统一转为端点1
			var tempList = LocalDevice.Current.GetDevicesByMac(report.DeviceAddr);
			if (tempList.Count > 0)
			{
			var tempDeviceEnum = LocalDevice.Current.GetMyDeviceEnumInfo(tempList);
			if (tempDeviceEnum.ConcreteType == Common.DeviceConcreteType.Airer)
			{
			mainKeys = report.DeviceAddr + "_" + 1;
			}
			}

			if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
			{
			//刷新卡片信息
			@@ -1096,7 +1157,16 @@
			//已经接收到网关的反馈 2020.05.09:删除Ack主题
			this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
			//刷新控件
			this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
			if (locadevice.Type != DeviceType.IASZone)
			{
			//传感器不需要属性上报(但是那个球型传感器居然会属性上报)
			this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
			}
			else if (report.DeviceStatusReport.CluterID == 1)
			{
			//这个是电量推送
			this.dicDeviceCardControl[mainKeys].RefreshBatteryStatu();
			}
			}
			}, ShowErrorMode.NO);
			});
			@@ -1147,6 +1217,46 @@

			#endregion

			#region ■ 传感器状态还原_____________________

			/// <summary>
			/// 开启传感器状态还原的线程
			/// </summary>
			private void StartRecoverSenorStatuThread()
			{
			HdlThreadLogic.Current.RunThread(() =>
			{
			while (this.Parent != null)
			{
			try
			{
			var dicControl = this.dicDeviceCardControl;
			foreach (var contr in dicControl.Values)
			{
			//如果是传感器,则刷新状态
			if (contr.device.Type == DeviceType.IASZone && contr.Parent != null
			&& ((IASZone)contr.device).iASInfo == null)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			//设备状态必须刷新
			string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);
			contr.SetDeviceStatuText(statuText);
			//传感器切换为灰色状态
			contr.SwitchCardStatuAppeal(false);

			}, ShowErrorMode.NO);
			}
			}
			System.Threading.Thread.Sleep(8000);
			}
			catch { System.Threading.Thread.Sleep(3000); }
			}
			});
			}

			#endregion

			#region ■ 切换楼层___________________________

			/// <summary>
			@@ -1155,13 +1265,16 @@
			private void ShowSelectFloorForm(NormalViewControl btnFloor)
			{
			var floorFL = new Category.SelectFloorForm();
			floorFL.CurFloorId = Config.Instance.Home.CurrentFloorId;
			this.AddChidren(floorFL);
			floorFL.Init(35, 153);
			floorFL.changeFloor = true;
			floorFL.FloorAction = (floorId) =>
			{
			btnFloor.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
			Config.Instance.Home.CurrentFloorId = floorId;
			HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom();
			//分类界面需要刷新
			UserView.UserPage.Instance.RefreshCategoryForm = true;
			this.ShowForm();
			};
			}
			@@ -1203,6 +1316,109 @@
			return true;
			}

			/// <summary>
			/// 显示App公告
			/// </summary>
			private void ShowAppNotice()
			{
			HdlThreadLogic.Current.RunThread(() =>
			{
			if (HdlFirmwareUpdateLogic.CheckCanShowNotice() == true)
			{
			while (this.IsFormOpen("HdlAutoBackupForm") == true)
			{
			//自动备份的界面正在打开中
			System.Threading.Thread.Sleep(1000);
			}
			HdlThreadLogic.Current.RunMain(() =>
			{
			//加载系统公告
			var form2 = new AppNoticeForm();
			UserView.UserPage.Instance.AddChidren(form2);
			form2.Show();
			form2.FinishEvent += () =>
			{
			HdlThreadLogic.Current.RunThread(() =>
			{
			System.Threading.Thread.Sleep(1000);
			//显示App升级的弹窗
			this.ShowUpdateAppDialog();

			}, ShowErrorMode.NO);
			};

			}, ShowErrorMode.NO);
			}
			else
			{
			//显示App升级的弹窗
			this.ShowUpdateAppDialog();
			}
			}, ShowErrorMode.NO);
			}

			/// <summary>
			/// 显示App升级的弹窗
			/// </summary>
			private void ShowUpdateAppDialog()
			{
			//App升级提示
			if (string.IsNullOrEmpty(FirmwareUpdateResourse.AppNeedUpdateUrl) == false)
			{
			//整了一次之后就不整了
			string updateUrl = FirmwareUpdateResourse.AppNeedUpdateUrl;
			FirmwareUpdateResourse.AppNeedUpdateUrl = string.Empty;

			while (this.IsFormOpen("HdlAutoBackupForm") == true)
			{
			//自动备份的界面正在打开中
			System.Threading.Thread.Sleep(1000);
			}
			//发现APP新版本,马上升级{0}开启新体验哦~
			this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uAppUpdateMsg1).Replace("{0}", "\r\n"), () =>
			{
			#if iOS
			Uri url = new Uri(updateUrl);
			UIKit.UIApplication.SharedApplication.OpenUrl(url);
			#endif
			#if Android
			HDLUtils.OpenUrl(updateUrl);
			#endif
			}, Language.StringByID(R.MyInternationalizationString.uLevelUp));
			//App升级提示优先
			return;
			}
			//网关升级提示
			if (FirmwareUpdateResourse.ListGatewayNeedUpdate.Count > 0)
			{
			//整完之后就清空
			var listGateway = new List<string>();
			listGateway.AddRange(FirmwareUpdateResourse.ListGatewayNeedUpdate);
			FirmwareUpdateResourse.ListGatewayNeedUpdate = new List<string>();

			while (this.IsFormOpen("HdlAutoBackupForm") == true)
			{
			//自动备份的界面正在打开中
			System.Threading.Thread.Sleep(1000);
			}
			foreach (var gwId in listGateway)
			{
			//目前只整一个
			if (HdlGatewayLogic.Current.IsGatewayExist(gwId) == true)
			{
			//发现网关新版本,马上升级{0}开启新体验哦~
			this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uGatewayUpdateMsg1).Replace("{0}", "\r\n"), () =>
			{
			var form = new UserCenter.GatewayUpdate.GatewayFirmwareUpdateForm();
			form.AddForm(HdlGatewayLogic.Current.GetLocalGateway(gwId));
			});
			break;
			}
			}
			return;
			}
			}

			#endregion

			#region ■ 界面重新激活事件___________________
			@@ -1216,6 +1432,6 @@
			return 1;
			}

			#endregion
			#endregion
			}
			}