person center refact

app/src/main/java/com/sheep/gamegroup/di/modules/NetModule.java

@@ -49,8 +49,8 @@ public class NetModule {
     public Retrofit provideRetrofit(OkHttpClient okhttpClient) {
         Retrofit retrofit = new Retrofit.Builder()
                 .client(okhttpClient)
-                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
-//                .baseUrl("http://ss.17xmy.com/v1/")
+//                .baseUrl(SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/")
+                .baseUrl("http://ss.17xmy.com/v1/")
 //                .baseUrl("http://10.8.220.239:8080/v1/")
 //                .baseUrl("http://10.8.240.193:8080/v1/")
                 .addConverterFactory(StringConverterFactory.create())

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

@@ -845,7 +845,7 @@ public interface ApiService {
      * 收支明细
      */
     @GET(ApiKey.recharge_log)
-    Observable<BaseMessage> getRechargeLog(@Query("page") int page, @Query("per_page") int per_page);
+    Observable<BaseMessage> getRechargeLog(@Query("page") int page, @Query("per_page") int per_page, @Query("type") int type);
 
 
     /**

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtMainHeader.java

@@ -117,7 +117,13 @@ public class FgtMainHeader extends BaseFragment {
 
     private void showUserProfile() {
         GlideImageLoader.setAvatar(iv_user_face, user.getAvatar(), Color.argb(128, 255, 255, 255));
-        ViewUtil.setVisibility(iv_flag_vip, user.isVIP());
+        if(iv_flag_vip!=null) {
+            if (user.isVIP()) {
+                iv_flag_vip.setImageResource(R.mipmap.level_vip);
+            } else{
+                iv_flag_vip.setImageResource(R.mipmap.level_vip_un);
+            }
+        }
         ViewUtil.setText(tv_nickname, user.getNickname());
     }
 

app/src/main/java/com/sheep/gamegroup/module/personal/adapter/AdpILog.java

@@ -39,11 +39,7 @@ public class AdpILog extends BaseQuickAdapter<ILog, BaseViewHolder> {
     @Override
     protected void convert(BaseViewHolder helper, ILog item) {
         View convertView = helper.itemView;
-        int position = helper.getAdapterPosition();
 
-        View my_money_item_top = convertView.findViewById(R.id.my_money_item_top);
-        View my_money_item_center = convertView.findViewById(R.id.my_money_item_center);
-        View my_money_item_bottom = convertView.findViewById(R.id.my_money_item_bottom);
         TextView btn_exchange_tv = convertView.findViewById(R.id.btn_exchange_tv);
 
         //显示按钮
@@ -65,11 +61,6 @@ public class AdpILog extends BaseQuickAdapter<ILog, BaseViewHolder> {
         my_money_item_recharge_status.setText(item.getStateText());
         my_money_item_recharge_status.setTextColor(item.isEventSuccess() ? 0xff282828 : 0xffff2e4b);
         my_money_item_recharge_time.setText(TimeUtil.TimeStamp2Date(item.getEventTime(), "yyyy/MM/dd HH:mm"));
-        boolean isFirst = position == 0;
-        boolean isLast = ListUtil.isLastPosition(getData(), position);
-        my_money_item_top.setVisibility(isFirst ? View.VISIBLE : View.GONE);
-        my_money_item_center.setBackgroundColor(position % 2 == 1 ? 0xffF8F8F8 : 0xffffffff);
-        my_money_item_bottom.setVisibility(isLast ? View.VISIBLE : View.GONE);
 
         my_money_item_recharge_amount_2.setVisibility(View.GONE);
         my_money_item_recharge_amount.post(() -> {

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

@@ -1,15 +1,25 @@
 package com.sheep.gamegroup.module.personal.fragment;
 
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
+import com.kfzs.duanduan.cardview.ScreenUtil;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.ILog;
 import com.sheep.gamegroup.model.entity.RechargeLog;
 import com.sheep.gamegroup.module.personal.adapter.AdpILog;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.BaseListFragment3;
+import com.sheep.jiuyan.samllsheep.R;
 
 import org.afinal.simplecache.ApiKey;
 
@@ -25,10 +35,28 @@ import rx.functions.Action1;
  * realicing@sina.com
  */
 public class FgtRechargeLog extends BaseListFragment3<RechargeLog> {
+
+    int type = 0;
+
     @Override
     public void initView() {
         super.initView();
+        RelativeLayout container = getView().findViewById(R.id.list_rv);
+        RadioGroup typeRadio = (RadioGroup) (View.inflate(getContext(), R.layout.my_money_toggle, container).findViewById(R.id.type_toggle_layout));
+//        container.addView(testView, ViewGroup.LayoutParams.MATCH_PARENT, ScreenUtil.dip2px(getContext(), 40));
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) view_list.getLayoutParams();
+        layoutParams.topMargin = ScreenUtil.dip2px(getContext(), 40);
         per_page = 10;
+        typeRadio.setOnCheckedChangeListener((radio, checkedId) -> {
+            if (checkedId == R.id.all_radio) {
+                type = 0;
+            } else if (checkedId == R.id.income_radio) {
+                type = 1;
+            } else {
+                type = 2;
+            }
+            refreshData();
+        });
     }
 
     private List<ILog> logList = new ArrayList<>();
@@ -46,12 +74,12 @@ public class FgtRechargeLog extends BaseListFragment3<RechargeLog> {
 
     @Override
     protected String getKey(int page, int per_page) {
-        return ApiKey.pageKeyUrl(ApiKey.recharge_log, page, per_page);
+        return StringUtils.addParams(ApiKey.recharge_log, "page_no", page, "page_size", per_page, "type", type);
     }
 
     @Override
     protected Observable<BaseMessage> getApi(ApiService apiService) {
-        return apiService.getRechargeLog(page, per_page);
+        return apiService.getRechargeLog(page, per_page, type);
     }
 
     @Override

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

@@ -1355,6 +1355,32 @@ public class ViewUtil {
         return dialog;
     }
 
+    public static AlertDialog showConfirmDialog(Context mContext
+            , String title
+            , View content
+            , String cancelText
+            , String confirmString
+            , View.OnClickListener confirmListener) {
+        View container = View.inflate(mContext, R.layout.dialog_confirm, null);
+        final AlertDialog dialog = new AlertDialog.Builder(mContext, mContext instanceof Activity ? R.style.MyDialogActivityTheme : R.style.AppTheme_Dialog_Alert)
+                .setView(container)
+                .create();
+        TextView titleView = container.findViewById(R.id.dialog_title);
+        titleView.setText(title);
+        LinearLayout contentContainer = container.findViewById(R.id.dialog_center_ll);
+        contentContainer.addView(content, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        TextView cancelBtn = container.findViewById(R.id.cancel_btn);
+        cancelBtn.setText(cancelText);
+        cancelBtn.setOnClickListener((v) -> dialog.dismiss());
+        TextView confirmBtn = container.findViewById(R.id.confirm_btn);
+        confirmBtn.setText(confirmString);
+        confirmBtn.setOnClickListener((v) -> {
+            dialog.dismiss();
+            confirmListener.onClick(v);
+        });
+        return dialog;
+    }
+
     public static AlertDialog showUpgradeDialog(Context mContext, final DialogConfig dialogConfig) {
         String title = dialogConfig.getTitle();
         String msg = dialogConfig.getMsg();
@@ -2047,6 +2073,12 @@ public class ViewUtil {
                 .into(view);
     }
 
+    public static void setImageRes(ImageView imageView, int resId) {
+        if (imageView != null) {
+            imageView.setImageResource(resId);
+        }
+    }
+
     public static void setImagePath(ImageView imageView, String paths) {
         if (imageView != null) {
             if (TextUtils.isEmpty(paths)) {
@@ -2425,7 +2457,7 @@ public class ViewUtil {
      *
      * @param activity
      * @param shareLinkConfig
-     * @param umShareListener         回调的view为nul时，代表流程结束；不为空时，代表初始化dialog的view，可以做自定义
+     * @param umShareListener 回调的view为nul时，代表流程结束；不为空时，代表初始化dialog的view，可以做自定义
      */
     public static void showShareDialog(final Activity activity, final ShareLinkConfig shareLinkConfig, final UMShareListener umShareListener) {
         View dialogView = View.inflate(activity, R.layout.ask_to_share, null);

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -163,7 +163,7 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
-    public void playVideo(String url, String title){
+    public void playVideo(String url, String title) {
         Jump2View.getInstance().goActPlayVideo(url, title);
     }
 
@@ -451,6 +451,11 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
+    public void gotoPersonCenter() {
+        Jump2View.getInstance().goPersonnalCenterView(activity, null);
+    }
+
+    @JavascriptInterface
     public void buyVip(int level, int pay_type) {
         buyVip(activity, new BuyVipReq());
     }

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

@@ -7,6 +7,9 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
+import android.text.Html;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -33,6 +36,7 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
@@ -76,18 +80,12 @@ public class ActMyMoney extends BaseActivity {
 
     @BindView(R.id.my_money_total_money)
     TextView my_money_total_money;
-    @BindView(R.id.my_money_task_reward)
-    TextView my_money_task_reward;
-    @BindView(R.id.my_money_agent_extract)
-    TextView my_money_agent_extract;
     @BindView(R.id.my_money_recharge_amount)
     TextView my_money_recharge_amount;
     @BindView(R.id.my_money_available_amount)
     TextView my_money_available_amount;
     @BindView(R.id.my_money_dingxiang_amount)
     TextView my_money_dingxiang_amount;
-    @BindView(R.id.my_money_dingxiang_amount_iv)
-    ImageView my_money_dingxiang_amount_iv;
 
     private TitleFragmentListAdapter mAdapter;
 
@@ -102,7 +100,7 @@ public class ActMyMoney extends BaseActivity {
         return R.layout.act_my_money;
     }
 
-    public static final String[] tabNames = {"充值记录", "提现记录", "收支明细"};
+    public static final String[] tabNames = {"收支明细", "充值记录", "提现记录"};
 
     @Override
     public void initView() {
@@ -112,9 +110,9 @@ public class ActMyMoney extends BaseActivity {
         //顶部背景添加弧度
         GlideImageLoader.setImage(act_my_money_bg_iv, ViewUtil.getNetImgByName("home_blue_bg_hb"), R.mipmap.home_blue_bg);
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(new FgtRechargeBalanceLog(), tabNames[0]);
-        mAdapter.add(new FgtWithdraw(), tabNames[1]);
-        mAdapter.add(new FgtRechargeLog(), tabNames[2]);
+        mAdapter.add(new FgtRechargeLog(), tabNames[0]);
+        mAdapter.add(new FgtRechargeBalanceLog(), tabNames[1]);
+        mAdapter.add(new FgtWithdraw(), tabNames[2]);
         for (int i = 0; i < mAdapter.getCount(); i++) {
             Fragment fragment = mAdapter.getItem(i);
             if (fragment instanceof BaseRefreshLoadMoreFragment) {
@@ -126,7 +124,7 @@ public class ActMyMoney extends BaseActivity {
         viewPager.setMinimumHeight(G.HEIGHT - G.getRealPix(120));
         new_tab();
         //refresh
-        refresh.setHeaderInsetStart(G.getRealPix(34));
+//        refresh.setHeaderInsetStart(G.getRealPix(34));
         refresh.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
 
             @Override
@@ -140,20 +138,14 @@ public class ActMyMoney extends BaseActivity {
             }
         });
         RefreshUtil.newInstance().publicParameterLoadMore(refresh, this);
-//        viewPager.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-//            public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-//                LogUtil.println("ActMyMoney", "viewPager", "onLayoutChange", left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom);
-//                LayoutParamsUtil.resetLayoutParams(act_my_money_bottom_v, new Lp().setHeight(G.HEIGHT - G.getRealPix(74) - img_baseactivity_title.getHeight() + top - bottom));
-//            }
-//        });
     }
 
     private void new_tab() {
-        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[0], true)));
-        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[1], true)));
-        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[2], false)));
-        //Tablayout自定义view绑定ViewPager
-        viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
+//        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[0], true)));
+//        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[1], true)));
+//        indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[2], false)));
+//        viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
+        indicator.setupWithViewPager(viewPager);
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager) {
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
@@ -234,9 +226,11 @@ public class ActMyMoney extends BaseActivity {
 
     @OnClick({R.id.my_money_withdraw_tv,
             R.id.my_money_recharge_tv,
-            R.id.my_money_dingxiang_amount_iv,
             R.id.my_money_dingxiang_amount,
             R.id.my_money_dingxiang_tag,
+            R.id.my_money_game_coupon_tag,
+            R.id.my_money_mall_coupon_tag,
+            R.id.ico_baseactivity_title,
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -246,13 +240,37 @@ public class ActMyMoney extends BaseActivity {
             case R.id.my_money_recharge_tv://充值
                 Jump2View.getInstance().goRechargeAct(ActMyMoney.this, "我的资产");
                 break;
-            case R.id.my_money_dingxiang_amount_iv://定向货币详情
             case R.id.my_money_dingxiang_amount://定向货币详情
-            case R.id.my_money_dingxiang_tag://定向货币详情
+            case R.id.my_money_dingxiang_tag: {//定向货币详情
                 String url = Config.getUrlByPath(Config.PATH_GAME_LIST + "?authorization=" + SpUtils.getToken(this) + "&ssnocache=1");
                 WebParams webParams = new WebParams(url, "定向消费").setShowTitle(false);
                 Jump2View.getInstance().goWeb(this, webParams);
                 break;
+            }
+            case R.id.my_money_game_coupon_tag:
+                Jump2View.getInstance().goWeb(this, new WebParams(Config.getUrlByPath(Config.PATH_MY_GAME_COUPON, "authorization", SpUtils.getToken(this)), "代金券中心"));
+                break;
+            case R.id.my_money_mall_coupon_tag: {
+                CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_YF_SHOP_URL, url -> {
+                    if (TextUtils.isEmpty(url))
+                        url = SheepApp.getInstance().getConnectAddress().getYfShotHomeSheep();
+                    url += "/user.php?act=mycoupon&pf=android.sheep.app";
+                    Jump2View.getInstance().goWeb(this, new WebParams(url, Config.YF_SHOP_NAME).tokenFirstUpperCase());
+                });
+                break;
+            }
+            case R.id.ico_baseactivity_title:
+                View helpView = View.inflate(this, R.layout.discount_help, null);
+                TextView help1 = helpView.findViewById(R.id.help1);
+                TextView help2 = helpView.findViewById(R.id.help2);
+                TextView help3 = helpView.findViewById(R.id.help3);
+                help1.setText(Html.fromHtml("<strong>记账绵羊币：</strong>用户通过在平台做任务，获得奖励的绵羊币为记账绵羊币，该类型的绵羊币可提现到微信，也可以直接在平台消费。"));
+                help2.setText(Html.fromHtml("<strong>虚拟绵羊币：</strong>用户通过在平台直接充值或是活动获得的绵羊币，为虚拟币充值比例1:1，<font color='#2ebff3'>根据国家法律虚拟币不可提现</font>，虚拟绵羊币仅用于平台消费。"));
+                help3.setText(Html.fromHtml("<strong>定向福利币：</strong>该货币是由活动获得，使用范围和时间有限，需要在指定的游戏或商品消费。"));
+                ViewUtil.showConfirmDialog(this, "温馨提示", helpView, "取消", "确定", (v -> {
+                    LogUtil.logD("confirm");
+                })).show();
+                break;
         }
     }
 
@@ -299,24 +317,20 @@ public class ActMyMoney extends BaseActivity {
         if (my_money_total_money == null) {
             return;
         }
-        my_money_total_money.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getSheep_bi_total())));
-        my_money_task_reward.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getTask_reward())));
-        my_money_agent_extract.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getExtension_extract())));
-        my_money_recharge_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getUse_balance())));
-        my_money_available_amount.setText(getString(R.string.available_amount, NumberFormatUtils.retainMost2W(userAssets.getCash_withdrawal())));
-        my_money_dingxiang_amount.setText(getString(R.string.total_money, NumberFormatUtils.retainMost2W(userAssets.getDirectional_currency())));
+        my_money_total_money.setText(NumberFormatUtils.retainMost2W(userAssets.getSheep_bi_total()));
+        my_money_recharge_amount.setText(NumberFormatUtils.retainMost2W(userAssets.getUse_balance()));
+        my_money_available_amount.setText(NumberFormatUtils.retainMost2W(userAssets.getCash_withdrawal()));
+        my_money_dingxiang_amount.setText(NumberFormatUtils.retainMost2W(userAssets.getDirectional_currency()));
     }
 
     private void resetData() {
         if (my_money_total_money == null) {
             return;
         }
-        my_money_total_money.setText(getString(R.string.total_money, "0.00"));
-        my_money_task_reward.setText(getString(R.string.total_money, "0.00"));
-        my_money_agent_extract.setText(getString(R.string.total_money, "0.00"));
-        my_money_recharge_amount.setText(getString(R.string.total_money, "0.00"));
-        my_money_available_amount.setText(getString(R.string.available_amount, "0.00"));
-        my_money_dingxiang_amount.setText(getString(R.string.total_money, "0.00"));
+        my_money_total_money.setText("0.00");
+        my_money_recharge_amount.setText("0.00");
+        my_money_available_amount.setText("0.00");
+        my_money_dingxiang_amount.setText("0.00");
     }
 
     //点击优惠购物

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

@@ -3,12 +3,16 @@ package com.sheep.gamegroup.view.activity;
 import android.app.Activity;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.Version;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.pay.activity.ActPayPassword;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataKey;
@@ -22,9 +26,14 @@ 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 com.tencent.bugly.beta.Beta;
+
+import org.afinal.simplecache.ACache;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
@@ -38,6 +47,10 @@ public class ActSetting extends BaseActivity {
     @BindView(R.id.pay_pwd_flag)
     TextView payPwdFlag;
     private Activity activity;
+    @BindView(R.id.check_upgrade_view)
+    TextView check_upgrade_view;
+    @BindView(R.id.execute_upgrade_btn)
+    TextView execute_upgrade_btn;
 
     @Override
     protected int getLayoutId() {
@@ -68,9 +81,38 @@ public class ActSetting extends BaseActivity {
     public void initData() {
         initCacheSize();
         initCopyState();
+        checkVersionUpgrade();
+    }
+
+    private void checkVersionUpgrade() {
+        SheepApp.getInstance().getNetComponent().getApiService().getNewVersion(SheepApp.getInstance().getConnectAddress().getVersionType())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        Version version = baseMessage.getData(Version.class);
+                        int versionCode = ApkUtils.getCurrentPkgVersionCode(ActSetting.this);
+                        if (versionCode == version.getVersion_number()) {
+                            ViewUtil.setText(check_upgrade_view, "已经是最新版本: V" + ApkUtils.getCurrentPkgVersionName(ActSetting.this));
+                            ViewUtil.setVisibility(execute_upgrade_btn, false);
+                        } else {
+                            ViewUtil.setText(check_upgrade_view, "发现新版本: V" + version.getVersion_name());
+                            ViewUtil.setVisibility(execute_upgrade_btn, true);
+                        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        ViewUtil.setText(check_upgrade_view, "当前版本: V" + ApkUtils.getCurrentPkgVersionName(ActSetting.this));
+                        ViewUtil.setVisibility(execute_upgrade_btn, false);
+                    }
+                });
     }
 
-    @OnClick({R.id.change_password_layout, R.id.pay_pwd_layout, R.id.abourt_us_layout, R.id.clear_layout, R.id.tv_submit, R.id.copy_text_layout, R.id.change_layout})
+    @OnClick({R.id.change_password_layout, R.id.pay_pwd_layout, R.id.abourt_us_layout, R.id.clear_layout,
+            R.id.tv_submit, R.id.copy_text_layout, R.id.change_layout,
+            R.id.check_upgrade_view, R.id.execute_upgrade_btn})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.change_password_layout:
@@ -110,6 +152,15 @@ public class ActSetting extends BaseActivity {
             case R.id.tv_submit:
                 CommonUtil.getInstance().loginOut((BaseActivity) activity);
                 break;
+            case R.id.feedback_layout:
+                Jump2View.getInstance().goFeedbackAct(activity);
+                break;
+            case R.id.execute_upgrade_btn:
+                SysAppUtil.showVersionInfo(this, null);
+                break;
+            case R.id.check_upgrade_view:
+                SysAppUtil.showVersionInfo(this, null);
+                break;
         }
     }
 
@@ -121,11 +172,11 @@ public class ActSetting extends BaseActivity {
         clear_item_tv.setText(TextUtils.isEmpty(size) || TextUtils.equals("0K", size) ? "无需清理" : size);
     }
 
-    @BindView(R.id.copy_text_tv)
-    TextView copy_text_tv;
+    @BindView(R.id.copy_text_iv)
+    ImageView copy_text_iv;
 
     private void initCopyState() {
-        copy_text_tv.setText(DataUtil.getAsBoolean(Config.KEY_ENABLE_CHECK_COPY_TEXT, Config.dvbEnableCheckCopyText()) ? R.string.opened : R.string.closed);
+        ViewUtil.setImageRes(copy_text_iv, DataUtil.getAsBoolean(Config.KEY_ENABLE_CHECK_COPY_TEXT, Config.dvbEnableCheckCopyText()) ? R.mipmap.toggle_open : R.mipmap.toggle_close);
     }
 
 }

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

@@ -56,9 +56,6 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
             adapter = new ArrayAdapter<ILog>(activity, R.layout.x_my_money_act_layout_item, list){
                 @Override
                 public boolean convert(int position, View convertView, ViewGroup parent, final ILog item) {
-                    View my_money_item_top = convertView.findViewById(R.id.my_money_item_top);
-                    View my_money_item_center = convertView.findViewById(R.id.my_money_item_center);
-                    View my_money_item_bottom = convertView.findViewById(R.id.my_money_item_bottom);
                     final TextView my_money_item_recharge_amount = convertView.findViewById(R.id.my_money_item_recharge_amount);
                     TextView my_money_item_recharge_status = convertView.findViewById(R.id.my_money_item_recharge_status);
                     TextView my_money_item_recharge_time = convertView.findViewById(R.id.my_money_item_recharge_time);
@@ -69,11 +66,6 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
                     my_money_item_recharge_status.setText(item.getStateText());
                     my_money_item_recharge_status.setTextColor(item.isEventSuccess() ? 0xff282828 : 0xffff2e4b);
                     my_money_item_recharge_time.setText(TimeUtil.TimeStamp2Date(item.getEventTime(), "yyyy/MM/dd HH:mm"));
-                    boolean isFirst = position == 0;
-                    boolean isLast = ListUtil.isLastPosition(list, position);
-                    my_money_item_top.setVisibility(isFirst ? View.VISIBLE : View.GONE);
-                    my_money_item_center.setBackgroundColor(position % 2 == 1 ? 0xffF8F8F8 : 0xffffffff);
-                    my_money_item_bottom.setVisibility(isLast ? View.VISIBLE : View.GONE);
 
                     my_money_item_recharge_amount_2.setVisibility(View.GONE);
                     my_money_item_recharge_amount.post(new Runnable() {

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

@@ -2,6 +2,7 @@ package com.sheep.gamegroup.view.fragment;
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.support.v7.widget.GridLayoutManager;
@@ -35,6 +36,8 @@ import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
+import com.sheep.gamegroup.view.activity.PersonalInfoAct;
+import com.sheep.gamegroup.view.activity.ReNameActivity;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -59,6 +62,8 @@ import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_AGENT;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FAQ;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_LOGINNAME;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_NAME;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_SHARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
 import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
@@ -69,6 +74,7 @@ import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
  */
 
 public class FgtPersonalCenter extends BaseFragment {
+
     @BindView(R.id.icon_img_iv)
     ImageView iconImgIv;
     @BindView(R.id.name_tv)
@@ -118,9 +124,11 @@ public class FgtPersonalCenter extends BaseFragment {
     @BindView(R.id.fgt_pc_item_vip_ll)
     View fgt_pc_item_vip_ll;
     @BindView(R.id.vip_flag_view)
-    View vipFlagView;
-    @BindView(R.id.vip_info_tv)
-    TextView vipInfoView;
+    ImageView vipFlagView;
+    @BindView(R.id.tip_vip)
+    TextView vipTipView;
+    @BindView(R.id.be_vip_btn)
+    TextView beVipBtn;
     @BindView(R.id.voucher_red_dot)
     View voucher_red_dot;
     @BindView(R.id.fgt_pc_item_my_pet_v)
@@ -131,6 +139,8 @@ public class FgtPersonalCenter extends BaseFragment {
     View fgt_pc_item_my_card_v;
     @BindView(R.id.my_card_layout)
     View my_card_layout;
+    @BindView(R.id.login_name_tv)
+    TextView loginNameTv;
 
     public UserEntity userEntity;
     private String faqUrl;
@@ -266,7 +276,7 @@ public class FgtPersonalCenter extends BaseFragment {
 
     //初始化用户中心模块界面
     private void initUserModuleItemView() {
-        GridLayoutManager manager = new GridLayoutManager(SheepApp.getInstance(), 4);
+        GridLayoutManager manager = new GridLayoutManager(SheepApp.getInstance(), 5);
         moduleList.setHasFixedSize(true);
         moduleList.setNestedScrollingEnabled(false);
         moduleList.setLayoutManager(manager);
@@ -335,11 +345,19 @@ public class FgtPersonalCenter extends BaseFragment {
         ViewUtil.setText(nameTv, userEntity.getNickname());
         sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
         GlideImageLoader.setAvatar(iconImgIv, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
-        ViewUtil.setVisibility(vipFlagView, userEntity.isVIP());
-        ViewUtil.setVisibility(vipInfoView, userEntity.isVIP());
-        ViewUtil.setText(vipInfoView, userEntity.getVIPInfo().toString());
-//        ViewUtil.setVisibility(fgt_pc_item_vip_v, !userEntity.isVIP());
-//        ViewUtil.setVisibility(fgt_pc_item_vip_ll, !userEntity.isVIP());
+
+        ViewUtil.setImageRes(vipFlagView, (userEntity.isVIP() ? R.mipmap.level_vip : R.mipmap.level_vip_un));
+        ViewUtil.setText(vipTipView, userEntity.getVIPInfo().toString());
+        ViewUtil.setVisibility(beVipBtn, !userEntity.isVIP());
+        ViewUtil.setVisibility(vipTipView, userEntity.isVIP());
+        if (TextUtils.isEmpty(userEntity.getUser_name())) {
+            ViewUtil.setText(loginNameTv, "登录账号: 去设置>");
+            loginNameTv.setClickable(true);
+        } else {
+            ViewUtil.setText(loginNameTv, "登录账号: " + userEntity.getUser_name());
+            loginNameTv.setClickable(false);
+        }
+
         ViewUtil.setVisibility(voucher_red_dot, SpUtils.isVoucherFirst());
     }
 
@@ -454,10 +472,17 @@ public class FgtPersonalCenter extends BaseFragment {
             R.id.version_layout, R.id.order_layout, R.id.proxy_game_account_layout,
             R.id.audit_activity_cl, R.id.audit_success_cl, R.id.audit_failed_cl,
             R.id.iv_redpackage, R.id.fgt_person_center_my_focus, R.id.fgt_pc_item_vip_ll,
-            R.id.voucher_layout, R.id.my_pet_layout, R.id.my_card_layout
+            R.id.voucher_layout, R.id.my_pet_layout, R.id.my_card_layout, R.id.be_vip_btn,
+            R.id.login_name_tv, R.id.edit_nickname_view
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
+            case R.id.edit_nickname_view://审核中心
+                Intent i = new Intent(getActivity(), ReNameActivity.class);
+                i.putExtra("name", userEntity.getNickname());
+                startActivity(i);
+                USER_INFO_NAME.onEvent();
+                break;
             case R.id.audit_activity_cl://审核中心
                 Jump2View.getInstance().goAuditTastList(activity, FgtMainAudit.POSITION_ACTIVITY);
                 break;
@@ -486,6 +511,7 @@ public class FgtPersonalCenter extends BaseFragment {
                 Jump2View.getInstance().goWeb(activity, Config.getUrlByPath(Config.PATH_MY_CARD), "我的卡包");
                 break;
             case R.id.fgt_pc_item_vip_ll://VIP
+            case R.id.be_vip_btn://VIP
                 Jump2View.getInstance().gotoVip(activity);
                 break;
             case R.id.personalcenter_price_layout://我的资产
@@ -550,6 +576,13 @@ public class FgtPersonalCenter extends BaseFragment {
                 ViewUtil.setVisibility(voucher_red_dot, false);
                 EventBus.getDefault().post(new PersonVoucherClickEvent());
                 break;
+            case R.id.login_name_tv:
+                if (userEntity.getSet_password() == 0) {
+                    Jump2View.getInstance().goChangePassword(getActivity());
+                } else {
+                    G.shortToast("设置登录密码后不可修改登录名");
+                }
+                break;
         }
     }
 

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

@@ -113,8 +113,8 @@ public class Config {
         initSMALL_STATION_URL();
     }
     public static void initSMALL_STATION_URL(){
-        SMALL_STATION_URL = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? SMALL_STATION_URL_SHEEP : SMALL_STATION_URL_TEST;
-//        SMALL_STATION_URL = SMALL_STATION_URL_SHEEP;
+//        SMALL_STATION_URL = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? SMALL_STATION_URL_SHEEP : SMALL_STATION_URL_TEST;
+        SMALL_STATION_URL = SMALL_STATION_URL_SHEEP;
     }
     public static String getUrlByPath(String path, Object...query){
         String url = SMALL_STATION_URL + path;

app/src/main/java/com/sheep/jiuyan/samllsheep/wxutil/WXAPIUtil.java

@@ -63,6 +63,30 @@ public class WXAPIUtil {
                     public void onResponse(String response, int id) {
                         Log.i("wx auth", "wx auth "+response);
                         JSONObject resp = JSONObject.parseObject(response);
+//                        callback.callback(true, resp.getString("openid"), resp.getString("access_token"));
+                        refreshWXUserToken(resp.getString("refresh_token"), callback);
+                    }
+                });
+    }
+
+    public static void refreshWXUserToken(String token, WXUserTokenCallback callback) {
+        OkHttpUtils.get()
+                .url("https://api.weixin.qq.com/sns/oauth2/refresh_token?" +
+                        "appid=" + Config.WX_AUTH_APP_ID +
+                        "&refresh_token=" + token +
+                        "&grant_type=refresh_token")
+                .build()
+                .execute(new StringCallback() {
+
+                    @Override
+                    public void onError(Call call, Exception e, int id) {
+                        e.printStackTrace();
+                    }
+
+                    @Override
+                    public void onResponse(String response, int id) {
+                        Log.i("wx auth", "wx auth "+response);
+                        JSONObject resp = JSONObject.parseObject(response);
                         callback.callback(true, resp.getString("openid"), resp.getString("access_token"));
                     }
                 });

app/src/main/res/color/selector_color_my_money_toggle.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="true" android:color="#2ebff3"/>
+    <item android:color="#666666"/>
+</selector>

app/src/main/res/drawable/shape_grey_stroke_withe_radius_5.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/txt_gray_e6e4e4" />
+</shape>

app/src/main/res/drawable/yellow_btn.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#d3a365" />
+    <corners android:radius="8dp" />
+</shape>

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

@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_light"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:background="#f5f5f5"
     tools:context="com.sheep.gamegroup.view.activity.ActMyMoney">
 
+    <ImageView
+        android:id="@+id/act_my_money_bg_iv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:scaleType="fitXY"
+        android:src="@mipmap/bg_person" />
+
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="match_parent"
@@ -33,276 +41,246 @@
                     android:layout_height="wrap_content">
 
                     <ImageView
-                        android:id="@+id/act_my_money_bg_iv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="30dp"
-                        android:adjustViewBounds="true"
-                        android:scaleType="fitXY"
-                        android:src="@mipmap/home_blue_bg"
-                        app:layout_constraintTop_toTopOf="parent" />
-                    <View
-                        android:id="@+id/act_my_money_top_v"
-                        android:layout_width="match_parent"
+                        android:id="@+id/img_baseactivity_title"
+                        android:layout_width="wrap_content"
                         android:layout_height="?attr/actionBarSize"
                         android:layout_marginTop="@dimen/status_bar_height"
+                        android:gravity="center_vertical"
+                        android:paddingStart="@dimen/content_padding_20"
+                        android:paddingEnd="@dimen/content_padding_20"
+                        android:scaleType="centerInside"
+                        android:src="@drawable/narrow_back_white"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <TextView
-                        android:id="@+id/my_money_recharge_tv"
+                        android:id="@+id/txt_baseactivity_title"
                         android:layout_width="wrap_content"
-                        android:layout_height="28dp"
-                        android:background="@drawable/shape_white_solid_rectangle_left"
-                        android:gravity="center_vertical"
-                        android:paddingStart="14dp"
-                        android:paddingEnd="10dp"
-                        android:text="充值 >"
-                        android:textColor="#2BCEFA"
-                        android:textSize="15sp"
+                        android:layout_height="?attr/actionBarSize"
+                        android:layout_centerInParent="true"
+                        android:gravity="center"
+                        android:text="@string/app_name"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_size_4"
+                        app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/act_my_money_top_v" />
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
 
-                    <TextView
-                        android:id="@+id/my_money_withdraw_tv"
+                    <ImageView
+                        android:id="@+id/ico_baseactivity_title"
                         android:layout_width="wrap_content"
-                        android:layout_height="28dp"
-                        android:layout_marginTop="13dp"
-                        android:background="@drawable/shape_white_solid_rectangle_left"
+                        android:layout_height="?attr/actionBarSize"
+                        android:layout_marginTop="@dimen/status_bar_height"
                         android:gravity="center_vertical"
-                        android:paddingStart="14dp"
-                        android:paddingEnd="10dp"
-                        android:text="提现 >"
-                        android:textColor="#2BCEFA"
-                        android:textSize="15sp"
+                        android:paddingStart="@dimen/content_padding_20"
+                        android:paddingEnd="@dimen/content_padding_20"
+                        android:scaleType="centerInside"
+                        android:src="@mipmap/question"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/my_money_recharge_tv" />
-
-                    <TextView
-                        android:id="@+id/my_money_total_money_lable"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="22dp"
-                        android:text="@string/total_money_lable"
-                        android:textColor="#DCF3FD"
-                        android:textSize="15sp"
-                        app:layout_constraintBottom_toBottomOf="@id/my_money_withdraw_tv"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="@id/my_money_recharge_tv" />
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                    <LinearLayout
-                        android:layout_width="0dp"
+                    <android.support.v7.widget.CardView
+                        android:id="@+id/my_money_card_layout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintBottom_toBottomOf="@id/my_money_withdraw_tv"
-                        app:layout_constraintStart_toEndOf="@id/my_money_total_money_lable"
-                        app:layout_constraintTop_toTopOf="@id/my_money_recharge_tv">
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginRight="15dp"
+                        app:cardBackgroundColor="@color/white"
+                        app:cardCornerRadius="5dp"
+                        app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title">
 
-                        <TextView
-                            android:id="@+id/my_money_total_money"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="15dp"
-                            android:text="@string/total_money"
-                            android:textColor="@color/white"
-                            android:textSize="25sp" />
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
 
-                        <TextView
-                            android:id="@+id/my_money_available_amount"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="9dp"
-                            android:layout_marginTop="2dp"
-                            android:background="@drawable/shape_2b0a4c60_solid_rectangle_10"
-                            android:paddingStart="6dp"
-                            android:paddingTop="3dp"
-                            android:paddingEnd="6dp"
-                            android:paddingBottom="3dp"
-                            android:text="@string/available_amount"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
-                    </LinearLayout>
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="20dp"
+                                android:text="可用余额(元)"
+                                android:textColor="#393939"
+                                android:textSize="12sp" />
 
-                    <LinearLayout
-                        android:id="@+id/my_money_amount_ll"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="18dp"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/my_money_withdraw_tv">
+                            <TextView
+                                android:id="@+id/my_money_recharge_amount"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="36dp"
+                                android:text="00.00"
+                                android:textColor="#2ebff3"
+                                android:textSize="30sp" />
 
-                        <TextView
-                            android:id="@+id/my_money_agent_extract"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/total_money"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            <LinearLayout
+                                android:id="@+id/my_money_assets_layout"
+                                android:layout_below="@+id/my_money_recharge_amount"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="20dp"
+                                android:orientation="horizontal">
 
-                        <TextView
-                            android:id="@+id/my_money_task_reward"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/total_money"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="4"
+                                    android:gravity="center"
+                                    android:orientation="vertical">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_centerHorizontal="true"
+                                        android:text="可提现余额(元)"
+                                        android:textColor="#999999"
+                                        android:textSize="12sp" />
+                                    <TextView
+                                        android:id="@+id/my_money_available_amount"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_centerHorizontal="true"
+                                        android:text="00.00"
+                                        android:textColor="#000000"
+                                        android:textSize="18sp" />
+                                </LinearLayout>
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="4"
+                                    android:gravity="center"
+                                    android:orientation="vertical">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_centerHorizontal="true"
+                                        android:text="可用绵羊币(元)"
+                                        android:textColor="#999999"
+                                        android:textSize="12sp" />
+                                    <TextView
+                                        android:id="@+id/my_money_total_money"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_centerHorizontal="true"
+                                        android:text="00.00"
+                                        android:textColor="#000000"
+                                        android:textSize="18sp" />
+                                </LinearLayout>
+                            </LinearLayout>
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:layout_marginTop="30dp"
+                                android:layout_marginLeft="12dp"
+                                android:layout_marginRight="12dp"
+                                android:layout_marginBottom="18dp"
+                                android:layout_below="@+id/my_money_assets_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content">
+                                <TextView
+                                    android:id="@+id/my_money_withdraw_tv"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="48dp"
+                                    android:layout_weight="1"
+                                    android:layout_marginRight="6dp"
+                                    android:background="@drawable/shape_grey_stroke_withe_radius_5"
+                                    android:text="转出"
+                                    android:gravity="center"
+                                    android:textColor="#2ebff3"
+                                    android:textSize="15sp" />
+                                <TextView
+                                    android:id="@+id/my_money_recharge_tv"
+                                    android:layout_weight="1"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="48dp"
+                                    android:layout_marginLeft="6dp"
+                                    android:background="@drawable/shape_blue_stroke_withe_radius_5"
+                                    android:gravity="center"
+                                    android:text="转入"
+                                    android:textColor="#ffffff"
+                                    android:textSize="15sp" />
+                            </LinearLayout>
+                        </RelativeLayout>
+                    </android.support.v7.widget.CardView>
 
+                    <LinearLayout
+                        app:layout_constraintTop_toBottomOf="@+id/my_money_card_layout"
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="24dp"
+                        android:layout_height="wrap_content">
                         <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:orientation="horizontal">
+                            android:id="@+id/my_money_dingxiang_tag"
+                            style="@style/style_item_container"
+                            android:background="@color/white">
+
+                            <TextView
+                                style="@style/style_item_label"
+                                android:text="定向福利币" />
 
                             <TextView
                                 android:id="@+id/my_money_dingxiang_amount"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/total_money"
-                                android:textColor="@color/white"
-                                android:textSize="12sp" />
+                                android:textColor="#333333"
+                                android:textSize="15sp"
+                                android:text="00.00"
+                                />
 
-                            <ImageView
-                                android:id="@+id/my_money_dingxiang_amount_iv"
-                                android:layout_width="19dp"
-                                android:layout_height="35dp"
-                                android:paddingTop="10dp"
-                                android:paddingBottom="10dp"
-                                android:paddingEnd="2dp"
-                                android:paddingStart="2dp"
-                                android:src="@mipmap/question_mark" />
-                        </LinearLayout>
-
-                        <TextView
-                            android:id="@+id/my_money_recharge_amount"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/total_money"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            <TextView style="@style/style_item_end_next" />
 
-                    </LinearLayout>
+                        </LinearLayout>
+                        <View style="@style/style_item_line" />
+                        <LinearLayout
+                            android:id="@+id/my_money_game_coupon_tag"
+                            style="@style/style_item_container"
+                            android:background="@color/white">
 
-                    <LinearLayout
-                        android:id="@+id/my_money_ll"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:orientation="horizontal"
-                        app:layout_constraintTop_toBottomOf="@id/my_money_amount_ll">
+                            <TextView
+                                style="@style/style_item_label"
+                                android:text="游戏代金券" />
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/agent_extract"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            <TextView style="@style/style_item_end_next" />
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/task_reward"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                        </LinearLayout>
+                        <View style="@style/style_item_line" />
+                        <LinearLayout
+                            android:id="@+id/my_money_mall_coupon_tag"
+                            style="@style/style_item_container"
+                            android:background="@color/white">
 
-                        <TextView
-                            android:id="@+id/my_money_dingxiang_tag"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/dingxiang_amount"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            <TextView
+                                style="@style/style_item_label"
+                                android:text="商城代金券" />
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:gravity="center"
-                            android:text="@string/recharge_amount"
-                            android:textColor="@color/white"
-                            android:textSize="12sp" />
+                            <TextView style="@style/style_item_end_next" />
 
+                        </LinearLayout>
                     </LinearLayout>
+
                 </android.support.constraint.ConstraintLayout>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="7dp"
-                    android:text="管家推介"
-                    android:textColor="#ff333333"
-                    android:textSize="14sp" />
-                <LinearLayout
+                <View
+                    android:background="#f5f5f5"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:drawableTop="@mipmap/ic_coupons"
-                        android:drawablePadding="10dp"
-                        android:gravity="center"
-                        android:textColor="#ff333333"
-                        android:onClick="onClickCoupons"
-                        android:textSize="12sp"
-                        android:text="优惠购物"/>
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:drawableTop="@mipmap/ic_vip"
-                        android:drawablePadding="10dp"
-                        android:gravity="center"
-                        android:textColor="#ff333333"
-                        android:onClick="onClickVip"
-                        android:textSize="12sp"
-                        android:text="VIP"/>
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:drawableTop="@mipmap/ic_game_recharge"
-                        android:drawablePadding="10dp"
-                        android:gravity="center"
-                        android:textColor="#ff333333"
-                        android:onClick="onClickGameRecharge"
-                        android:textSize="12sp"
-                        android:visibility="gone"
-                        android:text="游戏直充"/>
-                </LinearLayout>
+                    android:layout_height="20dp"/>
+
                 <android.support.design.widget.TabLayout
                     android:id="@+id/indicator"
                     android:layout_width="match_parent"
                     android:layout_height="50dp"
-                    android:layout_marginStart="@dimen/content_padding_10"
-                    android:layout_marginTop="@dimen/content_padding_20"
-                    android:layout_marginEnd="@dimen/content_padding_10"
-                    android:background="@drawable/shape_main_solid_rectangle_small_top"
+                    android:background="@color/white"
                     app:tabGravity="center"
                     app:tabIndicatorColor="#4bc1fe"
-                    app:tabIndicatorHeight="0dp"
+                    app:tabIndicatorHeight="4dp"
                     app:tabMode="fixed"
-                    app:tabSelectedTextColor="@android:color/white"
-                    app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
-                    app:tabTextColor="#444444" />
+                    app:tabSelectedTextColor="#4bc1fe"
+                    app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
+                    app:tabTextColor="#333333" />
 
                 <com.kfzs.android.view.widget.WrapContentHeightViewPager
                     android:id="@+id/pager"
+                    android:background="#f5f5f5"
+                    android:minHeight="200dp"
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
                     android:layout_weight="1" />
@@ -310,36 +288,4 @@
         </android.support.v4.widget.NestedScrollView>
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
-    <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shape_gradient_main"
-        android:paddingTop="@dimen/status_bar_height">
-
-        <ImageView
-            android:id="@+id/img_baseactivity_title"
-            android:layout_width="wrap_content"
-            android:layout_height="?attr/actionBarSize"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/content_padding_20"
-            android:paddingEnd="@dimen/content_padding_20"
-            android:scaleType="centerInside"
-            android:src="@drawable/narrow_back_white"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/txt_baseactivity_title"
-            android:layout_width="wrap_content"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:text="@string/app_name"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_4"
-            app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
-    </android.support.constraint.ConstraintLayout>
 </RelativeLayout>

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

@@ -10,10 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/content_padding_15"
-        android:layout_marginEnd="@dimen/content_padding"
-        android:layout_marginStart="@dimen/content_padding"
         android:layout_marginTop="@dimen/content_padding"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+        android:background="@color/white"
         android:orientation="vertical">
 
         <LinearLayout
@@ -51,16 +49,64 @@
         </LinearLayout>
 
         <View style="@style/style_item_line" />
+        <LinearLayout
+            android:id="@+id/copy_text_layout"
+            style="@style/style_item_container">
+
+            <TextView
+                style="@style/style_item_label"
+                android:text="@string/copy_assistant" />
+
+            <ImageView
+                android:id="@+id/copy_text_iv"
+                android:src="@mipmap/toggle_open"
+                android:layout_width="50dp"
+                android:layout_height="30dp" />
+
+        </LinearLayout>
+
+
+        <View style="@style/style_item_line" />
 
         <LinearLayout
-            android:id="@+id/abourt_us_layout"
+            android:id="@+id/clear_layout"
             style="@style/style_item_container">
 
             <TextView
                 style="@style/style_item_label"
-                android:text="关于我们" />
+                android:text="清除缓存" />
+
+            <TextView
+                android:id="@+id/clear_item_tv"
+                style="@style/style_item_end"
+                android:text="128MB" />
+
+        </LinearLayout>
+
+        <View style="@style/style_item_line" android:layout_height="@dimen/content_padding" />
+
+        <LinearLayout
+            android:id="@+id/version_layout"
+            style="@style/style_item_container">
+
+            <TextView
+                android:id="@+id/check_upgrade_view"
+                style="@style/style_item_label"
+                android:text="检查版本更新" />
+
+            <TextView
+                android:id="@+id/execute_upgrade_btn"
+                android:background="@drawable/round_main_r25"
+                android:text="立即更新"
+                android:textColor="@color/white"
+                android:textSize="14sp"
+                android:gravity="center"
+                android:paddingLeft="10dp"
+                android:visibility="gone"
+                android:paddingRight="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="26dp" />
 
-            <TextView style="@style/style_item_end_next" />
 
         </LinearLayout>
 
@@ -79,37 +125,32 @@
         </LinearLayout>
 
         <View style="@style/style_item_line" />
+
         <LinearLayout
-            android:id="@+id/copy_text_layout"
+            android:id="@+id/abourt_us_layout"
             style="@style/style_item_container">
 
             <TextView
                 style="@style/style_item_label"
-                android:text="@string/copy_assistant" />
+                android:text="关于我们" />
 
-            <TextView
-                android:id="@+id/copy_text_tv"
-                style="@style/style_item_end"
-                android:text="@string/opened" />
+            <TextView style="@style/style_item_end_next" />
 
         </LinearLayout>
-
         <View style="@style/style_item_line" />
 
         <LinearLayout
-            android:id="@+id/clear_layout"
+            android:id="@+id/feedback_layout"
             style="@style/style_item_container">
 
             <TextView
                 style="@style/style_item_label"
-                android:text="清除缓存" />
+                android:text="意见反馈" />
 
-            <TextView
-                android:id="@+id/clear_item_tv"
-                style="@style/style_item_end"
-                android:text="128MB" />
+            <TextView style="@style/style_item_end_next" />
 
         </LinearLayout>
+
     </LinearLayout>
 
     <TextView

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

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/dp_10"
+        android:background="@drawable/shape_white_solid_rectangle">
+
+        <LinearLayout
+            android:id="@+id/dialog_center_ll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
+            android:minHeight="50dp"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingTop="64dp"
+            android:paddingEnd="@dimen/dp_10"
+            android:paddingBottom="@dimen/dp_10" />
+
+        <TextView
+            android:id="@+id/dialog_title"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:gravity="center"
+            android:padding="@dimen/dp_10"
+            android:text="温馨提示"
+            android:textColor="@color/black_333333"
+            android:textSize="17sp"
+            android:textStyle="bold" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/dialog_title"
+            android:background="#cccccc" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/dialog_center_ll"
+            android:background="#cccccc" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_below="@id/dialog_center_ll"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/cancel_btn"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="取消"
+                android:textColor="#999999"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_below="@id/dialog_center_ll"
+                android:background="#cccccc" />
+
+            <TextView
+                android:id="@+id/confirm_btn"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="确认"
+                android:textColor="#2ebff2"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+    </RelativeLayout>
+</FrameLayout>

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/help1"
+        android:layout_margin="8dp"
+        android:textSize="13sp"
+        android:padding="8dp"
+        android:background="#f5f5f5"
+        android:textColor="#333333"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/help2"
+        android:layout_margin="8dp"
+        android:textColor="#333333"
+        android:textSize="13sp"
+        android:padding="8dp"
+        android:background="#f5f5f5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/help3"
+        android:layout_margin="8dp"
+        android:textSize="13sp"
+        android:padding="8dp"
+        android:textColor="#333333"
+        android:background="#f5f5f5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>

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

@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@mipmap/home_blue_bg">
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="140dp"
-        android:background="@mipmap/home_blue_bg">
+        android:layout_height="180dp">
 
         <RelativeLayout
             android:id="@+id/layout_navigationBar"
             android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
             android:layout_marginTop="10dp"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_height="?attr/actionBarSize">
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/img_baseactivity_title"
@@ -26,7 +27,7 @@
                 android:minWidth="?attr/actionBarSize"
                 android:scaleType="centerInside"
                 android:src="@drawable/narrow_back_white"
-                android:visibility="gone" />
+                android:visibility="invisible" />
 
             <TextView
                 android:id="@+id/txt_baseactivity_title"
@@ -43,9 +44,9 @@
                 android:id="@+id/ibtn_baseactivity_right"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_marginEnd="16dp"
-                android:layout_alignParentBottom="true"
                 android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginEnd="16dp"
                 android:background="@color/translate"
                 android:src="@mipmap/setting" />
 
@@ -62,10 +63,11 @@
             android:id="@+id/icon_img_iv"
             android:layout_width="55dp"
             android:layout_height="55dp"
-            android:layout_marginTop="60dp"
-            android:layout_marginBottom="@dimen/content_padding"
-            android:layout_marginStart="33dp"
+            android:layout_marginTop="16dp"
             android:src="@drawable/avatar"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -73,73 +75,181 @@
             android:id="@+id/name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/content_padding_10"
-            android:textColor="@color/txt_white"
+            android:layout_marginTop="6dp"
             android:text="Billyyoyo"
+            android:textColor="@color/txt_white"
             android:textSize="15sp"
-            app:layout_constraintStart_toEndOf="@+id/icon_img_iv"
-            app:layout_constraintTop_toTopOf="@+id/icon_img_iv" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/icon_img_iv" />
 
         <ImageView
-            android:id="@+id/vip_flag_view"
-            android:src="@mipmap/level_vip"
+            android:id="@+id/edit_nickname_view"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_marginTop="53dp"
+            android:layout_marginLeft="6dp"
             android:adjustViewBounds="true"
+            android:src="@mipmap/edit"
+            app:layout_constraintBottom_toBottomOf="@+id/name_tv"
+            app:layout_constraintStart_toEndOf="@+id/name_tv" />
+
+        <ImageView
+            android:id="@+id/vip_flag_view"
             android:layout_width="wrap_content"
             android:layout_height="16dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginLeft="5dp"
-            app:layout_constraintTop_toTopOf="@+id/name_tv"
-            app:layout_constraintStart_toEndOf="@+id/name_tv"/>
+            android:layout_marginTop="56dp"
+            android:adjustViewBounds="true"
+            android:src="@mipmap/level_vip"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/vertical_seperator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="|"
+            android:textColor="@color/txt_white"
+            android:textSize="@dimen/text_size_11"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/name_tv"
+            app:layout_goneMarginLeft="8dp"
+            app:layout_goneMarginRight="8dp" />
 
         <TextView
             android:id="@+id/sheep_num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="15dp"
-            android:layout_marginStart="@dimen/content_padding_10"
+            android:layout_marginTop="6dp"
             android:text="绵羊号："
             android:textColor="@color/txt_white"
             android:textSize="@dimen/text_size_11"
-            app:layout_constraintBottom_toBottomOf="@+id/icon_img_iv"
-            app:layout_constraintStart_toEndOf="@+id/icon_img_iv" />
+            app:layout_constraintEnd_toStartOf="@+id/vertical_seperator"
+            app:layout_constraintTop_toBottomOf="@+id/name_tv" />
 
         <TextView
-            android:id="@+id/vip_info_tv"
+            android:id="@+id/login_name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/content_padding_10"
+            android:layout_marginTop="6dp"
             android:text="绵羊号："
-            android:textColor="#90ffffff"
-            android:textSize="@dimen/text_size_10"
-            app:layout_constraintBottom_toBottomOf="@+id/icon_img_iv"
-            app:layout_constraintStart_toEndOf="@+id/icon_img_iv" />
+            android:textColor="@color/txt_white"
+            android:textSize="@dimen/text_size_11"
+            app:layout_constraintStart_toEndOf="@+id/vertical_seperator"
+            app:layout_constraintTop_toBottomOf="@+id/name_tv" />
 
     </android.support.constraint.ConstraintLayout>
 
-    <LinearLayout
-        android:id="@+id/personalcenter_price_layout"
-        style="@style/style_item_container"
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <RelativeLayout
+            android:id="@+id/vip_layout"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:background="@mipmap/bg_vip"
+            android:layout_width="match_parent"
+            android:layout_height="80dp">
+            <ImageView
+                android:id="@+id/iv_crown"
+                android:src="@mipmap/crown"
+                android:layout_marginTop="14dp"
+                android:layout_marginLeft="20dp"
+                android:layout_width="23dp"
+                android:layout_height="20dp" />
+            <TextView
+                android:text="VIP特权"
+                android:layout_marginLeft="8dp"
+                android:textSize="15sp"
+                android:textColor="#f9c85d"
+                android:gravity="center"
+                android:layout_alignTop="@+id/iv_crown"
+                android:layout_toRightOf="@+id/iv_crown"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp" />
 
-        android:background="@color/white">
-        <!--  android:background="@drawable/x_shap_shadow_bg_rectgangle_white"-->
+            <TextView
+                android:id="@+id/sale_words"
+                android:text="省钱福利多, 你不了解一下"
+                android:layout_marginRight="20dp"
+                android:textSize="13sp"
+                android:textColor="#f9c85d"
+                android:gravity="center"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp" />
+            
+            <TextView
+                android:id="@+id/tip_vip"
+                android:layout_alignLeft="@+id/sale_words"
+                android:layout_below="@+id/sale_words"
+                android:text="VIP有效期: 2019-06-03到期"
+                android:textSize="10sp"
+                android:textColor="#cfbf9c"
+                android:visibility="gone"
+                android:layout_marginTop="3dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+            
+            <TextView
+                android:id="@+id/be_vip_btn"
+                android:text="升级成为VIP"
+                android:textColor="#1c1819"
+                android:textSize="10sp"
+                android:layout_alignLeft="@id/sale_words"
+                android:layout_below="@id/sale_words"
+                android:layout_marginTop="3dp"
+                android:paddingTop="2dp"
+                android:paddingBottom="2dp"
+                android:paddingLeft="4dp"
+                android:paddingRight="4dp"
+                android:background="@drawable/yellow_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+            
+        </RelativeLayout>
+        <LinearLayout
+            android:id="@+id/personalcenter_price_layout"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:layout_marginTop="40dp"
+            android:paddingTop="35dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:background="@mipmap/baise">
 
-        <ImageView
-            style="@style/style_item_img"
-            android:src="@mipmap/personalc_ic_my_price" />
+            <ImageView
+                style="@style/style_item_img"
+                android:src="@mipmap/my_assets" />
+
+            <TextView
+                style="@style/style_item_label"
+                android:textSize="15sp"
+                android:textColor="#333333"
+                android:text="我的资产" />
+
+            <View
+                android:id="@+id/pc_mm_red_dot_v"
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:layout_marginEnd="2dp"
+                android:background="@drawable/shape_oval_red"
+                android:visibility="gone" />
+            <TextView
+                android:id="@+id/personalcenter_item_price_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="0.00元"
+                android:textColor="#ff2ebff3"
+                android:textSize="15sp" />
+        </LinearLayout>
+    </RelativeLayout>
 
-        <TextView
-            style="@style/style_item_label"
-            android:text="我的资产" />
-
-        <View
-            android:id="@+id/pc_mm_red_dot_v"
-            android:layout_width="8dp"
-            android:layout_height="8dp"
-            android:layout_marginEnd="2dp"
-            android:background="@drawable/shape_oval_red"
-            android:visibility="gone" />
-        <TextView
-            android:id="@+id/personalcenter_item_price_tv"
-            style="@style/style_item_end_next" />
-    </LinearLayout>
 </LinearLayout>

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

@@ -2,17 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/content_padding_15"
     android:layout_marginTop="@dimen/content_padding_13"
+    android:layout_marginBottom="@dimen/content_padding_15"
     android:background="@color/white"
     android:orientation="vertical">
 
-    <View style="@style/style_item_line_new"
-        android:visibility="gone"/>
+    <View
+        style="@style/style_item_line_new"
+        android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/feedbook_layout"
-        style="@style/style_item_container">
+        style="@style/style_item_container"
+        android:visibility="gone">
 
         <ImageView
             style="@style/style_item_img"
@@ -26,7 +28,9 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new" />
+    <View
+        style="@style/style_item_line_new"
+        android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/faq_layout"
@@ -62,36 +66,43 @@
 
     </LinearLayout>
 
-    <View style="@style/style_item_line_new" />
+    <View
+        style="@style/style_item_line_new"
+        android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/version_layout"
-        style="@style/style_item_container">
+        style="@style/style_item_container"
+        android:visibility="gone">
 
         <ImageView
             style="@style/style_item_img"
             android:src="@mipmap/personalc_ic_version" />
+
         <TextView
+            style="@style/style_item_label_parent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/style_item_label_parent"
             android:text="更新版本" />
+
         <TextView
             android:id="@+id/personal_center_version_new"
             android:layout_width="wrap_content"
             android:layout_height="14dp"
-            android:textColor="@color/white"
-            android:paddingStart="6dp"
-            android:paddingEnd="6dp"
-            android:gravity="center"
-            android:textSize="9sp"
             android:layout_marginStart="@dimen/content_padding"
             android:background="@drawable/shape_red_solid_rectangle"
-            android:text="new" />
+            android:gravity="center"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:text="new"
+            android:textColor="@color/white"
+            android:textSize="9sp" />
+
         <View
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1"/>
+            android:layout_weight="1" />
+
         <TextView
             android:id="@+id/version_item_tv"
             style="@style/style_item_end" />

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/type_toggle_layout"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:gravity="left|center_vertical"
+    android:background="#f5f5f5"
+    android:orientation="horizontal">
+
+    <RadioButton
+        android:id="@+id/all_radio"
+        android:button="@null"
+        android:text="全部"
+        android:checked="true"
+        android:textColor="@color/selector_color_my_money_toggle"
+        android:textSize="12sp"
+        android:layout_marginLeft="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:background="#cccccc"
+        android:layout_marginLeft="10dp"
+        android:layout_width="1dp"
+        android:layout_height="10dp"/>
+
+    <RadioButton
+        android:id="@+id/income_radio"
+        android:button="@null"
+        android:text="收入"
+        android:layout_marginLeft="10dp"
+
+        android:textColor="@color/selector_color_my_money_toggle"
+        android:textSize="12sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:layout_marginLeft="10dp"
+        android:background="#cccccc"
+        android:layout_width="1dp"
+        android:layout_height="10dp"/>
+
+    <RadioButton
+        android:id="@+id/output_radio"
+        android:button="@null"
+        android:text="支出"
+        android:layout_marginLeft="10dp"
+        android:textColor="@color/selector_color_my_money_toggle"
+        android:textSize="12sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RadioGroup>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_rv"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

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

@@ -2,15 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:orientation="vertical">
 
-    <View
-        android:id="@+id/my_money_item_top"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding_10"
-        android:background="@drawable/shape_white_solid_rectangle_small_top" />
-
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/my_money_item_center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -19,22 +14,22 @@
         android:orientation="horizontal">
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:id="@+id/item_desc"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
             android:gravity="center_vertical">
             <TextView
                 android:id="@+id/my_money_item_recharge_amount"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:gravity="start"
                 android:singleLine="true"
                 android:ellipsize="end"
                 android:text="充值金额100.00元"
                 android:textColor="#282828"
-                android:textSize="12sp" />
+                android:textSize="14sp" />
 
             <ImageView
                 android:id="@+id/my_money_item_recharge_amount_iv"
@@ -60,27 +55,27 @@
 
         <TextView
             android:id="@+id/my_money_item_recharge_status"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:gravity="center"
             android:singleLine="true"
+            android:layout_alignParentRight="true"
             android:text="充值成功"
-            android:textColor="#282828"
-            android:textSize="12sp" />
+            android:textColor="#333333"
+            android:textSize="18sp" />
 
         <TextView
             android:id="@+id/my_money_item_recharge_time"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_below="@+id/item_desc"
             android:gravity="end"
             android:singleLine="true"
             android:text="2018/05/07 20:59"
-            android:textColor="#282828"
+            android:textColor="#999999"
             android:textSize="12sp" />
 
-    </LinearLayout>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/my_money_item_recharge_amount_2"
@@ -91,14 +86,13 @@
         android:singleLine="true"
         android:text="充值金额100.00元"
         android:textColor="#282828"
-        android:textSize="12sp"
+        android:textSize="11sp"
         android:padding="@dimen/content_padding_10"
         android:layout_marginTop="@dimen/content_padding_1"
         android:visibility="gone"/>
+
     <View
-        android:id="@+id/my_money_item_bottom"
+        android:background="#e6e6e6"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding_10"
-        android:background="@drawable/shape_white_solid_rectangle_small_bottom" />
-
+        android:layout_height="1dp"/>
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -76,8 +76,8 @@
     <string name="audit_total_welfare">%s元\n累计福利</string>
     <string name="my_invitation_str">我的邀请码:%s</string>
     <string name="audit_activity">审核中\n%s</string>
-    <string name="audit_success">奖励成功\n%s</string>
-    <string name="audit_failed">奖励失败\n%s</string>
+    <string name="audit_success">任务成功\n%s</string>
+    <string name="audit_failed">任务失败\n%s</string>
 
     <string name="homepage_award">你还有%s元的奖励未领取</string>
     <string name="homepage_cash">现金奖励：%s元 ></string>