Merge branch 'WJC' into newBranch1

wxr

2021-11-19 a170a2ecef6d5c87883ed552dbbc81cfb0358d13

 HDL_ON/UI/MainPage.cs

@@ -10,6 +10,7 @@
{
    public static class MainPage
    {
        
        /// <summary>
        /// BaseView
        /// </summary>
@@ -25,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.2.1014";
        public static string VersionString = "1.3.1117";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -109,6 +110,7 @@
            SPK.FloorHeatStandard,SPK.HvacFloorHeat,
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
        };


@@ -134,8 +136,6 @@
            }
        }



        public static void Show()
        {
            try
@@ -145,7 +145,8 @@

                BaseView = Application.MainPage;
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;

                ///监听经纬度
                HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.CurrLogicMethod.AppLatAndLonEvent();

                //#region 测试
                //var ddd = new UI.test.TestDialog();
@@ -382,6 +383,7 @@
                    });
                }
            }).Start();

        }

        /// <summary>