派生自 ~xm/HomeApp
ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -1827,6 +1827,7 @@ 16112=虚拟账号 16113=灯全开 16114=灯全关 16115=常开自动化手动取消 ;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★ 18004=指定网关已经被绑定 @@ -1972,6 +1973,7 @@ 40015=插座 40016=灯光 40017=干接点 40018=新风 ;★★★★下面这些是模块ID的设备默认备注名字,从50000开始.注:它并不需要再R.cs文件中定义★★★★ 50000=紧急按钮 ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -1827,6 +1827,7 @@ 16112=虚拟账号 16113=灯全开 16114=灯全关 16115=常开自动化手动取消 ;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★ 18004=指定网关已经被绑定 @@ -1972,6 +1973,7 @@ 40015=插座 40016=灯光 40017=干接点 40018=新风 ;★★★★下面这些是模块ID的设备默认备注名字,从50000开始.注:它并不需要再R.cs文件中定义★★★★ 50000=紧急按钮 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(); }); 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 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
File was renamed from ZigbeeApp/Shared/Phone/Login/AccountLogin.cs @@ -9,7 +9,7 @@ /// <summary> /// 登录界面 /// </summary> public class AccountLogin : FrameLayoutBase public class AccountLoginForm : FrameLayoutBase { #region ■ 变量声明___________________________
@@ -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); }); 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(); } ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
File was renamed from ZigbeeApp/Shared/Phone/Login/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 { } } 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> 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 ■ 控件事件___________________________ ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs
@@ -7,7 +7,7 @@ /// <summary> /// 做成一个列表型的FrameLayout(它与VerticalListControl同一性质,但是它是FrameLayout,它会改变高度) /// </summary> public class FrameListControl : FrameLayout public class FrameListControl : FrameLayoutBase { /// <summary> /// 行之间的间距 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); }); 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(); } ZigbeeApp/Shared/R.cs
@@ -6194,6 +6194,10 @@ /// 自定义设备所属ID为16的翻译名字：干接点 /// </summary> public const int uDeviceBelongId16 = 40017; /// <summary> /// 自定义设备所属ID为2310的翻译名字：新风 /// </summary> public const int uDeviceBelongId2310 = 40018; //★★★★模块ID的设备默认备注名字,从50000开始,这里不需要定义,只写在Language.ini文件里面★★★★ //★★★★模块ID的设备类型名字,从60000开始,这里不需要定义,只写在Language.ini文件里面★★★★ 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>
