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.6.2";
        public static string VersionString = "2.4.8";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -35,7 +35,7 @@
        /// <summary>
        /// 
        /// </summary>
        public static Entity.CityInfo cityInfo = new Entity.CityInfo();
        public static CityInfo cityInfo = new CityInfo();
        /// <summary>
        /// 城市天气信息antion
        /// </summary>
@@ -58,6 +58,10 @@
        /// 0:无网络
        /// </summary>
        public static int InternetStatus = 2;
        /// <summary>
        /// 连接mqtt次数
        /// </summary>
        public static int LinkHdlMqttCount = 0;
        /// <summary>
        /// 是否进入后台
        /// </summary>
@@ -116,7 +120,13 @@
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
            SPK.MechanicalArm,
            SPK.MechanicalArm,SPK.IpCam_Imou,
            SPK.GroupControl,
            SPK.AvMusic,
            SPK.MusicStandard,
            SPK.ElectricalTvHisense,
            SPK.OtherCommon,
            
        };


@@ -132,11 +142,13 @@
                {
                    _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.AirSwitchP3);
                    _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
                    _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
                    _RoomNotSupportFunctionList.Add(SPK.SensorLight);
                    _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
                    //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
                }
@@ -153,9 +165,16 @@
                //设置语言环境 防止string转 double出现逗号，todouble异常等问题
                System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("zh-CN");


                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();
@@ -200,6 +219,52 @@
                //    Application.HideSoftInput();
                //});
            }

            try
            {
                CommonClass.excptionAction = (obj) =>
                {
                    Application.RunOnMainThread(() =>
                    {
                        Stan.HdlMessageLogic.Current.ShowAppProgramIsError(obj);
                    });
                };
            }
            catch (Exception ex)
            {

            }

//#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>
@@ -207,7 +272,14 @@
        /// </summary>
        public static void GoLoginPage(UserInfo userInfo = null)
        {
            BaseView.RemoveAll();
            try
            {
                for (int i = 0; i < BaseView.ChildrenCount; i++)
                {
                    BaseView.GetChildren(i).RemoveFromParent();
                }
            }
            catch { }
            BaseView.BackgroundColor = CSS_Color.BackgroundColor;
            var fisrtView = new UI.UI1Login.LoginPage();
            fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -222,7 +294,14 @@
        /// <param name="pageShowEvent">主页显示之后触发的事件(没有住宅的话,则不会触发)</param>
        public static void GoUserPage(bool downloadData, bool isFirstOpen = false, Action pageShowEvent = null)
        {
            BaseView.RemoveAll();
            try
            {
                for (int i = 0; i < BaseView.ChildrenCount; i++)
                {
                    BaseView.GetChildren(i).RemoveFromParent();
                }
            }
            catch { }
            #region 后退事件
            BasePageView = new PageLayout();
            BasePageView.ScrollEnabled = false;
@@ -390,36 +469,38 @@
                addResidencePage.LoadView();
                return;
            }
            new System.Threading.Thread(async () =>

            new System.Threading.Thread(() =>
            {
                try
                {
                    Entity.FunctionList.List.Clear();
                    Entity.FunctionList.List.ClearDatas();
                    Entity.SpatialInfo.CurrentSpatial.Clear();
              ///等待获取住宅信息
              Application.RunOnMainThread(() =>
              {
                    if (waitPage != null)
                    ///等待获取住宅信息
                    Application.RunOnMainThread(() =>
                    {
                        waitPage.RemoveFromParent();
                        waitPage = null;
                    }
                        if (waitPage != null)
                        {
                            waitPage.Hide();
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }

              //跳转页面----
              UserBasePage = new UserPage();
                    BasePageView.AddChidren(UserBasePage);
                    UserBasePage.LoadPage();
                    BasePageView.PageIndex = 0;
                        //跳转页面----
                        UserBasePage = new UserPage();
                        BasePageView.AddChidren(UserBasePage);
                        UserBasePage.LoadPage();
                        BasePageView.PageIndex = 0;

                    if (isFirstOpen)
                    {
                  //启动密码验证
                  new AppUnlockPage().LoadPage(isFirstOpen);
                    }
              //主页加载完成,回调事件
              pageShowEvent?.Invoke();
                    pageShowEvent = null;
                });
                        if (isFirstOpen)
                        {
                            //启动密码验证
                            new AppUnlockPage().LoadPage(isFirstOpen);
                        }
                        //主页加载完成,回调事件
                        pageShowEvent?.Invoke();
                        pageShowEvent = null;
                    });
                }
                catch (Exception ex)
                {
@@ -428,17 +509,30 @@
                finally
                {
                    Application.RunOnMainThread(() =>
              {
                    if (downloadData)
                    {
                        DB_ResidenceData.Instance.EixtAccount();
                  ///初始化app数据
                  Common.ApiUtlis.Ins.DownloadData();
                    };
                });
                      {
                          if (downloadData)
                          {
                              DB_ResidenceData.Instance.EixtAccount();
                              ///初始化app数据
                              Common.ApiUtlis.Ins.DownloadData();
                          };
                      });
                }
            }).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>
@@ -450,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;
@@ -528,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
        }

@@ -541,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();
            }
        }