From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
index 1e5dfa7..f49441e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
@@ -203,6 +203,11 @@
#if Android
com.hdl.home.Application.WXLogin();
com.hdl.home.WXEntryActivity.RespAction = (authStr) =>
+#endif
+#if iOS
+ Home.IOS.AppDelegate.WXLogin();
+ Home.IOS.AppDelegate.RespAction = (authStr) =>
+#endif
{
if (string.IsNullOrEmpty(authStr) == true)
{
@@ -212,7 +217,6 @@
//缁戝畾寰俊
this.BindWechat(authRes.access_token, authRes.refresh_token, authRes.openid);
};
-#endif
}
/// <summary>
@@ -246,10 +250,10 @@
result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAuthUserToAccount", false, pra2);
if (result == true)
{
- //缁戝畾寰俊鎴愬姛!
- string msg = Language.StringByID(R.MyInternationalizationString.uBindSomethingSuccess);
- msg = msg.Replace("{0}", Language.StringByID(R.MyInternationalizationString.uWebChat));
- this.ShowMassage(ShowMsgType.Tip, msg);
+ //缁戝畾鎴愬姛锛佷笅娆′綘鍙互鐢ㄥ井淇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();
}
--
Gitblit v1.8.0