2020-11-24 1.注册增加服务器选择。 2.增加极光推送接口

JLChen

2020-11-24 25bb055b0249d86548883083bb315922e6a2076b

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -659,7 +659,7 @@
        /// <returns></returns>
        public ResponsePackNew GetResidenceMemberAccount()
        {
            var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
        }

@@ -674,7 +674,7 @@
                childAccountId = subaccount.childAccountId,
                homeId = subaccount.homeId
            };
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
        }

@@ -686,7 +686,7 @@
        /// <returns></returns>
        public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildNickNameObj()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId,
@@ -703,7 +703,7 @@
        /// <returns></returns>
        public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildAllowCreateSceneObj()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId,
@@ -724,7 +724,7 @@
            //string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
            //return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);

            var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeShareFindAll()
            {
                homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
                childAccountId = childAccountId
@@ -844,7 +844,7 @@
        {
            //添加子账号
            var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
            var requestJson = HttpUtil.GetSignRequestJson(requestObj);
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);

        }
@@ -862,7 +862,6 @@
        }

        #endregion

        /// <summary>
        /// 获取MQTT远程连接信息接口
        /// </summary>
@@ -893,123 +892,226 @@
        }

        #region 推送
        //        /// <summary>
        //        /// 提交推送需要的关键标识信息
        //        /// </summary>
        //        public bool PushserivceAddPushInfo()
        //        {
        //            try
        //            {
        //                string DeviceType = "Android";
        //#if __IOS__
        //                DeviceType = "Iphone";
        //#endif
        //                //是否生成模式
        //                bool isProduce = true;
        //#if DEBUG
        //                isProduce = false;
        //#endif
        /// <summary>
        /// 提交推送需要的关键标识信息
        /// </summary>
        public bool PushSerivceAddPushInfo()
        {
            try
            {
                string deviceType = PhoneDeviceType.Android.ToString();
#if __IOS__
                deviceType = PhoneDeviceType.IOS.ToString();
#endif
                //是否生成模式
                bool isProduce = true;
#if DEBUG
                isProduce = false;
#endif

        //                if (string.IsNullOrEmpty(UserConfig.Instance.tokenID)) return false;
                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) return false;

        //                var mAddpushinfoObj = new AddpushinfoObj()
        //                {
        //                    pushid = UserConfig.Instance.tokenID,
        //                    deviceName = UserConfig.Instance.phoneName,
        //                    deviceType = DeviceType,
        //                    produce = isProduce,
                var mAddpushinfoObj = new AddpushinfoObj()
                {
                    pushToken = OnAppConfig.Instance.PushDeviceToken,
                    deviceName = OnAppConfig.Instance.PhoneName,
                    deviceType = deviceType,
                    produce = isProduce,

        //                };
        //                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
        //                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Pushserivce_Addpushinfo, mAddpushinfoJson);
        //                if (revertObj.Code == StateCode.SUCCESS)
        //                {
        //                    if (revertObj.Data != null)
        //                    {
        //                        var pushId = revertObj.Data.ToString();
        //                        if (!string.IsNullOrEmpty(pushId))
        //                        {
        //                            UserConfig.Instance.PushId = pushId;
        //                            UserConfig.Instance.SaveUserConfig();
        //                            return true;
        //                        }
        //                    }
        //                    Utlis.WriteLine("Addpushinfo 成功");
        //                }
        //                else
        //                {
        //                    Utlis.WriteLine("Addpushinfo 失败");
        //                }
                };
                var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    if (revertObj.Data != null)
                    {
                        var pushId = revertObj.Data.ToString();
                        if (!string.IsNullOrEmpty(pushId))
                        {
                            OnAppConfig.Instance.PushId = pushId;
                            OnAppConfig.Instance.SaveUserConfig();
                            return true;
                        }
                    }
                    Utlis.WriteLine("AddToken 成功");
                }
                else
                {
                    Utlis.WriteLine("AddToken 失败");
                }
                return false;
            }
            catch
            {
                return false;
            }
        }

        //                return false;
        //            }
        //            catch
        //            {
        //                return false;
        //            }
        //        }
        /// <summary>
        /// 查询推送信息列表
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew PushSerivceGetpushmessagelist()
        {
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMessageListObj()
            {
                pushId = OnAppConfig.Instance.PushId
            });
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
        }

        //        /// <summary>
        //        /// 查询推送信息列表
        //        /// </summary>
        //        /// <returns></returns>
        //        public ResponsePackNew PushserivceGetpushmessagelist()
        //        {
        //            var urlSegmentDic = HttpUtil.GetBaseQueryDictionary();
        //            urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
        //            return HttpUtil.RequestHttpsGet(NewAPI.API_GET_Pushserivce_Getpushmessagelist, null, urlSegmentDic);
        //        }
        /// <summary>
        /// 清空消息记录
        /// </summary>
        /// <returns></returns>
        public bool PushSerivceClearmessagelist()
        {
            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;

        //        /// <summary>
        //        /// 清空消息记录
        //        /// </summary>
        //        /// <returns></returns>
        //        public bool PushserivceClearmessagelist()
        //        {
        //            if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false;
            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
            {
                pushId = OnAppConfig.Instance.PushId
            });

        //            var urlSegmentDic = new Dictionary<string, object>();
        //            urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
        //            var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Clearmessagelist, null, null, urlSegmentDic);
        //            if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
        //            {
        //                return true;
        //            }
        //            else
        //            {
            var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Clearmessagelist, requestJson);
            if (revertObj.Code == StateCode.SUCCESS)
            {
                return true;
            }
            else
            {

        //            }
        //            return false;
        //        }
            }
            return false;
        }

        //        /// <summary>
        //        /// 退出登录，清空推送标识
        //        /// </summary>
        //        /// <returns></returns>
        //        public bool PushserivceSignOut()
        //        {
        //            if (string.IsNullOrEmpty(UserConfig.Instance.PushId)) return false;
        //            try
        //            {
        //                var urlSegmentDic = new Dictionary<string, object>();
        //                urlSegmentDic.Add("pushId", UserConfig.Instance.PushId);
        //                var revertObj = HttpUtil.RequestHttpsDelete(NewAPI.API_DELETE_Pushserivce_Deletepushinfo, null, null, urlSegmentDic);
        //                if (revertObj.Code.ToUpper() == HttpUtil.SUCCESS_CODE)
        //                {
        //                    return true;
        //                }
        //                else
        //                {
        /// <summary>
        /// 退出登录，清空推送标识
        /// </summary>
        /// <returns></returns>
        public bool PushSerivceSignOut()
        {
            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
            try
            {
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() {
                    pushId = OnAppConfig.Instance.PushId
                });
               
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    return true;
                }
                else
                {

        //                }
        //                return false;
        //            }
        //            catch
        //            {
        //                return false;
        //            }
        //        }
                }
                return false;
            }
            catch
            {
                return false;
            }
        }

        /// <summary>
        /// 标记消息全部已读
        /// </summary>
        /// <param name="msgId"></param>
        /// <returns></returns>
        public bool PushSerivceMarkAllMessageRead()
        {
            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;

            try
            {
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
                {
                    pushId = OnAppConfig.Instance.PushId
                });
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_ALLMarkread, requestJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    return true;
                }
                else
                {

                }
                return false;
            }
            catch
            {
                return false;
            }
        }

        /// <summary>
        /// 标记指定消息已读
        /// </summary>
        /// <param name="msgId"></param>
        /// <returns></returns>
        public bool PushSerivceMarkMessageRead(string msgId)
        {
            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;

            try
            {
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
                {
                    msgId = msgId
                });

                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Markread, requestJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    return true;
                }
                else
                {

                }
                return false;
            }
            catch
            {
                return false;
            }
        }

        /// <summary>
        /// 通过主键id删除一条推送记录
        /// </summary>
        /// <param name="msgId"></param>
        /// <returns></returns>
        public bool PushSerivceDeleteMessage(string msgId)
        {
            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;

            try
            {
                var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
                {
                    msgId = msgId
                });

                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Deletepushinfo, requestJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    return true;
                }
                else
                {

                }
                return false;
            }
            catch
            {
                return false;
            }
        }
        #endregion

        #region 获取天气部分