From 205a7bba1dbef65c082daa17df82ab8339a5411d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 05 二月 2021 21:55:24 +0800
Subject: [PATCH] Merge branch '3.7.9' of ssh://193.112.35.168:29418/buwan-android-new into 3.7.9
---
BuWanVideo/src/com/doudou/ysvideo/wxapi/WXEntryActivity.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/BuWanVideo/src/com/doudou/ysvideo/wxapi/WXEntryActivity.java b/BuWanVideo/src/com/doudou/ysvideo/wxapi/WXEntryActivity.java
index 88761e1..ed8a81f 100644
--- a/BuWanVideo/src/com/doudou/ysvideo/wxapi/WXEntryActivity.java
+++ b/BuWanVideo/src/com/doudou/ysvideo/wxapi/WXEntryActivity.java
@@ -1,6 +1,7 @@
package com.doudou.ysvideo.wxapi;
+import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.SharedPreferences;
@@ -8,6 +9,7 @@
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.util.Log;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
@@ -21,6 +23,7 @@
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.BeibeiVideoApplication;
import com.weikou.beibeivideo.ui.BaseActivity;
+import com.weikou.beibeivideo.ui.dialog.LoadingDialogUtil;
import com.weikou.beibeivideo.util.UserUtil;
import org.apache.http.Header;
@@ -31,7 +34,8 @@
private static final int RETURN_MSG_TYPE_LOGIN = 1;
private static final int RETURN_MSG_TYPE_SHARE = 2;
private static final int RETURN_MSG_TYPE_XCX = 19;
- private ProgressDialog dialog;
+ private static final int RETURN_MSG_TYPE_BIND = 30;
+ private Dialog dialog;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,12 +52,13 @@
}
//濡傛灉娌″洖璋僶nResp锛屽叓鎴愭槸杩欏彞娌℃湁鍐�
BeibeiVideoApplication.application.mWxApi.handleIntent(getIntent(), this);
- dialog = new ProgressDialog(this);
+ dialog = LoadingDialogUtil.getLoadingDialog(this, "");
}
// 寰俊鍙戦�佽姹傚埌绗笁鏂瑰簲鐢ㄦ椂锛屼細鍥炶皟鍒拌鏂规硶
@Override
public void onReq(BaseReq req) {
+
}
// 绗笁鏂瑰簲鐢ㄥ彂閫佸埌寰俊鐨勮姹傚鐞嗗悗鐨勫搷搴旂粨鏋滐紝浼氬洖璋冨埌璇ユ柟娉�
@@ -78,16 +83,18 @@
switch (resp.getType()) {
case RETURN_MSG_TYPE_LOGIN:
SendAuth.Resp res = (SendAuth.Resp) resp;
- setLogin(res.code);
+ if ("bind".equalsIgnoreCase(res.state)) {
+ bind(res.code);
+ } else {
+ login(res.code);
+ }
break;
case RETURN_MSG_TYPE_SHARE:
-// UIUtils.showToast("寰俊鍒嗕韩鎴愬姛");
finish();
break;
case RETURN_MSG_TYPE_XCX:
-// UIUtils.showToast("寰俊鍒嗕韩鎴愬姛");
finish();
break;
@@ -100,7 +107,7 @@
/**
* 璇锋眰鏈嶅姟鍣ㄥ尮閰嶉獙璇佺爜
*/
- private void setLogin(String code) {
+ private void login(String code) {
BeibeiVideoAPI.wxLogin(this, UserUtil.getUid(this), code, new BasicTextHttpResponseHandler() {
@Override
@@ -154,4 +161,48 @@
}
});
}
+
+
+ /**
+ * 璇锋眰鏈嶅姟鍣ㄥ尮閰嶉獙璇佺爜
+ */
+ private void bind(String code) {
+ BeibeiVideoAPI.bindWX(this, UserUtil.getLoginUid(this), code, new BasicTextHttpResponseHandler() {
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ if (!dialog.isShowing())
+ dialog.show();
+ }
+
+ @Override
+ public void onFinish() {
+ super.onFinish();
+ if (dialog.isShowing())
+ dialog.dismiss();
+ }
+
+ @Override
+ public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
+
+ if (jsonObject.optBoolean("IsPost")) {
+ SingleToast.showToast(getApplicationContext(),
+ "寰俊缁戝畾鎴愬姛");
+ } else {
+ SingleToast.showToast(WXEntryActivity.this,
+ jsonObject.optString("Error"));
+ }
+ WXEntryActivity.this.finish();
+ }
+
+ @Override
+ public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+ super.onFailure(statusCode, headers, responseString, throwable);
+ SingleToast.showToast(getApplicationContext(),
+ "寰俊缁戝畾澶辫触");
+ WXEntryActivity.this.finish();
+ }
+ });
+ }
}
--
Gitblit v1.8.0