From 321d2f007c7f85e933b3f90266af07e10c6b4658 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 21:06:20 +0800
Subject: [PATCH] 2020-12-03 1.修改推送ID保存方法
---
HDL_ON/Entity/OnAppConfig.cs | 16 +-------
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 3 +
HDL_ON/DAL/Server/HttpServerRequest.cs | 45 +++++++++++++++-------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 22 ++++------
HDL-ON_iOS/AppDelegate.cs | 14 +++---
HDL_ON/Entity/UserInfo.cs | 13 ++++++
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 2
7 files changed, 64 insertions(+), 51 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 7676b46..4869028 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,15 +1,8 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/OnAppConfig.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpServerRequest.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="344" Column="45" IsPinned="True" />
- <File FileName="HDL_ON/Common/ImageUtlis.cs" Line="18" Column="8" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="23" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="203" Column="42" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/FileUtils.cs" Line="197" Column="122" />
- <File FileName="HDL_ON/Entity/OnAppConfig.cs" Line="15" Column="50" />
- <File FileName="HDL_ON/Entity/UserInfo.cs" Line="14" Column="49" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1155" Column="27" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -19,18 +12,21 @@
<Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
<Node name="DriverLayer" expanded="True" />
- <Node name="Server" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="HttpServerRequest.cs" selected="True" />
+ </Node>
</Node>
- <Node name="Entity" expanded="True">
- <Node name="OnAppConfig.cs" selected="True" />
- </Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
+ <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True" />
<Node name="3-Intelligence" expanded="True">
<Node name="Scene" expanded="True" />
</Node>
<Node name="4-PersonalCenter" expanded="True">
<Node name="AccountBindInfo" expanded="True" />
+ <Node name="MemberManagement" expanded="True" />
<Node name="ResetAccountPassword" expanded="True" />
<Node name="RoomListManage" expanded="True">
<Node name="Transfer" expanded="True" />
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 0709827..3728f8d 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -99,16 +99,16 @@
NSUserDefaults.StandardUserDefaults.SetString(DeviceToken, "PushDeviceToken");
string userPhoneName = UIDevice.CurrentDevice.Name;
- OnAppConfig.Instance.PushDeviceToken = DeviceToken;
- OnAppConfig.Instance.PhoneName = userPhoneName;
- OnAppConfig.Instance.SaveUserConfig();
+ UserInfo.Current.PushDeviceToken = DeviceToken;
+ UserInfo.Current.PhoneName = userPhoneName;
+ UserInfo.Current.SaveUserInfo();
}
- if (OnAppConfig.Instance.PushDeviceToken != DeviceToken)
+ if (UserInfo.Current.PushDeviceToken != DeviceToken)
{
string userPhoneName = UIDevice.CurrentDevice.Name;
- OnAppConfig.Instance.PushDeviceToken = DeviceToken;
- OnAppConfig.Instance.PhoneName = userPhoneName;
- OnAppConfig.Instance.SaveUserConfig();
+ UserInfo.Current.PushDeviceToken = DeviceToken;
+ UserInfo.Current.PhoneName = userPhoneName;
+ UserInfo.Current.SaveUserInfo();
}
}
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f156f7b..ed2cfd2 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -359,7 +359,22 @@
}
-
+ /// <summary>
+ /// 鑾峰彇鐢ㄦ埛澶村儚
+ /// </summary>
+ /// <param name="userId"></param>
+ public void GetUserHeadImage(string userId)
+ {
+ var imageKey = ImageUtlis.Current.GetHeadImageKey(userId);
+
+ var headImageBytes = ImageUtlis.Current.DownHeadImage(userId);
+
+ if (headImageBytes != null && headImageBytes.Length > 0)
+ {
+ //UserInfo.Current.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePagePath = imageKey;
+ }
+ }
/// <summary>
/// 鏇存柊鐢ㄦ埛鏄电О
@@ -942,15 +957,15 @@
isProduce = false;
#endif
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) {
+ if (string.IsNullOrEmpty(UserInfo.Current.PushDeviceToken)) {
Utlis.WriteLine("PushDeviceToken 涓虹┖");
return false;
}
var mAddpushinfoObj = new AddpushinfoObj()
{
- pushToken = OnAppConfig.Instance.PushDeviceToken,
- deviceName = OnAppConfig.Instance.PhoneName,
+ pushToken = UserInfo.Current.PushDeviceToken,
+ deviceName = UserInfo.Current.PhoneName,
deviceType = deviceType,
produce = isProduce,
};
@@ -965,8 +980,8 @@
var pushId = revertObj.Data.ToString();
if (!string.IsNullOrEmpty(pushId))
{
- OnAppConfig.Instance.PushId = pushId;
- OnAppConfig.Instance.SaveUserConfig();
+ UserInfo.Current.PushId = pushId;
+ UserInfo.Current.SaveUserInfo();
return true;
}
@@ -1010,7 +1025,7 @@
var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
{
- pushId = OnAppConfig.Instance.PushId,
+ pushId = UserInfo.Current.PushId,
pushType = pushType
});
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
@@ -1022,11 +1037,11 @@
/// <returns></returns>
public bool PushSerivceClearmessagelist()
{
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+ if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
{
- pushId = OnAppConfig.Instance.PushId
+ pushId = UserInfo.Current.PushId
});
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Clearmessagelist, requestJson);
@@ -1047,11 +1062,11 @@
/// <returns></returns>
public bool PushSerivceSignOut()
{
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+ if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
try
{
var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj() {
- pushId = OnAppConfig.Instance.PushId
+ pushId = UserInfo.Current.PushId
});
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson);
@@ -1078,13 +1093,13 @@
/// <returns></returns>
public bool PushSerivceMarkAllMessageRead()
{
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+ if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
try
{
var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
{
- pushId = OnAppConfig.Instance.PushId
+ pushId = UserInfo.Current.PushId
});
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_ALLMarkread, requestJson);
if (revertObj.Code == StateCode.SUCCESS)
@@ -1110,7 +1125,7 @@
/// <returns></returns>
public bool PushSerivceMarkMessageRead(string msgId)
{
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+ if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
try
{
@@ -1143,7 +1158,7 @@
/// <returns></returns>
public bool PushSerivceDeleteMessage(string msgId)
{
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
+ if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
try
{
diff --git a/HDL_ON/Entity/OnAppConfig.cs b/HDL_ON/Entity/OnAppConfig.cs
index 1c20b4f..deb4144 100644
--- a/HDL_ON/Entity/OnAppConfig.cs
+++ b/HDL_ON/Entity/OnAppConfig.cs
@@ -10,7 +10,7 @@
public class OnAppConfig
{
/// <summary>
- /// 鐢ㄦ埛澶村儚
+ /// OnAppConfig
/// </summary>
public const string ConfigFile = "OnAppConfig";
@@ -57,19 +57,7 @@
{
FileUtils.WriteFileByBytes (ConfigFile, GetUserConfigBytes ());
}
- /// <summary>
- /// 淇℃伅鎺ㄩ�佹爣璁�
- /// </summary>
- public string PushDeviceToken;
- /// <summary>
- /// phoneName
- /// </summary>
- public string PhoneName;
- /// <summary>
- /// 娣诲姞鎺ㄩ�乀oken鎴愬姛鏃惰繑鍥炵殑Id
- /// </summary>
- public string PushId;
-
+
public string SetLanguage = "";
/// <summary>
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index dd640af..e9719c4 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -68,6 +68,19 @@
/// 蹇界暐鏇存柊鐨勭増鏈彿
/// </summary>
public string IgnoreUpdateVersion = string.Empty;
+
+ /// <summary>
+ /// 淇℃伅鎺ㄩ�佹爣璁�
+ /// </summary>
+ public string PushDeviceToken;
+ /// <summary>
+ /// phoneName
+ /// </summary>
+ public string PhoneName;
+ /// <summary>
+ /// 娣诲姞鎺ㄩ�乀oken鎴愬姛鏃惰繑鍥炵殑Id
+ /// </summary>
+ public string PushId;
#endregion
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index e3ac5fe..f020e0a 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -671,7 +671,8 @@
//鑾峰彇鐢ㄦ埛淇℃伅
new Thread(() =>
{
- pm.GetUserInfo();
+ pm.GetUserHeadImage(revertData.userId);
+ pm.GetUserInfo(false);
})
{ IsBackground = true }.Start();
}
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index 517fce4..829146d 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -425,7 +425,7 @@
bodyScrolView.RemoveAll();
PushMessageInfoList.Clear();
YearMark = "";//鏍囪娓呯┖
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) {
+ if (string.IsNullOrEmpty(UserInfo.Current.PushId)) {
AddEmptyTipView();
return;
}
--
Gitblit v1.8.0