token for wx pay

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -563,6 +563,9 @@ public interface ApiService {
     @POST("app/sdk/pay/wx")
     Observable<BaseMessage> getPayWxParams(@Query("order_no") String orderNo);
 
+    @POST("app/sdk/pay/wx")
+    Observable<BaseMessage> getPayWxParams(@Header("Authorization") String token, @Query("order_no") String orderNo);
+
     /**
      * 获取下发充值类型
      *
@@ -572,6 +575,9 @@ public interface ApiService {
     @POST("app/sdk/pay/ipaynow")
     Observable<BaseMessage> getPayIpaynowParams(@Query("order_no") String orderNo);
 
+    @POST("app/sdk/pay/ipaynow")
+    Observable<BaseMessage> getPayIpaynowParams(@Header("Authorization") String token, @Query("order_no") String orderNo);
+
     /**
      * 充值
      *

app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -185,12 +185,12 @@ public class LoginAct extends BaseUMActivity implements LoginController {
     }
 
     private void goMain(LoginEntity entity) {
-        CertificationUtil.newInstance().addCurUserToSdkLoginUser();
+        CertificationUtil.newInstance().addCurUserToSdkLoginUser(entity.getToken(), entity.getUser());
         if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
             showProgress();
             Jump2View.getInstance().checkOrGoHomePage(this);
         } else {
-            CertificationUtil.newInstance().authCertificationCode(this, SpUtils.getToken(SheepApp.getInstance()));
+            CertificationUtil.newInstance().authCertificationCode(this, entity.getToken());
         }
     }
 

app/src/main/java/com/sheep/gamegroup/module/login/fragments/AbsLoginFgt.java

@@ -96,8 +96,10 @@ public class AbsLoginFgt extends BaseFragment {
                                 hideProgress();
                                 if (baseMessage != null) {
                                     LoginEntity loginEty = FastJsonUtils.toBean(JSONObject.toJSONString(baseMessage.getData()), LoginEntity.class);
-                                    SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
-                                    DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                                    if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                                        SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
+                                        DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                                    }
                                     mController.whenLoginSuccess(LoginController.PLATFORM_WX, loginEty);
                                     TestUtil.saveUser(loginEty);
                                 }
@@ -138,8 +140,10 @@ public class AbsLoginFgt extends BaseFragment {
                                 hideProgress();
                                 if (baseMessage != null) {
                                     LoginEntity loginEty = FastJsonUtils.toBean(JSONObject.toJSONString(baseMessage.getData()), LoginEntity.class);
-                                    SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
-                                    DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                                    if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                                        SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
+                                        DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                                    }
                                     mController.whenLoginSuccess(LoginController.PLATFORM_QQ, loginEty);
                                     TestUtil.saveUser(loginEty);
                                 }

app/src/main/java/com/sheep/gamegroup/module/login/fragments/EditUserInfoFgt.java

@@ -180,8 +180,10 @@ public class EditUserInfoFgt extends BaseFragment {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        DataUtil.getInstance().setUserNickName(nickNameBox.getText().toString());
-                        DataUtil.getInstance().setUserAvatar(newAvatar);
+                        if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                            DataUtil.getInstance().setUserNickName(nickNameBox.getText().toString());
+                            DataUtil.getInstance().setUserAvatar(newAvatar);
+                        }
                         mController.whenEditedInfo(mLoginResult);
                     }
 

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -179,8 +179,10 @@ public class SignInFgt extends AbsLoginFgt {
                             e.printStackTrace();
                         }
                         if (loginEty != null) {
-                            SpUtils.saveToken(getActivity(), loginEty.getToken());
-                            DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                                SpUtils.saveToken(getActivity(), loginEty.getToken());
+                                DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            }
                             SpUtils.saveUp(getContext(), loginEty.getUser().getId(), passwordBox.getText().toString().trim());
                             mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
                         }
@@ -232,8 +234,10 @@ public class SignInFgt extends AbsLoginFgt {
                             e.printStackTrace();
                         }
                         if (loginEty != null) {
-                            SpUtils.saveToken(getActivity(), loginEty.getToken());
-                            DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                                SpUtils.saveToken(getActivity(), loginEty.getToken());
+                                DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            }
                             mController.whenLoginSuccess(LoginController.PLATFORM_PHONE, loginEty);
                         }
                     }

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -207,8 +207,10 @@ public class SignUpFgt extends BaseFragment {
                             e.printStackTrace();
                         }
                         if (loginEty != null) {
-                            SpUtils.saveToken(getActivity(), loginEty.getToken());
-                            DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                                SpUtils.saveToken(getActivity(), loginEty.getToken());
+                                DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            }
                             mController.whenLoginSuccess(LoginController.PLATFORM_PHONE, loginEty);
                         }
                     }
@@ -259,8 +261,10 @@ public class SignUpFgt extends BaseFragment {
                             e.printStackTrace();
                         }
                         if (loginEty != null) {
-                            SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
-                            DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                                SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
+                                DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            }
                             SpUtils.saveUp(getContext(),loginEty.getUser().getId(), passwordBox.getText().toString().trim());
                             mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
                         }

app/src/main/java/com/sheep/gamegroup/module/login/fragments/ValidCaptchaFgt.java

@@ -4,6 +4,7 @@ package com.sheep.gamegroup.module.login.fragments;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.EditText;
@@ -71,7 +72,7 @@ public class ValidCaptchaFgt extends BaseFragment {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (s!=null && s.length() == 6) {
+                if (s != null && s.length() == 6) {
                     submitCaptcha();
                 }
             }
@@ -84,7 +85,7 @@ public class ValidCaptchaFgt extends BaseFragment {
         countDownButton.click();
     }
 
-    private void submitCaptcha(){
+    private void submitCaptcha() {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("account", phoneNum);
         jsonObject.put("sec_code", captchaBox.getText().toString());
@@ -113,8 +114,10 @@ public class ValidCaptchaFgt extends BaseFragment {
                             e.printStackTrace();
                         }
                         if (loginEty != null) {
-                            SpUtils.saveToken(getActivity(), loginEty.getToken());
-                            DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
+                                SpUtils.saveToken(getActivity(), loginEty.getToken());
+                                DataUtil.getInstance().initUserEntity(loginEty.getUser());
+                            }
                             mController.whenLoginSuccess(LoginController.PLATFORM_PHONE, loginEty);
                         }
                     }
@@ -128,7 +131,7 @@ public class ValidCaptchaFgt extends BaseFragment {
         SheepApp.getInstance().getNetComponent().getApiService().getCaptcha(jsonObject)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()){
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {

app/src/main/java/com/sheep/gamegroup/util/CertificationUtil.java

@@ -113,20 +113,24 @@ public class CertificationUtil {
     }
 
     //保存当前登录用户信息到游戏sdk用户登录列表所有数据库中
-    public void addCurUserToSdkLoginUser() {
+    public void addCurUserToSdkLoginUser(String token) {
         CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
             @Override
             public void call(UserEntity userEntity) {
                 if (userEntity != null) {
-                    SdkLoginUser newSdkLoginUser = new SdkLoginUser();
-                    newSdkLoginUser.setAvatar(userEntity.getAvatar());
-                    newSdkLoginUser.setToken(SpUtils.getToken(SheepApp.getInstance()));
-                    newSdkLoginUser.setInvitation_code(userEntity.getInvitation_code());
-                    newSdkLoginUser.setNickname(userEntity.getNickname());
-                    newSdkLoginUser.setServiceName(SheepApp.getInstance().getConnectAddress().name());
-                    DDProviderHelper.getInstance().addOrUpdateSdkLoginUser(newSdkLoginUser, null);
+                    addCurUserToSdkLoginUser(token, userEntity);
                 }
             }
         });
     }
+
+    public void addCurUserToSdkLoginUser(String token, UserEntity userEntity) {
+        SdkLoginUser newSdkLoginUser = new SdkLoginUser();
+        newSdkLoginUser.setAvatar(userEntity.getAvatar());
+        newSdkLoginUser.setToken(token);
+        newSdkLoginUser.setInvitation_code(userEntity.getInvitation_code());
+        newSdkLoginUser.setNickname(userEntity.getNickname());
+        newSdkLoginUser.setServiceName(SheepApp.getInstance().getConnectAddress().name());
+        DDProviderHelper.getInstance().addOrUpdateSdkLoginUser(newSdkLoginUser, null);
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActBindMobileRegister.java

@@ -189,7 +189,7 @@ public class ActBindMobileRegister extends BaseActivity {
                         if(TextUtils.isEmpty(SheepApp.getInstance().getGameCode())){
                             Jump2View.getInstance().checkCommendApp(activity, EntityUtils.getUserCode(loginEty));
                         }else {
-                            CertificationUtil.newInstance().addCurUserToSdkLoginUser();
+                            CertificationUtil.newInstance().addCurUserToSdkLoginUser(SpUtils.getToken(ActBindMobileRegister.this));
                             CertificationUtil.newInstance().authCertificationCode(activity, SpUtils.getToken(SheepApp.getInstance()));
                         }
                         TestUtil.saveUser(loginEty);

app/src/main/java/com/sheep/gamegroup/view/activity/ActPay.java

@@ -71,7 +71,6 @@ public class ActPay extends BaseActivity {
     @Override
     protected void onCreate(Bundle b) {
         super.onCreate(b);
-        Log.e("ActPay", "Oncreate -------------");
         IpaynowPlugin.getInstance().init(this);
     }
 
@@ -166,7 +165,7 @@ public class ActPay extends BaseActivity {
     }
 
     public void tryWxOrder() {
-        SheepApp.getInstance().getNetComponent().getApiService().getPayWxParams(order_no)
+        SheepApp.getInstance().getNetComponent().getApiService().getPayWxParams(token, order_no)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
@@ -193,7 +192,7 @@ public class ActPay extends BaseActivity {
     }
 
     public void tryMiniOrder() {
-        SheepApp.getInstance().getNetComponent().getApiService().getPayIpaynowParams(order_no)
+        SheepApp.getInstance().getNetComponent().getApiService().getPayIpaynowParams(token, order_no)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

app/src/main/java/com/sheep/gamegroup/view/activity/RechargeAct.java

@@ -370,12 +370,16 @@ public class RechargeAct extends BaseActivity {
                 if ("9000".equals(result)) {
                     ApiJSONUtil.missionExecute(4);
                 }
-                if (forResult && "9000".equals(result)) {
+                if ("9000".equals(result)) {
                     Intent intent = new Intent();
                     intent.putExtra("amount", Integer.parseInt(mAmount));
                     setResult(777, intent);
                 } else {
-                    Jump2View.getInstance().goRechargeResultAct(RechargeAct.this, result);
+                    if (forResult) {
+                        Jump2View.getInstance().goRechargeResult(RechargeAct.this, result, fromPackage, null);
+                    } else {
+                        Jump2View.getInstance().goRechargeResultAct(RechargeAct.this, result);
+                    }
                 }
                 finish();
             }