From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs | 122 ++++++++++++++++------------------------
1 files changed, 49 insertions(+), 73 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
index 7ff544e..686de8b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
@@ -175,19 +175,18 @@
/// <returns></returns>
private bool GetBingData()
{
- //鈽嗐優銉笺偗鈽� 缁戝畾寰俊
- //this.dicBindData = new Dictionary<string, OtherPartyResult>();
+ this.dicBindData = new Dictionary<string, OtherPartyResult>();
- //var result = HdlUserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetUserAuthItem", false, "");
- //if (string.IsNullOrEmpty(result) == true)
- //{
- // return false;
- //}
- //var data = Newtonsoft.Json.JsonConvert.DeserializeObject<List<OtherPartyResult>>(result);
- //foreach (var info in data)
- //{
- // this.dicBindData[info.Platform] = info;
- //}
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetUserAuthItem", false, "");
+ if (string.IsNullOrEmpty(result) == true)
+ {
+ return false;
+ }
+ var data = Newtonsoft.Json.JsonConvert.DeserializeObject<List<OtherPartyResult>>(result);
+ foreach (var info in data)
+ {
+ this.dicBindData[info.Platform] = info;
+ }
return true;
}
@@ -214,7 +213,7 @@
{
return;
}
- var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AuthUserRes>(authStr);
+ var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
//缁戝畾寰俊
this.BindWechat(authRes.access_token, authRes.refresh_token, authRes.openid);
};
@@ -226,39 +225,38 @@
/// <param name="infoData"></param>
private void BindWechat(string accessToken, string refreshToken, string openID)
{
- //鈽嗐優銉笺偗鈽� 缁戝畾寰俊
- ////鑾峰彇寰俊鏄电О
- //var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken;
- //strUrl += "&openid=" + openID;
- //var byteData = Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
- //if (byteData == null)
- //{
- // return;
- //}
- //var receipData = System.Text.Encoding.UTF8.GetString(byteData);
- //var nickData = Newtonsoft.Json.JsonConvert.DeserializeObject<NicknameInfo>(receipData);
+ //鑾峰彇寰俊鏄电О
+ var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken;
+ strUrl += "&openid=" + openID;
+ var byteData = Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
+ if (byteData == null)
+ {
+ return;
+ }
+ var receipData = System.Text.Encoding.UTF8.GetString(byteData);
+ var nickData = Newtonsoft.Json.JsonConvert.DeserializeObject<NicknameInfo>(receipData);
- ////鍏堜笂浼犲井淇¤祫鏂�
- //var pra = new { AccessToken = accessToken, RefreshToken = refreshToken, OpenID = openID, UserName = nickData.nickname };
- //var listNotShow = new List<string>() { "UserNoBindAccount" };
- //var result = HdlUserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/InsertOrUpdateAuthUser", false, pra, listNotShow);
- //if (result == false)
- //{
- // return;
- //}
+ //鍏堜笂浼犲井淇¤祫鏂�
+ var pra = new { AccessToken = accessToken, RefreshToken = refreshToken, OpenID = openID, UserName = nickData.nickname };
+ var listNotShow = new List<string>() { "UserNoBindAccount" };
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/InsertOrUpdateAuthUser", false, pra, listNotShow);
+ if (result == false)
+ {
+ return;
+ }
- ////鍐嶆墽琛岀粦瀹�
- //var pra2 = new { AccountGuid = Common.Config.Instance.Guid, OpenID = openID };
- //result = HdlUserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAuthUserToAccount", false, pra2);
- //if (result == true)
- //{
- // //缁戝畾鎴愬姛锛佷笅娆′綘鍙互鐢ㄥ井淇0}璐﹀彿蹇�熺櫥褰曞暒
- // string msg = Language.StringByID(R.MyInternationalizationString.uBindWebchatSuccessMsg);
- // msg = msg.Replace("{0}", "\r\n");
- // this.ShowMassage(ShowMsgType.Normal, msg, null, Language.StringByID(R.MyInternationalizationString.uWell));
- // //閲嶆柊鍒锋柊鐣岄潰
- // this.InitMiddleData();
- //}
+ //鍐嶆墽琛岀粦瀹�
+ var pra2 = new { AccountGuid = Common.Config.Instance.Guid, OpenID = openID };
+ result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAuthUserToAccount", false, pra2);
+ if (result == true)
+ {
+ //缁戝畾鎴愬姛锛佷笅娆′綘鍙互鐢ㄥ井淇0}璐﹀彿蹇�熺櫥褰曞暒
+ string msg = Language.StringByID(R.MyInternationalizationString.uBindWebchatSuccessMsg);
+ msg = msg.Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Normal, msg, null, Language.StringByID(R.MyInternationalizationString.uWell));
+ //閲嶆柊鍒锋柊鐣岄潰
+ this.InitMiddleData();
+ }
}
#endregion
@@ -271,14 +269,13 @@
/// <param name="infoData"></param>
private void UnBindOtherParty(OtherPartyResult infoData)
{
- //鈽嗐優銉笺偗鈽� 缁戝畾寰俊
- //var pra = new { DistributedMark = infoData.Id };
- //var result = HdlUserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UnBindUserAuth", false, pra);
- //if (result == true)
- //{
- // //閲嶆柊鍒锋柊鐣岄潰
- // this.InitMiddleData();
- //}
+ var pra = new { DistributedMark = infoData.Id };
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UnBindUserAuth", false, pra);
+ if (result == true)
+ {
+ //閲嶆柊鍒锋柊鐣岄潰
+ this.InitMiddleData();
+ }
}
#endregion
@@ -314,27 +311,6 @@
/// 鏄电О
/// </summary>
public string UserName = string.Empty;
- }
-
- private class AuthUserRes
- {
- ///<summary>
- /// 绗笁鏂箃oken
- /// </summary>
- public string access_token;
- /// <summary>
- /// 鍒锋柊token
- /// </summary>
- public string refresh_token;
- /// <summary>
- ///绗笁鏂圭敤鎴峰敮涓�鏍囪瘑
- /// </summary>
- public string openid;
-
- public int expires_in;
- public string scope;
- public string unionid;
-
}
#endregion
--
Gitblit v1.8.0