wxr
2023-07-12 6c083de3930e4e3358925d980257363882b79090
状态刷新优化,后台回到前台重新读取数据
10个文件已修改
13867 ■■■■ 已修改文件
HDL-ON_Android/Application.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs 13811 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/AppDelegate.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/DriverLayer/Control.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/FunctionList.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Application.cs
@@ -175,6 +175,7 @@
                //if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
                {
                    HDL_ON.DAL.Mqtt.MqttClient.DisConnectRemote("closeTime", false);
                    HDL_ON.DriverLayer.Control.Ins.GatewayOnline_Cloud = HDL_ON.DriverLayer.Control.Ins.GatewayOnline_Local = false;
                }
            }
HDL-ON_Android/HDL-ON_Android.csproj
@@ -194,8 +194,8 @@
    <Reference Include="LcVideoSdk">
      <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
    </Reference>
    <Reference Include="HdlEzvizDroid">
      <HintPath>..\..\..\..\Downloads\HdlEzvizDroid.dll</HintPath>
    <Reference Include="ys">
      <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
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.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306161">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202307121">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--友盟-->
HDL-ON_Android/Resources/Resource.designer.cs
Diff too large
HDL-ON_iOS/AppDelegate.cs
@@ -484,6 +484,7 @@
            //进入后台mqtt正在连接重置状态
            HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
                    HDL_ON.DriverLayer.Control.Ins.GatewayOnline_Cloud = HDL_ON.DriverLayer.Control.Ins.GatewayOnline_Local = false;
          
        }
HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@
    <key>CFBundleName</key>
    <string>On Pro</string>
    <key>CFBundleShortVersionString</key>
    <string>1.8.0</string>
    <string>1.8.1</string>
    <key>CFBundleURLTypes</key>
    <array>
        <dict>
@@ -36,7 +36,7 @@
        </dict>
    </array>
    <key>CFBundleVersion</key>
    <string>1.8.0</string>
    <string>1.8.1</string>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>weixinULAPI</string>
HDL_ON/DAL/DriverLayer/Control.cs
@@ -124,6 +124,10 @@
                        HomePage.LoadEvent_CheckLinkStatus();
                    }
                }
                else
                {
                    MainPage.Log($"状态一致,不更新数据(本地)");
                }
            }
        }
        bool _GatewayOnline_Cloud = false;
@@ -180,6 +184,10 @@
                            HomePage.LoadEvent_CheckLinkStatus();
                        }
                    }
                    else
                    {
                        MainPage.Log($"状态一致,不更新数据(云端)");
                    }
                }catch(Exception ex)
                {
                    MainPage.Log($"Set GatewayCloudOnline Error:{ex.Message}");
HDL_ON/Entity/FunctionList.cs
@@ -586,14 +586,14 @@
        {
            if (lockReadFunctionStatus)
            {
                MainPage.Log($"多次进入--返回");
                MainPage.Log($"多次进入--返回1");
                return;
            }
            new Thread(() =>
            {
                if (lockReadFunctionStatus)
                {
                    MainPage.Log($"多次进入--返回");
                    MainPage.Log($"多次进入--返回2");
                    return;
                }
                MainPage.Log($"进入--读取");
HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.8.0";
        public static string VersionString = "1.8.1";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -134,25 +134,25 @@
                    }
                }
                LoadMothed_EnableResetButton();
            };
            //etVerificationCode.TextChangeEventHandler = (sender, e) => {
            etVerificationCode.TextChangeEventHandler = (sender, e) =>
            {
            //    if (etVerificationCode.Text.Length > 1)
            //    {
            //        LoadMothed_EnableResetButton();
            //    }
            //};
                if (etVerificationCode.Text.Length > 1)
                {
                    LoadMothed_EnableResetButton();
                }
            };
            //Action<View, string> textChangeEventHandler = (view, textStr) =>
            //{
            //    LoadMothed_EnableResetButton();
            //};
            ////etAccount.TextChangeEventHandler += textChangeEventHandler;
            //etPassword.TextChangeEventHandler += textChangeEventHandler;
            //etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
            //etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
            Action<View, string> textChangeEventHandler = (view, textStr) =>
            {
                LoadMothed_EnableResetButton();
            };
            //etAccount.TextChangeEventHandler += textChangeEventHandler;
            etPassword.TextChangeEventHandler += textChangeEventHandler;
            etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
            etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
        }
        /// <summary>