From b68cdc7e103a00d5df73e4b75603be8da1815b4a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 13:59:52 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 17 ++++++++
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 2 +
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 4 +-
ZigbeeApp/Home.Ios/Resources/Language.ini | 2 +
ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs | 4 --
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs | 2
ZigbeeApp/Shared/R.cs | 4 ++
ZigbeeApp/Shared/Shared.projitems | 5 +-
ZigbeeApp/Shared/Phone/Login/AccountResetPWDSuccess.cs | 2
ZigbeeApp/Shared/Common/CommonPage.cs | 2
ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs | 9 ++++
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 2
ZigbeeApp/Shared/Common/Device.cs | 9 ++--
15 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index de4baf5..926188e 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -1827,6 +1827,7 @@
16112=铏氭嫙璐﹀彿
16113=鐏叏寮�
16114=鐏叏鍏�
+16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1972,6 +1973,7 @@
40015=鎻掑骇
40016=鐏厜
40017=骞叉帴鐐�
+40018=鏂伴
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
50000=绱ф�ユ寜閽�
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index de4baf5..926188e 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -1827,6 +1827,7 @@
16112=铏氭嫙璐﹀彿
16113=鐏叏寮�
16114=鐏叏鍏�
+16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1972,6 +1973,7 @@
40015=鎻掑骇
40016=鐏厜
40017=骞叉帴鐐�
+40018=鏂伴
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
50000=绱ф�ユ寜閽�
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index ef10edc..cbcbd24 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -390,7 +390,7 @@
Config.Instance.Save();
CommonPage.Instance.RemoveAll();
CommonPage.Instance.Show();
- var login = new Phone.Login.AccountLogin();
+ var login = new Phone.Login.AccountLoginForm();
CommonPage.Instance.AddChidren(login);
login.ShowForm();
});
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index d9cddaa..b8126c8 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -2060,6 +2060,7 @@
list.Add(DeviceBeloneType.A鎻掑骇);
list.Add(DeviceBeloneType.A璋冨厜鍣�);
list.Add(DeviceBeloneType.A绐楀笜);
+ list.Add(DeviceBeloneType.A鏂伴);
list.Add(DeviceBeloneType.A绌鸿皟);
list.Add(DeviceBeloneType.A缁х數鍣�);
list.Add(DeviceBeloneType.A骞叉帴鐐�);
@@ -2992,6 +2993,10 @@
/// </summary>
A缁х數鍣� = 2300,
/// <summary>
+ /// 鏂伴
+ /// </summary>
+ A鏂伴 = 2310,
+ /// <summary>
/// 璋冨厜鍣�(2500-2799)
/// </summary>
A璋冨厜鍣� = 2500,
@@ -3047,10 +3052,6 @@
/// 骞叉帴鐐�
/// </summary>
A骞叉帴鐐� = 16,
- /// <summary>
- /// 鏂伴
- /// </summary>
- A鏂伴 = 17
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
similarity index 99%
rename from ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
rename to ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index 8bafd8e..1def82e 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 鐧诲綍鐣岄潰
/// </summary>
- public class AccountLogin : FrameLayoutBase
+ public class AccountLoginForm : FrameLayoutBase
{
#region 鈻� 鍙橀噺澹版槑___________________________
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
index 20faead..63eaddc 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
@@ -135,7 +135,7 @@
//鏈櫥褰曟垚鍔熷脊鍑虹櫥褰曠晫闈� 鍚屾椂闇�瑕佹爣璁颁负鏈櫥褰曠姸鎬�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
Config.Instance.Save();
- var login = new AccountLogin();
+ var login = new AccountLoginForm();
CommonPage.Instance.AddChidren(login);
login.ShowForm(account);
});
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountResetPWDSuccess.cs b/ZigbeeApp/Shared/Phone/Login/AccountResetPWDSuccess.cs
index 6c3db57..eea97f8 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountResetPWDSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountResetPWDSuccess.cs
@@ -95,7 +95,7 @@
}
finally
{
- var login = new AccountLogin();
+ var login = new AccountLoginForm();
CommonPage.Instance.AddChidren(login);
login.ShowForm();
}
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
similarity index 96%
rename from ZigbeeApp/Shared/Phone/Login/AccountLogic.cs
rename to ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
index 2cc5055..c3889ad 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
@@ -116,10 +116,6 @@
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
var revertObj = await RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
- //if (revertObj.StateCode.ToUpper() == "SUCCESS")
- //{
- // System.Console.WriteLine("涓婁紶浣嶇疆鎴愬姛" + lat + lon);
- //}
}
catch { }
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 000d878..098ffaa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -58,6 +58,23 @@
#endregion
+ #region 鈻� 閲嶅啓褰摜鐨勫睘鎬____________________
+
+ /// <summary>
+ /// 閲嶅啓Text灞炴��
+ /// </summary>
+ public new string Text
+ {
+ //鍏堣繖涔堝紕鍏堝惂
+ get { return base.Text == null ? string.Empty : base.Text; }
+ set
+ {
+ base.Text = value == null ? string.Empty : value;
+ }
+ }
+
+ #endregion
+
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs
index f5da451..c1b169c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs
@@ -196,6 +196,15 @@
this.BindChidrenEvent(view, chidrenBindMode);
}
+ /// <summary>
+ /// 娣诲姞瀛愭帶浠�
+ /// </summary>
+ /// <param name="view"></param>
+ public override void AddChidren(View view)
+ {
+ this.AddChidren(view, ChidrenBindMode.NotBind);
+ }
+
#endregion
#region 鈻� 鎺т欢浜嬩欢___________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs
index cc83e75..ed13ec9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鍋氭垚涓�涓垪琛ㄥ瀷鐨凢rameLayout(瀹冧笌VerticalListControl鍚屼竴鎬ц川,浣嗘槸瀹冩槸FrameLayout,瀹冧細鏀瑰彉楂樺害)
/// </summary>
- public class FrameListControl : FrameLayout
+ public class FrameListControl : FrameLayoutBase
{
/// <summary>
/// 琛屼箣闂寸殑闂磋窛
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 421cd93..e5d5c93 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -642,7 +642,7 @@
CloseAllOpenForm();
//鏄剧ず鐧婚檰鐢婚潰
- var formLogin = new Login.AccountLogin();
+ var formLogin = new Login.AccountLoginForm();
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
formLogin.ShowForm(account);
});
@@ -683,7 +683,7 @@
CloseAllOpenForm();
//鏄剧ず鐧婚檰鐢婚潰
- var formLogin = new Login.AccountLogin();
+ var formLogin = new Login.AccountLoginForm();
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
formLogin.ShowForm(account);
});
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 5b29ee7..cfe69a0 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -81,7 +81,7 @@
else
{
//鏈櫥褰曞脊鍑虹櫥褰曠晫闈�
- var accountLogin = new Login.AccountLogin { };
+ var accountLogin = new Login.AccountLoginForm { };
Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
accountLogin.ShowForm();
}
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index e488250..aa36b64 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -6194,6 +6194,10 @@
/// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
/// </summary>
public const int uDeviceBelongId16 = 40017;
+ /// <summary>
+ /// 鑷畾涔夎澶囨墍灞濱D涓�2310鐨勭炕璇戝悕瀛楋細鏂伴
+ /// </summary>
+ public const int uDeviceBelongId2310 = 40018;
//鈽呪槄鈽呪槄妯″潡ID鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
//鈽呪槄鈽呪槄妯″潡ID鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 6c3a1c5..f0009d2 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -51,7 +51,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SkipView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SoneLogicList.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountForgetPWD.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\Logic\AccountLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegister.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegisterSuccess.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountResetPWDSuccess.cs" />
@@ -417,7 +417,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewayDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewaySearchForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayInfoEditorForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountLogin.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountLoginForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\CommonPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\GetAreaCode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\ResidenceRes.cs" />
@@ -477,6 +477,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Phone\CommonForm\" />
+ <Folder Include="$(MSBuildThisFileDirectory)Phone\Login\Logic\" />
<Folder Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\Base\" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0