From a41a96b555f3aabf243741352bded5f28cd0ced5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 21 七月 2020 15:56:32 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs | 159 +++++--------
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs | 24 +-
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 4
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs | 21
ZigbeeApp/Shared/Common/CommonPage.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 202 ++++++++++++++++
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs | 43 ++-
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs | 20
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs | 85 ++----
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs | 6
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs | 4
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 54 ++-
ZigbeeApp/Shared/Common/Device.cs | 22
20 files changed, 426 insertions(+), 250 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 5e1036d..54532c3 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -42,7 +42,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.0120071701";
+ public static string CodeIDString = "1.1.0120072102";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
old mode 100644
new mode 100755
index 7f12108..b94b3e0
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -2563,7 +2563,7 @@
{
if (this.dicDeviceModelIdEnum.ContainsKey(strKey) == false)
{
- return null;
+ return new DeviceNameContent();
}
return this.dicDeviceModelIdEnum[strKey];
}
@@ -3178,18 +3178,18 @@
System.IO.StreamReader streamReader = null;
var listText = new List<string>();
try
- {
-#if iOS
- string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
- streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
+ {
+#if iOS
+ string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
+ streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
string text;
while ((text = streamReader.ReadLine()) != null)
{
listText.Add(text.Trim());
}
- return listText;
-#endif
-#if Android
+ return listText;
+#endif
+#if Android
var stream = Application.Activity.Assets.Open("DeviceName.ini");
streamReader = new System.IO.StreamReader(stream, Encoding.UTF8);
string text;
@@ -3217,10 +3217,10 @@
}
}
-#endregion
+ #endregion
}
-#region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
+ #region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
/// <summary>
/// <para>璁惧鐨勫叿浣撱�愯澶囩被鍨嬨��,鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
@@ -3595,5 +3595,5 @@
A骞叉帴鐐� = 16,
}
-#endregion
+ #endregion
}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
index 9c67d14..21fd604 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
@@ -366,19 +366,20 @@
/// <param name="comand"></param>
private void SetCurtainCommand(int comand)
{
+ //2020.07.20鍙樻洿:鏀惧紑闄愬埗,涓嶅啀绛夊緟缃戝叧鍥炲,涔熻兘鐐瑰嚮鎸夐挳
//鍦ㄦ病鏈夋帴鏀跺埌鍙嶉涔嬪墠,涓嶈兘鍐嶇偣鍑�
- this.btnClose.CanClick = false;
- this.btnOpen.CanClick = false;
- this.btnStop.CanClick = false;
+ //this.btnClose.CanClick = false;
+ //this.btnOpen.CanClick = false;
+ //this.btnStop.CanClick = false;
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
- this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>
- {
- //鏃堕棿缁撴潫,鍙互鍐嶆鐐瑰嚮
- this.btnClose.CanClick = true;
- this.btnOpen.CanClick = true;
- this.btnStop.CanClick = true;
- });
+ //this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>
+ //{
+ // //鏃堕棿缁撴潫,鍙互鍐嶆鐐瑰嚮
+ // this.btnClose.CanClick = true;
+ // this.btnOpen.CanClick = true;
+ // this.btnStop.CanClick = true;
+ //});
//鍙戦�佸懡浠�
((Rollershade)device).CurtainUpDownStopControl(comand);
}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 910c837..4e2b13b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -159,7 +159,7 @@
btnHouseName.TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor;
btnHouseName.IsBold = true;
btnHouseName.Text = Config.Instance.Home.Name;
- btnHouseName.Width = btnHouseName.GetRealWidthByText();
+ btnHouseName.Width = btnHouseName.GetRealWidthByText() + Application.GetRealWidth(100);
this.listBodyContr.frameTable.AddChidren(btnHouseName);
//鍒囨崲浣忓畢
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index fb1ca0a..b841920 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -583,6 +583,8 @@
//璁惧畾涓�涓椂闂�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
Config.Instance.Save();
+ //娓呯┖褰撳墠浣忓畢id
+ Config.Instance.HomeId = string.Empty;
//鏀惰捣宸﹁彍鍗�
CommonPage.Instance.CloseLeftMenu();
//鍏抽棴鍏ㄩ儴寮圭獥
@@ -672,6 +674,8 @@
}
else if (view is UserView.UserPage)
{
+ var form = ((UserView.UserPage)view).GetNowActionForm();
+ form?.FormActionAgainEvent();
return;
}
else
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
index 5e12411..55bdb86 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -306,7 +306,7 @@
var myTip = new Tip();
myTip.Direction = AMPopTipDirection.None;
myTip.CloseTime = 2;
- myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")";
myTip.Show(Common.CommonPage.Instance);
});
return;
@@ -324,7 +324,7 @@
var myTip = new Tip();
myTip.Direction = AMPopTipDirection.None;
myTip.CloseTime = 2;
- myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "120_ 6533" + ")";
myTip.Show(Common.CommonPage.Instance);
});
return;
@@ -443,7 +443,7 @@
btnFinish.Enable = true;
btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
});
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
index 5cdd8b4..b25f90f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -97,6 +97,30 @@
btnBackFrameLayout.AddChidren(btnBack);
titleFrameLayout.AddChidren(btnTitle);
btnTitle.Text = titleText;
+
+ btnTitle.MouseLongEventHandler = (sender, e) =>
+ {
+ var f1 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(400),
+ Gravity = Gravity.CenterHorizontal,
+ };
+ this.titleFrameLayout.AddChidren(f1);
+ var btn1 = new Button()
+ {
+ Width = Application.GetRealWidth(6),
+ Height = Application.GetRealHeight(6),
+ Radius = (uint)Application.GetRealWidth(3),
+ BackgroundColor = 0xff000000,
+ };
+ f1.AddChidren(btn1);
+
+ f1.MouseLongEventHandler += (sender1, e1) =>
+ {
+ ErrroInfoLayout(this);
+ f1.RemoveFromParent();
+ };
+ };
}
/// <summary>
/// 涓儴甯冨眬
@@ -341,5 +365,181 @@
sidelipFrameLayout.Height = Application.GetMinReal(780);
}
}
+
+ /// <summary>
+ /// Layout
+ /// </summary>
+ public void ErrroInfoLayout(FrameLayout frameLayout)
+ {
+ // 鍑嗗鍔犱竴闇�瑕佽緭鍏ュ瘑鐮佹墠 dialog.Show();
+ var editText = new EditText
+ {
+ Width = Application.GetRealWidth(800),
+ Height = Application.GetMinReal(100),
+ Text = "Bind",
+ TextAlignment = TextAlignment.Center,
+ TextSize = 12,
+ Gravity = Gravity.Center,
+ Radius = 10,
+ BorderColor = 0xffff00,
+ BorderWidth = 5,
+ BackgroundColor = 0xff000000,
+ };
+ frameLayout.AddChidren(editText);
+
+
+ Action<Shared.View> action = (obj) =>
+ {
+ if (editText.Text == "Bind")
+ {
+ editText.RemoveFromParent();
+
+ var dialog = new Dialog
+ {
+ };
+ dialog.Show();
+
+ var flMain = new FrameLayout { BackgroundColor = 0xff000000 };
+ dialog.AddChidren(flMain);
+ flMain.MouseUpEventHandler += (sender11, e11) =>
+ {
+ dialog.Close();
+ };
+
+ var titleFrameLayout = new FrameLayout
+ {
+ BackgroundColor = 0xff2f2f2f,
+ Height = Application.GetMinReal(80),
+ Y = Application.GetMinReal(80),
+ };
+ dialog.AddChidren(titleFrameLayout);
+
+ var title = new Button
+ {
+ Width = Application.GetRealWidth(1080 - 200),
+ Text = "Search Error Infomation",
+ TextAlignment = TextAlignment.Center,
+ TextSize = 12,
+ IsBold = true,
+ };
+ titleFrameLayout.AddChidren(title);
+ title.MouseUpEventHandler += (sender11, e11) =>
+ {
+ dialog.Close();
+ };
+
+ var close = new Button
+ {
+ Height = Application.GetMinReal(80),
+ Width = Application.GetRealWidth(200),
+ X = Application.GetRealWidth(1080 - 200),
+ Text = "鍏抽棴",
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 12,
+ Radius = 5,
+ };
+ titleFrameLayout.AddChidren(close);
+ close.MouseUpEventHandler += (sender11, e11) =>
+ {
+ dialog.Close();
+ };
+
+ var contentLayout = new VerticalScrolViewLayout()
+ {
+ BackgroundColor = 0xff2f2f2f,
+ Y = titleFrameLayout.Bottom,
+ Height = Application.GetRealHeight(1710),
+ };
+ flMain.AddChidren(contentLayout);
+
+ var Info = GetErrorList();
+ for (int i = 0; i < Info.Count; i++)
+ {
+ var mess = Info[i];
+ var msgArry = mess.Split(new string[] { "[0]" }, StringSplitOptions.RemoveEmptyEntries);
+
+ var row = new RowLayout()
+ {
+ Height = Application.GetRealHeight(90),
+ };
+ contentLayout.AddChidren(row);
+
+ var btnText1 = new Button
+ {
+ Height = Application.GetMinReal(80),
+ Width = Application.GetRealWidth(200),
+ X = Application.GetRealWidth(5),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 10,
+ Text = msgArry[0],
+ IsBold = true,
+ };
+ row.AddChidren(btnText1);
+
+ var btnText2 = new Button
+ {
+ Height = Application.GetMinReal(80),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 8,
+ X = btnText1.Right,
+ Text = msgArry[1],
+ };
+ row.AddChidren(btnText2);
+
+ if (msgArry.Length > 2)
+ {
+ btnText2.Height = Application.GetRealHeight(90 / 2);
+
+ var btnText3 = new Button
+ {
+ X = btnText1.Right,
+ Y = Application.GetRealHeight(90 / 2),
+ Height = Application.GetRealHeight(90 / 2),
+ Text = msgArry[2],
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 8,
+ };
+ row.AddChidren(btnText3);
+ }
+ }
+ }
+
+ };
+ editText.EditorEnterAction += action;
+ }
+
+ /// <summary>
+ ///缁戝畾閿欒琛�
+ /// </summary>
+ /// <returns></returns>
+ private List<string> GetErrorList()
+ {
+ var sList = new List<string> { };
+ sList.Add("0003:[0]鑾峰彇鎸夐敭鏀寔鐨勫姛鑳芥椂,缃戝叧娌″洖銆� 閫忎紶鍛戒护锛�0003 銆�");
+ sList.Add("0003_switch:[0]鑾峰彇寮�鍏冲叿浣撶被鍨嬫椂(绉佹湁鍔熻兘绗笁绾у埆),缃戝叧娌″洖銆愰�忎紶鍛戒护锛�0003銆�");
+ sList.Add("0003_dimmer:[0]鑾峰彇璋冨厜鍏蜂綋绫诲瀷鏃�(绉佹湁鍔熻兘绗笁绾у埆),缃戝叧娌″洖銆愰�忎紶鍛戒护锛�0003銆�");
+ sList.Add("0003_curtain:[0]鑾峰彇璋冨厜鍏蜂綋绫诲瀷鏃�(绉佹湁鍔熻兘绗笁绾у埆),缃戝叧娌″洖銆愰�忎紶鍛戒护锛�0003銆�");
+ sList.Add("108_ 6533:[0]璇诲彇闈㈡澘鐨勯厤缃俊鎭椂,缃戝叧娌″洖銆愬懡浠�108锛屽睘鎬�6533銆�");
+ sList.Add("120_ 6533:[0]閰嶇疆闈㈡澘鍔熻兘鏃�,缃戝叧娌″洖銆愬懡浠�120锛屽睘鎬�6533銆�");
+ sList.Add("5001:[0]璁惧缁戝畾鏃�,缃戝叧娌″洖銆愬懡浠�5001銆�");
+ sList.Add("5001_1:[0]璁惧娣诲姞缁戝畾鐩爣鏃�,缃戝叧缁戝畾鐩爣澶辫触锛岀粦瀹氳澶囩洰鏍囨湁婕忔帀銆愬懡浠�5001銆�");
+ sList.Add("5001_2:[0]璁惧娣诲姞缁戝畾鐩爣鏃�,缃戝叧鍥炲鏈煡閿欒銆愬懡浠�5001銆�");
+ sList.Add("5003:[0]鍒犻櫎璁惧鏃�,缃戝叧娌″洖銆愬懡浠�5003銆�");
+ sList.Add("5003_1:[0]褰撶粦瀹氱┖鐩爣锛屽彂鍒犻櫎宸茬粡瀛樺湪鎸夐敭鐨勭洰鏍囨椂锛孾0]缃戝叧娌″洖銆愬懡浠�5003銆�");
+ sList.Add("5003_2:[0]褰撶粦瀹氱┖鐩爣锛屽彂鍒犻櫎宸茬粡瀛樺湪鎸夐敭鐨勭洰鏍囨椂锛孾0]鎸夐敭鍥炲閿欒缁撴灉銆愬懡浠�5003銆�");
+ sList.Add("5003_3:[0]褰撶粦瀹氱┖鐩爣锛屽彂鍒犻櫎宸茬粡瀛樺湪鎸夐敭鐨勭洰鏍囨椂锛孾0]鎸夐敭缁撴灉鏄┖锛岀綉鍏冲洖澶嶉敊璇粨鏋溿�愬懡浠�5003銆�");
+ sList.Add("5003_4:[0]鏇存崲鐩爣鏃讹紝鍙戝垹闄ゆ寜閿棫鐨勭洰鏍囨椂锛屾寜閿粨鏋滄槸绌猴紝[0]缃戝叧鍥炲閿欒缁撴灉銆愬懡浠�5003銆�");
+ sList.Add("5003_5:[0]鏇存崲鐩爣鏃讹紝鍙戝垹闄ゆ寜閿棫鐨勭洰鏍囨椂锛孾0]鎸夐敭鍥炲閿欒缁撴灉銆愬懡浠�5003銆�");
+ sList.Add("5003_6:[0]鏇存崲鐩爣鏃讹紝鍙戝垹闄ゆ寜閿棫鐨勭洰鏍囨椂锛屾寜閿粨鏋滄槸绌猴紝[0]缃戝叧鍥炲閿欒缁撴灉銆愬懡浠�5003銆�");
+ sList.Add("5003_7:[0]鏇存崲鐩爣鏃讹紝鍙戝垹闄ゆ寜閿棫鐨勭洰鏍囨椂锛屾棫鐨勫悓绉嶇被鍨嬬殑鐩爣娌℃湁鍒犻櫎瀹岋紝[0]涓嶈兘缁戝畾鏂扮殑鐩爣銆愬懡浠�5003銆�");
+ sList.Add("5003_8:[0]鍒犻櫎鍗曚釜璁惧锛岀綉鍏冲洖澶嶇殑缁撴灉鏄け璐ョ殑銆愬懡浠�5003銆�");
+ sList.Add("5003_9:[0]鍒犻櫎鍗曚釜璁惧锛岀綉鍏冲洖澶嶉敊璇崟缁撴灉銆愬懡浠�5003銆�");
+ sList.Add("5006:[0]鍒犻櫎鎸夐敭鎵�鏈夌粦瀹氳〃鏃�,缃戝叧娌″洖銆愬懡浠�5006銆�");
+ sList.Add("5007:[0]鑾峰彇鎸夐敭缁戝畾琛ㄦ椂, 缃戝叧娌″洖銆愬懡浠�5007銆�");
+ sList.Add("5007_1:[0]鑾峰彇鎸夐敭缁戝畾琛ㄦ椂,缃戝叧娌″洖,缁撴灉鏄痆0]鑾峰彇澶氬姛鑳介潰鏉跨殑鐩爣涓暟涓嶅叏銆愬懡浠�5007銆�");
+ sList.Add("5007_2:[0]鑾峰彇鎸夐敭缁戝畾鐨勬俯搴︿紶鎰熷櫒澶辫触銆愬懡浠�5007銆�");
+ sList.Add("5007_3:[0]鑾峰彇鎸夐敭缁戝畾鐨勬箍搴﹀害浼犳劅鍣ㄥけ璐ャ�愬懡浠�5007銆�");
+ return sList;
+ }
}
-}
\ No newline at end of file
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 1278976..5d20fe7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -168,7 +168,7 @@
{
CommonPage.Loading.Hide();
midVerticalRefreshLayout.EndHeaderRefreshing();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
return;
});
}
@@ -207,7 +207,7 @@
{
CommonPage.Loading.Hide();
midVerticalRefreshLayout.EndHeaderRefreshing();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "108_ 6533" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
@@ -684,7 +684,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
});
}
}
@@ -758,7 +758,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
CommonPage.Loading.Hide();
});
dialog.Close();
@@ -1165,7 +1165,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
});
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
index 31e7fb7..f36a132 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
@@ -157,7 +157,7 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
});
return;
}
@@ -324,7 +324,7 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
});
return;
}
@@ -348,7 +348,7 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnFinifh);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "120_ 6533" + ")", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnFinifh);
});
return;
}
@@ -382,7 +382,7 @@
typeDetailModeList = await GetAddSwitchMode();
if (typeDetailModeList == null)
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_switch" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
}
else
{
@@ -394,7 +394,7 @@
typeDetailModeList = await GetAddDimmerMode();
if (typeDetailModeList == null)
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_dimmer" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
}
else
{
@@ -406,7 +406,7 @@
typeDetailModeList = await GetAddCurtainMode();
if (typeDetailModeList == null)
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_curtain" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
}
else
{
@@ -642,7 +642,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_switch" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
@@ -789,7 +789,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_dimmer" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
@@ -968,12 +968,12 @@
if (typeDetailModeList == null)
{
//鍐嶆鍔ㄦ�佽幏鍙栨寜閿敮鎸佺殑绫�
- typeDetailModeList = await GetAddSwitchMode();
+ typeDetailModeList = await GetAddCurtainMode();
if (typeDetailModeList == null)
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_curtain" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
index 1fced47..7e5db3d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -48,11 +48,34 @@
var tempList = new List<BindListAllInfo>();
int count1 = 0;
int count2 = 0;
+
+ switch (curBindType)
+ {
+ case 1:
+ curSwitchCount = 0;
+ break;
+ case 2:
+ curSocketCount = 0;
+ break;
+ case 3:
+ curLightFromRelayCount = 0;
+ curLightCount = 0;
+ break;
+ }
+
foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
{
var bList = bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
+ if (curBindType == 0)
+ {
+ if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
+ {
+ tempList.Add(bDev);
+ }
+ }
+
var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
@@ -60,12 +83,6 @@
}
switch (curBindType)
{
- case 0:
- if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
- {
- tempList.Add(bDev);
- }
- break;
case 1:
if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
{
@@ -225,6 +242,14 @@
var bList = bindTargetsFromMutilfunctionPanelList[key];
foreach (var bDev in bList)
{
+ if (curBindType == 0)
+ {
+ if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
+ {
+ tempList.Remove(bDev.KeyEpoint);
+ }
+ }
+
var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
if (device == null)
{
@@ -232,12 +257,6 @@
}
switch (curBindType)
{
- case 0:
- if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
- {
- tempList.Remove(bDev.KeyEpoint);
- }
- break;
case 1:
case 2:
if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
index 7fdf549..0839b7d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
@@ -715,7 +715,7 @@
canFresh = false;
midVerticalScrolViewLayout.EndHeaderRefreshing();
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
this.midFrameLayout.RemoveAll();
@@ -901,7 +901,7 @@
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
if (btnTipPic.IsSelected)
{
- //鍒犻櫎鎯呭喌1:缁戝畾绌虹洰鏍囧繀椤诲彇娑堟寜閿腑宸茬粡瀛樺湪鐨勭洰鏍�
+ //褰撶粦瀹氱┖鐩爣锛岃鍒犻櫎宸茬粡瀛樺湪鎸夐敭鐨勭洰鏍�
if (oldTargetList.Count != 0)
{
//鍒犻櫎鎸夐敭涓凡缁忕粦瀹氱殑鐩爣涓暟銆愬垹闄ゆ垚鍔熶釜鏁般��
@@ -920,7 +920,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_1" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
ShowReLoadView();
@@ -968,7 +968,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
@@ -1000,7 +1000,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
@@ -1082,7 +1082,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_4" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
ShowReLoadView();
@@ -1109,7 +1109,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_6" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
@@ -1131,7 +1131,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_5" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
@@ -1147,7 +1147,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_7" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
CommonPage.Loading.Hide();
@@ -1225,7 +1225,7 @@
Application.RunOnMainThread(() =>
{
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
ShowReLoadView();
ReLoadAction += () =>
@@ -1265,7 +1265,7 @@
new Tip()
{
MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
+ Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5001_1" + ")",
Direction = AMPopTipDirection.None,
CloseTime = 1
}.Show(CommonPage.Instance);
@@ -1281,7 +1281,7 @@
new Tip()
{
MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
+ Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError) + "(" + "5001_2" + ")",
Direction = AMPopTipDirection.None,
CloseTime = 1
}.Show(CommonPage.Instance);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 6d3c85d..5f24bcd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -1162,7 +1162,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
@@ -1174,7 +1174,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index b428f18..7073c99 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -175,7 +175,6 @@
device.CurrentGateWayId = this.realGateway.GwId;
//灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
Common.LocalDevice.Current.SetDeviceInfoToMain(device, device);
- Common.LocalDevice.Current.RefreshDeviceFunctionType(device, device, true);
//娣诲姞璁惧鐨勭紦瀛�
device.IsOnline = 1;
@@ -183,9 +182,6 @@
//鍒锋柊瓒呮椂鏃堕棿
this.waitDeviceTimeOut = 20;
-
- //鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
- HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
//涓嶉渶瑕�200绔偣鐨勯偅涓澶� 2020.01.13 鍙樻洿:ota涔熷姞杩涙潵
this.listNewDevice.Add(device);
@@ -222,26 +218,33 @@
this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
System.Threading.Thread.Sleep(200);
+ var listDevice = new List<CommonDevice>();
+ for (int i = 0; i < this.listNewDevice.Count; i++)
+ {
+ var device = this.listNewDevice[i];
+ if (device.DeviceAddr != this.listNewDevice[0].DeviceAddr)
+ {
+ continue;
+ }
+ listDevice.Add(device);
+ //閲嶆柊鍙樻洿UI
+ if (device is OTADevice)
+ {
+ continue;
+ }
+ device.IconPath = string.Empty;
+ device.ReSave();
+
+ //璁剧疆璁惧鍔熻兘绫诲瀷 (涓嶈兘鍦ㄦ帴鏀跺洖璺殑鍦版柟鍐欏叆,涓嶇劧缃戝叧鍙兘浼氳秴璐熻嵎)
+ Common.LocalDevice.Current.RefreshDeviceFunctionType(device, device, true);
+ //鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
+ HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
+ System.Threading.Thread.Sleep(100);
+ }
+
//鐩墠灏卞紕涓�涓�
HdlThreadLogic.Current.RunMain(() =>
{
- var listDevice = new List<CommonDevice>();
- for (int i = 0; i < this.listNewDevice.Count; i++)
- {
- var device = this.listNewDevice[i];
- if (device.DeviceAddr != this.listNewDevice[0].DeviceAddr)
- {
- continue;
- }
- listDevice.Add(device);
- //閲嶆柊鍙樻洿UI
- if (device is OTADevice)
- {
- continue;
- }
- device.IconPath = string.Empty;
- device.ReSave();
- }
//鏄剧ず璁惧淇℃伅鐢婚潰
this.ShowDeviceAddSuccessForm(listDevice);
});
@@ -440,6 +443,15 @@
else if (topic == gatewayId + "/DeviceInComingRespon")
{
this.topTimeOut = topMaxTime;
+
+ //璁惧鍏ョ綉鏃�,鏈夋椂鍊欑綉鍏充細涓婃姤铏氭嫙璁惧
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(resultData);
+ CommonDevice.DeviceInfoData info = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceInfoData>(jobject["Data"].ToString());
+ if (info.DriveCode != 0)
+ {
+ //涓嶉渶瑕佽櫄鎷熻澶�
+ return 0;
+ }
//缃戝叧鏈�缁堜笂鎶ヨ妭鐐硅澶囦俊鎭�
this.btnProgressBar.SetValue(6, 6);
return 1;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
index e81a59c..f66cf40 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -448,21 +448,25 @@
int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- //棰滆壊澶栨
- var btnColorLine = new FrameLayoutStatuControl();
- btnColorLine.Width = Application.GetRealHeight(79);
- btnColorLine.Height = this.GetPictrueRealSize(79);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xffcccccc;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+ //棰滆壊澶栨
+ var frameColorLine = new FrameLayoutStatuControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = this.GetPictrueRealSize(79);
+ frameColorLine.Width = this.GetPictrueRealSize(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
btnColor.Gravity = Gravity.Center;
- btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
@@ -476,46 +480,22 @@
frameColor.ButtonClickEvent += (sender, e) =>
{
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorView.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColor.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorLine.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnRight.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- }
+ var form = new PanelColorSelectForm();
+ form.AddForm(R1, G1, B1);
+ form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+ {
+ R1 = Rcolor;
+ G1 = Gcolor;
+ B1 = Bcolor;
- /// <summary>
- /// PanelColorBefore
- /// </summary>
- private void PanelColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)
- {
- var form = new PanelColorSelectForm();
- form.AddForm(R1, G1, B1);
- form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
- {
- R1 = Rcolor;
- G1 = Gcolor;
- B1 = Bcolor;
+ this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);
+ this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);
+ this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
- this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);
- this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);
- this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
-
- btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
- //鍙樻洿婊戝姩鏉＄殑棰滆壊
- seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ };
};
}
@@ -536,6 +516,7 @@
btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
btnClick.TextID = R.MyInternationalizationString.uAfterClick;
listview.AddChidren(btnClick);
+
//鑳屾櫙
var frameBack = new FrameLayout();
frameBack.Y = Application.GetRealHeight(608);
@@ -611,20 +592,24 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new FrameLayoutStatuControl();
- btnColorLine.Width = Application.GetRealHeight(79);
- btnColorLine.Height = this.GetPictrueRealSize(79);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xffcccccc;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+ var frameColorLine = new FrameLayoutStatuControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = this.GetPictrueRealSize(79);
+ frameColorLine.Width = this.GetPictrueRealSize(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
btnColor.Gravity = Gravity.Center;
- btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
@@ -638,46 +623,22 @@
frameColor.ButtonClickEvent += (sender, e) =>
{
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorView.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColor.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorLine.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnRight.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- }
+ var form = new PanelColorSelectForm();
+ form.AddForm(R1, G1, B1);
+ form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+ {
+ R1 = Rcolor;
+ G1 = Gcolor;
+ B1 = Bcolor;
- /// <summary>
- /// PanelColorBefore
- /// </summary>
- private void PanelAfterColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)
- {
- var form = new PanelColorSelectForm();
- form.AddForm(R1, G1, B1);
- form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
- {
- R1 = Rcolor;
- G1 = Gcolor;
- B1 = Bcolor;
+ this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
+ this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
+ this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
- this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
- this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
- this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
-
- btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
- //鍙樻洿婊戝姩鏉＄殑棰滆壊
- seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ };
};
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
index 041add9..1803c0b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
@@ -327,8 +327,8 @@
frameColor.UseClickStatu = false;
frameColor.Width = Application.GetRealHeight(262);
frameColor.Height = this.GetPictrueRealSize(79);
- frameColor.Gravity = Gravity.CenterVertical;
- frameColor.X = frameBack.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
+ frameColor.Y = Application.GetRealHeight(26);
+ frameColor.X = listview.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
frameBack.AddChidren(frameColor);
//棰滆壊
@@ -346,21 +346,25 @@
int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- //棰滆壊澶栨
- var btnColorLine = new FrameLayoutStatuControl();
- btnColorLine.Width = Application.GetRealHeight(79);
- btnColorLine.Height = this.GetPictrueRealSize(79);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xffcccccc;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+ //棰滆壊澶栨
+ var frameColorLine = new FrameLayoutStatuControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = this.GetPictrueRealSize(79);
+ frameColorLine.Width = this.GetPictrueRealSize(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
btnColor.Gravity = Gravity.Center;
- btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);
btnRight.UnSelectedImagePath = "Item/RightNext.png";
@@ -371,47 +375,22 @@
frameColor.ButtonClickEvent += (sender, e) =>
{
- PanelColor(btnColor, R1, G1, B1);
- };
- btnColorView.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, R1, G1, B1);
- };
- btnColor.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, R1, G1, B1);
- };
- btnColorLine.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, R1, G1, B1);
- };
- btnRight.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, R1, G1, B1);
+ var form = new PanelColorSelectForm();
+ form.AddForm(R1, G1, B1);
+ form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+ {
+ R1 = Rcolor;
+ G1 = Gcolor;
+ B1 = Bcolor;
+
+ this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
+ this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
+ this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
+
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ };
};
}
-
- /// <summary>
- /// PanelColorSelectForm
- /// </summary>
- private void PanelColor(NormalViewControl btnColor, int R1, int G1, int B1)
- {
- var form = new PanelColorSelectForm();
- form.AddForm(R1, G1, B1);
- form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
- {
- R1 = Rcolor;
- G1 = Gcolor;
- B1 = Bcolor;
-
- this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
- this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
- this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
-
- btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
- };
- }
-
#endregion
#region 鈻� 鑺傝兘妯″紡琛宊________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 7dec652..db51608 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -166,7 +166,7 @@
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
index 6b6ac40..e212fdf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
@@ -164,7 +164,7 @@
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
index 2083145..1cc5f84 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
@@ -1265,7 +1265,7 @@
new Tip()
{
MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
+ Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5001_1" + ")",
Direction = AMPopTipDirection.Up,
CloseTime = 1
}.Show(btnFinifh);
@@ -1282,7 +1282,7 @@
new Tip()
{
MaxWidth = 150,
- Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
+ Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError) + "(" + "5001_2" + ")",
Direction = AMPopTipDirection.Up,
CloseTime = 1
}.Show(btnFinifh);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
index 58ce04e..4e4ad2c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -633,7 +633,7 @@
RefreshBindListUI();
midVerticalScrolViewLayout.EndHeaderRefreshing();
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_1" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
break;
}
@@ -756,7 +756,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
});
return;
@@ -785,7 +785,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail) + "(" + "5003_8" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
});
return;
@@ -796,7 +796,7 @@
{
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003_9" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
});
return;
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 88a2389..5802128 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -3553,7 +3553,7 @@
#if DEBUG
if (flage == true)
{
- //if (msg.Contains("DeviceStatusReport") == false)
+ if (msg.Contains("DeviceStatusReport") == false)
{
System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
}
--
Gitblit v1.8.0