From 9bf82668ee7dc8483fcdfa4c9feb8e5305029d5e Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期四, 07 五月 2020 11:44:28 +0800 Subject: [PATCH] 2020-05-07-2 --- ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 17 +++++++- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 6 ++ ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 1 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 51 +++++++++++++++++++++---- ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 15 ++++++- ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0 ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 3 + ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 6 +- 8 files changed, 80 insertions(+), 19 deletions(-) diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml index d1e3bc6..e8ba07c 100644 --- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml +++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml @@ -1,17 +1,50 @@ 锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default"> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" /> - <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs"> <Files> - <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="802" Column="43" /> - <File FileName="Shared/Phone/ZigBee/Common/Config.cs" /> - <File FileName="Shared/Common/House.cs" /> - <File FileName="Shared/Phone/Device/Logic/SkipView.cs" /> - <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" /> - <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="833" Column="74" /> - <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" /> - <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" /> + <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="789" Column="9" /> + <File FileName="Shared/Phone/ZigBee/Common/Config.cs" Line="4" Column="11" /> + <File FileName="Shared/Common/House.cs" Line="29" Column="23" /> + <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="251" Column="54" /> + <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="12" Column="2" /> + <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="114" Column="31" /> + <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="343" Column="61" /> + <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="7" Column="2" /> + <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="96" Column="71" /> + <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs" Line="221" Column="19" /> + <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="22" Column="17" /> + <File FileName="Shared/Common/Logic.cs" Line="8" Column="6" /> + <File FileName="Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs" Line="1" Column="1" /> + <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="118" Column="46" /> </Files> + <Pads> + <Pad Id="ProjectPad"> + <State name="__root__"> + <Node name="GateWay" expanded="True"> + <Node name="Shared" expanded="True"> + <Node name="Common" expanded="True" /> + <Node name="Phone" expanded="True"> + <Node name="Device" expanded="True"> + <Node name="Logic" expanded="True" /> + </Node> + <Node name="UserCenter" expanded="True"> + <Node name="CommonBase" expanded="True"> + <Node name="Common" expanded="True" /> + <Node name="Logic" expanded="True"> + <Node name="UserCenterLogic.cs" selected="True" /> + </Node> + </Node> + </Node> + <Node name="ZigBee" expanded="True"> + <Node name="Common" expanded="True" /> + </Node> + </Node> + </Node> + </Node> + </State> + </Pad> + </Pads> </MonoDevelop.Ide.Workbench> <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" /> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide index 0803f07..f0aa087 100644 --- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide +++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide Binary files differ diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs old mode 100755 new mode 100644 index 51f374d..d6c89bd --- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs @@ -72,6 +72,7 @@ UserView.HomePage.Instance.PageIndex += 1; roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic; roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate)); + }; securityView.clickviewBtn.MouseUpEventHandler += (sender, e) => { diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs old mode 100755 new mode 100644 index 8dbb478..c9f4318 --- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs @@ -387,6 +387,7 @@ break; case 40: { + openView.titleBtn.TextID = MyInternationalizationString.smokescreen; openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor; completeView.Show(1).AddChidren(openView.Show()); @@ -403,7 +404,7 @@ } break; case 43: - { + {//鍙厓璇寸殑 openView.titleBtn.TextID = MyInternationalizationString.gas; openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor; completeView.Show(1).AddChidren(openView.Show()); diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs old mode 100755 new mode 100644 index adac499..a6cf276 --- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs @@ -245,7 +245,7 @@ }; fra.AddChidren(roomnameBtn); - if (i == 0)// + if (i == 0)//榛樿閫変腑绗竴涓埧闂� { roombjButton.IsSelected = false; roombjButton = roombjBtn; @@ -343,7 +343,17 @@ TextSize = 10, }; deviceRowLayout.AddChidren(devicetypename); - + + + //if (i == 0)//榛樿閫変腑绗竴涓澶囩被鍨� + //{ + // devicetypeButton.IsSelected = false; + // devicetypeButton = backgroundColor; + // backgroundColor.IsSelected = true; + // var list = Method.GetDeviceType(devicetypename.Text); + // ConditionDeviceView(list, devicelist); + //} + EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) => { devicetypeButton.IsSelected = false; @@ -361,6 +371,7 @@ ///鏄剧ず鎴块棿鎵�鏈夎澶� ConditionDeviceView(new List<DeviceType>(), devicelist); + } /// <summary> /// 鍔犺浇璇ョ被鍨嬭澶囪鍥炬柟娉� diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs index 374b643..ef19807 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs @@ -241,9 +241,12 @@ //涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢 logicScrolView.BeginHeaderRefreshingAction += () => { - //閲嶆柊鍒锋柊logic鍒楄〃 - Common.Logic.LogicList.Clear(); - Read(logicScrolView, no); + if (!Config.Instance.Home.IsVirtually) + {//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃 + //閲嶆柊鍒锋柊logic鍒楄〃 + Common.Logic.LogicList.Clear(); + Read(logicScrolView, no); + } //鍏抽棴鍒锋柊View锛� logicScrolView.EndHeaderRefreshing(); }; @@ -258,6 +261,14 @@ /// <param name="logicScrolView"></param> private static async void Read(VerticalRefreshLayout logicScrolView, bool no) { + //if (Config.Instance.HomeId != UserCenter.UserCenterResourse.AccountOption.OldHomeStringId) + //{ + // //鍒囨崲浣忓畢娓呴櫎涔嬪墠缂撳瓨鏁版嵁; + // Common.Logic.LogicList.Clear(); + // Common.Logic.LockLogicList.Clear(); + // Common.Logic.SoneLogicList.Clear(); + //} + CommonPage.Loading.Start(); try { diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs old mode 100755 new mode 100644 index 878d26f..cf88b54 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs @@ -215,10 +215,10 @@ foreach (var floorKey in listFloorKey) { //瀹㈠巺 - list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A2鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); - list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A3鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); + //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A2鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); + //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A3鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A4鎸夐敭闈㈡澘, RoomId = floorKey + "_KeTing", DeviceCount = 2 }); - list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A绌鸿皟缃戝叧, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); + //list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A绌鸿皟缃戝叧, RoomId = floorKey + "_KeTing", DeviceCount = 1 }); //闃冲彴 list.Add(new AddDevicePra { DeviceType = VirtualDeviceEnum.A220pir浼犳劅鍣�, RoomId = floorKey + "_YangTai", DeviceCount = 1 }); diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs old mode 100755 new mode 100644 index e5d5c93..445dd4e --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs @@ -974,7 +974,11 @@ //褰撳墠涓婚〉,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 1:鍦烘櫙 2:鍔熻兘 UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1; //褰撳墠鍒嗙被,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘 2:鑷姩鍖� - UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0; + UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0; + //鍒囨崲浣忓畢娓呴櫎涔嬪墠缂撳瓨鏁版嵁; + Common.Logic.LogicList.Clear(); + Common.Logic.LockLogicList.Clear(); + Common.Logic.SoneLogicList.Clear(); } #endregion -- Gitblit v1.8.0