派生自 ~xm/HomeApp
ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -541,8 +541,8 @@ 5274=检测无漏水 5275=检测到燃气 5276=检测无燃气 5277=检测到烟幕 5278=检测无烟幕 5277=检测到烟雾 5278=检测无烟雾 5279=添加安防 5280=立即执行 5281=时间范围 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png
@@ -539,6 +539,8 @@ <AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" /> <AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrison.png" /> <AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrisonSelected.png" /> <AndroidAsset Include="Assets\Phone\ZigeeLogic\selectedsensor0.png" /> <AndroidAsset Include="Assets\Phone\ZigeeLogic\sensor0.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" /> ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -715,6 +715,8 @@ <BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" /> <BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" /> <BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" /> <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" /> <BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj"> ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -541,8 +541,8 @@ 5274=检测无漏水 5275=检测到燃气 5276=检测无燃气 5277=检测到烟幕 5278=检测无烟幕 5277=检测到烟雾 5278=检测无烟雾 5279=添加安防 5280=立即执行 5281=时间范围 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png
old mode 100755 new mode 100644
ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1744,7 +1744,7 @@ /// <summary> /// 自动化功能代码入口 /// </summary> private async void ShowAutotion() private void ShowAutotion() { functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; @@ -1814,7 +1814,6 @@ }; functionSceneAutoBodyView.AddChidren(logicScrolView); logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft); recommendswitchBtn.MouseUpEventHandler += (sender, e) => { ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -17,7 +17,7 @@ Tag = "Logic"; } public void Show(int isInt=0, bool edit=false) public void Show(int isInt = 0, bool edit = false) { #region 最上面的布局代码 @@ -78,7 +78,6 @@ }; this.AddChidren(middle); var blancolor = new FrameLayout { Width = Application.GetMinRealAverage(200), @@ -114,7 +113,7 @@ Height = Application.GetMinRealAverage(60), X = Application.GetRealWidth(300), Y = blancolor.Bottom + Application.GetRealHeight(50), TextID =MyInternationalizationString.createtimetext, TextID = MyInternationalizationString.createtimetext, TextColor = ZigbeeColor.Current.LogicTextBlackColor, TextSize = 15, @@ -129,7 +128,6 @@ }; middle.AddChidren(PickerViewfra); PickerViewfra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight); var mUIPickerView = new UIPickerView { @@ -162,7 +160,7 @@ int value = 0; if (edit) { timevalue = int.Parse(Common.Logic.CurrentLogic.Actions[isInt]["DelayTime"].ToString()); if (timevalue > 3600) { @@ -177,7 +175,7 @@ //更新最新状态 mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0); } value = timevalue; } string selectde = ""; @@ -189,7 +187,6 @@ selectde = "yes"; }; var btnsave = new Button { @@ -211,7 +208,7 @@ { return; } if (selectde != ""|| timevalue==5) if (selectde != "" || timevalue == 5) { Dictionary<string, object> actionsInfo = new Dictionary<string, object>(); actionsInfo.Add("LinkType", 7); @@ -243,6 +240,7 @@ UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); }; } } } ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -86,6 +86,7 @@ { ///从列表移除当前门锁全部的旧数据； Send.LockList.Remove(Send.LockList[i]); i--; } } Read(); @@ -125,7 +126,7 @@ /// </summary> public void UserAllView(string macport) { middle.RemoveAll(); for (int i = 0; i < Send.LockList.Count; i++) { var user = Send.LockList[i]; ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -632,7 +632,6 @@ case 21: case 22: { conditionIcon.UnSelectedImagePath = "ZigeeLogic/doormagnetism.png"; if (intvalue == "1") { devicestatus.TextID = MyInternationalizationString.logicopen; @@ -664,7 +663,6 @@ break; case 40: { conditionIcon.UnSelectedImagePath = "ZigeeLogic/smoke.png"; if (intvalue == "1") { devicestatus.TextID = MyInternationalizationString.smokescreen; @@ -674,7 +672,6 @@ break; case 42: { conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png"; if (intvalue == "1") { devicestatus.TextID = MyInternationalizationString.waterleakage; @@ -687,7 +684,6 @@ break; case 43: { conditionIcon.UnSelectedImagePath = "ZigeeLogic/gas.png"; if (intvalue == "1") { devicestatus.TextID = MyInternationalizationString.gas; @@ -697,7 +693,6 @@ break; case 277: { conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png"; if (intvalue == "1") { devicestatus.TextID = MyInternationalizationString.callthepolice; @@ -707,7 +702,6 @@ break; default: { conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png"; if (intvalue == "1") { devicestatus.TextID = MyInternationalizationString.callthepolice; ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -18,7 +18,6 @@ VerticalRefreshLayout middle; CommonDevice common; Dictionary<string, string> editdeviceConditionsInfo; public void Show(CommonDevice commondevice, Dictionary<string, string> editdeviceConditions = null) { common = commondevice; @@ -92,6 +91,7 @@ { ///从列表移除当前门锁全部的旧数据； Send.LockList.Remove(Send.LockList[i]); i--; } } Read(); @@ -133,7 +133,7 @@ /// <param name="macport"></param> public void UserList(string macport) { middle.RemoveAll(); foreach (var user in Send.LockList) { if (user.DoorLockMacPort != macport) ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.csold mode 100755 new mode 100644
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.csold mode 100755 new mode 100644
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.csold mode 100755 new mode 100644
@@ -2680,6 +2680,7 @@ public void ReadPanelSupportAttribute() { ReadAttri(Device.Cluster_ID.HdlKey, AttriButeId.HdlKey); } #region 读取面板的配置信息
