update for realname, mobile etc

app/src/main/java/com/sheep/gamegroup/IBase/IBasePresenter.java

@@ -8,6 +8,6 @@ import java.util.HashMap;
 
 public interface IBasePresenter {
 
-    void getTask(HashMap<String, String> map);
+    void getTask(String token, HashMap<String, String> map);
 
 }

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

@@ -306,6 +306,9 @@ public interface ApiService {
     @GET(ApiKey.withdraw)
     Observable<BaseMessage> goWithdrawal(@Query("page") int page, @Query("per_page") int per_page, @Query("start_time") String start_time, @Query("end_time") String end_time);
 
+    @GET(ApiKey.withdraw)
+    Observable<BaseMessage> goWithdrawal(@Header("Authorization") String token, @Query("page") int page, @Query("per_page") int per_page, @Query("start_time") String start_time, @Query("end_time") String end_time);
+
 
     /**
      * 微信登录
@@ -370,20 +373,20 @@ public interface ApiService {
      * 更换手机号
      */
     @POST("app/user/switch_phone")
-    Observable<BaseMessage> switchPhone(@Body JSONObject jsonObject);
+    Observable<BaseMessage> switchPhone(@Header("Authorization") String token, @Body JSONObject jsonObject);
 
 
     /**
      * 更换手机号
      */
     @PUT("app/user/bind_all_real_info")
-    Observable<BaseMessage> bindALl(@Body JSONObject jsonObject);
+    Observable<BaseMessage> bindAll(@Header("Authorization") String token, @Body JSONObject jsonObject);
 
     /**
      * 绑定手机号
      */
     @PUT("app/user/bind_mobile")
-    Observable<BaseMessage> bindPhone(@Body JSONObject jsonObject);
+    Observable<BaseMessage> bindPhone(@Header("Authorization") String token, @Body JSONObject jsonObject);
 
     /**
      * 实时动态
@@ -395,7 +398,7 @@ public interface ApiService {
      * 发送绑定手机号短信，只传mobile
      */
     @POST("app/user/sms_for_bind_mobile")
-    Observable<BaseMessage> smsBindMobile(@Body JSONObject jsonObject);
+    Observable<BaseMessage> smsBindMobile(@Header("Authorization") String token, @Body JSONObject jsonObject);
 
     /**
      * 使用第三方登录时，未找到该qq对应的账号，不再直接创建账号，会先绑定手机号来注册新账号
@@ -540,7 +543,7 @@ public interface ApiService {
      * 充值记录
      */
     @GET(ApiKey.recharge_balance_log)
-    Observable<BaseMessage> getRechargeBalanceLog(@Query("page") int page, @Query("per_page") int per_page);
+    Observable<BaseMessage> getRechargeBalanceLog(@Header("Authorization") String token, @Query("page") int page, @Query("per_page") int per_page);
 
     /**
      * 充值q币记录
@@ -848,7 +851,7 @@ public interface ApiService {
      * 收支明细
      */
     @GET(ApiKey.recharge_log)
-    Observable<BaseMessage> getRechargeLog(@Query("page") int page, @Query("per_page") int per_page, @Query("type") int type);
+    Observable<BaseMessage> getRechargeLog(@Header("Authorization") String token, @Query("page") int page, @Query("per_page") int per_page, @Query("type") int type);
 
 
     /**

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

@@ -294,6 +294,11 @@ public class LoginAct extends BaseUMActivity implements LoginController {
                 String face = data.getStringExtra("face");
                 CertificationUtil.newInstance().authCertificationCode(this, token, face);
             }
+        } else if (requestCode == Constant.INTENT_REAL_NAME || requestCode == Constant.INTENT_BIND_MOBILE) {
+            if (resultCode == RESULT_OK) {
+                String token = data.getStringExtra("token");
+                CertificationUtil.newInstance().authCertificationCode(this, token, null);
+            }
         } else {
             getLastFragment().onActivityResult(requestCode, resultCode, data);
         }

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtRechargeBalanceLog.java

@@ -23,6 +23,14 @@ import io.reactivex.Observable;
  * realicing@sina.com
  */
 public class FgtRechargeBalanceLog extends BaseListFragment3<RechargeBalanceLog> {
+
+    private String token;
+
+    public FgtRechargeBalanceLog setToken(String t){
+        token = t;
+        return this;
+    }
+
     @Override
     public void initView() {
         super.initView();
@@ -48,7 +56,7 @@ public class FgtRechargeBalanceLog extends BaseListFragment3<RechargeBalanceLog>
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.getRechargeBalanceLog(page, per_page);
+        return apiService.getRechargeBalanceLog(token, page, per_page);
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtRechargeLog.java

@@ -39,6 +39,13 @@ public class FgtRechargeLog extends BaseListFragment3<RechargeLog> {
     int type = 0;
     private List<ILog> logList = new ArrayList<>();
 
+    private String token;
+
+    public FgtRechargeLog setToken(String t) {
+        token = t;
+        return this;
+    }
+
     @Override
     public void initView() {
         super.initView();
@@ -79,7 +86,7 @@ public class FgtRechargeLog extends BaseListFragment3<RechargeLog> {
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.getRechargeLog(page, per_page, type);
+        return apiService.getRechargeLog(token, page, per_page, type);
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtWithdraw.java

@@ -23,6 +23,14 @@ import io.reactivex.Observable;
  * realicing@sina.com
  */
 public class FgtWithdraw extends BaseListFragment3<WithdrawalEty> {
+
+    private String token;
+
+    public FgtWithdraw setToken(String t){
+        token = t;
+        return this;
+    }
+
     @Override
     public void initView() {
         super.initView();
@@ -53,7 +61,7 @@ public class FgtWithdraw extends BaseListFragment3<WithdrawalEty> {
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.goWithdrawal(page, per_page,"",System.currentTimeMillis()+"");
+        return apiService.goWithdrawal(token, page, per_page,"",System.currentTimeMillis()+"");
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/presenter/PhoneContract.java

@@ -17,9 +17,9 @@ public interface PhoneContract {
         boolean getCaptchaa(String telphone) throws JSONException;
         void loginByCaptcha(String telphone, String code);
 
-        void switchPhone(JSONObject object);
-        void bindPhone(JSONObject object);
-        void smsBindMobile(JSONObject object);
+        void switchPhone(String token, JSONObject object);
+        void bindPhone(String token, JSONObject object);
+        void smsBindMobile(String token, JSONObject object);
     }
 
     interface View{

app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -132,8 +132,8 @@ public class PhonePresenter implements PhoneContract.Presenter {
     }
 
     @Override
-    public void switchPhone(JSONObject object) {
-        apiService.switchPhone(object)
+    public void switchPhone(String token, JSONObject object) {
+        apiService.switchPhone(token, object)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
@@ -150,8 +150,8 @@ public class PhonePresenter implements PhoneContract.Presenter {
     }
 
     @Override
-    public void bindPhone(JSONObject object) {
-        apiService.bindPhone(object)
+    public void bindPhone(String token, JSONObject object) {
+        apiService.bindPhone(token, object)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
@@ -168,8 +168,8 @@ public class PhonePresenter implements PhoneContract.Presenter {
     }
 
     @Override
-    public void smsBindMobile(JSONObject object) {
-        apiService.smsBindMobile(object)
+    public void smsBindMobile(String token, JSONObject object) {
+        apiService.smsBindMobile(token, object)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

app/src/main/java/com/sheep/gamegroup/presenter/ReNamePresenter.java

@@ -29,7 +29,7 @@ public class ReNamePresenter implements  ReNameContract.Presenter  {
     }
 
     @Override
-    public void getTask(HashMap<String, String> map) {
+    public void getTask(String token, HashMap<String, String> map) {
         view.showDialog();
         JSONObject j = new JSONObject();
         j.put("nickname",map.get("nickname"));

app/src/main/java/com/sheep/gamegroup/presenter/RealNameAutherPresenter.java

@@ -30,7 +30,7 @@ public class RealNameAutherPresenter implements  RealNameAutherContract.Presente
     }
 
     @Override
-    public void getTask(HashMap<String, String> map) {
+    public void getTask(String token, HashMap<String, String> map) {
        JSONObject  jsonObject=new JSONObject();
         Iterator map1it=map.entrySet().iterator();
         for(String key:map.keySet())
@@ -38,7 +38,7 @@ public class RealNameAutherPresenter implements  RealNameAutherContract.Presente
             jsonObject.put(key,map.get(key));
         }
         view.showGoProgress();
-        apiService.bindALl(jsonObject).subscribeOn(Schedulers.io())
+        apiService.bindAll(token, jsonObject).subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override

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

@@ -128,9 +128,9 @@ public class CertificationUtil {
                         } else if (baseMessage.getCode() == 404000023) {
                             Jump2View.getInstance().goFaceWithQR(activity, Constant.INTENT_DETECT_FACE, token, "auth");
                         } else if (baseMessage.getCode() == 404000024) {
-                            G.showToast(baseMessage);
+                            Jump2View.getInstance().goBindMobile(activity, token);
                         } else if (baseMessage.getCode() == 404000025) {
-                            G.showToast(baseMessage);
+                            Jump2View.getInstance().goAuthRealname(activity, token);
                         } else if (baseMessage.getCode() == 404000033) {
                             G.showToast(baseMessage);
                         } else {

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

@@ -1470,9 +1470,9 @@ public class CommonUtil {
                             Jump2View.getInstance().goFaceWithQR(activity, Constant.INTENT_DETECT_FACE, token, "check");
                             return;
                         } else if (baseMessage.getCode() == 404000024) {
-                            G.showToast(baseMessage);
+                            Jump2View.getInstance().goBindMobile(activity, token);
                         } else if (baseMessage.getCode() == 404000025) {
-                            G.showToast(baseMessage);
+                            Jump2View.getInstance().goAuthRealname(activity, token);
                         } else if (baseMessage.getCode() == 404000033) {
                             G.showToast(baseMessage);
                         }

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

@@ -8,4 +8,6 @@ public class Constant {
     public final static int INTENT_CAPTURE_QRCODE = 1005;
     public final static int INTENT_QRCODE_DATA = 1006;
     public final static int INTENT_SHOW_QRCODE = 1007;
+    public final static int INTENT_REAL_NAME = 1008;
+    public final static int INTENT_BIND_MOBILE = 1009;
 }

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

@@ -329,6 +329,7 @@ public class Jump2View {
      * @param from
      */
     public synchronized void goLoginView(Context context, String from) {
+        SheepApp.getInstance().clearGameAuthData();
         Intent intent = new Intent(context, LoginAct.class);
         intent.putExtra("where_from", from);
         if (!(context instanceof Activity)) {
@@ -882,6 +883,18 @@ public class Jump2View {
         activity.startActivityForResult(in, Constant.INTENT_DETECT_FACE);
     }
 
+    public void goAuthRealname(Activity activity, String token) {
+        Intent in = new Intent(activity, RealNameAuthenAct.class);
+        in.putExtra("token", token);
+        activity.startActivityForResult(in, Constant.INTENT_REAL_NAME);
+    }
+
+    public void goBindMobile(Activity activity, String token) {
+        Intent in = new Intent(activity, ChangeTelAct.class);
+        in.putExtra("token", token);
+        activity.startActivityForResult(in, Constant.INTENT_BIND_MOBILE);
+    }
+
     /**
      * 跳转到非wifi网络提示
      *
@@ -2186,8 +2199,11 @@ public class Jump2View {
     /**
      * 进入礼包中心界面
      */
-    public void goGiftCenter(Activity activity) {
+    public void goGiftCenter(Activity activity, boolean... flags) {
         Intent intent = new Intent(activity, ActGiftCenter.class);
+        if (flags != null && flags.length > 0) {
+            intent.putExtra("showMine", flags[0]);
+        }
         activity.startActivity(intent);
         GAME_GIFT_CENTER.onEvent();
     }
@@ -2208,8 +2224,11 @@ public class Jump2View {
     /**
      * 进入我的礼包界面
      */
-    public void goMyWelfare(Activity activity) {
+    public void goMyWelfare(Activity activity, boolean... flags) {
         Intent intent = new Intent(activity, ActMyWelfare.class);
+        if (flags != null && flags.length > 0 && flags[0]) {
+            intent.putExtra("showCenter", true);
+        }
         activity.startActivity(intent);
         GAME_MY_WELFARE.onEvent();
     }

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

@@ -6,6 +6,7 @@ import android.support.v4.app.FragmentTransaction;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.view.fragment.FgtGiftCenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -28,7 +29,7 @@ public class ActGiftCenter extends BaseActivity {
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitle(this, "礼包中心")
-                .setRightImgBotton(this, R.drawable.index_search, (v)->{
+                .setRightImgBotton(this, R.drawable.index_search, (v) -> {
                     Jump2View.getInstance().goActSearch(this);
                 })
                 .setTitleFinish(this);
@@ -36,12 +37,12 @@ public class ActGiftCenter extends BaseActivity {
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         Bundle bundle = new Bundle();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
-        if(fragment == null){
-            fragment = new FgtGiftCenter();
+        if (fragment == null) {
+            fragment = new FgtGiftCenter().setShowMine(getIntent().getBooleanExtra("showMine", true));
             fragment.setArguments(bundle);
             transaction.add(R.id.frame_container, fragment, "tag");
             transaction.commitAllowingStateLoss();
-        }else {
+        } else {
             fragment.setArguments(bundle);
             transaction.replace(R.id.frame_container, fragment);
             transaction.commitAllowingStateLoss();

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

@@ -91,10 +91,17 @@ public class ActMyMoney extends BaseActivity {
 
     private TitleFragmentListAdapter mAdapter;
 
+    private String foreignToken;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         StatusBarUtils.setTranslucent(this);
         super.onCreate(savedInstanceState);
+        if (getIntent().hasExtra("token")) {
+            foreignToken = getIntent().getStringExtra("token");
+        } else {
+            foreignToken = SpUtils.getToken(this);
+        }
     }
 
     @Override
@@ -111,9 +118,9 @@ public class ActMyMoney extends BaseActivity {
                 .setTitleFinish(this);
         //顶部背景添加弧度
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(new FgtRechargeLog(), tabNames[0]);
-        mAdapter.add(new FgtRechargeBalanceLog(), tabNames[1]);
-        mAdapter.add(new FgtWithdraw(), tabNames[2]);
+        mAdapter.add(new FgtRechargeLog().setToken(foreignToken), tabNames[0]);
+        mAdapter.add(new FgtRechargeBalanceLog().setToken(foreignToken), tabNames[1]);
+        mAdapter.add(new FgtWithdraw().setToken(foreignToken), tabNames[2]);
         for (int i = 0; i < mAdapter.getCount(); i++) {
             Fragment fragment = mAdapter.getItem(i);
             if (fragment instanceof BaseRefreshLoadMoreFragment) {
@@ -292,6 +299,21 @@ public class ActMyMoney extends BaseActivity {
             showProgress();
             resetData();
         }
+        if (TextUtils.isEmpty(foreignToken)) {
+            loadAssets(showProgress);
+        } else {
+            CommonUtil.getInstance().checkAuth(foreignToken, ret -> {
+                if (ret) {
+                    loadAssets(showProgress);
+                } else {
+                    G.showToast("授权错误");
+                    finish();
+                }
+            });
+        }
+    }
+
+    private void loadAssets(boolean showProgress) {
         SheepApp.getInstance().getNetComponent().getApiService().getMyAssets()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

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

@@ -5,6 +5,7 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -26,6 +27,7 @@ public class ActMyWelfare extends BaseActivity {
     TabLayout indicator;
     @BindView(R.id.pager)
     ViewPager pager;
+
     @Override
     protected int getLayoutId() {
         return R.layout.common_tab_vp;
@@ -39,13 +41,16 @@ public class ActMyWelfare extends BaseActivity {
                 .setShowOrHide(this, true)
                 .setTitle(this, "我的礼包")
                 .setTitleFinish(this);
-
+        if (getIntent().hasExtra("showCenter") && getIntent().getBooleanExtra("showCenter", false)) {
+            TitleBarUtils.getInstance().setRightBtn(this, "礼包中心", 0, v -> Jump2View.getInstance().goGiftCenter(this, false));
+        }
     }
 
     private Activity activity;
 
 
     private TitleFragmentListAdapter mAdapter;
+
     @Override
     public void initListener() {
         indicator.setVisibility(View.GONE);

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

@@ -14,6 +14,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerChangePhoneComponent;
 import com.sheep.gamegroup.di.modules.PhoneModule;
+import com.sheep.gamegroup.greendao.DDProviderHelper;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.presenter.PhoneContract;
 import com.sheep.gamegroup.presenter.PhonePresenter;
@@ -24,6 +26,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -70,6 +73,17 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
     @BindView(R.id.code_icon_iv)
     ImageView code_icon_iv;
 
+    @BindView(R.id.game_account_layout)
+    View game_account_layout;
+    @BindView(R.id.face_view)
+    ImageView face_view;
+    @BindView(R.id.nickname_view)
+    TextView nickname_view;
+    @BindView(R.id.loginname_view)
+    TextView loginname_view;
+    @BindView(R.id.number_view)
+    TextView number_view;
+
     @Inject
     PhonePresenter presenter;
 
@@ -85,6 +99,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
     private String hitStr = "请输入手机号";
     private String noticeStr = "绑定手机号";
     String mobiles;
+    private String foreignToken;
 
     //验证码倒计时
     private SelfCountDownTimer selfCountDownTimer;
@@ -114,6 +129,17 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                 .build()
                 .inject(this);
         where_from = getIntent().getIntExtra("where_from", 0);
+        if (getIntent().hasExtra("token")) {
+            foreignToken = getIntent().getStringExtra("token");
+            ViewUtil.setVisibility(game_account_layout, true);
+            SdkLoginUser gameUser = DDProviderHelper.getInstance().getSdkLoginUser(foreignToken);
+            ViewUtil.setText(nickname_view, gameUser.getNickname());
+            ViewUtil.setText(loginname_view, gameUser.getLoginname());
+            ViewUtil.setText(number_view, gameUser.getInvitation_code());
+            ViewUtil.setAvatar(face_view, gameUser.getAvatar());
+        } else {
+            ViewUtil.setVisibility(game_account_layout, false);
+        }
         TitleBarUtils titleBarUtils = TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitle(this, noticeStr)
@@ -126,10 +152,10 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
         int skip_login = SpUtils.getOrder(SpUtils.SKIP_LOGIN_FLAG);
         switch (where_from) {
             case FROM_SPLASH://非第一次登录(如：登录后直接重启)，老用户需要绑定手机号
-                if(skip_login == 1){
+                if (skip_login == 1) {
 
                     startMainAct();
-                }else {
+                } else {
                     titleBarUtils.setRightBtn(this, "跳过", 0, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
@@ -142,10 +168,10 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
 
                 break;
             case FROM_LOGIN://用户可以跳过
-                if(skip_login == 1){
+                if (skip_login == 1) {
 
                     startMainAct();
-                }else {
+                } else {
                     titleBarUtils.setRightBtn(this, "跳过", 0, new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
@@ -272,7 +298,11 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                     selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("mobile", mobile + "");
-                    presenter.smsBindMobile(jsonObject);
+                    if (TextUtils.isEmpty(foreignToken)) {
+                        presenter.smsBindMobile(SpUtils.getToken(ChangeTelAct.this), jsonObject);
+                    } else {
+                        presenter.smsBindMobile(foreignToken, jsonObject);
+                    }
                     canGetCaptchaPhone = false;
                     selfCountDownTimer.start();
                     return;
@@ -293,7 +323,11 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("mobile", mobile + "");
                     jsonObject.put("sec_code", sec_code + "");
-                    presenter.bindPhone(jsonObject);
+                    if (TextUtils.isEmpty(foreignToken)) {
+                        presenter.bindPhone(SpUtils.getToken(ChangeTelAct.this), jsonObject);
+                    } else {
+                        presenter.bindPhone(foreignToken, jsonObject);
+                    }
                     return;
                 }
                 step = 4;
@@ -349,7 +383,11 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                 jsonObject.put("mobile", mobile + "");
                 break;
         }
-        presenter.switchPhone(jsonObject);
+        if (TextUtils.isEmpty(foreignToken)) {
+            presenter.switchPhone(SpUtils.getToken(ChangeTelAct.this), jsonObject);
+        } else {
+            presenter.switchPhone(foreignToken, jsonObject);
+        }
     }
 
     @Override
@@ -391,7 +429,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
                 case 4:
                     G.showToast(o);
                     CommonUtil.getInstance().updateUserInfo(userEntity -> {
-                        if(userEntity == null){
+                        if (userEntity == null) {
                             DataUtil.getInstance().setChange(true);
                         }
                         finish();
@@ -460,7 +498,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View {
 
     @Override
     public void bindTelSmsFail(BaseMessage o) {
-        if(TestUtil.isDev()){
+        if (TestUtil.isDev()) {
             mobile = "13880742867";
             step = 4;
             changeTelSuccess(o);

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

@@ -207,6 +207,12 @@ public class GameCertificationActivity extends BaseActivity {
             } else {
                 CertificationUtil.newInstance().authCertificationCode(GameCertificationActivity.this, token, face);
             }
+        } else if ((requestCode == Constant.INTENT_REAL_NAME || requestCode == Constant.INTENT_BIND_MOBILE) && resultCode == RESULT_OK && data != null) {
+            CommonUtil.getInstance().checkAuth(this, gameToken, null, (ret) -> {
+                if (ret) {
+                    CertificationUtil.newInstance().doCertification(GameCertificationActivity.this, gameToken, packageName, "validate");
+                }
+            });
         }
     }
 

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

@@ -135,7 +135,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
         }
         HashMap<String,String>  map=new HashMap<>();
         map.put("nickname", et.getText().toString());
-        presenter.getTask(map);
+        presenter.getTask(null, map);
 
     }
 }

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

@@ -4,13 +4,17 @@ import android.content.Intent;
 import android.support.annotation.IntDef;
 import android.text.TextUtils;
 import android.view.Gravity;
+import android.view.TextureView;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerRealNameAutherComponent;
 import com.sheep.gamegroup.di.modules.RealNameAutherModule;
+import com.sheep.gamegroup.greendao.DDProviderHelper;
+import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.RealNameAutherContract;
@@ -25,6 +29,7 @@ import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.lang.annotation.Retention;
@@ -54,6 +59,17 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     @BindView(R.id.et_name)
     EditText etName;
 
+    @BindView(R.id.game_account_layout)
+    View game_account_layout;
+    @BindView(R.id.face_view)
+    ImageView face_view;
+    @BindView(R.id.nickname_view)
+    TextView nickname_view;
+    @BindView(R.id.loginname_view)
+    TextView loginname_view;
+    @BindView(R.id.number_view)
+    TextView number_view;
+
     UserEntity userEntity;
     @Inject
     RealNameAutherPresenter presenter;
@@ -64,6 +80,8 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
 
     private int count = 0;
 
+    private String foreignToken;
+
     @Override
     protected int getLayoutId() {
         return R.layout.x_real_name_auther_layout;
@@ -71,18 +89,30 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
 
     @Override
     public void initView() {
-
+        if (getIntent().hasExtra("token")) {
+            foreignToken = getIntent().getStringExtra("token");
+            ViewUtil.setVisibility(game_account_layout, true);
+            SdkLoginUser gameUser = DDProviderHelper.getInstance().getSdkLoginUser(foreignToken);
+            ViewUtil.setText(nickname_view, gameUser.getNickname());
+            ViewUtil.setText(loginname_view, gameUser.getLoginname());
+            ViewUtil.setText(number_view, gameUser.getInvitation_code());
+            ViewUtil.setAvatar(face_view, gameUser.getAvatar());
+        } else {
+            ViewUtil.setVisibility(game_account_layout, false);
+        }
     }
 
     @Override
-    protected boolean showWhiteStatusBar(){
+    protected boolean showWhiteStatusBar() {
         return true;
     }
 
     @Override
     public void initListener() {
     }
+
     public static final int MAX_COUNT = 2;//修改为只验证身份证与姓名
+
     @Override
     public void initData() {
         DaggerRealNameAutherComponent.builder().netComponent(SheepApp.getInstance().getNetComponent()).realNameAutherModule(new RealNameAutherModule(this)).build().inject(this);
@@ -99,7 +129,7 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
         }
         tvSubmit.setVisibility(View.GONE);
         userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null){
+        if (userEntity != null) {
             if (!TextUtils.isEmpty(RealNameAuthenAct.this.userEntity.getReal_name())) {
                 etName.setText(RealNameAuthenAct.this.userEntity.getReal_name());
                 count = count + 1;
@@ -139,23 +169,30 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     public void NetSuccess(int code, String msg, String string) {
         hideProgress();
         G.showToast(msg);
-        CommonUtil.getInstance().updateUserInfo(result -> {
-            if (result == null) {
-                DataUtil.getInstance().setChange(true);
-            } else {
-                userEntity = result;
-            }
-            switch (willGoWhere){
-                case GO_WITHDRAWAL:
-                    Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this);
-                    finish();
-                    break;
-                case ONLY_FINISH:
-                default:
-                    finish();
-                    break;
-            }
-        });
+        if (TextUtils.isEmpty(foreignToken)) {
+            CommonUtil.getInstance().updateUserInfo(result -> {
+                if (result == null) {
+                    DataUtil.getInstance().setChange(true);
+                } else {
+                    userEntity = result;
+                }
+                switch (willGoWhere) {
+                    case GO_WITHDRAWAL:
+                        Jump2View.getInstance().goWithdrawal(RealNameAuthenAct.this);
+                        finish();
+                        break;
+                    case ONLY_FINISH:
+                    default:
+                        finish();
+                        break;
+                }
+            });
+        } else {
+            Intent result = new Intent();
+            result.putExtra("token", foreignToken);
+            setResult(RESULT_OK, result);
+            finish();
+        }
     }
 
     @Override
@@ -250,7 +287,11 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
                     public void onClick(View view) {
                         if (userEntity != null)
                             userEntity.setCertification_count(userEntity.getCertification_count() + 1);
-                        presenter.getTask(map);
+                        if (TextUtils.isEmpty(foreignToken)) {
+                            presenter.getTask(SpUtils.getToken(RealNameAuthenAct.this), map);
+                        } else {
+                            presenter.getTask(foreignToken, map);
+                        }
                         UMConfigUtils.onEvent(UMConfigUtils.Event.USER_AUTHENTICATION);
                     }
                 }));
@@ -261,9 +302,11 @@ public class RealNameAuthenAct extends BaseActivity implements RealNameAutherCon
     public void showGoProgress() {
         showProgress();
     }
+
     public static final String KEY_WILL_GO_WHERE = "will_go_where";
     public static final int ONLY_FINISH = 0;//直接finish
     public static final int GO_WITHDRAWAL = 1;//跳转提现界面
+
     @IntDef({ONLY_FINISH, GO_WITHDRAWAL})
     @Retention(RetentionPolicy.SOURCE)
     public @interface WILL_GO_WHERE {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGiftCenter.java

@@ -11,6 +11,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GiftBagApp;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.WelfareAdapter;
 import com.sheep.gamegroup.view.adapter.GiftCenterAdapter;
 import com.sheep.jiuyan.samllsheep.R;
@@ -29,6 +30,13 @@ import rx.functions.Action1;
  */
 public class FgtGiftCenter extends BaseListFragment2<GiftBagApp> implements Action1<Integer> {
 
+    private boolean showMine = true;
+
+    public FgtGiftCenter setShowMine(boolean sm) {
+        showMine = sm;
+        return this;
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.fgt_download_welfare_list;
@@ -37,10 +45,11 @@ public class FgtGiftCenter extends BaseListFragment2<GiftBagApp> implements Acti
     @Override
     public void initView() {
         super.initView();
-//        wc_gift_center_title_container = findViewById(R.id.wc_gift_center_title_container);
         View wc_all_gift = findViewById(R.id.wc_all_gift);
         wc_all_gift.setOnClickListener(view -> Jump2View.getInstance().goMyWelfare(getActivity()));
+        ViewUtil.setVisibility(wc_all_gift, showMine);
     }
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -641,7 +641,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 Jump2View.getInstance().gotoYYShopAssist(getContext());
                 break;
             case R.id.fgt_pc_item_gift_ll:
-                Jump2View.getInstance().goMyWelfare(getActivity());
+                Jump2View.getInstance().goMyWelfare(getActivity(), true);
                 break;
             case R.id.fgt_person_center_cart:
                 Jump2View.getInstance().goActMyCart();

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -159,6 +159,14 @@ public class SheepApp extends MultiDexApplication {
         isShowQB = showQB;
     }
 
+    public void clearGameAuthData(){
+        gameId = null;
+        gameCode = null;
+        wlan = null;
+        needFace=false;
+        gamePackgeName = null;
+    }
+
     public ConnectAddress getConnectAddress() {
         return connectAddress;
     }

app/src/main/res/layout/change_tel_layout.xml

@@ -16,6 +16,14 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <include
+                layout="@layout/game_account_layout"
+                android:layout_margin="@dimen/content_padding_10"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            </include>
+
             <LinearLayout
                 android:id="@+id/show_change_layout"
                 android:layout_width="match_parent"

app/src/main/res/layout/game_account_layout.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/game_account_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/tip_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="关联的游戏账号"
+        android:textColor="@color/black_333333"
+        android:textSize="16sp" />
+
+    <ImageView
+        android:id="@+id/face_view"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_below="@+id/tip_view"
+        android:layout_marginTop="8dp"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/ic_assist" />
+
+    <TextView
+        android:id="@+id/nickname_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/face_view"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="6dp"
+        android:layout_toRightOf="@+id/face_view"
+        android:text="Kevin"
+        android:textColor="@color/black_333333"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/loginname_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/face_view"
+        android:layout_marginLeft="8dp"
+        android:layout_marginBottom="6dp"
+        android:layout_toRightOf="@+id/face_view"
+        android:text="sfadljf"
+        android:textColor="@color/black_333333"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/number_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/nickname_view"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_toRightOf="@+id/nickname_view"
+        android:text="(12312312)"
+        android:textColor="@color/black_333333"
+        android:textSize="12sp" />
+
+</RelativeLayout>

app/src/main/res/layout/x_real_name_auther_layout.xml

@@ -29,6 +29,16 @@
             android:textSize="14sp" />
     </LinearLayout>
 
+    <include
+        layout="@layout/game_account_layout"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:layout_marginStart="@dimen/content_padding_10"
+        android:layout_marginTop="@dimen/content_padding_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </include>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"