Skip to content

唐文 / AiyoZhuaWaWa

Go to a project
Commit 51b7953b by 潘宗杰
Options

重新清理IDE相关

parent 6d5d8423
Inline Side-by-side
Showing with 20 additions and 19 deletions
app/src/main/java/com/maile/aiyowawa/base/Constant.java
......@@ -30,8 +30,8 @@ public class Constant {
public static final String AIYO_HOME = "https://wawa.bfb88.net/wawa/dist/index.html";
public static final String AIYO_MY = "";
public static final String WEIXIN_APP_ID = "wx542d8e92bc5eb530";
public static final String WEIXIN_APP_SECRET = "2b7840b0f18fa4f0fc5c692d8cf95ba8";
public static final String WEIXIN_APP_ID = "wx7b552818e53878ca";
public static final String WEIXIN_APP_SECRET = "718507fb7fdebb238de832cc37fcddeb";
public static final String WEIXIN_AUTH_LOGIN_INFO_SCOPE = "snsapi_userinfo";
public static final String WEIXIN_AUTH_LOGIN_INFO_STATE = "wtf";
......
app/src/main/java/com/maile/aiyowawa/wxapi/WXEntryActivity.java
......@@ -111,7 +111,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
if (baseResp.getType() == ConstantsAPI.COMMAND_SENDAUTH) { //登录授权
mCode = ((SendAuth.Resp) baseResp).code;
upLoadCode(mCode);
// get_access_token = getCodeRequest(((SendAuth.Resp) baseResp).code);
// get_access_token = getCodeRequest(((SendAuth.Resp) baseResp).code);
// Log.i("zou", "WXEntryActivity mCode= " + mCode + " get_access_token= " + get_access_token);
// Thread thread = new Thread(downloadRun);
// thread.start();
......@@ -122,7 +122,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
// }
} else { //TODO:分享成功
PublicUtils.showToast("分享成功");
// this.finish();
// this.finish();
}
break;
......@@ -138,17 +138,17 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
}
}
private void upLoadCode(String mCode){
private void upLoadCode(String mCode) {
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
Log.d("wxCode0" , mCode);
SortedMap<Object,Object> map = new TreeMap<Object,Object>();
map.put("msgid",uuid);
map.put("type","1");
map.put("wxcode",mCode);
String mySign = BaseApplication.createSign(BaseApplication.characterEncoding,map);
Log.d("wxCode0", mCode);
SortedMap<Object, Object> map = new TreeMap<Object, Object>();
map.put("msgid", uuid);
map.put("type", "3");
map.put("wxcode", mCode);
String mySign = BaseApplication.createSign(BaseApplication.characterEncoding, map);
map.put("sign", mySign);
RetrofitManager.getInstance().createReq(LoginApiService.class).wxLogin(uuid,1,mCode,mySign).subscribeOn(Schedulers.io())
RetrofitManager.getInstance().createReq(LoginApiService.class).wxLogin(uuid, 3, mCode, mySign).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<LoginBean>() {
@Override
......@@ -176,7 +176,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
PreferencesManager preferencesManager = PreferencesManager.getSharedPreference(getApplication(),
IPreferencesIds.DEFAULT_SHAREPREFERENCES_FILE,
Context.MODE_PRIVATE);
preferencesManager.putString(IPreferencesIds.TOKEN,userWrapperRspEntity.getToken());
preferencesManager.putString(IPreferencesIds.TOKEN, userWrapperRspEntity.getToken());
LoginActivity.startEntranceActivity(mContext);
mLoading.setVisibility(View.GONE);
finish();
......@@ -311,7 +311,8 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
String openid = "";
String nickname = "";
String headimgurl = "";
String channel = "android";;
String channel = "android";
;
String accounType = "weixin";
try {
......@@ -338,7 +339,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
" nickname= " + nickname + " headimgurl= " + headimgurl + " mCode =" + mCode + " mAccessToken = " + mAccessToken);
final String finalOpenid = openid;
RetrofitManager.getInstance().createReq(LoginApiService.class).thirdLogin(channel,openid,accounType,headimgurl,nickname).subscribeOn(Schedulers.io())
RetrofitManager.getInstance().createReq(LoginApiService.class).thirdLogin(channel, openid, accounType, headimgurl, nickname).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<WrapperRspEntity<String>>() {
@Override
......@@ -372,13 +373,13 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
runOnUiThread(new Runnable() {
@Override
public void run() {
if(userWrapperRspEntity == null || userWrapperRspEntity.getData().equals("")){
if (userWrapperRspEntity == null || userWrapperRspEntity.getData().equals("")) {
PublicUtils.showToast(getString(R.string.error_upload_user_info_not_ok));
}else{
} else {
PreferencesManager preferencesManager = PreferencesManager.getSharedPreference(getApplication(),
IPreferencesIds.DEFAULT_SHAREPREFERENCES_FILE,
Context.MODE_PRIVATE);
preferencesManager.putString(IPreferencesIds.TOKEN,userWrapperRspEntity.getData());
preferencesManager.putString(IPreferencesIds.TOKEN, userWrapperRspEntity.getData());
preferencesManager.putString(IPreferencesIds.openid_phone, finalOpenid);
LoginActivity.startEntranceActivity(mContext);
}
......
gradle.properties
......@@ -32,7 +32,7 @@ IN_COMPONENY = false
PROJECT_NAME = AiyoZhuaWaWa
#jenkins\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
APP_VERSION = 1.0.0
APP_VERSION = 1.0.1
IS_JENKINS = false
ENVIRONMENT = debug
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment