From 774baeb1f5d2d49bfd692b79faa240bd7949dc17 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 九月 2021 10:06:48 +0800
Subject: [PATCH] 2021-09-02 1.更新控件库,iOS裁剪支持指定大小或者不压缩。2.更新linphoneiOS和Android库,监视关闭麦克风。3.Android丰林和乐橙截图后增加广播推送系统相册刷新。

---
 HDL_ON/UI/MainPage.cs |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 2061e25..4c5fbd6 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string VersionString = "1.2.0821";
+        public static string VersionString = "1.2.0827";
         ///// <summary>
         ///// 瀹㈡埛绔被鍨�
         ///// </summary>
@@ -116,6 +116,8 @@
         {
             SPK.EnergyStandard,
             SPK.MusicStandard,
+            SPK.AirSwitch,
+            SPK.ElectricEnergy,
         };
 
 
@@ -159,7 +161,7 @@
                         //})
                         //{ IsBackground = true }.Start();
                         Common.ApiUtlis.Ins.DownloadData();
-
+                        
                         GoUserPage(false,true);
                     }
                 }
@@ -195,7 +197,7 @@
         /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
         /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
         public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
-        {
+        {     
             BaseView.RemoveAll();
             #region 鍚庨��浜嬩欢
             BasePageView = new PageLayout();
@@ -328,8 +330,11 @@
                     ///绛夊緟鑾峰彇浣忓畢淇℃伅
                     Application.RunOnMainThread( () =>
                     {
-                        waitPage.Hide();
-                        waitPage.RemoveFromParent();
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
 
                         //璺宠浆椤甸潰----
                         UserBasePage = new UserPage();

--
Gitblit v1.8.0