Merge branch 'Dev-1.9' into Dev-Branch

wxr

2023-07-20 c135877a65244706008b6215b2734bb37bbfb7f4

 HDL_ON/UI/MainPage.cs

@@ -121,6 +121,7 @@
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl
        };


@@ -529,7 +530,10 @@
        public static int LoadEvent_BackAction()
        {
            int result = 0;
            
            Application.RunOnMainThread(() =>
            {
                try
            {
                if (Inverter.Ins.H5Page.Parent != null)
                {
@@ -553,6 +557,8 @@
                {
                    result = 2;//无法再后退，可以执行退到桌面
                }
                    else
                    {
                if (BasePageView.ChildrenCount > 1)
                {
                    int index = BasePageView.ChildrenCount - 1;
@@ -596,6 +602,11 @@
                {
                    result = 2;//无法再后退，可以执行退到桌面
                }
                    }
                }catch(Exception ex)
                {
                    MainPage.Log($"加载安卓后退异常:{ex.Message}");
                }
            });
            return result;
        }
@@ -607,7 +618,10 @@
        public static void Log(string msg)
        {
#if DEBUG
            if (msg.Contains("收到数据"))
            if (msg.Contains("收到数据")
                || msg.Contains("发送")

                )
                Console.WriteLine(msg);
#endif
        }