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

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 128
-        versionName "1.2.8"
+        versionCode 129
+        versionName "1.2.9"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java

@@ -456,20 +456,19 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
             int cityId = data.getIntExtra("id", 0);
             String cityName = data.getStringExtra("location");
             setRequestData(type, requestData, lat, lon, company, cityId, companyId, cityName);
-
         }
     }
 
     private void setRequestData(int type, String requestData, double lat, double lon, String compangy, int cityId, int companyId, String cityName) {
         if (type == 1) {
             tvGetAddress.setText(compangy);
-            dataBean.setStartAddr(requestData);
+            dataBean.setStartAddr(compangy);
             dataBean.setStartCity(cityId);
             dataBean.setStartCityName(cityName);
             dataBean.setStartCompanyId(companyId);
         } else if (type == 2) {
             tvOutAddress.setText(compangy);
-            dataBean.setEndAddr(requestData);
+            dataBean.setEndAddr(compangy);
             dataBean.setEndCity(cityId);
             dataBean.setEndCityName(cityName);
             dataBean.setEndCompanyId(companyId);

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShareImageActivity.java

@@ -86,7 +86,7 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
-        GlideManager.getInstance(this).loadImage(icon, ivGoods);
+        GlideManager.getInstance(this).loadImage3(icon, ivGoods);
         tvName.setText(name);
         tvContent.setText(Html.fromHtml(keyword));
         tvPrice.setText(String.format("%1$s%2$s", price, this.getString(R.string.rv_day)));
@@ -102,10 +102,10 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
 
     }
 
-    @OnClick({R2.id.iv_title_left, R2.id.tv_share})
+    @OnClick({R2.id.img_title_left, R2.id.tv_share})
     public void onViewClicked(View view) {
         int i = view.getId();
-        if (i == R.id.iv_title_left) {
+        if (i == R.id.img_title_left) {
             finish();
 
         } else if (i == R.id.tv_share) {
@@ -201,7 +201,6 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
     }
 
 
-
     public static Bitmap createQRImage(String content, int widthPix, int heightPix,
                                        Bitmap logoBm) {
         try {

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/EvaluationActivity.java

@@ -117,11 +117,12 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
             GlideManager.getInstance(mActivity).loadImage(dataBean.getIcon(), ivCar);
             if (dataBean.getType() == 1) {
                 if (dataBean.getOrderRentVehicleDetail() != null && !TextUtils.isEmpty(dataBean.getOrderRentVehicleDetail().getCost_detail())) {
-                    tvContent.setText(dataBean.getOrderRentVehicleDetail().getCost_detail());
+                    tvContent.setText("");
                 }
             } else if (dataBean.getType() == 2) {
                 if (dataBean.getOrderTourDetail() != null && !TextUtils.isEmpty(dataBean.getOrderTourDetail().getCostDetail())) {
-                    tvContent.setText(dataBean.getOrderTourDetail().getCostDetail());
+//                    tvContent.setText(dataBean.getOrderTourDetail().getCostDetail());
+                    tvContent.setText("");
                 }
             } else if (dataBean.getType() == 3) {
                 if (dataBean.getOrderMemberDetail() != null) {

module_home/src/main/res/layout/rv_act_share_image.xml

@@ -12,11 +12,13 @@
         android:layout_height="@dimen/size_50">
 
         <ImageView
-            android:id="@+id/iv_title_left"
+            android:id="@+id/img_title_left"
             android:layout_width="@dimen/size_32"
             android:layout_height="@dimen/size_32"
+            android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
             android:layout_marginLeft="@dimen/size_5"
+            android:clickable="true"
             android:padding="@dimen/size_8"
             android:src="@drawable/rv_common_icon_back_dark" />
 
@@ -52,10 +54,12 @@
             android:background="@color/colorWrite">
 
             <ImageView
+
                 android:id="@+id/iv_goods"
                 android:layout_width="match_parent"
-                android:layout_height="300dp"
-                android:scaleType="centerCrop" />
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/size_200"
+                android:scaleType="fitXY" />
 
             <LinearLayout
 

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

@@ -50,7 +50,7 @@
     <string name="rv_get_car_address">取车分公司</string>
     <string name="rv_get_car_address_">取车地址：</string>
     <string name="rv_get_car_hint">请选择取车分公司</string>
-    <string name="rv_get_out_address">还分车公司</string>
+    <string name="rv_get_out_address">还车公司</string>
     <string name="rv_get_out_address_">还车地址：</string>
     <string name="rv_get_out_hint">请选择还车分公司</string>
     <string name="rv_full_time_driver">欣新专职司机(600/天)</string>

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

@@ -243,7 +243,7 @@ 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.iv_item_message,
-            R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_collection,R2.id.rl_item_my_release,
+            R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_collection, R2.id.rl_item_my_release,
             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) {
@@ -252,17 +252,17 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
             //设置
             if (isLogin()) return;
             startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
-        }else if (id == R.id.iv_item_message){
+        } else if (id == R.id.iv_item_message) {
             //消息通知
             if (isLogin()) return;
             showToast("该功能还在开发中。。。");
 
-        }else if (id == R.id.iv_avatar) {
+        } else if (id == R.id.iv_avatar) {
             //头像
             if (isLogin()) return;
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                startActivity(PersonalInformationActivity.getIntent(_mActivity, info), ActivityOptions.makeSceneTransitionAnimation(_mActivity,ivAvatar,"sharedView").toBundle());
-            }else {
+                startActivity(PersonalInformationActivity.getIntent(_mActivity, info), ActivityOptions.makeSceneTransitionAnimation(_mActivity, ivAvatar, "sharedView").toBundle());
+            } else {
                 startActivity(PersonalInformationActivity.getIntent(_mActivity, info));
             }
 
@@ -404,7 +404,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
                     @Override
                     public void displayImage(Context context, Object path, ImageView imageView) {
 
-                        GlideManager.getInstance(context).loadRoundImage2(path, imageView,8);
+                        GlideManager.getInstance(context).loadRoundImage2(path, imageView, 8);
                     }
                 })
                 .setOnBannerListener(new OnBannerListener() {
@@ -519,8 +519,12 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
                     tvVerified.setEnabled(false);
                 }
 
-                if (!TextUtils.isEmpty(info.getIcon()))
+                if (!TextUtils.isEmpty(info.getIcon())) {
+                    ivMember.setVisibility(View.VISIBLE);
                     GlideManager.getInstance(getContext()).loadImage(info.getIcon(), ivMember);
+                } else {
+                    ivMember.setVisibility(View.GONE);
+                }
                 if (TextUtils.isEmpty(info.getPositionName())) {
                     tvUserIdentity.setVisibility(View.GONE);
                 } else {

module_tourism/src/main/java/com/rv/tourism/presenter/TourismPresenter.java

@@ -57,7 +57,12 @@ public class TourismPresenter extends MvpPresenter {
                     for (String param : params) {
                         String[] values = param.split("=");
                         if (values.length == 2) {
-                            intent.putExtra(values[0], values[1]);
+
+                            if ("price".equals(values[0])) {
+                                intent.putExtra(values[0], Double.valueOf(values[1]));
+                            } else {
+                                intent.putExtra(values[0], values[1]);
+                            }
                         }
                     }
                 }

plugin_share/src/main/java/com/rv/share/view/ShareChoiceDialog.java

@@ -155,7 +155,7 @@ public class ShareChoiceDialog implements View.OnClickListener {
         }
 
         public Builder setQQVisiable(boolean b) {
-            dialog.isShowQQ = b;
+            dialog.isShowQQ = false;
             return this;
         }
 

plugin_share/src/main/res/layout/activity_bill.xml

@@ -55,9 +55,10 @@
     <android.support.v7.widget.CardView
         android:id="@+id/ll_webview"
         android:layout_width="match_parent"
-        android:layout_height="380dp"
+        android:layout_height="match_parent"
         android:layout_above="@id/ll_bottom"
-        android:layout_centerInParent="true"
+        android:layout_below="@id/tv_back_title"
+        android:layout_marginTop="@dimen/size_50"
         android:layout_marginLeft="@dimen/dp_10"
         android:layout_marginRight="@dimen/dp_10"
         android:layout_marginBottom="@dimen/size_20"

plugin_wallet/src/main/java/com/xxrv/wallet/activity/CommissionDetailActivity.java

@@ -53,7 +53,7 @@ public class CommissionDetailActivity extends BaseStatusActivity<CommonPresenter
 
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
-        titleView.setTitle("提现记录");
+        titleView.setTitle("佣金记录");
         initRecyclerView();
         initViewpager();
     }