Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -86,13 +86,11 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     TextView tvLogin;
     @BindView(R2.id.tv_verified)
     TextView tvVerified;
-    @BindView(R2.id.iv_notification)
-    ImageView ivNotification;
     @BindView(R2.id.tv_membership_level)
     TextView tvMembershipLevel;
     @BindView(R2.id.tv_member_hint)
     TextView tvMemberHint;
-    @BindView(R2.id.tv_view_privileges)
+    @BindView(R2.id.tv_item_view_privileges)
     TextView tvViewPrivileges;
     @BindView(R2.id.rl_item_to_be_paid)
     RelativeLayout rlItemToBePaid;
@@ -102,14 +100,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     RelativeLayout rlItemTraveling;
     @BindView(R2.id.rl_item_completed)
     RelativeLayout rlItemCompleted;
-    @BindView(R2.id.rl_item_all)
-    RelativeLayout rlItemAll;
     @BindView(R2.id.rl_item_collection)
     RelativeLayout rlItemCollection;
-    @BindView(R2.id.rl_item_personal_information)
-    RelativeLayout rlItemPersonalInformation;
-    @BindView(R2.id.rl_item_setting)
-    RelativeLayout rlItemSetting;
     @BindView(R2.id.travel_fragment_layout)
     LinearLayout travelFragmentLayout;
     @BindView(R2.id.mine_banner)
@@ -174,6 +166,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     }
 
 
+
     @SuppressLint("CheckResult")
     private void initRxBus() {
 
@@ -198,14 +191,19 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
 
 
     @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying,
-            R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information,
-            R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler,
-            R2.id.tv_view_privileges, R2.id.rl_item_share, R2.id.rl_item_coupon, R2.id.rl_item_points, R2.id.rl_item_wallet})
+            R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_collection,
+            R2.id.iv_item_setting, R2.id.tv_item_view_privileges,R2.id.rl_item_order_all,R2.id.ll_item_integral,R2.id.ll_item_wallet,
+            R2.id.ll_item_coupon, R2.id.ll_item_promotion,R2.id.rl_item_check_in,R2.id.rl_item_travel_management})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id == R.id.iv_avatar) {
+        if (id == R.id.iv_item_setting){
+            //设置
+            if (isLogin()) return;
+            startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
+        }else if (id == R.id.iv_avatar) {
             //头像
             if (isLogin()) return;
+            startActivity(PersonalInformationActivity.getIntent(_mActivity, info));
 
         } else if (id == R.id.tv_login) {
             //登录
@@ -217,6 +215,40 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
             startActivity(IDCardCertificationActivity.getIntent(_mActivity));
 
 
+        }else if (id == R.id.ll_item_integral){
+            //积分
+            if (isLogin()) return;
+            startActivity(new Intent(_mActivity, PointsActivity.class));
+
+        }else if (id == R.id.ll_item_wallet){
+            //钱包
+            if (isLogin()) return;
+            ARouter.getInstance()
+                    .build(Constance.ACTIVITY_URL_WALLET)
+                    .navigation();
+
+        }else if (id == R.id.ll_item_coupon){
+            //优惠券
+            if (isLogin()) return;
+            ARouter.getInstance()
+                    .build(Constance.ACTIVITY_URL_COUPONALL)
+                    .navigation();
+
+        }else if (id == R.id.ll_item_promotion){
+            //推广有奖
+            if (isLogin()) return;
+            startActivity(new Intent(_mActivity, ShareActivity.class));
+
+        } else if (id == R.id.tv_item_view_privileges) {
+            //会员中心
+            if (isLogin()) return;
+            startActivity(MemberCenterActivity.getIntent(_mActivity));
+
+        } else if (id == R.id.rl_item_order_all) {
+            //全部
+            if (isLogin()) return;
+            startActivity(OrderListActivity.getIntent(_mActivity, 4));
+
         } else if (id == R.id.rl_item_to_be_paid) {
             //待支付
             if (isLogin()) return;
@@ -237,59 +269,31 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
             if (isLogin()) return;
             startActivity(OrderListActivity.getIntent(_mActivity, 3));
 
-        } else if (id == R.id.rl_item_all) {
-            //全部
-            if (isLogin()) return;
-            startActivity(OrderListActivity.getIntent(_mActivity, 4));
-
-        } else if (id == R.id.rl_item_my_release) {
+        }  else if (id == R.id.rl_item_my_release) {
             //我的发布
             if (isLogin()) return;
 
+
         } else if (id == R.id.rl_item_collection) {
             //收藏
             if (isLogin()) return;
             startActivity(CollectionActivity.getIntent(_mActivity));
 
-        } else if (id == R.id.rl_item_personal_information) {
-            //个人资料
+        }else if (id == R.id.rl_item_check_in){
+            //签到
             if (isLogin()) return;
-            startActivity(PersonalInformationActivity.getIntent(_mActivity, info));
 
-        } else if (id == R.id.rl_item_setting) {
-            //设置
-            if (isLogin()) return;
-            startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
-
-        } else if (id == R.id.rl_item_driver) {
-            //驾驶人
-            if (isLogin()) return;
-            startActivity(DrivingListActivity.getIntent(_mActivity, null));
-        } else if (id == R.id.rl_item_traveler) {
-            //出游人
+        }else if (id ==R.id.rl_item_travel_management){
+            //出游管理
             if (isLogin()) return;
             startActivity(new Intent(_mActivity, ChooseAVisitorActivity.class));
         }
-//        else if (id == R.id.rl_item_my_pat) {
-//            //我的拍拍
-//        }
-        else if (id == R.id.tv_view_privileges) {
-            startActivity(MemberCenterActivity.getIntent(_mActivity));
-        } else if (id == R.id.rl_item_coupon) {
-            ARouter.getInstance()
-                    .build(Constance.ACTIVITY_URL_COUPONALL)
-                    .navigation();
-        } else if (id == R.id.rl_item_share) {
-            if (isLogin()) return;
-            startActivity(new Intent(_mActivity, ShareActivity.class));
-        } else if (id == R.id.rl_item_points) {
-            if (isLogin()) return;
-            startActivity(new Intent(_mActivity, PointsActivity.class));
-        } else if (id == R.id.rl_item_wallet) {
-            ARouter.getInstance()
-                    .build(Constance.ACTIVITY_URL_WALLET)
-                    .navigation();
-        }
+
+//        } else if (id == R.id.rl_item_driver) {
+//            //驾驶人
+//            if (isLogin()) return;
+//            startActivity(DrivingListActivity.getIntent(_mActivity, null));
+
     }
 
     @Override
@@ -305,7 +309,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
             tvUserIdentity.setVisibility(View.GONE);
             tvViewPrivileges.setText("会员中心");
             tvMembershipLevel.setText("会员特权");
-            tvMemberHint.setText("免费用车7天");
+            tvMemberHint.setText("免费用车- -天");
         }
     }
 
@@ -434,7 +438,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
 
                 if (0 == info.getIsMember()) {
                     tvMembershipLevel.setText("会员特权");
-                    tvMemberHint.setText("免费用车7天");
+                    tvMemberHint.setText("免费用车- -天");
                     tvMember.setText("普通用户");
                 } else if (1 == info.getIsMember()) {
                     if (1 == info.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员

plugin_wallet/src/main/res/layout/activity_wallet.xml

@@ -8,7 +8,7 @@
     tools:context=".activity.WalletActivity">
     
     <LinearLayout
-        android:background="@color/colorYellow"
+        android:background="@drawable/icon_wallet_bg"
         android:layout_width="match_parent"
         android:layout_height="@dimen/size_220"
         android:orientation="vertical">