提交代码

MyFrame/src/main/java/com/frame/base/url/ImageUrl.java

+package com.frame.base.url;
+
+public final class ImageUrl {
+    public static final String IMG_BG_SHARE_TOP = "https://mgmt.dfangche.com/image/app/bg_share_top.png";
+
+    public static final String IMG_BG_BILL = "https://mgmt.dfangche.com/image/app/bg_bill.jpg";
+
+    public static final String IMG_BG_BANNER_SIGN = "https://mgmt.dfangche.com/image/app/banner_sign.png";
+}

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 155
+        versionName "1.5.5"
         multiDexEnabled true
 
 

RvWrapper/src/main/res/values/dimens.xml

@@ -53,6 +53,7 @@
     <dimen name="size_240">240dp</dimen>
     <dimen name="size_245">245dp</dimen>
     <dimen name="size_250">250dp</dimen>
+    <dimen name="size_320">320dp</dimen>
     <dimen name="size_410">410dp</dimen>
     <dimen name="size_420">420dp</dimen>
     <dimen name="size_440">440dp</dimen>

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

@@ -458,7 +458,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
             begTime = hh + ":30";
         }
 
-        if (DateUtils.formatDate20(begTime) > DateUtils.formatDate20("19:30")) {   //如果当前时间大于 19：30，日期往后加一，时间改成早上8：00
+        if (DateUtils.formatDate20(begTime) > DateUtils.formatDate20("22:30")) {   //如果当前时间大于 22：30，日期往后加一，时间改成早上8：00
             begDate = MyUtils.getFetureDate(1) + " " + "08:30";
             endDate = MyUtils.getFetureDate(3) + " " + "08:30";
         } else {

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/CarRentalCheckPriceAdapter.java

@@ -29,7 +29,7 @@ public class CarRentalCheckPriceAdapter extends BaseQuickAdapter<CarRentalPriceB
         }
 
         if (type) {
-            helper.setText(R.id.tv_price, item.getFreeDays());
+            helper.setText(R.id.tv_price, item.getFreeDays() + "天");
         } else {
             helper.setText(R.id.tv_price, "¥" + item.getPrice());
         }

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

@@ -10,7 +10,7 @@
         android:id="@+id/tv_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="15"
+        android:text=""
         android:textColor="@color/text_Main"
         android:textSize="@dimen/text_16" />
 
@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/size_3"
-        android:text="￥1500"
+        android:text=""
         android:textColor="@color/colorAuxiliaryRed"
         android:textSize="@dimen/text_10" />
 

plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java

@@ -358,7 +358,7 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
      * 初始化时间数据
      */
     private void initTime() {
-        for (int i = 8; i < 20; i++) {
+        for (int i = 8; i < 23; i++) {
             if (i > 8) {
                 timeList.add(String.format("%02d", i) + ":00");
             }

plugin_im/src/main/java/com/rv/im/util/SmileyParser.java

@@ -307,7 +307,7 @@ public class SmileyParser {
     }
 
     public static class Gifs {
-        private static final int[][] IDS = {
+       /* private static final int[][] IDS = {
                 {
                         R.drawable.gif_eight, R.drawable.gif_eighteen, R.drawable.gif_eleven, R.drawable.gif_fifity,
                         R.drawable.gif_fifity_four, R.drawable.gif_fifity_one, R.drawable.gif_fifity_three, R.drawable.gif_fifity_two
@@ -334,7 +334,7 @@ public class SmileyParser {
                         , R.drawable.gif_twenty_three, R.drawable.gif_twenty_two
                 }
 
-        };
+        };*/
         private static final String[][] TEXTS = {
                 {
                         "eight.gif", "eighteen.gif", "eleven.gif", "fifity.gif",
@@ -372,72 +372,72 @@ public class SmileyParser {
         /**
          * gif
          */
-        private static final int[][] PNGID = {
-                {
-                        R.drawable.gif_eight_png, R.drawable.gif_eighteen_png, R.drawable.gif_eleven_png, R.drawable.gif_fifity_png,
-                        R.drawable.gif_fifity_four_png, R.drawable.gif_fifity_one_png, R.drawable.gif_fifity_three_png, R.drawable.gif_fifity_two_png
-                        , R.drawable.gif_fifteen_png, R.drawable.gif_five_png
-                },
-                {
-                        R.drawable.gif_forty_png, R.drawable.gif_forty_eight_png,
-                        R.drawable.gif_forty_five_png, R.drawable.gif_forty_four_png, R.drawable.gif_forty_nine_png, R.drawable.gif_forty_one_png
-                        , R.drawable.gif_forty_seven_png, R.drawable.gif_forty_three_png, R.drawable.gif_forty_two_png, R.drawable.gif_fourteen_png
-                },
-                {
-
-                        R.drawable.gif_nine_png, R.drawable.gif_nineteen_png, R.drawable.gif_one_png, R.drawable.gif_seven_png,
-                        R.drawable.gif_seventeen_png, R.drawable.gif_sixteen_png, R.drawable.gif_ten_png, R.drawable.gif_thirteen_png,
-                        R.drawable.gif_thirty_png, R.drawable.gif_thirty_eight_png
-                },
-                {
-                        R.drawable.gif_thirty_five_png, R.drawable.gif_thirty_four_png, R.drawable.gif_thirty_nine_png, R.drawable.gif_thirty_seven_png
-                        , R.drawable.gif_thirty_six_png, R.drawable.gif_thirty_three_png, R.drawable.gif_thirty_two_png, R.drawable.gif_thirty_one_png
-                        , R.drawable.gif_three_png, R.drawable.gif_twelve_png
-                },
-                {
-                        R.drawable.gif_twenty_png, R.drawable.gif_twenty_eight_png, R.drawable.gif_twenty_five_png, R.drawable.gif_twenty_four_png,
-                        R.drawable.gif_twenty_nine_png, R.drawable.gif_twenty_one_png, R.drawable.gif_twenty_seven_png, R.drawable.gif_twenty_six_png
-                        , R.drawable.gif_twenty_three_png, R.drawable.gif_twenty_two_png
-                }
-
-        };
+//        private static final int[][] PNGID = {
+//                {
+//                        R.drawable.gif_eight_png, R.drawable.gif_eighteen_png, R.drawable.gif_eleven_png, R.drawable.gif_fifity_png,
+//                        R.drawable.gif_fifity_four_png, R.drawable.gif_fifity_one_png, R.drawable.gif_fifity_three_png, R.drawable.gif_fifity_two_png
+//                        , R.drawable.gif_fifteen_png, R.drawable.gif_five_png
+//                },
+//                {
+//                        R.drawable.gif_forty_png, R.drawable.gif_forty_eight_png,
+//                        R.drawable.gif_forty_five_png, R.drawable.gif_forty_four_png, R.drawable.gif_forty_nine_png, R.drawable.gif_forty_one_png
+//                        , R.drawable.gif_forty_seven_png, R.drawable.gif_forty_three_png, R.drawable.gif_forty_two_png, R.drawable.gif_fourteen_png
+//                },
+//                {
+//
+//                        R.drawable.gif_nine_png, R.drawable.gif_nineteen_png, R.drawable.gif_one_png, R.drawable.gif_seven_png,
+//                        R.drawable.gif_seventeen_png, R.drawable.gif_sixteen_png, R.drawable.gif_ten_png, R.drawable.gif_thirteen_png,
+//                        R.drawable.gif_thirty_png, R.drawable.gif_thirty_eight_png
+//                },
+//                {
+//                        R.drawable.gif_thirty_five_png, R.drawable.gif_thirty_four_png, R.drawable.gif_thirty_nine_png, R.drawable.gif_thirty_seven_png
+//                        , R.drawable.gif_thirty_six_png, R.drawable.gif_thirty_three_png, R.drawable.gif_thirty_two_png, R.drawable.gif_thirty_one_png
+//                        , R.drawable.gif_three_png, R.drawable.gif_twelve_png
+//                },
+//                {
+//                        R.drawable.gif_twenty_png, R.drawable.gif_twenty_eight_png, R.drawable.gif_twenty_five_png, R.drawable.gif_twenty_four_png,
+//                        R.drawable.gif_twenty_nine_png, R.drawable.gif_twenty_one_png, R.drawable.gif_twenty_seven_png, R.drawable.gif_twenty_six_png
+//                        , R.drawable.gif_twenty_three_png, R.drawable.gif_twenty_two_png
+//                }
+//
+//        };
         private static final Map<String, Integer> MAPS = new HashMap<String, Integer>();
 
-        static {
-            // 取最小的长度，防止长度不一致出错
-            int length = IDS.length > TEXTS.length ? TEXTS.length : IDS.length;
-            for (int i = 0; i < length; i++) {
-                int[] subIds = IDS[i];
-                String[] subTexts = TEXTS[i];
-                if (subIds == null || subTexts == null) {
-                    continue;
-                }
-                int subLength = subIds.length > subTexts.length ? subTexts.length : subIds.length;
-                for (int j = 0; j < subLength; j++) {
-                    MAPS.put(TEXTS[i][j], IDS[i][j]);
-                }
-            }
-        }
-
-        public static int[][] getIds() {
-            return IDS;
-        }
-
-        public static String[][] getTexts() {
-            return TEXTS;
-        }
-
-        public static int textMapId(String text) {
-            if (MAPS.containsKey(text)) {
-                return MAPS.get(text);
-            } else {
-                return -1;
-            }
-        }
-
-        public static int[][] getPngIds() {
-
-            return PNGID;
-        }
+//        static {
+//            // 取最小的长度，防止长度不一致出错
+//            int length = IDS.length > TEXTS.length ? TEXTS.length : IDS.length;
+//            for (int i = 0; i < length; i++) {
+//                int[] subIds = IDS[i];
+//                String[] subTexts = TEXTS[i];
+//                if (subIds == null || subTexts == null) {
+//                    continue;
+//                }
+//                int subLength = subIds.length > subTexts.length ? subTexts.length : subIds.length;
+//                for (int j = 0; j < subLength; j++) {
+//                    MAPS.put(TEXTS[i][j], IDS[i][j]);
+//                }
+//            }
+//        }
+
+//        public static int[][] getIds() {
+//            return IDS;
+//        }
+//
+//        public static String[][] getTexts() {
+//            return TEXTS;
+//        }
+//
+//        public static int textMapId(String text) {
+//            if (MAPS.containsKey(text)) {
+//                return MAPS.get(text);
+//            } else {
+//                return -1;
+//            }
+//        }
+//
+//        public static int[][] getPngIds() {
+//
+//            return PNGID;
+//        }
     }
 }