From 3f52028f3ca6513f89933ed76e513376fec0962a Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 一月 2020 17:55:07 +0800
Subject: [PATCH] 2020-01-02-2
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 9 +-
ZigbeeApp/Home.Ios/Resources/Language.ini | 9 +-
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 61 ++++++++++++++++++++
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 6 +-
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 6 +-
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 25 +++-----
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 2
ZigbeeApp/Shared/R.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs | 2
9 files changed, 89 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index f1506f1..fec5d63 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,22 +1,15 @@
锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.Workbench>
- <Pads>
- <Pad Id="ProjectPad">
- <State name="__root__">
- <Node name="GateWay" expanded="True">
- <Node name="Shared" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="Device" expanded="True">
- <Node name="Category" selected="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- </State>
- </Pad>
- </Pads>
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Common/ZigbeeColor.cs">
+ <Files>
+ <File FileName="Shared/Phone/Device/Logic/CustomText.cs" Line="94" Column="66" />
+ <File FileName="GateWay.Droid/Application.cs" Line="187" Column="16" />
+ <File FileName="Home.Ios/AppDelegate.cs" />
+ <File FileName="Shared/Common/CommonPage.cs" Line="41" Column="51" />
+ <File FileName="Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs" />
+ <File FileName="Shared/Common/ZigbeeColor.cs" Line="315" Column="40" />
+ </Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index ffe2c93..9b814bd 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -362,7 +362,7 @@
5097=鍙栨秷
-5098=纭
+5098=纭畾
5099=鎻愮ず
5100=閫昏緫鍒楄〃
5101=鏃�
@@ -405,7 +405,7 @@
5138=鏃堕棿鏉′欢
5139=鏉′欢
5140=鎺ㄩ�佽缃�
-5141=鎺ㄩ�佸紑鍏�
+5141=鎺ㄩ�佹秷鎭�
5142=鑷畾涔夋帹閫�
5143=鏃ュ嚭鍓�
5144=鏃ュ嚭鍚�
@@ -533,7 +533,7 @@
5266=甯冮槻
5267=璇烽�夋嫨甯冮槻鎴栨挙闃蹭负鏉′欢
5268=璇烽�夋嫨瀹夐槻绫诲瀷
-5269=鏈変汉
+5269=妫�娴嬫湁浜烘椂
5270=鏃犱汉
5271=寮�鍚�
5272=鍏抽棴
@@ -547,7 +547,7 @@
5280=绔嬪嵆鎵ц
5281=鏃堕棿鑼冨洿
5282=鑷畾涔夋埧闂�
-5283=璁剧疆鍛ㄦ湡
+5283=鐢熸晥鏃堕棿
5284=鑷姩鍖�
5285=鑷姩鍖栧悕绉�
5286=濡傛灉
@@ -613,6 +613,7 @@
5376=搴旂敤
5377=娌℃湁鑷姩鍖杮\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5378=鎺ㄩ�佸唴瀹逛笉鑳戒负绌�.
+5379=鏆傛棤闂ㄩ攣鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 25293d4..b77531f 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -362,7 +362,7 @@
5097=鍙栨秷
-5098=纭
+5098=纭畾
5099=鎻愮ず
5100=閫昏緫鍒楄〃
5101=鏃�
@@ -405,7 +405,7 @@
5138=鏃堕棿鏉′欢
5139=鏉′欢
5140=鎺ㄩ�佽缃�
-5141=鎺ㄩ�佸紑鍏�
+5141=鎺ㄩ�佹秷鎭�
5142=鑷畾涔夋帹閫�
5143=鏃ュ嚭鍓�
5144=鏃ュ嚭鍚�
@@ -533,7 +533,7 @@
5266=甯冮槻
5267=璇烽�夋嫨甯冮槻鎴栨挙闃蹭负鏉′欢
5268=璇烽�夋嫨瀹夐槻绫诲瀷
-5269=鏈変汉
+5269=妫�娴嬫湁浜烘椂
5270=鏃犱汉
5271=寮�鍚�
5272=鍏抽棴
@@ -547,7 +547,7 @@
5280=绔嬪嵆鎵ц
5281=鏃堕棿鑼冨洿
5282=鑷畾涔夋埧闂�
-5283=璁剧疆鍛ㄦ湡
+5283=鐢熸晥鏃堕棿
5284=鑷姩鍖�
5285=鑷姩鍖栧悕绉�
5286=濡傛灉
@@ -613,6 +613,7 @@
5376=搴旂敤
5377=娌℃湁鑷姩鍖杮\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5378=鎺ㄩ�佸唴瀹逛笉鑳戒负绌�.
+5379=鏆傛棤闂ㄩ攣鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 1ec4312..0f27e05 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -84,6 +84,30 @@
middle.AddChidren(textBox);
textBox.HideSoftInput();
+ var textBtn = new Button
+ {
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealHeight(50),
+ X = Application.GetRealWidth(1080 - 80 - 50),
+ Y = Application.GetRealHeight(550 - 25),
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ Text = "50",
+ };
+ middle.AddChidren(textBtn);
+ textBox.TextChangeEventHandler += (sender, e) =>
+ {
+ var leng = e.Length;
+ if (leng > 50)
+ {
+ var substring = e.Substring(0, 50);
+ textBox.Text = substring;
+ }
+ else
+ {
+ textBtn.Text = (50 - leng).ToString();
+ }
+ };
+
var btnsave = new Button
{
Y = middle.Height - Application.GetRealHeight(260),
@@ -115,6 +139,43 @@
RemoveFromParent();
};
+
+
+ //var txtInput = new EditTextView();
+ //txtInput.Width = bodyFrameLayout.Width - ControlCommonResourse.XXLeft * 2;
+ //txtInput.Height = Application.GetRealHeight(470);
+ //txtInput.Y = Application.GetRealHeight(32);
+ //txtInput.TextAlignment = TextAlignment.TopLeft;
+ //txtInput.Gravity = Gravity.CenterHorizontal;
+ //txtInput.TextColor = UserCenterColor.Current.TextColor1;
+ //txtInput.PlaceholderTextColor = UserCenterColor.Current.TextGrayColor1;
+ //txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uYouSuggestionMsg);
+ //frameInput.AddChidren(txtInput);
+ //txtInput.TextChangeEventHandler += (sender, txtvalue) =>
+ //{
+ // if (this.suggestionCount <= 0)
+ // {
+ // return;
+ // }
+
+ // int length = txtvalue.Length;
+ // if (length > 500)
+ // {
+ // if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
+ // btnFild.Text = "0";
+ // return;
+ // }
+ // if (length == 0)
+ // {
+ // if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
+ // }
+ // else
+ // {
+ // if (btnSubmit.CanClick == false) { btnSubmit.CanClick = true; }
+ // }
+ // btnFild.Text = (500 - length).ToString();
+ //};
+
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index e83c213..931f2e0 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -284,11 +284,11 @@
lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50);
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50);
- if (membershipIfon.UserIdMode.Count > 10)
+ if (membershipIfon.UserIdMode.Count > 9)
{
///鍏冪礌瓒呭嚭10涓紝鏆傛椂榛樿鏄剧ず10;
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50);
+ lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
+ lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
}
string SelectedLockStatus = "";
///瀹氫箟涓や釜鍙橀噺璁板綍閫変腑鐘舵�侊紱
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index 7c00eb6..103104f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -182,7 +182,7 @@
Height = Application.GetRealHeight(200) + Application.GetRealHeight(32),
Width = Application.GetRealWidth(700),
//Gravity = Gravity.CenterHorizontal,
- Text = Language.StringByID(MyInternationalizationString.automationaddtext).Replace("{\\r\\n}", "\r\n"),
+ Text = Language.StringByID(MyInternationalizationString.tiplocktextnull).Replace("{\\r\\n}", "\r\n"),
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
TextAlignment = TextAlignment.Center,
IsMoreLines = true,
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 6a9b586..a962515 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -296,11 +296,11 @@
string SelectedDeviceStatuscondition = "";
lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
- if (user.UserIdMode.Count > 10)
+ if (user.UserIdMode.Count > 9)
{
///鍏冪礌瓒呭嚭10涓紝鏆傛椂榛樿鏄剧ず10;
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50);
+ lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
+ lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
}
for (int i = 0; i < user.UserIdMode.Count; i++)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
index 5ff077b..75fd4f9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -46,7 +46,7 @@
Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.devicestate,
+ TextID = MyInternationalizationString.addsensor,
IsBold = true,
};
topRowLayout.AddChidren(titleName);
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 3b9fa54..cc286ed 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -583,6 +583,7 @@
public readonly static int application = 5376;
public readonly static int automationaddtext = 5377;
public readonly static int tiptextnull = 5378;
+ public readonly static int tiplocktextnull = 5379;
#region 鐧诲綍娉ㄥ唽
/// <summary>
--
Gitblit v1.8.0