wxr
2023-07-19 6fe1c5ebeb8312edc479a4576f05d80c5051a6c6
HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.7.6";
        public static string VersionString = "1.8.1";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -121,6 +121,7 @@
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl
        };
@@ -136,8 +137,8 @@
                {
                    _RoomNotSupportFunctionList = new List<string>();
                    _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
                    _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
                    _RoomNotSupportFunctionList.Add(SPK.AvMusic);
                    //_RoomNotSupportFunctionList.Add(SPK.MusicStandard);
                    //_RoomNotSupportFunctionList.Add(SPK.AvMusic);
                    _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
                    _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
                    //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
@@ -219,6 +220,37 @@
            {
            }
#if __ANDROID__
            new System.Threading.Thread(async () =>
            {
                int i = 10;
                while (i < 10) {
                    try
                    {
                        var location_android = await HDL_ON_Android.LocationUtils.GetCurrentLocationAsync();
                        if (location_android != null)
                        {
                            MainPage.cityInfo.lat = location_android.Latitude.ToString();
                            MainPage.cityInfo.lon = location_android.Longitude.ToString();
                            new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(MainPage.cityInfo.lon.Replace(",", "."), MainPage.cityInfo.lat.ToString().Replace(",", "."));
                            i = 100;
                            Application.RunOnMainThread(() => {
                                HomePage.LoadEvent_RefreshAir();
                            });
                        }
                        else
                        {
                            i++;
                        }
                    } catch (Exception ex)
                    {
                        Log($"经纬度获取异常: {ex.Message}");
                    }
                }
            })
            { IsBackground = true }.Start();
#endif
        }
        /// <summary>
@@ -423,7 +455,8 @@
                addResidencePage.LoadView();
                return;
            }
            new System.Threading.Thread(async () =>
            new System.Threading.Thread(() =>
            {
                try
                {
@@ -473,6 +506,19 @@
                }
            }).Start();
            try
            {
#if __ANDROID__
                Com.Chteam.Agent.BuglyAgentHelper.SetUserId(UserInfo.Current.AccountString);
#else
                Bugly.Bugly.SetUserIdentifier(UserInfo.Current.AccountString);
#endif
            }
            catch (Exception ex)
            {
                MainPage.Log("Bugly error");
            }
        }
        /// <summary>
@@ -562,7 +608,11 @@
        public static void Log(string msg)
        {
#if DEBUG
            Console.WriteLine(msg);
            if (msg.Contains("收到数据")
                || msg.Contains("发送")
                )
                Console.WriteLine(msg);
#endif
        }