From fb1d2ee8a53c56dbb22f38fccb83335fd489456f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:33:56 +0800
Subject: [PATCH] Merge branch 'CJL-NEW' into NewFilePath

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs |    4 ++--
 HDL-ON_iOS/AppDelegate.cs                             |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index c1567e0..4ddbb7d 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -211,8 +211,14 @@
         {
 
             //Shared.Application.FontSize = 12;
+
+            //鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
             Shared.Application.IsEditTextContentTypePassword = false;
+            //榛樿浣跨敤鑻规柟瀛椾綋
             Shared.Application.IsUsePingFang = true;
+            ////榛樿绂佹闊充箰鏈嶅姟
+            //Shared.Application.IsMusicEnable = false;
+
             Window = new UIWindow(UIScreen.MainScreen.Bounds);
             rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
             Window.RootViewController = rootViewController;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index ffbbe89..6437949 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -272,14 +272,14 @@
                             {
                                 Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl);
                                 //1.2濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨�
-                                if (!imageView.ImagePath.Contains("LoginIcon/2.png"))
+                                if (!string.IsNullOrEmpty(imageView.ImagePath) && !imageView.ImagePath.Contains("LoginIcon/2.png"))
                                 {
                                     Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath);
                                     System.IO.File.Delete(imageView.ImagePath);
                                 }
                                 //閲嶅懡鍚嶄繚瀛�
                                 FileUtils.WriteFileByBytes(imageUrl, imageBytes);
-                                imageView.ImagePath = null;
+                                imageView.ImagePath = imageUrl;
                                 imageView.ImageBytes = imageBytes;
                                 //涓婁紶鎴愬姛
                                 Utlis.ShowTip(Language.StringByID(StringId.UploadSuccessfully));

--
Gitblit v1.8.0