wjc
2023-06-07 ad51f05f31440bcc64e0ef248ab32fd12997e565
Merge branch 'Dev-Branch' into wjc
9个文件已修改
98 ■■■■■ 已修改文件
HDL-ON_iOS/AppDelegate.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/ApiUtlis.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Mqtt/MqttClient.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/HomePage.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/UserPage.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/UserPageBLL.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/AppDelegate.cs
@@ -199,12 +199,12 @@
        public override void DidEnterBackground(UIApplication application)
        {
            //设置全视通状态
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            }
            //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            //string errorVersion = "16.2.0";
            //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            //{
            //    Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            //}
            //SharedMethod.SharedMethod.IsBackground = true;
            //MainPage.IsEnterBackground = true;
            ////进入后台mqtt正在连接重置状态
@@ -231,12 +231,12 @@
        public override void OnActivated(UIApplication application)
        {
            //设置全视通状态
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            }
            //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            //string errorVersion = "16.2.0";
            //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            //{
            //    Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            //}
            Console.WriteLine("OnActivated");
            base.OnActivated(application);
            //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -294,12 +294,12 @@
        {
            //设置全视通状态
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            }
            //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            //string errorVersion = "16.2.0";
            //if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            //{
            //    Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            //}
            Console.WriteLine("111111111111");
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
HDL_ON/Common/ApiUtlis.cs
@@ -78,7 +78,10 @@
        public void DownloadData()
        {
            if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
            {
                DownloadDataComplete = true;
                return;
            }
            endTime1 = DateTime.Now.AddSeconds(25);
            complateDevice = complateScene = false;
HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -683,7 +683,7 @@
                }
                catch (Exception ex)
                {
                    Utlis.WriteLine($"error:" + ex.Message);
                    Utlis.WriteLine($"mqtt连接异常 error:" + ex.Message);
                    //mqtt连接异常,清空本地mqtt信息,可能需要重新获取:wxr
                    MqttInfoConfig.Current.Refresh();
                }
HDL_ON/UI/MainPage.cs
@@ -454,7 +454,8 @@
                addResidencePage.LoadView();
                return;
            }
            new System.Threading.Thread(async () =>
            new System.Threading.Thread(() =>
            {
                try
                {
HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -457,6 +457,7 @@
                environmentalView.AddChidren(btnPm25Values);
#endregion
                btnSecurityStatus = new Button()
                {
                    X = Application.GetRealWidth(329),
@@ -633,6 +634,7 @@
        /// </summary>
        void LoadContentView()
        {
            if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
            {
                var waitPage = new Loading();
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -818,6 +818,10 @@
        /// </summary>
        void GetUnreadPushMessages()
        {
            if (MainPage.NoLoginMode)
            {
                return;
            }
            System.Threading.Tasks.Task.Run(() =>
            {
                try
@@ -922,6 +926,10 @@
        /// </summary>
        void RegisterGetPushMessageAction()
        {
            if (MainPage.NoLoginMode)
            {
                return;
            }
            Action RegisterGetPushMessageAction = () => {
                if (bodyView != null)
                {
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -167,6 +167,22 @@
        public void LoadView()
        {
            //try
            //{
            //    if (MainPage.CurPageIndex == 3)
            //    {
            //        Application.RunOnMainThread(() =>
            //        {
            //            this.RemoveFromParent();
            //            return;
            //        });
            //    }
            //}
            //catch (Exception ex)
            //{
            //    MainPage.Log($"界面切换异常:{ex.Message}");
            //}
            MainPage.CurPageIndex = 3;
            #region 个人信息
            topbg = new FrameLayout()
            {
HDL_ON/UI/UI2/UserPage.cs
@@ -91,7 +91,7 @@
        {
            try
            {
                bodyView = this;
                bodyView = this;//1
                bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
                ContextView = new FrameLayout()
                {
@@ -104,12 +104,10 @@
                {
                    Y = Application.GetRealHeight(607),
                    Height = Application.GetMinRealAverage(60),
                    //BackgroundColor = CSS_Color.BackgroundColor
                };
                bodyView.AddChidren(navigationView);
                if (MainPage.Increase)
                {
                    //ContextView.Height = Application.GetRealHeight(618 + 20);
                    navigationView.Y = Application.GetRealHeight(597 + 5);
                    navigationView.Height = Application.GetRealHeight(70 - 5);
                }
@@ -117,9 +115,9 @@
                LoadEventList();
                var homePage = new HomePage();
                ContextView.AddChidren(homePage);
                homePage.LoadPage();
                //var homePage = new HomePage();
                //ContextView.AddChidren(homePage);
                //homePage.LoadPage();
                if (!MainPage.NoLoginMode)
                {
HDL_ON/UI/UI2/UserPageBLL.cs
@@ -12,26 +12,8 @@
        void LoadEventList()
        {
            LoadEvent_NavigationSelection();
            LoadEvent_RefreshData();
        }
        /// <summary>
        /// 刷新住宅数据
        /// </summary>
        void LoadEvent_RefreshData()
        {
            //ContextView.BeginHeaderRefreshingAction = () => {
            //    if (CurAnimationEffect == 0)
            //    {
            //        Common.ApiUtlis.Ins.DownloadData();
            //        ContextView.RemoveAll();
            //        var homePage = new HomePage();
            //        ContextView.AddChidren(homePage);
            //        homePage.LoadPage();
            //        ContextView.EndHeaderRefreshing();
            //    }
            //};
        }
        /// <summary>
        /// 加载导航栏点击事件