2020-12-03 1.修改推送ID保存方法

JLChen

2020-12-03 321d2f007c7f85e933b3f90266af07e10c6b4658

2020-12-03 1.修改推送ID保存方法

 .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" />

 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();
            }
        }


 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
            {

 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>
        /// 添加推送Token成功时返回的Id
        /// </summary>
        public string PushId;

      
        public string SetLanguage = "";

        /// <summary>

 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>
        /// 添加推送Token成功时返回的Id
        /// </summary>
        public string PushId;
        #endregion



 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();
            }

 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;
            }