From 5f4b040a92e5e1b69d49e531cfa5ac3012c6730a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 14:36:06 +0800
Subject: [PATCH] 备份
---
HDL-ON_Android/Resources/Resource.designer.cs | 2
HDL-ON_iOS/HDL-ON_iOS.csproj | 20 ---------
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 12 -----
HDL_ON/UI/UI1-Login/LoginPage.cs | 31 ++++++++-------
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 28 ++++++++++----
5 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index e2cf986..67dd43b 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/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
{
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 46c7ab2..7a64231 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -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>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 280000b..8fd4643 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/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>
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index c540ce6..849ce05 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/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;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index 0f80995..9ac7244 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/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();
--
Gitblit v1.8.0