2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.8.0";
        public static string VersionString = "2.4.8";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -121,6 +121,12 @@
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl,
            SPK.AvMusic,
            SPK.MusicStandard,
            SPK.ElectricalTvHisense,
            SPK.OtherCommon,
            
        };


@@ -139,8 +145,9 @@
                    //_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.OtherCommon);
                    _RoomNotSupportFunctionList.Add(SPK.SensorLight);
                    _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
                    //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
@@ -160,6 +167,14 @@

                BaseView = Application.MainPage;
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
                //Application.MainPage.BackgroundColor = 0xFFFF0000;// CSS_Color.MainBackgroundColor;
                //BaseView = new FrameLayout()
                //{
                //    Y = Application.GetRealHeight(20),
                //    Width = Application.GetRealWidth(376),
                //    Height = Application.GetRealHeight(667),
                //};
                //Application.MainPage.AddChidren(BaseView);
                Language.UpdateLanguage();
                //#region 测试
                //var ddd = new UI.test.TestDialog();
@@ -220,36 +235,36 @@

            }

#if __ANDROID__
            new System.Threading.Thread(async () =>
            {
                int i = 0;
                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
//#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>
@@ -505,6 +520,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>
@@ -516,72 +544,82 @@
        public static int LoadEvent_BackAction()
        {
            int result = 0;
            
            Application.RunOnMainThread(() =>
            {
                if (Inverter.Ins.H5Page.Parent != null)
                try
                {
                    if (Inverter.Ins.PageIndex != "1")
                    if (Inverter.Ins.H5Page.Parent != null)
                    {
                        Inverter.Ins.PageIndex = "1";
                        var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                        Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                        StartX = 0;
                        BtnBackIcon.X = -Application.GetRealWidth(100);
                        return;
                    }
                    else
                    {
                        Inverter.Ins.PageIndex = "1";
                    }
                }


                if (BasePageView == null || BasePageView.ChildrenCount <= 1)
                {
                    result = 2;//无法再后退，可以执行退到桌面
                }
                if (BasePageView.ChildrenCount > 1)
                {
                    int index = BasePageView.ChildrenCount - 1;
                    var view = BasePageView.GetChildren(index);
                    if (view.GetType() == typeof(Loading))
                    {
                        var loading = view as Loading;
                        if (loading.CurStatus == false)//有一些等待界面隐藏了，但是没有移除到，需要先移除
                        if (Inverter.Ins.PageIndex != "1")
                        {
                            loading.RemoveFromParent();
                            result = LoadEvent_BackAction();
                            Inverter.Ins.PageIndex = "1";
                            var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
                            Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
                            StartX = 0;
                            BtnBackIcon.X = -Application.GetRealWidth(100);
                            return;
                        }
                        else
                        {
                            result = 1;//正在等待某些操作
                            Inverter.Ins.PageIndex = "1";
                        }
                    }


                    if (BasePageView == null || BasePageView.ChildrenCount <= 1)
                    {
                        result = 2;//无法再后退，可以执行退到桌面
                    }
                    else
                    {
                        if (view != null)
                        if (BasePageView.ChildrenCount > 1)
                        {
                            if (view.Tag != null)
                            int index = BasePageView.ChildrenCount - 1;
                            var view = BasePageView.GetChildren(index);
                            if (view.GetType() == typeof(Loading))
                            {
                                if (view.Tag.ToString() != "unlockpage")
                                var loading = view as Loading;
                                if (loading.CurStatus == false)//有一些等待界面隐藏了，但是没有移除到，需要先移除
                                {
                                    view.RemoveFromParent();
                                    loading.RemoveFromParent();
                                    result = LoadEvent_BackAction();
                                }
                                else
                                {
                                    result = 2;
                                    result = 1;//正在等待某些操作
                                }
                            }
                            else
                            {
                                view.RemoveFromParent();
                                if (view != null)
                                {
                                    if (view.Tag != null)
                                    {
                                        if (view.Tag.ToString() != "unlockpage")
                                        {
                                            view.RemoveFromParent();
                                        }
                                        else
                                        {
                                            result = 2;
                                        }
                                    }
                                    else
                                    {
                                        view.RemoveFromParent();
                                    }
                                }
                            }
                        }
                        else
                        {
                            result = 2;//无法再后退，可以执行退到桌面
                        }
                    }
                }
                else
                }catch(Exception ex)
                {
                    result = 2;//无法再后退，可以执行退到桌面
                    MainPage.Log($"加载安卓后退异常:{ex.Message}");
                }
            });
            return result;
@@ -594,7 +632,12 @@
        public static void Log(string msg)
        {
#if DEBUG
            Console.WriteLine(msg);
            if (msg.Contains("收到")
                //|| msg.Contains("发送")
                //|| msg.Contains("接收")
                || true
                )
                Console.WriteLine(msg);
#endif
        }

@@ -607,6 +650,14 @@
#if DEBUG
            Console.WriteLine($"{tag}-->{msg}");
#endif
            if (tag == "error")
            {
                new System.Threading.Thread(async () =>
                {
                    await Common.AliyunLog.AliyunLogClient.PostLogs("自定义Error日志", msg);
                })
                { IsBackground = true }.Start();
            }
        }