修改会员特权为会员中心，修改会员价格 小数点后多余的0

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 154
-        versionName "1.5.4"
+        versionCode 153
+        versionName "1.5.3"
         multiDexEnabled true
 
 

RvClient/src/main/AndroidManifest.xml

@@ -224,9 +224,6 @@
         <activity
             android:name="com.rv.home.rv.module.ui.main.home.CarRentalListActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name="com.rv.home.rv.module.ui.main.home.CarRentalActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name="com.rv.home.rv.module.ui.main.home.CityListActivity"
             android:screenOrientation="portrait" />

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

@@ -17,7 +17,7 @@
     <string name="rv_login_rest">重新获取</string>
     <string name="rv_login_authorization_failure">第三方登录失败</string>
     <string name="rv_login_success">登录成功</string>
-    <string name="rv_pwd_hint">请输入密码</string>
+    <string name="rv_pwd_hint">请输入密码，至少8位数字或字母</string>
     <string name="rv_pwd_again_hint">请再次输入密码</string>
     <string name="rv_registered">注册</string>
     <string name="rv_registered_annotations">注册即表示同意滴房车</string>

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

@@ -93,8 +93,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     TextView tvLogin;
     @BindView(R2.id.tv_verified)
     TextView tvVerified;
-    @BindView(R2.id.tv_membership_level)
-    TextView tvMembershipLevel;
+//    @BindView(R2.id.tv_membership_level)
+//    TextView tvMembershipLevel;
     @BindView(R2.id.tv_member_hint)
     TextView tvMemberHint;
     @BindView(R2.id.tv_item_view_privileges)
@@ -390,7 +390,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
         tvVerified.setVisibility(View.GONE);
         tvUserIdentity.setVisibility(View.GONE);
         tvViewPrivileges.setText("查看会员特权");
-        tvMembershipLevel.setText("会员特权");
+//        tvMembershipLevel.setText("会员中心");
         tvMemberHint.setText("免费用车- -天");
         tvIntegral.setText("0");
         tvWallet.setText("0");
@@ -578,18 +578,18 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
 
     private void setMember(UserInfoBean.UserInfo infos) {
         if (0 == infos.getIsMember()) {
-            tvMembershipLevel.setText("会员特权");
+//            tvMembershipLevel.setText("会员中心");
             tvMemberHint.setText("免费用车- -天");
             tvMember.setText("普通用户");
         } else if (1 == infos.getIsMember()) {
             if (1 == infos.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员
-                tvMembershipLevel.setText(" 普通会员特权");
+//                tvMembershipLevel.setText(" 会员中心");
                 tvMember.setText("普通会员");
             } else if (2 == infos.getMemberLevel()) {
-                tvMembershipLevel.setText("黄金会员特权");
+//                tvMembershipLevel.setText("黄金会员特权");
                 tvMember.setText("黄金会员");
             } else if (3 == infos.getMemberLevel()) {
-                tvMembershipLevel.setText("钻石会员特权");
+//                tvMembershipLevel.setText("钻石会员特权");
                 tvMember.setText("钻石会员");
             }
             tvMemberHint.setText("免费用车" + infos.getRentFreeDays() + "天");

module_mine/src/main/res/layout/activity_mine.xml

@@ -321,7 +321,7 @@
                             android:id="@+id/tv_membership_level"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="会员特权"
+                            android:text="会员中心"
                             android:textColor="@color/colorMain"
                             android:textSize="@dimen/text_14"
                             android:textStyle="bold" />

plugin_member/src/main/java/com/rv.member/adapter/GridMemerAdapter.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import com.rv.member.R;
 import com.rv.member.bean.MemberListBean;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public class GridMemerAdapter extends BaseAdapter {
@@ -74,7 +75,9 @@ public class GridMemerAdapter extends BaseAdapter {
             holder = (ViewHolder) view.getTag();
         }
 
-        SpannableString s = new SpannableString("¥ " + memberCard.getPrice());
+        String price = dealPrice(memberCard.getPrice());
+
+        SpannableString s = new SpannableString("¥ " + price);
 
         s.setSpan(new AbsoluteSizeSpan(10, true), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         s.setSpan(new AbsoluteSizeSpan(20, true), 1, s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -119,6 +122,11 @@ public class GridMemerAdapter extends BaseAdapter {
         return view;
     }
 
+    private String dealPrice(BigDecimal value){
+        BigDecimal noZeros = value.stripTrailingZeros();
+        return noZeros.toPlainString();
+    }
+
     private class ViewHolder {
         LinearLayout rl_content;
         TextView tv_type;

plugin_member/src/main/res/layout/view_member_privilege.xml

@@ -147,14 +147,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="7dp"
-        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginLeft="@dimen/size_5"
         android:gravity="center_vertical|left"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/img_agree"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="34dp"
+            android:layout_height="34dp"
             android:paddingLeft="@dimen/dp_10"
             android:paddingTop="@dimen/dp_10"
             android:paddingRight="@dimen/size_5"