| HDL-ON_Android/Resources/Resource.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPageBLL.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@ { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")] public partial class Resource {
@@ -80,8 +80,6 @@ <Reference Include="System.Xml" /> <Reference Include="System.Core" /> <Reference Include="Xamarin.iOS" /> <Reference Include="System.Numerics" /> <Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Web.Services" /> <Reference Include="Shared.IOS.TBL"> <HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath> @@ -120,7 +118,7 @@ </ItemGroup> <ItemGroup> <PackageReference Include="Newtonsoft.Json"> <Version>13.0.1</Version> <Version>13.0.3</Version> </PackageReference> <PackageReference Include="MQTTnet"> <Version>3.1.0</Version> @@ -447,20 +445,6 @@ <ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" /> <ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" /> <ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" /> <ImageAsset Include="Resources\Assets.xcassets\Contents.json" /> <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" /> <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" /> @@ -1610,8 +1594,6 @@ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58-1.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-2.png" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\.DS_Store" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" /> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" /> </ItemGroup> <ItemGroup> HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,13 +22,14 @@ Application.HideSoftInput(); }; pm = new HttpServerRequest(); #if __ANDROID__ BaseActivity.HideKeyboardEvent = () => { Application.RunOnMainThread(() => { this.Y = 0; }); }; #endif } public override void RemoveFromParent() @@ -40,18 +41,18 @@ waitPage = null; } #if __ANDROID__ BaseActivity.HideKeyboardEvent = () => { }; #endif base.RemoveFromParent(); //2020-12-22 增加点击隐藏键盘事件 //Application.HideSoftInput(); } #region 局部变量 #region 局部变量 /// <summary> /// 登录类型 /// 0:手机 @@ -66,9 +67,9 @@ int logintMode = 0; string account = ""; string password = ""; #endregion #endregion #region 控件列表 #region 控件列表 /// <summary> /// 等待提示 /// </summary> @@ -161,7 +162,7 @@ /// 服务器请求对象 /// </summary> HttpServerRequest pm; #endregion #endregion string verAccount = ""; @@ -312,7 +313,7 @@ }; #endif #region 登录方式选择 #region 登录方式选择 btnPhoneLogin = new Button() { X = Application.GetRealWidth(28), @@ -1265,8 +1266,8 @@ #endif #endregion #region 场景 #endregion #region 场景 var scene1 = new Scene() { sid = "scene1", @@ -1585,7 +1586,7 @@ // collect = false, //}; //scene6.SaveSceneFile(); #endregion #endregion var lightSwitch6 = new Function() @@ -1648,11 +1649,11 @@ #region 隐私政策 AddServiceAgreementControl(bodyView); #endregion #endregion } #region ■ 服务协议___________________________ #region ■ 服务协议___________________________ bool isAgreePrivacyPolicy = false; /// <summary> /// 添加服务协议控件 @@ -1774,12 +1775,12 @@ OpenWebViewPage(true); }; #if __ANDROID__ #if __ANDROID__ //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy) //{ // HDL_ON_Android.HDLONUtils.StartSplashActivity(); //} #endif #endif } /// <summary> HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -448,6 +448,7 @@ } else { this.Y = 0; btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor; btnPasswordViewBottomLine.Height = Application.GetRealHeight(1); } @@ -464,15 +465,6 @@ LoginEvent(); Application.HideSoftInput(); }; etPassword.MouseUpEventHandler = (sender, e) => { etPassword.Foucs = true; }; etPassword.MouseDownEventHandler = (sender, e) => { etPassword.Foucs = true; }; } /// <summary> @@ -917,8 +909,6 @@ { //2020-12-22 增加点击隐藏键盘事件 Application.HideSoftInput(); this.Y = 0; //判断是否同意了隐私政策 if (CheckPrivacyPolicy() == false) return; HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -449,19 +449,31 @@ { DB_ResidenceData.Instance.CurrentRegion.debugPerm = !DB_ResidenceData.Instance.CurrentRegion.debugPerm; btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm; var waitPage = new Loading(); bodyView.AddChidren(waitPage); waitPage.Start(""); new System.Threading.Thread(() => { var pack = new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm); if(pack != null) try { if(pack.Code == DAL.Server.StateCode.SUCCESS) var pack = new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm); if (pack != null) { DB_ResidenceData.Instance.CurrentRegion.debugStatus = DB_ResidenceData.Instance.CurrentRegion.debugPerm ? "SECONDARY_DEBUGGIN" : "Delivered"; Application.RunOnMainThread(() => { bodyView.RemoveAll(); LoadPage(); }); if (pack.Code == DAL.Server.StateCode.SUCCESS) { DB_ResidenceData.Instance.CurrentRegion.debugStatus = DB_ResidenceData.Instance.CurrentRegion.debugPerm ? "SECONDARY_DEBUGGIN" : "Delivered"; Application.RunOnMainThread(() => { bodyView.RemoveAll(); LoadPage(); }); } } }catch(Exception ex) { Application.RunOnMainThread(() => { waitPage.Hide(); }); } }) { IsBackground = true }.Start();
