修改签到处的bug;替换分享规则的图片以及修改分享规定的提成率；

RvClient/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 127
+        versionCode 128
         versionName "1.2.7"
         multiDexEnabled true
 

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

@@ -2,6 +2,7 @@ package com.rv.home.rv.module.ui.main.home;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -165,11 +166,11 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
-         switch (requestType){
-             case 0:
-                 userInfoData((UserInfoBean) result);
-                 break;
-         }
+        switch (requestType) {
+            case 0:
+                userInfoData((UserInfoBean) result);
+                break;
+        }
     }
 
     private void userInfoData(UserInfoBean infoBean) {
@@ -323,10 +324,9 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         mWebView.setWebChromeClient(new WebChromeClient() {
             @Override
             public void onProgressChanged(WebView view, int newProgress) {
-                if(newProgress==100){
+                if (newProgress == 100) {
                     pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
-                }
-                else{
+                } else {
                     pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
                     pbProgress.setProgress(newProgress);//设置进度值
                 }
@@ -351,7 +351,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
                             .withString("name", mCarBean.getVehicleModel().getName())
                             .withString("keyword", mCarBean.getVehicleModel().getKeyword())
                             .withDouble("price", mCarBean.getVehicleModel().getPrice())
-                            .withString("url",url)
+                            .withString("url", url)
                             .navigation();
 
                 } else if (snsPlatform.mShowWord.equals("复制链接")) {
@@ -421,6 +421,14 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             }
 
         }
+
+        @JavascriptInterface
+        public void toMemberCenter() {
+            ComponentName componentName = new ComponentName(getApplicationContext(), "com.rv.member.MemberCenterActivity");
+            Intent in = new Intent();
+            in.setComponent(componentName);
+            startActivity(in);
+        }
     }
 
     /**

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

@@ -200,6 +200,8 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
     private double lonLongitude;
     private LatLng mLatLng;//当前城市经纬度
 
+    private String getCompanyName;
+    private String outCompanyName;
     private int getCompanyId; // 取车公司id
     private int outCompanyId; // 取车公司id;
     private double getLatitude;
@@ -621,9 +623,9 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
             }
 
             sendData(getCityName,
-                    headTvGetShop.getText().toString().trim(),
+                    getCompanyName,
                     outCityName,
-                    headTvOutShop.getText().toString().trim(),
+                    outCompanyName,
                     begDate, endDate, copyDay,
                     begDate,
                     endDate
@@ -789,22 +791,22 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
             switch (requestCode) {
                 case TYPE_REQUEST_CITY://城市列表
                     if (type == 1) {
-                        String companyName = data.getStringExtra("company");
+                        getCompanyName = data.getStringExtra("company");
                         getCompanyId = data.getIntExtra("company_id", 1);
                         getCityName = requestData;
                         getCityId = data.getIntExtra("id", 0);
                         String getAddress = "%s(%s)";
-                        headTvGetShop.setText(String.format(getAddress, new Object[]{companyName, getCityName}));
+                        headTvGetShop.setText(String.format(getAddress, new Object[]{getCompanyName, getCityName}));
                         getLatitude = data.getDoubleExtra("latitude", 0);
                         getLongitude = data.getDoubleExtra("longitude", 0);
                         setRequestData(type, requestData, getLatitude, getLongitude);
                     } else if (type == 2) {
-                        String companyName = data.getStringExtra("company");
+                        outCompanyName = data.getStringExtra("company");
                         outCompanyId = data.getIntExtra("company_id", 1);
                         outCityName = requestData;
                         outCityId = data.getIntExtra("id", 0);
                         String outAddress = "%s(%s)";
-                        headTvOutShop.setText(String.format(outAddress, new Object[]{companyName, outCityName}));
+                        headTvOutShop.setText(String.format(outAddress, new Object[]{outCompanyName, outCityName}));
                         outLatitude = data.getDoubleExtra("latitude", 0);
                         outLongitude = data.getDoubleExtra("longitude", 0);
                         setRequestData(type, requestData, outLatitude, outLongitude);
@@ -944,7 +946,8 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         if (bean.getData() != null && bean.getData().getTotalCount() > 0) {
             if (headTvGetShop != null) {
                 String getAdress = "%s(%s)";
-                headTvGetShop.setText(String.format(getAdress, new Object[]{bean.getData().getData().get(0).getName(), getCityName}));
+                getCompanyName = bean.getData().getData().get(0).getName();
+                headTvGetShop.setText(String.format(getAdress, new Object[]{getCompanyName, getCityName}));
                 headTvGetShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
                 getLatitude = bean.getData().getData().get(0).getLatitude();
                 getLongitude = bean.getData().getData().get(0).getLongitude();
@@ -953,16 +956,19 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
 
             if (headTvOutShop != null) {
                 String getAdress = "%s(%s)";
-                headTvOutShop.setText(String.format(getAdress, new Object[]{bean.getData().getData().get(0).getName(), outCityName}));
+                outCompanyName = bean.getData().getData().get(0).getName();
+                headTvOutShop.setText(String.format(getAdress, new Object[]{outCompanyName, outCityName}));
                 headTvOutShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
                 outLatitude = bean.getData().getData().get(0).getLatitude();
                 outLongitude = bean.getData().getData().get(0).getLongitude();
             }
         } else {
-            headTvGetShop.setText("");
+            getCompanyName = "" ;
+            headTvGetShop.setText(getCompanyName);
             getLatitude = 0;
             getLongitude = 0;
-            headTvOutShop.setText("");
+            outCompanyName = "" ;
+            headTvOutShop.setText(outCompanyName);
             outLatitude = 0;
             outLongitude = 0;
         }

plugin_points/src/main/java/com/rv/points/adapter/DateAdapter.java

@@ -74,19 +74,21 @@ public class DateAdapter extends BaseAdapter {
         viewHolder.tv = view.findViewById(R.id.tvWeek);
         viewHolder.rlItem = view.findViewById(R.id.rlItem);
         viewHolder.ivStatus = view.findViewById(R.id.ivStatus);
-        if (today == i) {
+        if (today == days.get(i)) {
             viewHolder.tv.setText("今天");
         } else {
             viewHolder.tv.setText(days.get(i) + "");
         }
         if (days.get(i) == 0) {
             viewHolder.rlItem.setVisibility(View.GONE);
+        } else {
+            viewHolder.rlItem.setVisibility(View.VISIBLE);
         }
-        if (singRecords != null && singRecords.contains(i)) {
+        if (singRecords != null && singRecords.contains(days.get(i))) {
             viewHolder.ivStatus.setImageResource(R.drawable.icon_signed);
             viewHolder.ivStatus.setVisibility(View.VISIBLE);
         } else {
-            if (today > i) {
+            if (today > days.get(i)) {
                 viewHolder.ivStatus.setImageResource(R.drawable.icon_unsign);
                 viewHolder.ivStatus.setVisibility(View.VISIBLE);
             } else {

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

@@ -28,7 +28,6 @@ public class PromotionDialog extends Dialog {
     public static class Builder {
 
         private Context mContext;
-        private ImageView button;
         private ImageView imgBg;
         private ImageView imgClose;
         private View.OnClickListener mListener;
@@ -60,10 +59,6 @@ public class PromotionDialog extends Dialog {
             View layout = inflater.inflate(R.layout.dialog_promotion, null);
             // 为对话框添加布局和设置大小
             dialog.addContentView(layout, new WindowManager.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT));
-            this.button = layout.findViewById(R.id.button);
-//            if (this.act != null && !TextUtils.isEmpty(this.act.getButtonImages())) {
-//                GlideManager.getInstance(mContext).loadImage2(this.act.getButtonImages(), this.button);
-//            }
             this.imgBg = layout.findViewById(R.id.img_bg);
             if (this.act != null && !TextUtils.isEmpty(this.act.getBackground())) {
                 GlideManager.getInstance(mContext).loadImage2(this.act.getBackground(), this.imgBg);

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

@@ -17,8 +17,9 @@
             android:orientation="vertical">
 
             <ImageView
+                android:scaleType="fitXY"
                 android:layout_width="match_parent"
-                android:layout_height="650px"
+                android:layout_height="@dimen/height_share_ruler_top"
                 android:src="@drawable/banner_share_ruler_top" />
 
             <TextView
@@ -59,7 +60,7 @@
                 android:layout_marginLeft="@dimen/size_10"
                 android:layout_marginTop="@dimen/size_10"
                 android:layout_marginRight="@dimen/size_10"
-                android:text="         分享你的推广码或专属链接给您的好友，邀请好友下载进入APP体验并注册。在好友注册的时间开始算2个月，每当您的1位好友完成1次租车或房车游行程或购买会员并支付订单，您便可获得好友支付订单金额（不包括租车押金）的10%提成作为邀请奖励。您邀请下单的好友越多，您获得的奖励越多，奖励现金可提现。"
+                android:text="         分享你的推广码或专属链接给您的好友，邀请好友下载进入APP体验并注册。在好友注册的时间开始算2个月，每当您的1位好友完成1次租车或房车游行程或购买会员并支付订单，您便可获得好友支付订单金额（不包括租车押金）的5%提成作为邀请奖励。您邀请下单的好友越多，您获得的奖励越多，奖励现金可提现。"
                 android:textColor="#ff666666"
                 android:textSize="@dimen/sp_14" />
 
@@ -95,9 +96,9 @@
                     android:layout_height="@dimen/size_20"
                     android:layout_marginTop="@dimen/size_3"
                     android:layout_marginBottom="3dp"
-                    android:src="@drawable/icon_share_ruler_down"
                     android:gravity="center_horizontal"
-                    android:orientation="vertical"/>
+                    android:orientation="vertical"
+                    android:src="@drawable/icon_share_ruler_down" />
 
 
                 <TextView
@@ -114,9 +115,9 @@
                     android:layout_height="@dimen/size_20"
                     android:layout_marginTop="@dimen/size_3"
                     android:layout_marginBottom="3dp"
-                    android:src="@drawable/icon_share_ruler_down"
                     android:gravity="center_horizontal"
-                    android:orientation="vertical"/>
+                    android:orientation="vertical"
+                    android:src="@drawable/icon_share_ruler_down" />
 
 
                 <TextView
@@ -133,9 +134,9 @@
                     android:layout_height="@dimen/size_20"
                     android:layout_marginTop="@dimen/size_3"
                     android:layout_marginBottom="3dp"
-                    android:src="@drawable/icon_share_ruler_down"
                     android:gravity="center_horizontal"
-                    android:orientation="vertical"/>
+                    android:orientation="vertical"
+                    android:src="@drawable/icon_share_ruler_down" />
 
 
                 <TextView
@@ -152,9 +153,9 @@
                     android:layout_height="@dimen/size_20"
                     android:layout_marginTop="@dimen/size_3"
                     android:layout_marginBottom="3dp"
-                    android:src="@drawable/icon_share_ruler_down"
                     android:gravity="center_horizontal"
-                    android:orientation="vertical"/>
+                    android:orientation="vertical"
+                    android:src="@drawable/icon_share_ruler_down" />
 
 
                 <TextView
@@ -171,9 +172,9 @@
                     android:layout_height="@dimen/size_20"
                     android:layout_marginTop="@dimen/size_3"
                     android:layout_marginBottom="3dp"
-                    android:src="@drawable/icon_share_ruler_down"
                     android:gravity="center_horizontal"
-                    android:orientation="vertical"/>
+                    android:orientation="vertical"
+                    android:src="@drawable/icon_share_ruler_down" />
 
                 <TextView
                     android:layout_width="match_parent"
@@ -182,7 +183,7 @@
                     android:layout_marginRight="@dimen/size_50"
                     android:background="@drawable/bg_income_item"
                     android:gravity="center"
-                    android:text="您获得邀请奖励：订单20%的提成" />
+                    android:text="您获得邀请奖励：订单5%的提成" />
 
             </LinearLayout>
 

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

@@ -18,19 +18,6 @@
             android:minHeight="@dimen/dialog_min_height"
             android:scaleType="fitXY" />
 
-
-        <ImageView
-            android:id="@+id/button"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/size_40"
-            android:layout_gravity="bottom"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_10"
-            android:layout_marginBottom="@dimen/size_10"
-            android:gravity="center"
-            android:visibility="gone" />
-
     </FrameLayout>
 
     <ImageView

plugin_share/src/main/res/values-hdpi/dimens.xml

@@ -4,4 +4,6 @@
     <dimen name="dialog_min_height">150dp</dimen>
     <dimen name="dialog_act_width">150dp</dimen>
     <dimen name="dialog_act_height">200dp</dimen>
+
+    <dimen name="height_share_ruler_top">108.34dp</dimen>
 </resources>

plugin_share/src/main/res/values-xhdpi/dimens.xml

@@ -4,4 +4,6 @@
     <dimen name="dialog_min_height">200dp</dimen>
     <dimen name="dialog_act_width">200dp</dimen>
     <dimen name="dialog_act_height">266.67dp</dimen>
+
+    <dimen name="height_share_ruler_top">240.45dp</dimen>
 </resources>

plugin_share/src/main/res/values-xxhdpi/dimens.xml

@@ -5,4 +5,7 @@
 
     <dimen name="dialog_act_width">300dp</dimen>
     <dimen name="dialog_act_height">400dp</dimen>
+    
+    
+    <dimen name="height_share_ruler_top">216.67dp</dimen>
 </resources>