From 8c52c7c268ca5b2147b5276da0e2d550876213c3 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 09 十二月 2019 15:00:04 +0800
Subject: [PATCH] 2019-12-09-2
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 4 +
ZigbeeApp/Home.Ios/Resources/Language.ini | 5 +
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 30 ++++++++-
ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs | 18 ++++-
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs | 18 ++++-
ZigbeeApp/Shared/R.cs | 5 +
ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 16 ++++-
19 files changed, 95 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 972884f..de0af4d 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -603,7 +603,10 @@
5366=鑱斿姩浜嬩欢
5367=褰撳墠
5368=閫夋嫨妤煎眰
-
+5369=璇烽�夋嫨寤舵椂鏃堕棿锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5370=璇烽�夋嫨鐢ㄦ埛锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5371=璇烽�夋嫨鍦烘櫙锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
+5372=璇烽�夋嫨瀹夐槻妯″紡锛屽惁鍒欐棤娉曟墽琛屼笅涓�姝�.
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index 09f0fd1..8e695ce 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -153,8 +153,8 @@
if (clickTag == "no" || tempScene == null)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.scenetip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
index 0878bf6..5a912fe 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
@@ -433,7 +433,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectweek),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 50afd43..f9bc060 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -229,8 +229,8 @@
if (!edit)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 2f9ea5e..3091840 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -1537,7 +1537,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 36a7fc5..5756b56 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -433,8 +433,8 @@
if (conditionsIndex == -1)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.usertip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
index 3d9eb71..c1141e3 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
@@ -2079,7 +2079,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
index 819b229..59db8c2 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
@@ -151,8 +151,8 @@
if (clickTag == "no" || tempScene == null)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.scenetip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
index 32a11a6..35aa6f1 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -203,7 +203,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectweek),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
index e944344..237ca75 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
@@ -160,8 +160,18 @@
}
}
- int selectIndex1 = timevalue / 60;
- int selectIndex2 = timevalue % 60;
+ int selectIndex1 = 0;
+ int selectIndex2 = 0;
+ if (timevalue > 3600)
+ {
+ selectIndex1 = 60;
+ selectIndex2 = timevalue - 3600;
+ }
+ else
+ {
+ selectIndex1 = timevalue / 60;
+ selectIndex2 = timevalue % 60;
+ }
PickerView.ShowNormal(minuteList, secondList, new List<string>(), (Index1, Index2, Index3) =>
{
selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
@@ -237,8 +247,8 @@
if (!edit)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index cff085e..3dd1850 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -617,14 +617,24 @@
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
}
@@ -643,14 +653,24 @@
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index fffe741..02c0e4c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -2075,7 +2075,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index cb140ff..5c41019 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -391,6 +391,10 @@
{
if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
{
+ var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+ Language.StringByID(MyInternationalizationString.securitytip),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
index bc06c67..2bb99da 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -1119,7 +1119,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
index 09ec1cd..ea6b903 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
@@ -158,8 +158,18 @@
}
}
- int selectIndex1 = timevalue / 60;
- int selectIndex2 = timevalue % 60;
+ int selectIndex1 = 0;
+ int selectIndex2 = 0;
+ if (timevalue > 3600)
+ {
+ selectIndex1 = 60;
+ selectIndex2 = timevalue - 3600;
+ }
+ else
+ {
+ selectIndex1 = timevalue / 60;
+ selectIndex2 = timevalue % 60;
+ }
PickerView.ShowNormal(minuteList, secondList, new List<string>(), (Index1, Index2, Index3) =>
{
selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
@@ -235,8 +245,8 @@
if (!edit)
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index 92f05bc..d3f7e8a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -441,14 +441,24 @@
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 93d702f..a1865e8 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -485,7 +485,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.completeNext),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
@@ -493,7 +493,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.sametime),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
index ae51cf5..a55f368 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -283,7 +283,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectweek),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 5658982..4c348f8
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -573,7 +573,10 @@
public readonly static int linkageevent = 5366;
public readonly static int current = 5367;
public readonly static int selecfoolr = 5368;
-
+ public readonly static int delaytip = 5369;
+ public readonly static int usertip = 5370;
+ public readonly static int scenetip = 5371;
+ public readonly static int securitytip = 5372;
#region 鐧诲綍娉ㄥ唽
/// <summary>
--
Gitblit v1.8.0