From ef63c84b3b408fea661f84d3f9ecc237787af250 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 09 十二月 2019 11:10:07 +0800
Subject: [PATCH] 2019-12-09-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 14 ++++++--------
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 4 ++--
ZigbeeApp/Home.Ios/Resources/Language.ini | 4 ++--
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 4 ++--
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 0
ZigbeeApp/Home.Ios/Home.IOS.csproj | 2 ++
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 6 ------
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 1 +
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 2 ++
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png | 0
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 3 +--
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png | 0
ZigbeeApp/Shared/Common/CommonPage.cs | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 3 ++-
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs | 0
17 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 086da77..ada4032 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -541,8 +541,8 @@
5274=妫�娴嬫棤婕忔按
5275=妫�娴嬪埌鐕冩皵
5276=妫�娴嬫棤鐕冩皵
-5277=妫�娴嬪埌鐑熷箷
-5278=妫�娴嬫棤鐑熷箷
+5277=妫�娴嬪埌鐑熼浘
+5278=妫�娴嬫棤鐑熼浘
5279=娣诲姞瀹夐槻
5280=绔嬪嵆鎵ц
5281=鏃堕棿鑼冨洿
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png
new file mode 100755
index 0000000..34fd2c1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor0.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png
new file mode 100755
index 0000000..2de7965
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor0.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 2d33bea..1ac54a2 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -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" />
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 7319808..678256c 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/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">
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 8b87531..972884f 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -541,8 +541,8 @@
5274=妫�娴嬫棤婕忔按
5275=妫�娴嬪埌鐕冩皵
5276=妫�娴嬫棤鐕冩皵
-5277=妫�娴嬪埌鐑熷箷
-5278=妫�娴嬫棤鐑熷箷
+5277=妫�娴嬪埌鐑熼浘
+5278=妫�娴嬫棤鐑熼浘
5279=娣诲姞瀹夐槻
5280=绔嬪嵆鎵ц
5281=鏃堕棿鑼冨洿
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png
new file mode 100755
index 0000000..34fd2c1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor0.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png
new file mode 100755
index 0000000..2de7965
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor0.png
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
old mode 100755
new mode 100644
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 3c06a98..46e8940 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/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) =>
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 63dae7a..50afd43 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/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(() => { });
};
+
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index fa4eb0b..36a7fc5 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/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];
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 36ea833..cff085e 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/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;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index c387b1c..2ac86ac 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/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)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
old mode 100755
new mode 100644
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs
old mode 100755
new mode 100644
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
old mode 100755
new mode 100644
index 0bc309a..d1ca154
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -2680,6 +2680,7 @@
public void ReadPanelSupportAttribute()
{
ReadAttri(Device.Cluster_ID.HdlKey, AttriButeId.HdlKey);
+
}
#region 璇诲彇闈㈡澘鐨勯厤缃俊鎭�
--
Gitblit v1.8.0