From 098bc6e25ccaa85f056bd4bafe20cb669c785295 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 28 八月 2021 10:27:01 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 10 +-
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/DAL/Server/NewAPI.cs | 10 +
HDL_ON/Common/Constant.cs | 12 +++
HDL_ON/DAL/Server/NewApiRes.cs | 19 ++++
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs | 99 ++++++++++++++----------
DLL/Shared.Droid.HDLWidget.dll | 0
HDL_ON/DAL/Server/HttpServerRequest.cs | 11 ++
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 73 ++++++++++++++++-
9 files changed, 178 insertions(+), 58 deletions(-)
diff --git a/DLL/Shared.Droid.HDLWidget.dll b/DLL/Shared.Droid.HDLWidget.dll
index 4153dfa..95222a6 100644
--- a/DLL/Shared.Droid.HDLWidget.dll
+++ b/DLL/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index eee2f33..19eefb5 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108273" android:versionName="1.2.202108273" package="com.hdl.onpro">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
+ <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
<!--缃戠粶璁块棶-->
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index a5c0598..06fb199 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -233,6 +233,18 @@
/// 绯荤粺淇℃伅
/// </summary>
Prompt,
+ /// <summary>
+ /// 鏂伴椈
+ /// </summary>
+ News,
+ /// <summary>
+ /// 鎺ㄨ崘
+ /// </summary>
+ Recommend,
+ /// <summary>
+ /// 鐗╀笟閫氱煡锛屽緟纭淇敼
+ /// </summary>
+ Property,
}
/// <summary>
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index e292c2a..32868bd 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1041,7 +1041,7 @@
/// <summary>
/// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
/// </summary>
- /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+ /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
/// <returns></returns>
public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
{
@@ -1059,14 +1059,18 @@
{
pushType = PushType.Prompt.ToString();
}
-
+ else if (queryType == 4)
+ {
+ pushType = PushType.Property.ToString();
+ }
var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
{
pushId = OnAppConfig.Instance.PushId,
pushType = pushType,
homeId = DB_ResidenceData.Instance.CurrentRegion.id,
});
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
+ //2021-08-28 鏀逛负鍒嗛〉鏌ヨ
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist_Paging, requestJson);
}
/// <summary>
@@ -2644,6 +2648,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("userFace", @"data:image/jpg;base64,"+imageBytes);
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
//MainPage.Log(imageBytes);
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index bd32d6f..e43aa25 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -284,10 +284,14 @@
/// 鍒犻櫎鎺ㄩ�乀oken
/// </summary>
public const string API_POST_PushSerivce_DeleteToken = "/smart-footstone/app/push-information/delete";
+ ///// <summary>
+ /////// 鑾峰彇鎺ㄩ�佹秷鎭褰�
+ /////// </summary>
+ //public const string API_POST_PushSerivce_Getpushmessagelist = "/smart-footstone/app/message/list";
/// <summary>
- /// 鑾峰彇鎺ㄩ�佹秷鎭褰�
+ /// 鑾峰彇鎺ㄩ�佹秷鎭褰� 鍒嗛〉
/// </summary>
- public const string API_POST_PushSerivce_Getpushmessagelist = "/smart-footstone/app/message/list";
+ public const string API_POST_PushSerivce_Getpushmessagelist_Paging = "/smart-footstone/app/message/page";
/// <summary>
/// 娓呯┖鎺ㄩ�佺殑娑堟伅璁板綍
/// </summary>
@@ -665,7 +669,7 @@
/// <summary>
/// 浜鸿劯褰曞叆
/// </summary>
- public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFaceHouse";//"/community-wisdom/app/doorDevice/inputUserFace";
+ public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFaceHouse";
/// <summary>
/// 寮�鍏充汉鑴稿姛鑳�
/// </summary>
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 4d5cf58..a5a3fc7 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -49,6 +49,17 @@
public string regionUrl;
}
+ /// <summary>
+ /// 鍒嗛〉
+ /// </summary>
+ public class BasePagingObj
+ {
+ public int totalCount = 0;
+ public int totalPage = 0;
+ public int pageNo = 0;
+ public int pageSize = 0;
+ }
+
#endregion
#region 鈻� 鐧诲綍 ____________________________
@@ -1085,6 +1096,14 @@
/// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
/// </summary>
public string pushType;
+ /// <summary>
+ /// 椤甸潰澶у皬
+ /// </summary>
+ public int pageSize = 100;
+ /// <summary>
+ /// 椤甸潰搴忓彿
+ /// </summary>
+ public int pageNo = 1;
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 52ba900..4922410 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -635,12 +635,12 @@
{
//鏈鐨勬秷鎭垪琛�
var unreadList = new List<PushMessageInfo>();
+
+ var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());
- var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
-
- if (pushMessageInfoList != null && pushMessageInfoList.Count > 0)
+ if (pushMessageInfoList != null && pushMessageInfoList.list != null && pushMessageInfoList.list.Count > 0)
{
- foreach (var info in pushMessageInfoList)
+ foreach (var info in pushMessageInfoList.list)
{
if (!info.isRead)
{
@@ -660,7 +660,7 @@
{
Application.RunOnMainThread(() =>
{
- ShowMesBtnState(pushMessageInfoList[0], true);
+ ShowMesBtnState(pushMessageInfoList.list[0], true);
});
}
}
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index f00ffbe..eb5f464 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -27,16 +27,17 @@
/// <summary>
/// menuView
/// </summary>
- FrameLayout menuView;
+ HorizontalScrolViewLayout menuView;//2021-08-27 澧炲姞澶氫簡涓�涓彍鍗曟寜閽墍浠ユ敼涓烘粴鍔ㄦ帶浠�
MenuButton allMenuButton;
MenuButton shareMenuButton;
MenuButton alarmMenuButton;
MenuButton systemMenuButton;
+ MenuButton propertyMenuButton;//澧炲姞鐗╀笟閫氱煡鎸夐挳
FrameLayout messageView;
/// <summary>
/// 鏄剧ず鐨勬秷鎭被鍨�
- /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅
+ /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟鍏憡
/// </summary>
int showMesType = 0;
/// <summary>
@@ -89,14 +90,21 @@
void AddTopMenuView()
{
- menuView = new FrameLayout()
+ menuView = new HorizontalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealWidth(117),
BackgroundColor = CSS_Color.MainBackgroundColor,
+ HorizontalScrollBarEnabled = false//闅愯棌婊氬姩鏉�
};
bodyView.AddChidren(menuView);
+ //宸adding View
+ menuView.AddChidren(new Button()
+ {
+ Width = Application.GetRealWidth(15),
+ BackgroundColor = CSS_Color.viewTranslucence
+ });
#region 鍏ㄩ儴鎸夐挳
allMenuButton = new MenuButton()
@@ -184,7 +192,31 @@
MenuButtonSelect(3);
};
systemMenuButton.SelectAction = systemAction;
-#endregion
+ #endregion
+
+ #region 鐗╀笟閫氱煡
+ propertyMenuButton = new MenuButton()
+ {
+ X = systemMenuButton.Right,
+ Y = Application.GetRealWidth(16),
+ };
+ //menuView.AddChidren(propertyMenuButton); //鍏堝睆钄�
+ propertyMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/SystemOn.png";
+ propertyMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/System.png";
+ propertyMenuButton.TextButton.TextID = StringId.SystemMessage;
+ Action propertyAction = () =>
+ {
+ MenuButtonSelect(4);
+ };
+ propertyMenuButton.SelectAction = propertyAction;
+ #endregion
+
+ //鍏堝睆钄�
+ ////鍙硃addingView
+ //menuView.AddChidren(new Button() {
+ // Width = Application.GetRealWidth(15),
+ // BackgroundColor = CSS_Color.viewTranslucence
+ //});
}
@@ -214,7 +246,7 @@
/// <summary>
///
/// </summary>
- /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+ /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
void MenuButtonSelect(int selectId)
{
showMesType = selectId;
@@ -225,6 +257,7 @@
shareMenuButton.IsSelected = true;
alarmMenuButton.IsSelected = true;
systemMenuButton.IsSelected = true;
+ propertyMenuButton.IsSelected = true;
}
else if (selectId == 1)
@@ -233,6 +266,7 @@
shareMenuButton.IsSelected = true;
alarmMenuButton.IsSelected = false;
systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = false;
}
else if (selectId == 2)
@@ -241,6 +275,7 @@
shareMenuButton.IsSelected = false;
alarmMenuButton.IsSelected = true;
systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = false;
}
else if (selectId == 3)
{
@@ -248,6 +283,16 @@
shareMenuButton.IsSelected = false;
alarmMenuButton.IsSelected = false;
systemMenuButton.IsSelected = true;
+ propertyMenuButton.IsSelected = false;
+
+ }
+ else if (selectId == 4)
+ {
+ allMenuButton.IsSelected = false;
+ shareMenuButton.IsSelected = false;
+ alarmMenuButton.IsSelected = false;
+ systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = true;
}
@@ -494,7 +539,13 @@
var result = new HttpServerRequest().PushSerivceGetPushmessagelist(queryType);
if (result.Code == StateCode.SUCCESS)
{
- PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
+ //PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
+ //2021-08-28 鏀逛负鍒嗛〉鎺ュ彛
+ var mPushMesList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());
+ if(mPushMesList != null) {
+ PushMessageInfoList = mPushMesList.list;
+ }
+
Application.RunOnMainThread(() =>
{
if (PushMessageInfoList != null && PushMessageInfoList.Count > 0)
@@ -745,4 +796,14 @@
public long createTime;
}
+
+ /// <summary>
+ // 鎺ㄩ�佹秷鎭垎椤靛璞�
+ /// </summary>
+ public class PushMessageInfoList : BasePagingObj
+ {
+ public List<PushMessageInfo> list = new List<PushMessageInfo>();
+
+ }
+
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
index 99cbb0c..2d86ddd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
@@ -63,7 +63,7 @@
contentView = new FrameLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667-64),
+ Height = Application.GetRealHeight(667 - 64),
};
bodyView.AddChidren(contentView);
@@ -96,7 +96,7 @@
};
topView.AddChidren(btnText1);
- topView.AddChidren(new Button() { Height = 1,BackgroundColor = CSS_Color.DividingLineColor,Y = Application.GetRealHeight(188) ,X = Application.GetRealWidth(16),Width = Application.GetRealWidth(359)});
+ topView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor, Y = Application.GetRealHeight(188), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(359) });
#region 绀惧尯闂ㄧ閫氳
var communityRow = new FrameLayout()
@@ -130,19 +130,21 @@
};
communityRow.AddChidren(btnCommunityAccessControlIcon);
- btnCommunityAccessControlIcon.MouseUpEventHandler = (sender, e) => {
- if(customerObj.faceClose == 3)//娌℃湁浜鸿劯鏁版嵁涓嶈兘寮�鍚汉鑴搁�氳鍔熻兘
+ btnCommunityAccessControlIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ if (customerObj.faceClose == 3)//娌℃湁浜鸿劯鏁版嵁涓嶈兘寮�鍚汉鑴搁�氳鍔熻兘
{
return;
}
btnCommunityAccessControlIcon.IsSelected = !btnCommunityAccessControlIcon.IsSelected;
- int switchStatus = btnCommunityAccessControlIcon.IsSelected == true ? 1 :2;
+ int switchStatus = btnCommunityAccessControlIcon.IsSelected == true ? 1 : 2;
- //澶辫触鍥炶皟
- Action action = () => {
- btnCommunityAccessControlIcon.IsSelected = !btnCommunityAccessControlIcon.IsSelected;
+ //鍒锋柊鍥炶皟
+ Action action = () =>
+ {
+ initButtonStatus();
};
- editFaceInfo(switchStatus,action);
+ editFaceInfo(switchStatus, action);
};
#endregion
@@ -175,7 +177,8 @@
IsBold = true,
};
contentView.AddChidren(btnSetFaceId);
- btnSetFaceId.MouseUpEventHandler = (sender, e) => {
+ btnSetFaceId.MouseUpEventHandler = (sender, e) =>
+ {
LoadPictureOptionView();
};
@@ -193,11 +196,13 @@
TextAlignment = TextAlignment.Center,
IsBold = true,
};
- btnEraseData.MouseUpEventHandler = (sender,e) => {
- Action action = () => {
+ btnEraseData.MouseUpEventHandler = (sender, e) =>
+ {
+ Action action = () =>
+ {
initButtonStatus();
};
- editFaceInfo(3,action);
+ editFaceInfo(3, action);
};
ReadFaceInfo();
@@ -206,10 +211,15 @@
/// <summary>
/// 鑾峰彇浜鸿劯淇℃伅
/// </summary>
- void ReadFaceInfo()
+ void ReadFaceInfo(bool isLoading = true)
{
- var waitPage = new Loading();
- waitPage.Start();
+ Loading waitPage = null;
+ if (isLoading)
+ {
+ waitPage = new Loading();
+ waitPage.Start();
+ }
+
new Thread(() =>
{
try
@@ -232,13 +242,15 @@
}
}
- }catch(Exception ex)
+ }
+ catch (Exception ex)
{
MainPage.Log($"璇诲彇浜鸿劯淇℃伅寮傚父:{ex.Message}");
}
finally
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread(() =>
+ {
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -252,7 +264,7 @@
/// <summary>
/// 娓呴櫎浜鸿劯鏁版嵁
/// </summary>
- void editFaceInfo(int status,Action action)
+ void editFaceInfo(int status, Action action)
{
var waitPage = new Loading();
waitPage.Start();
@@ -283,7 +295,8 @@
}
finally
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread(() =>
+ {
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -311,9 +324,9 @@
return;
}
}
- btnCommunityAccessControlIcon.IsSelected = false;
- btnEraseData.RemoveFromParent();
- btnSetFaceId.TextID = StringId.SetFace;
+ btnCommunityAccessControlIcon.IsSelected = false;
+ btnEraseData.RemoveFromParent();
+ btnSetFaceId.TextID = StringId.SetFace;
}
@@ -332,7 +345,7 @@
pictureOptionView = new FrameLayout()
{
- Y = Application.GetRealHeight(445+50),
+ Y = Application.GetRealHeight(445 + 50),
Height = Application.GetRealHeight(250),
AnimateSpeed = 0.3f,
Animate = Animate.DownToUp,
@@ -411,7 +424,8 @@
{
pictureOptionView.Parent.RemoveFromParent();
};
- btnTakePicture.MouseDownEventHandler = (sender, e) => {
+ btnTakePicture.MouseDownEventHandler = (sender, e) =>
+ {
btnTakePicture.IsSelected = true;
};
btnTakePicture.MouseUpEventHandler = (sender, e) =>
@@ -420,12 +434,13 @@
var imageName = Guid.NewGuid().ToString();
CropImage.TakePicture((imagePath) =>
{
- CropImageCallBack(imagePath,1,imageName);
- }, imageName, 4, 6, 1000);
+ CropImageCallBack(imagePath, 1, imageName);
+ }, imageName, 4, 6, 400);
pictureOptionView.Parent.RemoveFromParent();
};
- btnAlbum.MouseDownEventHandler = (sender, e) => {
+ btnAlbum.MouseDownEventHandler = (sender, e) =>
+ {
btnAlbum.IsSelected = true;
};
@@ -437,8 +452,8 @@
//var imageName = scene.sid;
CropImage.SelectPicture((imagePath) =>
{
- CropImageCallBack(imagePath,2,imageName);
- }, imageName, 4, 6,1000);
+ CropImageCallBack(imagePath, 2, imageName);
+ }, imageName, 4, 6, 400);//OutputYSize鐩墠浠呭Android鏈変簺 400浠ｈ〃Y鐨勬渶澶氬垎杈ㄧ巼锛屾墍浠ユ渶缁堝緱鍒板浘鐗囩殑鍒嗚鲸鐜囦负锛�266*400
pictureOptionView.Parent.RemoveFromParent();
};
@@ -446,14 +461,12 @@
}
-
-
/// <summary>
/// 瑁佸壀瀹岀収鐗囧洖璋冿紝缁熶竴澶勭悊
/// </summary>
/// <param name="imagePath">瑁佸壀鍚庣殑鐪熷疄璺緞</param>
/// <param name="imageSource">鐓х墖鏉ユ簮锛�1锛氭媿鐓э紱2锛氬浘搴�</param>
- void CropImageCallBack(string selectImagePath,int imageSource,string imageName)
+ void CropImageCallBack(string selectImagePath, int imageSource, string imageName)
{
if (string.IsNullOrEmpty(selectImagePath) == true)
{
@@ -462,7 +475,9 @@
//涓婁紶鎴愬姛鍒板洖璋�
Action<bool> uploadSuccessAction = (isSuccess) =>
{
- Action action = () => {
+ //鐐瑰嚮閲嶆柊褰曞叆浜嬩欢
+ Action action = () =>
+ {
if (!isSuccess)
{
if (imageSource == 1)
@@ -470,20 +485,23 @@
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath, 2, imageName);
- }, imageName, 4, 6);
+ }, imageName, 4, 6, 400);
}
else
{
CropImage.SelectPicture((imagePath) =>
{
- CropImageCallBack(imagePath, 1,imageName);
- }, imageName, 4, 6);
+ CropImageCallBack(imagePath, 1, imageName);
+ }, imageName, 4, 6, 400);
}
- }else
- {
- ReadFaceInfo();
}
};
+
+ if (isSuccess)
+ {
+ ReadFaceInfo(false);
+ }
+
Application.RunOnMainThread(() =>
{
var page = new FaceSettingResultPage(action);
@@ -522,6 +540,7 @@
var pack = new HttpServerRequest().FaceSetting(base64string);
if (pack != null)
{
+ Utlis.WriteLine("涓婁紶缁撴灉锛�" + pack.message);
uploadResultAction?.Invoke(pack.Code == StateCode.SUCCESS);
}
--
Gitblit v1.8.0