修改个人中心 代码

app/src/main/AndroidManifest.xml

@@ -328,6 +328,7 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ActGuideOnHook" />
         <activity android:name="com.sheep.gamegroup.view.activity.CommitWxCodeAct" />
         <activity android:name="com.sheep.gamegroup.view.activity.ActGuideDeblocked" />
+        <activity android:name="com.sheep.gamegroup.view.activity.ReNameActivity" />
 
 
         <!--友盟start-->

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -53,6 +53,8 @@ import com.kfzs.duanduan.utils.net.APIRequestInstance;
 import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
 import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
 import com.kfzs.duanduan.view.DialogStorageLow;
+import com.sheep.gamegroup.event.UserNameChange;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -61,6 +63,7 @@ import com.zhy.http.okhttp.callback.StringCallback;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.wlf.filedownloader.FileDownloader;
@@ -108,8 +111,16 @@ public class ActMain extends BaseCompatActivity{
         mDownloadTaskService.restoreDownloadTaskStatus();
 
         initLinsener();
+
     }
 
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(UserNameChange done) {
+
+    }
+
+
     private void initLinsener() {
         findViewById(R.id.edt_main_search_enter).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -302,7 +313,6 @@ public class ActMain extends BaseCompatActivity{
                                     OkHttpUtils.get().url(url).build().execute(new StringCallback() {
                                         @Override
                                         public void onError(Call call, Exception e, int id) {
-
                                         }
 
                                         @Override

app/src/main/java/com/sheep/gamegroup/event/UserNameChange.java

@@ -0,0 +1,17 @@
+package com.sheep.gamegroup.event;
+
+/**
+ * Created by Administrator on 2018/3/26.
+ */
+
+public class UserNameChange {
+    String  nikeName;
+
+    public String getNikeName() {
+        return nikeName;
+    }
+
+    public void setNikeName(String nikeName) {
+        this.nikeName = nikeName;
+    }
+}

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

@@ -62,7 +62,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1, "网络异常");
+                            view.NetError(-1, "微信登录失败  请检查网络是否正常");
                         }
 
                         @Override
@@ -97,7 +97,7 @@ public class LoginPresenter implements LoginContract.Presenter {
 
                         @Override
                         public void onError(Throwable throwable) {
-                            view.NetError(-1, "网络异常");
+                            view.NetError(-1, "QQ登录失败  请检查网络是否正常");
                         }
 
                         @Override

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

@@ -15,6 +15,8 @@ public interface ReNameContract {
 
     interface View extends IBaseView {
        void   showTask();
+      void showDialog();
+      void hideDialog();
 
     }
 }

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

@@ -32,11 +32,10 @@ public class ReNamePresenter implements  ReNameContract.Presenter  {
 
     @Override
     public void getTask(HashMap<String, String> map) {
+        view.showDialog();
         JSONObject j = new JSONObject();
         j.put("nickname",map.get("nickname"));
 
-
-
         apiService.changeBaseInfo(j)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -44,6 +43,7 @@ public class ReNamePresenter implements  ReNameContract.Presenter  {
                     @Override
                     public void onCompleted() {
                         Log.e("onCompleted--------","onCompleted");
+
                     }
 
                     @Override

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

@@ -8,6 +8,7 @@ import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.bean.KFIntentKeys;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.model.entity.WXOnHookAccount;
 import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
 import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
@@ -21,6 +22,7 @@ import com.sheep.gamegroup.view.activity.CommitWxCodeAct;
 import com.sheep.gamegroup.view.activity.DialogActivity;
 import com.sheep.gamegroup.view.activity.LieMakeMoneyAct;
 import com.sheep.gamegroup.view.activity.LoginAct;
+import com.sheep.gamegroup.view.activity.PersionInfoAct;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.gamegroup.view.activity.PhoneAct;
 import com.sheep.gamegroup.view.activity.TaskListAct;
@@ -293,4 +295,17 @@ public class Jump2View {
         return false;
     }
 
+
+    /**
+     * 跳转到个人中心界面
+     * @param context
+     * @param o
+     */
+    public void goPersionInfo(Context context, UserInfoEntity o){
+        Intent i = new Intent(context, PersionInfoAct.class);
+        i.putExtra("info", o);
+        context.startActivity(i);
+    }
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
@@ -11,15 +12,32 @@ import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerAccountAndSercuritComponent;
 import com.sheep.gamegroup.di.modules.AccountAndSercuritModule;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.handler.UMWXHandler;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.xutils.ex.DbException;
+
+import java.util.Map;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -53,6 +71,8 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
     @Inject
     AccountAndSecuritPresenter presenter;
     UserInfoEntity mEntity;
+    @BindView(R.id.tv_submit)
+    TextView tvSubmit;
 
 
     @Override
@@ -62,13 +82,16 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void initView() {
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "账号与安全")
+                .setTitleFinish(this);
 
         DaggerAccountAndSercuritComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .accountAndSercuritModule(new AccountAndSercuritModule(this))
                 .build().inject(this);
 
-
     }
 
     @Override
@@ -81,11 +104,26 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
         presenter.getTask(null);
 
+        EventBus.getDefault().register(this);
+
+
+
     }
 
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(UserNameChange done) {
+        UserInfoEntity user=mEntity;
+        user.setNickname(done.getNikeName());
+        mEntity=user;
+        tvName.setText(mEntity.getNickname());
 
-    @OnClick({R.id.rl_phone, R.id.rl_wx, R.id.rl_auther, R.id.rl_top})
+    }
+
+
+
+
+    @OnClick({R.id.rl_phone, R.id.rl_wx, R.id.rl_auther, R.id.rl_top,R.id.tv_submit})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.rl_phone:   //跳转到绑定手机号
@@ -96,14 +134,63 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
             case R.id.rl_auther: ////跳转授权
                 break;
 
-            case  R.id.rl_top:
-                Intent i=new  Intent(AccountAndSecurityAct.this,PersionInfoAct.class);
-                i.putExtra("info",mEntity);
-                startActivity(i);
+            case R.id.rl_top:
+                Jump2View.getInstance().goPersionInfo(AccountAndSecurityAct.this,mEntity);
+                break;
+            case R.id.tv_submit:
+                loginOut();
                 break;
         }
     }
 
+    private  void  loginOut(){
+        UMShareAPI api=  UMShareAPI.get(this);
+        api.deleteOauth(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                hideProgress();
+            }
+        });
+
+        api.deleteOauth(this, SHARE_MEDIA.QQ, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                hideProgress();
+            }
+        });
+        SpUtils.login(this, "");
+        SheepApp.removeAllActivity();
+        Jump2View.getInstance().goLoginView(AccountAndSecurityAct.this,null);
+        finish();
+    }
+
+
     @Override
     public void NetSuccess(int code, String msg) {
         showToast(msg);
@@ -111,7 +198,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
     @Override
     public void NetError(int code, String errorMsg) {
-          showToast(errorMsg);
+        showToast(errorMsg);
 
     }
 
@@ -122,12 +209,12 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                mEntity=entity;
+                mEntity = entity;
                 tvName.setText(entity.getNickname());
-                tvLinkContent.setText("绵羊号:"+entity.getInvitation_code());
-                if(TextUtils.isEmpty(entity.getMobile())){
+                tvLinkContent.setText("绵羊号:" + entity.getInvitation_code());
+                if (TextUtils.isEmpty(entity.getMobile())) {
                     tvPhone.setText("未绑定");
-                }else{
+                } else {
                     tvPhone.setText(entity.getMobile());
                 }
 
@@ -136,23 +223,35 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
                         .placeholder(R.mipmap.ic_launcher)
                         .into(ivHead);
                 tvWx.setText(entity.getWx_openid());
-                boolean  isBanck=TextUtils.isEmpty(entity.getBank_card());
-                boolean  isId_number=TextUtils.isEmpty(entity.getId_number());
-                boolean  isRoalName=TextUtils.isEmpty(entity.getReal_name());
+                boolean isBanck = TextUtils.isEmpty(entity.getBank_card());
+                boolean isId_number = TextUtils.isEmpty(entity.getId_number());
+                boolean isRoalName = TextUtils.isEmpty(entity.getReal_name());
 
-                if(isBanck&&isId_number&&isRoalName){
+                if (isBanck && isId_number && isRoalName) {
                     tvAuther.setText("未认证");
-                }else if(!isBanck&&!isId_number&&!isRoalName){
+                } else if (!isBanck && !isId_number && !isRoalName) {
                     tvAuther.setText("已认证");
-                }else{
+                } else {
                     tvAuther.setText("认证中");
                 }
             }
         });
 
 
+    }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
 
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
     }
+
 }

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

@@ -103,6 +103,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
             finish();
         } else {
             Jump2View.getInstance().goPhoneLoginView(LoginAct.this, false);
+            finish();
         }
     }
 
@@ -110,6 +111,7 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
         UMShareAPI.get(this).doOauthVerify(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
             @Override
             public void onStart(SHARE_MEDIA platform) {
+                showProgress();
             }
 
             @Override

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

@@ -4,21 +4,31 @@ import android.app.AlertDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.UserInfoEntity;
 
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import butterknife.BindView;
 import butterknife.OnClick;
 
+import static com.sheep.jiuyan.samllsheep.utils.G.mUser;
+
 
 /**
  * Created by Administrator on 2018/3/16.
@@ -47,7 +57,10 @@ public class PersionInfoAct extends BaseActivity {
 
     @Override
     public void initView() {
-
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "个人资料")
+                .setTitleFinish(this);
     }
 
     @Override
@@ -73,8 +86,22 @@ public class PersionInfoAct extends BaseActivity {
             }
         }
 
+        EventBus.getDefault().register(this);
+
     }
 
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(UserNameChange done) {
+        UserInfoEntity user=mEntity;
+        user.setNickname(done.getNikeName());
+        mEntity=user;
+        tvNike.setText(mEntity.getNickname());
+
+    }
+
+
+
     private void showQR() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = View.inflate(this, R.layout.x_ask_qr_dialog, null);
@@ -103,6 +130,11 @@ public class PersionInfoAct extends BaseActivity {
         final AlertDialog dialog = builder.create();
         ImageView iv = view.findViewById(R.id.iv_close);
         ImageView iv_qr = view.findViewById(R.id.iv_qr);
+        ViewGroup.LayoutParams params = iv_qr.getLayoutParams();
+        params.height=G.WIDTH - 60;
+        params.width =G.HEIGHT / 2-20;
+        iv_qr.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        iv_qr.setLayoutParams(params);
         Glide.with(PersionInfoAct.this)
                 .load(mEntity.getAvatar())
                 .placeholder(R.mipmap.ic_launcher)
@@ -136,4 +168,10 @@ public class PersionInfoAct extends BaseActivity {
                 break;
         }
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 }

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

@@ -15,14 +15,21 @@ import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerPersonalCenterComponent;
 import com.sheep.gamegroup.di.modules.PersonalCenterModule;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.UserInfoEntity;
 import com.sheep.gamegroup.presenter.PersonalCenterContract;
 import com.sheep.gamegroup.presenter.PersonalCenterPresenter;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import javax.inject.Inject;
 
@@ -80,6 +87,12 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
                 .build()
                 .inject(this);
 
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "个人中心")
+                .setTitleFinish(this);
+
+
     }
 
     @Override
@@ -90,8 +103,12 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
     @Override
     public void initData() {
         presenter.getUserInfo();
+
     }
 
+
+
+
     @OnClick({R.id.my_price, R.id.my_all_price, R.id.withdrawal, R.id.account_safe_layout, R.id.account_task_layout, R.id.account_detail_layout})
     public void onViewClicked(View view) {
         switch (view.getId()) {

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

@@ -71,6 +71,9 @@ public class PhoneAct extends BaseActivity implements PhoneContract.View {
     private String etCode;
     private boolean showNotice = false;//false：手机登录，true：绑定手机
 
+    private int  bindPhone;
+
+
     @Override
     protected int getLayoutId() {
         return R.layout.bind_phone_number_act_layout;

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

@@ -9,12 +9,15 @@ import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerReNameComponent;
 import com.sheep.gamegroup.di.modules.ReNameModule;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.presenter.ReNameContract;
 import com.sheep.gamegroup.presenter.ReNamePresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.HashMap;
 
 import javax.inject.Inject;
@@ -45,7 +48,10 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     @Override
     public void initView() {
-
+        TitleBarUtils
+                .getInstance()
+                .setTitle(this, "修改昵称")
+                .setTitleFinish(this);
         DaggerReNameComponent.builder()
                 .netComponent(SheepApp.get(this).getNetComponent())
                 .reNameModule(new ReNameModule(this))
@@ -77,11 +83,16 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
     @Override
     public void NetSuccess(int code, String msg) {
         showToast(msg);
+        UserNameChange  name=new UserNameChange();
+        name.setNikeName(et.getText().toString());
+        EventBus.getDefault().post(name);
+        finish();
     }
 
     @Override
     public void NetError(int code, String errorMsg) {
         showToast(errorMsg);
+        hideProgress();
     }
 
     @Override
@@ -89,6 +100,16 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
 
     }
 
+    @Override
+    public void showDialog() {
+        showProgress();
+    }
+
+    @Override
+    public void hideDialog() {
+        hideProgress();
+    }
+
 
     @OnClick(R.id.tv_submit)
     public void onClick() {

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

@@ -24,7 +24,6 @@ public class BaseApplication extends KFZSApp {
         ZXingLibrary.initDisplayOpinion(this);
         UMConfigure.setLogEnabled(true);
         UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "5ab0a1da8f4a9d742900035f");
-
         UMShareAPI.get(this);
         PlatformConfig.setWeixin("wx2be7f59bb7bb963f", "6cf7ca0f6c6ac97c6961d901fee8adb9");
         PlatformConfig.setQQZone("101461115", "b874bc950bcf066f17fd52cf2bb959e9");

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

@@ -17,6 +17,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.umeng.commonsdk.UMConfigure;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -47,13 +48,22 @@ public class SheepApp extends BaseApplication {
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();
         Bugly.init(getApplicationContext(), Config.BUGLY_APPID, true);
+        initNet();
+    }
 
-        //友盟
-        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, "xxxxx");
+    public  static void  removeAllActivity(){
 
-        initNet();
+        Iterator<Map.Entry<String, Activity>> it = mActivitys.entrySet().iterator();
+        while(it.hasNext()){
+            Map.Entry<String, Activity> entry = it.next();
+             Activity a=entry.getValue();
+             a.finish();
+            it.remove();
+        }
     }
 
+
+
     private void initNet() {
         netComponent = DaggerNetComponent.builder()
                 .netModule(new NetModule())
@@ -61,8 +71,6 @@ public class SheepApp extends BaseApplication {
     }
 
     private void regWx() {
-        mWxapi = WXAPIFactory.createWXAPI(this, Config.WX_APPID);
-        mWxapi.registerApp(Config.WX_APPID);
         mActivitys = new HashMap<>();
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -16,8 +16,10 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
@@ -27,6 +29,10 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.io.IOException;
 import java.util.HashMap;
 
@@ -84,6 +90,8 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
     }
 
 
+
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -19,6 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="100dp"
+
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:text="提 现"
@@ -55,33 +56,34 @@
             android:textSize="12dp"/>
     </RelativeLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_margin="12dp"
-        android:paddingTop="15dp"
-        android:paddingRight="15dp"
-        android:paddingLeft="15dp"
-        android:paddingBottom="1dp">
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        >
         <TextView
             android:id="@+id/account_info_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="账户信息"
             android:textColor="@color/black"
+            android:layout_margin="15dp"
             android:textSize="15dp"/>
         <RelativeLayout
             android:id="@+id/account_safe_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/account_info_tv"
+            android:padding="15dp"
             android:gravity="center">
             <ImageView
                 android:id="@+id/personalcenter_item_icon_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/personalcenter_img"
+                android:src="@mipmap/x_ic_account_secuity"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
             <TextView
@@ -103,25 +105,29 @@
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="12dp"
                 android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_marginTop="25dp"
-                android:id="@+id/personalcenter_item_line"
-                android:layout_width="match_parent"
-                android:layout_height="1sp"
-                android:background="@color/white_bg_line"
-                android:layout_below="@+id/personalcenter_item_name_tv"/>
+
         </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            />
+
         <RelativeLayout
             android:id="@+id/account_task_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/account_safe_layout"
+            android:padding="15dp"
+
             android:layout_alignParentStart="true">
             <ImageView
                 android:id="@+id/tast_item_icon_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/personalcenter_img"
+                android:src="@mipmap/x_ic_task_history"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
             <TextView
@@ -143,24 +149,28 @@
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="12dp"
                 android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_marginTop="25dp"
-                android:id="@+id/tast_item_line"
-                android:layout_width="match_parent"
-                android:layout_height="1sp"
-                android:background="@color/white_bg_line"
-                android:layout_below="@+id/tast_item_name_tv"/>
+
         </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/white_bg_line"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            />
+
         <RelativeLayout
             android:id="@+id/account_detail_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/account_task_layout">
+            android:padding="15dp"
+         >
             <ImageView
                 android:id="@+id/detail_item_icon_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/personalcenter_img"
+                android:src="@mipmap/x_ic_withdrawal"
                 android:layout_marginRight="12dp"
                 android:layout_centerVertical="true"/>
             <TextView
@@ -182,15 +192,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_marginLeft="12dp"
                 android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_marginTop="25dp"
-                android:id="@+id/detail_item_line"
-                android:layout_width="match_parent"
-                android:layout_height="1sp"
-                android:background="@color/transparent"
-                android:layout_below="@+id/detail_item_name_tv"
-                android:visibility="visible"/>
+
         </RelativeLayout>
-    </RelativeLayout>
+    </LinearLayout>
 
 </LinearLayout>

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

@@ -78,7 +78,7 @@
         >
         <ImageView
             android:id="@+id/iv_phone"
-            android:layout_width="wrap_content"
+            android:layout_width="40dp"
             android:layout_height="wrap_content"
             android:background="@null"
             android:src="@mipmap/x_ic_phone"
@@ -101,7 +101,6 @@
             android:id="@+id/tv_phone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="13658025248"
             style="@style/hint_txt_style"
             android:layout_marginLeft="5dp"
             android:layout_centerVertical="true"
@@ -130,7 +129,7 @@
         >
         <ImageView
             android:id="@+id/iv_wx"
-            android:layout_width="wrap_content"
+            android:layout_width="40dp"
             android:layout_height="wrap_content"
             android:background="@null"
             android:src="@mipmap/x_ic_weixin"
@@ -153,7 +152,6 @@
             android:id="@+id/tv_wx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="小河里翻大浪"
             style="@style/hint_txt_style"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
@@ -179,7 +177,7 @@
         >
         <ImageView
             android:id="@+id/iv_auther"
-            android:layout_width="wrap_content"
+            android:layout_width="40dp"
             android:layout_height="wrap_content"
             android:background="@null"
             android:src="@mipmap/x_ic_id_card"
@@ -212,22 +210,25 @@
             />
     </RelativeLayout>
 
+
+
+
+
+</LinearLayout>
+
+
     <TextView
         android:id="@+id/tv_submit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="40dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
         android:background="@drawable/selector_button_full_main"
         android:gravity="center"
         android:padding="@dimen/content_padding_10"
         android:text="退出登录"
         android:textColor="@color/txt_black_010101"
         android:textSize="@dimen/text_size_18" />
-
-
-
-</LinearLayout>
 </LinearLayout>

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/bg_gray"
+    android:background="@color/white_light"
     android:scrollbars="none"
     >
 
@@ -20,7 +20,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:orientation="vertical"
         >
@@ -209,7 +209,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="100dp"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:orientation="horizontal"
         >
@@ -286,7 +286,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:orientation="vertical"
         android:padding="15dp"

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

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-
     android:layout_marginLeft="20dp"
     android:layout_marginRight="20dp"
     android:layout_marginBottom="20dp"

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

@@ -3,14 +3,14 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
-              android:background="@color/bg_gray"
+    android:background="@color/white_light"
     android:baselineAligned="false">
     <include layout="@layout/title"></include>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="@drawable/x_ll_bg"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
         android:padding="10dp"
         android:orientation="vertical"
@@ -29,8 +29,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_margin="10dp"
+
         android:layout_marginTop="30dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
         android:background="@drawable/selector_button_full_main"
         android:gravity="center"
         android:padding="@dimen/content_padding_10"

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/bg_gray"
+    android:background="@color/white_light"
     >
         <include
             layout="@layout/title"/>
@@ -12,7 +12,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
-            android:background="@drawable/x_ll_bg"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:layout_margin="10dp"
             >
 
@@ -40,10 +40,11 @@
 
                 <ImageView
                     android:id="@+id/iv_head_right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:background="@null"
                     android:src="@mipmap/ic_launcher"
+                    android:scaleType="centerInside"
                     android:layout_toLeftOf="@id/tv_more"
                     android:layout_centerVertical="true"
 
@@ -56,7 +57,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:background="@drawable/x_ll_bg"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
             >
@@ -65,7 +66,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="15dp"
-                    android:background="@drawable/x_ll_bg"
+
                     android:layout_margin="10dp"
                     >
 
@@ -117,7 +118,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="15dp"
-                    android:background="@drawable/x_ll_bg"
                     android:layout_margin="10dp"
                     >
 
@@ -156,7 +156,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="15dp"
-                    android:background="@drawable/x_ll_bg"
+
                     android:layout_margin="10dp"
                     android:id="@+id/rl_qr"
                     >