Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

wxr

2023-07-17 59d9f0ad6dc40b079fa1f8f514698429ead04a75

Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

 HDL-ON_Android/Application.cs

@@ -125,7 +125,6 @@
                multicast.Release();
                //进入后台
                UserInfo.Current.unlockTime = DateTime.Now;

            }
        }

@@ -153,7 +152,7 @@
        /// </summary>
        void BusSocketStop()
        {
            //IsEnterBackground = true;

            CloseTime = DateTime.Now;
            MainPage.IsEnterBackground = true;
            //进入后台mqtt正在连接重置状态
@@ -167,8 +166,6 @@
        /// </summary>
        void BusSocketStart()
        {
            //IsEnterBackground = false;

            if (CloseTime.AddSeconds(10) < DateTime.Now)
            {
                //后台超过10s就断开MQTT重连

 HDL-ON_Android/Other/HDLONUtils.cs

@@ -32,12 +32,12 @@
            }
        }

        public static void StartSplashActivity()
        {
            Intent intent = new Intent(Shared.Application.Activity, typeof(SplashActivity));
            Shared.Application.Activity.StartActivity(intent);
            Shared.Application.Activity.Finish();
        }
        //public static void StartSplashActivity()
        //{
        //    Intent intent = new Intent(Shared.Application.Activity, typeof(SplashActivity));
        //    Shared.Application.Activity.StartActivity(intent);
        //    Shared.Application.Activity.Finish();
        //}

    }
}

 HDL-ON_Android/SplashActivity.cs

@@ -24,10 +24,6 @@
    [IntentFilter(new string[] { "com.hdl.onpro.SplashActivity", Intent.ActionView })]
    public class SplashActivity : Activity
    {




        protected override void OnActivityResult(int requestCode, Result resultVal, Intent data)
        {
            if (requestCode == 99)
@@ -54,12 +50,20 @@
        {
            base.OnCreate(savedInstanceState);

            if(Shared.Application.Activity != null && Shared.Application.Activity.GetType() == typeof(BaseActivity))
            {
                Finish();
                return;
            }

            //Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 起始组件对象 , 目标 Service.class);
            //StartActivityForResult(i, 1);
            //OverridePendingTransition(0, 0);
            //initAll();
            if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
            {
                //OnAppConfig.Instance.FirstRunApp = false;
                //OnAppConfig.Instance.SaveConfig();
                Language.CurrentLanguage = "Chinese";
                Locale locale1 = Locale.Default;
                var localeList = Resources.Configuration.Locale;
@@ -185,7 +189,7 @@
                }
            };

            BaseActivity.OnCreateActoin += (activity, application) =>
            BaseActivity.OnCreateActoin = (activity, application) =>
            {
                Language.CurrentLanguage = "Chinese";
                Locale locale1 = Locale.Default;
@@ -234,7 +238,7 @@
                    HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
                };
            };
            BaseActivity.RefreshUIAction += (activity) =>
            BaseActivity.RefreshUIAction = (activity) =>
            {
                Language.CurrentLanguage = "Chinese";
                Locale locale1 = Locale.Default;
@@ -263,11 +267,11 @@
                MainPage.Show();
                checkSomeInfo();
            };
            BaseActivity.OnResumeAction += (activity) =>
            BaseActivity.OnResumeAction = (activity) =>
            {
                checkSomeInfo();
            };
            BaseActivity.OnDestroyAction += (activity) =>
            BaseActivity.OnDestroyAction = (activity) =>
            {
                Console.WriteLine("OnDestroyAction");
                //BusSocket.Stop();

 HDL-ON_iOS/AppDelegate.cs

@@ -484,7 +484,7 @@
            //进入后台mqtt正在连接重置状态
            HDL_ON.DAL.Mqtt.MqttClient.RemoteMqttIsConnecting = false;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Stop();
          

        }



 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

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using HDL_ON.DAL.Mqtt;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI;
@@ -124,6 +125,10 @@
                        HomePage.LoadEvent_CheckLinkStatus();
                    }
                }
                else
                {
                    MainPage.Log($"状态一致，不更新数据(本地)");
                }
            }
        }
        bool _GatewayOnline_Cloud = false;
@@ -169,7 +174,16 @@
                            MainPage.Log($"网关云端在线，刷新设备状态");
                            new System.Threading.Thread(() =>
                            {
                                System.Threading.Thread.Sleep(1000);
                                int count = 20;
                                while (true)
                                {
                                    System.Threading.Thread.Sleep(500);
                                    if (MqttClient.isSubscribeSuccess || count<1)
                                    {
                                        break;
                                    }
                                    count--;
                                }
                                FunctionList.List.ReadAllFunctionStatus();
                            })
                            { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
@@ -179,6 +193,10 @@
                            //修改主页连接状态
                            HomePage.LoadEvent_CheckLinkStatus();
                        }
                    }
                    else
                    {
                        MainPage.Log($"状态一致，不更新数据(云端)");
                    }
                }catch(Exception ex)
                {
@@ -277,6 +295,7 @@
            }
            else if (MainPage.InternetStatus == 2)
            {
                DAL.Mqtt.MqttClient.InitState();
                OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
                //重置搜索网关标志
                IsSearchLocalGatewaySuccessful = false;
@@ -303,7 +322,6 @@
                        System.Threading.Thread.Sleep(500);
                    }

                    DAL.Mqtt.MqttClient.InitState();
                })
                { IsBackground = true }.Start();
            }

 HDL_ON/DAL/DriverLayer/Packet.cs

@@ -14,8 +14,9 @@
    {
        /// <summary>
        /// 缓冲区大小
        /// Link协议现在一个包的数据比较大，缓冲区太小存不完全部数据 2023-07-14 16:03:56  wxr
        /// </summary>
        public const int Size = 1024 + 200;
        public const int Size = 1024 * 10;

        /// <summary>
        /// 接收到的数据

 HDL_ON/DAL/DriverLayer/UdpSocket.cs

@@ -77,7 +77,7 @@
            }
            catch { }
            busSocket = null;
            MainPage.Log("Socket关闭");
            MainPage.Log("Socket关闭");
        }

        /// <summary>
@@ -140,7 +140,6 @@
                //mqtt连接数据读取  A协议网络设备信息读取回复 处理
                if (((IPEndPoint)packet.RemoteEndPoint).Port == 8585)
                {
                    MainPage.Log($"局域网udp信息");
                    Control.Ins.ConvertReceiveData(bytes, ((IPEndPoint)packet.RemoteEndPoint).Address.ToString());
                }
                else if (((IPEndPoint)packet.RemoteEndPoint).Port == 6000)//处理bus 6000端口的数据

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -110,6 +110,7 @@
            {
                MqttInfoConfig.Current.IfGetMqttInfoSuccess = false;
            }
            Control.Ins.GatewayOnline_Cloud = Control.Ins.GatewayOnline_Local = false;
            await DisConnectRemoteMqttClient(s);
        }

@@ -159,7 +160,7 @@
            StartCloudMqtt();
        }

        static bool isSubscribeSuccess;
        public static bool isSubscribeSuccess;
        /// <summary>
        /// 订阅主题
        /// </summary>
@@ -261,8 +262,8 @@
                    #endregion


                    Utlis.WriteLine("开始订阅！");
                    var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
                    Utlis.WriteLine("开始订阅！"); 
                     var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
                        pirStatus,pirStudy,
                        appDeviceRefresh,appHomeRefresh,appRoomRefresh,residenceChange,
                        topicFilterPush2, topicAlinkStatus ,mqttkeyChange,

 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs

@@ -338,7 +338,7 @@

        #region ■  --  新接听和开锁接口_______________________________
        /// <summary>
        /// 开锁
        /// 可视对讲开锁
        /// </summary>
        public void HDLUnlockAction()
        {

 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>

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -269,9 +269,15 @@
        {
            Application.RunOnMainThread(() =>
            {
                if (bodyView != null)
                try
                {
                    bodyView.CheckLinkStatus();
                    if (bodyView != null)
                    {
                        bodyView.CheckLinkStatus();
                    }
                }catch(Exception ex)
                {
                    MainPage.Log($"LoadEvent_CheckLinkStatus : {ex.Message}");
                }
            });
        }