代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

            }