备份1

wxr

2023-08-23 96e9ff2e5a54f54cdbb6b8b2f049fdf6a837de3c

 OnPro/HDL_ON/UI/MainPage.cs

@@ -118,11 +118,6 @@
            SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
            SPK.FloorHeatStandard,SPK.HvacFloorHeat,
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl,
            //SPK.AvMusic,SPK.MusicStandard
        };


@@ -137,16 +132,6 @@
                if (_RoomNotSupportFunctionList == null)
                {
                    _RoomNotSupportFunctionList = new List<string>();
                    _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
                    //_RoomNotSupportFunctionList.Add(SPK.MusicStandard);
                    //_RoomNotSupportFunctionList.Add(SPK.AvMusic);
                    _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
                    //_RoomNotSupportFunctionList.Add(SPK.AirSwitchP3);
                    _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
                    //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
                    _RoomNotSupportFunctionList.Add(SPK.SensorLight);
                    _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
                    //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
                }
                return _RoomNotSupportFunctionList;
            }
@@ -157,7 +142,7 @@
            try
            {
                Application.DesignWidth = 375;
                Application.DesignHeight = 667 + 20;
                Application.DesignHeight = 667;
                //设置语言环境 防止string转 double出现逗号，todouble异常等问题
                System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("zh-CN");

@@ -231,36 +216,6 @@

            }

#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>
@@ -517,18 +472,6 @@
            }).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>