From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4
DLL/Shared.Droid230508.dll | 0
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 112 +++++++++++++++++++++++--------------
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI1-Login/LoginPage.cs | 15 +++++
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 18 +++++-
HDL-ON_Android/Application.cs | 3 -
DLL/Shared.Droid.dll | 0
9 files changed, 103 insertions(+), 53 deletions(-)
diff --git a/DLL/Shared.Droid.dll b/DLL/Shared.Droid.dll
index 2219ca6..dcfb70c 100644
--- a/DLL/Shared.Droid.dll
+++ b/DLL/Shared.Droid.dll
Binary files differ
diff --git a/DLL/Shared.Droid230508.dll b/DLL/Shared.Droid230508.dll
new file mode 100644
index 0000000..2219ca6
--- /dev/null
+++ b/DLL/Shared.Droid230508.dll
Binary files differ
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 92b09ce..1888200 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -40,9 +40,6 @@
public override void OnCreate()
{
-
-
-
if (Shared.Application.Activity != null)
{
//reStartApp(this);
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index b5a4fec..d9abbf9 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305031">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.4" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305081">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 2d44b7d..f7db100 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@
<key>CFBundleName</key>
<string>On Pro</string>
<key>CFBundleShortVersionString</key>
- <string>1.7.3</string>
+ <string>1.7.4</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.7.3</string>
+ <string>1.7.4</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixinULAPI</string>
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 75da649..471abe3 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.7.3";
+ public static string VersionString = "1.7.4";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a9e2fdb..280000b 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,6 +22,13 @@
Application.HideSoftInput();
};
pm = new HttpServerRequest();
+
+ BaseActivity.HideKeyboardEvent = () => {
+ Application.RunOnMainThread(() =>
+ {
+ this.Y = 0;
+ });
+ };
}
public override void RemoveFromParent()
@@ -32,6 +39,11 @@
waitPage.RemoveFromParent();
waitPage = null;
}
+
+
+ BaseActivity.HideKeyboardEvent = () => {
+
+ };
base.RemoveFromParent();
@@ -190,6 +202,9 @@
UnSelectedImagePath = "Public/Logo-bg.png"
};
bodyView.AddChidren(btnIcon_bg);
+ btnIcon_bg.MouseDownEventHandler += (sender, e) => {
+ Application.HideSoftInput();
+ };
#if DEBUG
btnIcon_bg.MouseUpEventHandler += (sender, e) =>
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index e2fbe02..c540ce6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -435,6 +435,16 @@
{
btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor;
btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ new Thread(() => {
+ for(var i = 0; i < 10; i++)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ this.Y = 0-Application.GetRealHeight(10 * i);
+ });
+ Thread.Sleep(10);
+ }
+ }) { IsBackground = true }.Start();
}
else
{
@@ -451,9 +461,14 @@
//褰撶劍鐐瑰湪瀵嗙爜鏂囨湰妗嗘椂锛岀偣鍑婚敭鐩樺洖鎾ゆ寜閿紝瑙﹀彂鐨勪簨浠�
etPassword.EditorEnterAction += (obj) =>
{
+ LoginEvent();
Application.HideSoftInput();
};
etPassword.MouseUpEventHandler = (sender, e) =>
+ {
+ etPassword.Foucs = true;
+ };
+ etPassword.MouseDownEventHandler = (sender, e) =>
{
etPassword.Foucs = true;
};
@@ -486,49 +501,7 @@
{
btnLogin.MouseUpEventHandler += (sender, e) =>
{
- if (btnLogin.IsSelected)
- {
- //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
- if (CheckPrivacyPolicy() == false) return;
-
- account = etAccount.Text.Trim();
- password = etPassword.Text.Trim();
-
- if (loginType == 0)
- {
- if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
- {
- var tip = new Tip()
- {
- MaxWidth = Application.GetRealWidth(300),
- Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- return;
- }
- }
- else
- {
- if (!Utlis.CheckEmail(account))
- {
- var tip = new Tip()
- {
- Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
- CloseTime = 1,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- return;
- }
- }
-
- //鍒涘缓鐧诲綍绾跨▼
- var loginThread = LoadThread_Login();
- waitPage = new Loading();
- new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
- }
+ LoginEvent();
};
#region 褰撹处鍙峰瘑鐮侀兘杈撳叆鏃讹紝鎵嶈兘鐐瑰嚮鐧诲綍鎸夐挳
etAccount.TextChangeEventHandler = (sender, e) =>
@@ -566,7 +539,58 @@
};
#endregion
}
+ /// <summary>
+ /// 鐧诲綍浜嬩欢
+ /// </summary>
+ void LoginEvent()
+ {
+ if (btnLogin.IsSelected)
+ {
+ //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
+ if (CheckPrivacyPolicy() == false)
+ {
+ Application.HideSoftInput();
+ return;
+ }
+ account = etAccount.Text.Trim();
+ password = etPassword.Text.Trim();
+ if (loginType == 0)
+ {
+ if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
+ {
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
+ return;
+ }
+ }
+ else
+ {
+ if (!Utlis.CheckEmail(account))
+ {
+ var tip = new Tip()
+ {
+ Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
+ return;
+ }
+ }
+
+ //鍒涘缓鐧诲綍绾跨▼
+ var loginThread = LoadThread_Login();
+ waitPage = new Loading();
+ new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
+ }
+ }
/// <summary>
/// 鍔犺浇鐧诲綍绾跨▼
/// </summary>
@@ -893,6 +917,8 @@
{
//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 5cb1eb4..0f80995 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -391,6 +391,9 @@
};
transferRow.AddChidren(btnTrasferSkinIcon);
#endregion
+
+ LoadEvent_SkipAdminMigrationConfirmPage();
+ LoadEvent_SkipTransferConfirmPage();
}
#region 璋冭瘯鏉冮檺
@@ -448,15 +451,24 @@
btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm;
new System.Threading.Thread(() =>
{
- new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
+ var pack = new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
+ if(pack != null)
+ {
+ 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();
+ });
+ }
+ }
})
{ IsBackground = true }.Start();
};
#endregion
- LoadEvent_SkipAdminMigrationConfirmPage();
- LoadEvent_SkipTransferConfirmPage();
}
//璋冭瘯瀹屾垚 鎵嶈兘鍔犺浇浜岀淮鐮�
else if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "WAIT_DELIVERED")
--
Gitblit v1.8.0