bug修复

RvClient/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.test.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 102
-        versionName "1.0.2"
+        versionCode 101
+        versionName "1.0.1"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvFrame/src/main/java/com/frame/rv/config/RvFrameConfig.java

@@ -22,7 +22,7 @@ public interface RvFrameConfig extends RvFrameConstant {
     String VEHICLE_CAMPLIST = HOST + "/api/campsite/";
 
 
-    String APP_ID = "wx9c9d978e5698d00f";//微信注册ID
+    String APP_ID = "wx9ed5e51251cf7c61";//微信注册ID
 
     class RvFrameInfo {
         public static int TYPE_LOGIN = 0;//登录类型0、token过期、1、租车

module_home/src/main/java/com/rv/home/rv/module/basic/presenter/PickerPresenter.java

@@ -145,7 +145,6 @@ public class PickerPresenter extends CommonPresenter {
     }
 
 
-
     /**
      * 获取图片存储地址
      * @return
@@ -185,7 +184,6 @@ public class PickerPresenter extends CommonPresenter {
     }
 
 
-
     public  int calculateInSampleSize(BitmapFactory.Options options,
                                       int reqWidth, int reqHeight) {
         final int height = options.outHeight;

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

@@ -56,7 +56,6 @@ import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
-import com.rv.home.rv.module.ui.main.home.adapter.RVEnthusiastAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.RVTourListAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.RVTourListLabelAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.SelectedEventsAdapter;
@@ -131,8 +130,8 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
     RecyclerView recyclerViewRvtourlist;
     @BindView(R2.id.recyclerView_rvtourlist_title)
     RecyclerView recyclerViewRvtourlistTitle;
-    @BindView(R2.id.recyclerView_rv_enthusiast)
-    RecyclerView recyclerViewRvEnthusiast;
+    //    @BindView(R2.id.recyclerView_rv_enthusiast)
+//    RecyclerView recyclerViewRvEnthusiast;
     @BindView(R2.id.travel_city_text)
     TextView travelCityText;
     @BindView(R2.id.travel_city_layout)
@@ -177,6 +176,12 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
     LinearLayout llItemHotEntertainmentCamp;
     @BindView(R2.id.ll_item_hot_car_rental)
     LinearLayout llItemHotCarRental;
+    @BindView(R2.id.tv_hot_rvtour_hint)
+    TextView tvHotRvtourHint;
+    @BindView(R2.id.tv_hot_entertainment_hint)
+    TextView tvHotEntertainmentHint;
+    @BindView(R2.id.tv_hot_car_rental_hint)
+    TextView tvHotCarRentalHint;
 
 
     private ArrayList<String> images = new ArrayList<>();    //图片(默认采用网络地址)
@@ -221,7 +226,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
 
     private HotCarTypeAdapter mAdapter;
     private SelectedEventsAdapter mActivityAdapter;
-    private RVEnthusiastAdapter mRvEnthusiast;
+    //    private RVEnthusiastAdapter mRvEnthusiast;
     private RVTourListAdapter mRvTourAdapter;
     private RVTourListLabelAdapter mRvTourLabelAdapter;
 
@@ -257,7 +262,8 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
 
         llItemHotRvtour.setSelected(true);
         tvItemRvTour.setSelected(true);
-        tvHotRvtour.setTextColor(getResources().getColor(R.color.text_Main));
+        tvHotRvtourHint.setTextColor(getResources().getColor(R.color.colorWrite));
+        tvHotRvtour.setTextColor(getResources().getColor(R.color.colorWrite));
         tvHotRvtour.getPaint().setFakeBoldText(true);
 
         ViewTreeObserver observer = rlItemLayout.getViewTreeObserver();
@@ -265,9 +271,8 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             @Override
             public void onGlobalLayout() {
                 rlItemLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                height = rlItemLayout.getHeight();
+                height = rlItemLayout.getHeight()-120;
                 rlItemLayout.getWidth();
-
                 scrollview.setScrollViewListener(HomeFragment.this);
             }
         });
@@ -287,12 +292,12 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         recyclerViewActivity.setAdapter(mActivityAdapter);
 
         //房车发烧友
-        mRvEnthusiast = new RVEnthusiastAdapter();
-        recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
+//        mRvEnthusiast = new RVEnthusiastAdapter();
+//        recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
 //      recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
-        recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
-        recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
-        recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
+//        recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
+//        recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
+//        recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
 
         //房车游榜单
         mRvTourAdapter = new RVTourListAdapter();
@@ -406,10 +411,10 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
 
         @Override
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
-            super.getItemOffsets(outRect,view,parent,state);
-            if (parent.getChildAdapterPosition(view) % 2 ==0){
+            super.getItemOffsets(outRect, view, parent, state);
+            if (parent.getChildAdapterPosition(view) % 2 == 0) {
                 outRect.top = 40;
-            }else {
+            } else {
                 outRect.top = space;
             }
 
@@ -426,7 +431,7 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             list.add("https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png");
         }
         mActivityAdapter.setNewData(list);
-        mRvEnthusiast.setNewData(list);
+//        mRvEnthusiast.setNewData(list);
     }
 
     @Override
@@ -654,9 +659,11 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             llItemHotRvtour.setSelected(true);
             llItemHotEntertainmentCamp.setSelected(false);
             llItemHotCarRental.setSelected(false);
-
-            tvHotRvtour.setTextColor(getResources().getColor(R.color.text_Main));
+            tvHotRvtourHint.setTextColor(getResources().getColor(R.color.colorWrite));
+            tvHotRvtour.setTextColor(getResources().getColor(R.color.colorWrite));
+            tvHotEntertainmentHint.setTextColor(getResources().getColor(R.color.textGray));
             tvHotEntertainmentCamp.setTextColor(getResources().getColor(R.color.textGray));
+            tvHotCarRentalHint.setTextColor(getResources().getColor(R.color.textGray));
             tvHotCarRental.setTextColor(getResources().getColor(R.color.textGray));
 
             tvHotRvtour.getPaint().setFakeBoldText(true);
@@ -672,8 +679,11 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             llItemHotRvtour.setSelected(false);
             llItemHotEntertainmentCamp.setSelected(true);
             llItemHotCarRental.setSelected(false);
+            tvHotRvtourHint.setTextColor(getResources().getColor(R.color.textGray));
             tvHotRvtour.setTextColor(getResources().getColor(R.color.textGray));
-            tvHotEntertainmentCamp.setTextColor(getResources().getColor(R.color.text_Main));
+            tvHotEntertainmentHint.setTextColor(getResources().getColor(R.color.colorWrite));
+            tvHotEntertainmentCamp.setTextColor(getResources().getColor(R.color.colorWrite));
+            tvHotCarRentalHint.setTextColor(getResources().getColor(R.color.textGray));
             tvHotCarRental.setTextColor(getResources().getColor(R.color.textGray));
 
             tvHotRvtour.getPaint().setFakeBoldText(false);
@@ -688,9 +698,12 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
             llItemHotRvtour.setSelected(false);
             llItemHotEntertainmentCamp.setSelected(false);
             llItemHotCarRental.setSelected(true);
+            tvHotRvtourHint.setTextColor(getResources().getColor(R.color.textGray));
             tvHotRvtour.setTextColor(getResources().getColor(R.color.textGray));
+            tvHotEntertainmentHint.setTextColor(getResources().getColor(R.color.textGray));
             tvHotEntertainmentCamp.setTextColor(getResources().getColor(R.color.textGray));
-            tvHotCarRental.setTextColor(getResources().getColor(R.color.text_Main));
+            tvHotCarRentalHint.setTextColor(getResources().getColor(R.color.colorWrite));
+            tvHotCarRental.setTextColor(getResources().getColor(R.color.colorWrite));
 
             tvHotRvtour.getPaint().setFakeBoldText(false);
             tvHotEntertainmentCamp.getPaint().setFakeBoldText(false);

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

@@ -14,9 +14,9 @@ import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
+import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 /**
@@ -41,6 +41,8 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
+
+//        webUrl = ApiConfig.HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL + "?no=" + no;
     }
 
     @Override

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

@@ -112,7 +112,6 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         }
 //        mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
         mWebView.destroy();// 生命周期销毁
-
     }
 
 

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

@@ -66,6 +66,7 @@
                 <ImageView
                     android:layout_width="@dimen/size_15"
                     android:layout_height="@dimen/size_15"
+                    android:padding="@dimen/size_1"
                     android:src="@drawable/aa_icon_like" />
 
                 <TextView

module_mine/build.gradle

@@ -44,4 +44,6 @@ dependencies {
     implementation 'top.zibin:Luban:1.1.3'
     implementation project(':plugin_member')
     api project(':plugin_version')
+    //动态权限申请库
+    implementation 'pub.devrel:easypermissions:1.3.0'
 }

module_mine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java

@@ -45,6 +45,7 @@ import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import pub.devrel.easypermissions.EasyPermissions;
 import top.zibin.luban.Luban;
 import top.zibin.luban.OnCompressListener;
 
@@ -228,6 +229,8 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
      *
      * @param type 1、相机2、相册
      */
+
+
     @SuppressLint("CheckResult")
     private void processPicker(final int type) {
         /**

plugin_calendar/src/main/res/layout/activity_calendar.xml

@@ -7,111 +7,32 @@
 
 
     <LinearLayout
-        android:background="@color/colorYellow"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/size_50"
+        android:layout_height="@dimen/size_200"
+        android:background="@color/gray_FFB74B"
         android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_calendar_inday"
-                android:text="17-12-05"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorMain"
-                android:textSize="@dimen/text_14" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-                <TextView
-                    android:id="@+id/tv_calendar_inweek"
+            <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                    android:textColor="@color/colorMain"
-                    android:textSize="@dimen/text_12"
-                    android:text="周一" />
+                android:layout_gravity="right"
+                android:layout_alignParentRight="true"
+                android:src="@drawable/common_icon_close_white" />
 
-                <TextView
-                    android:id="@+id/tv_calendar_intime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorMain"
-                    android:textSize="@dimen/text_12"
-                    android:layout_marginLeft="@dimen/size_5"
-                    android:text="12:00" />
-            </LinearLayout>
-        </LinearLayout>
+        </RelativeLayout>
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center">
-
-            <TextView
-                android:id="@+id/tv_calendar_night"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="366"
-                android:textColor="@color/colorMain"
-                android:textSize="@dimen/text_14" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="天"
-                android:textColor="@color/colorMain"
-                android:textSize="@dimen/text_14" />
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/tv_calendar_outday"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorMain"
-                android:textSize="@dimen/text_14"
-                android:text="17-12-05" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/tv_calendar_outweek"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorMain"
-                    android:textSize="@dimen/text_12"
-                    android:text="周一" />
-
-                <TextView
-                    android:id="@+id/tv_calendar_outtime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/colorMain"
-                    android:textSize="@dimen/text_12"
-                    android:layout_marginLeft="@dimen/size_5"
-                    android:text="12:00" />
-            </LinearLayout>
-        </LinearLayout>
     </LinearLayout>
 
     <include layout="@layout/common_line" />