~wxr/OnPro.git - Gitblit

parent: cb7a3417 | 补丁 | 提交 | show whitespace

wxr

2023-05-09 bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0

Merge branch 'Dev-Wxr' into Dev-Branch

1个文件已添加

8个文件已修改

	DLL/Shared.Droid.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Shared.Droid230508.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_Android/Application.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_Android/Properties/AndroidManifest.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_iOS/Info.plist	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/MainPage.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI1-Login/LoginPage.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI1-Login/LoginPageBLL.cs	104 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DLL/Shared.Droid.dll

Binary files differ

 DLL/Shared.Droid230508.dll

Binary files differ

 HDL-ON_Android/Application.cs

@@ -40,9 +40,6 @@
        public override void OnCreate()
        {

           


            if (Shared.Application.Activity != null)
            {
                //reStartApp(this);

 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>-->

 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>

 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>

 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) =>

 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,11 +501,57 @@
        {
            btnLogin.MouseUpEventHandler += (sender, e) =>
            {
                LoginEvent();
            };
            #region 当账号密码都输入时，才能点击登录按钮
            etAccount.TextChangeEventHandler = (sender, e) =>
            {
                account = etAccount.Text.Trim();
                if (account.Length > 0 && etPassword.Text.Trim().Length > 0)
                {
                    btnLogin.IsSelected = true;
                }
                else
                {
                    btnLogin.IsSelected = false;
                }
                if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
                {
                    btnGetVerificationCode.IsSelected = true;
                    btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
                }
                else
                {
                    btnGetVerificationCode.IsSelected = false;
                    btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                }
            };
            etPassword.TextChangeEventHandler += (sender, e) =>
            {
                if (etAccount.Text.Trim().Length > 0 && etPassword.Text.Trim().Length > 0)
                {
                    btnLogin.IsSelected = true;
                }
                else
                {
                    btnLogin.IsSelected = false;
                }
            };
            #endregion
        }
        /// <summary>
        /// 登录事件
        /// </summary>
        void LoginEvent()
        {
                if (btnLogin.IsSelected)
                {
                    //判断是否同意了隐私政策
                    if (CheckPrivacyPolicy() == false) return;

                if (CheckPrivacyPolicy() == false)
                {
                    Application.HideSoftInput();
                    return;
                }
                    account = etAccount.Text.Trim();
                    password = etPassword.Text.Trim();

@@ -529,44 +590,7 @@
                    waitPage = new Loading();
                    new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
                }
            };
            #region 当账号密码都输入时，才能点击登录按钮
            etAccount.TextChangeEventHandler = (sender, e) =>
            {
                account = etAccount.Text.Trim();
                if (account.Length > 0 && etPassword.Text.Trim().Length > 0)
                {
                    btnLogin.IsSelected = true;
                }
                else
                {
                    btnLogin.IsSelected = false;
                }
                if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
                {
                    btnGetVerificationCode.IsSelected = true;
                    btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
                }
                else
                {
                    btnGetVerificationCode.IsSelected = false;
                    btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                }
            };
            etPassword.TextChangeEventHandler += (sender, e) =>
            {
                if (etAccount.Text.Trim().Length > 0 && etPassword.Text.Trim().Length > 0)
                {
                    btnLogin.IsSelected = true;
                }
                else
                {
                    btnLogin.IsSelected = false;
                }
            };
            #endregion
        }

        /// <summary>
        /// 加载登录线程
        /// </summary>
@@ -893,6 +917,8 @@
            {
                //2020-12-22 增加点击隐藏键盘事件
                Application.HideSoftInput();
                this.Y = 0;
                

                //判断是否同意了隐私政策
                if (CheckPrivacyPolicy() == false) return;

 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")

			@@ -40,9 +40,6 @@
			public override void OnCreate()
			{




			if (Shared.Application.Activity != null)
			{
			//reStartApp(this);

			@@ -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>-->

			@@ -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>

			@@ -26,7 +26,7 @@
			/// <summary>
			/// 版本号
			/// </summary>
			public static string VersionString = "1.7.3";
			public static string VersionString = "1.7.4";
			///// <summary>
			///// 客户端类型
			///// </summary>

			@@ -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) =>

			@@ -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,11 +501,57 @@
			{
			btnLogin.MouseUpEventHandler += (sender, e) =>
			{
			LoginEvent();
			};
			#region 当账号密码都输入时，才能点击登录按钮
			etAccount.TextChangeEventHandler = (sender, e) =>
			{
			account = etAccount.Text.Trim();
			if (account.Length > 0 && etPassword.Text.Trim().Length > 0)
			{
			btnLogin.IsSelected = true;
			}
			else
			{
			btnLogin.IsSelected = false;
			}
			if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
			{
			btnGetVerificationCode.IsSelected = true;
			btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
			}
			else
			{
			btnGetVerificationCode.IsSelected = false;
			btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
			}
			};
			etPassword.TextChangeEventHandler += (sender, e) =>
			{
			if (etAccount.Text.Trim().Length > 0 && etPassword.Text.Trim().Length > 0)
			{
			btnLogin.IsSelected = true;
			}
			else
			{
			btnLogin.IsSelected = false;
			}
			};
			#endregion
			}
			/// <summary>
			/// 登录事件
			/// </summary>
			void LoginEvent()
			{
			if (btnLogin.IsSelected)
			{
			//判断是否同意了隐私政策
			if (CheckPrivacyPolicy() == false) return;

			if (CheckPrivacyPolicy() == false)
			{
			Application.HideSoftInput();
			return;
			}
			account = etAccount.Text.Trim();
			password = etPassword.Text.Trim();

			@@ -529,44 +590,7 @@
			waitPage = new Loading();
			new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
			}
			};
			#region 当账号密码都输入时，才能点击登录按钮
			etAccount.TextChangeEventHandler = (sender, e) =>
			{
			account = etAccount.Text.Trim();
			if (account.Length > 0 && etPassword.Text.Trim().Length > 0)
			{
			btnLogin.IsSelected = true;
			}
			else
			{
			btnLogin.IsSelected = false;
			}
			if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
			{
			btnGetVerificationCode.IsSelected = true;
			btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
			}
			else
			{
			btnGetVerificationCode.IsSelected = false;
			btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
			}
			};
			etPassword.TextChangeEventHandler += (sender, e) =>
			{
			if (etAccount.Text.Trim().Length > 0 && etPassword.Text.Trim().Length > 0)
			{
			btnLogin.IsSelected = true;
			}
			else
			{
			btnLogin.IsSelected = false;
			}
			};
			#endregion
			}

			/// <summary>
			/// 加载登录线程
			/// </summary>
			@@ -893,6 +917,8 @@
			{
			//2020-12-22 增加点击隐藏键盘事件
			Application.HideSoftInput();
			this.Y = 0;


			//判断是否同意了隐私政策
			if (CheckPrivacyPolicy() == false) return;

			@@ -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")