合并代码

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 08 17:21:59 CST 2017
-debugName=99
+#Mon Dec 11 10:10:20 CST 2017
+debugName=105
 versionName=617
-debugCode=99
+debugCode=105
 versionCode=156

app_core/common/src/main/java/com/core/app/Constants.java

@@ -433,8 +433,8 @@ public class Constants {
     public static final String START = "start-image/1080*1776";
     public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
 
-    public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile/activeDetail/";
-    public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile/projectDetail/";
+    public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile#/activity/detail/";
+    public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile#/project/detail/";
 
     //工作菜单缓存
     public static String WORK_MENU_CACHE = "work_menu_cache";

app_modular/apputils/src/main/res/layout/autoplay_banner_layout.xml

@@ -14,6 +14,6 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/viewpager"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="10dp" />
+        android:layout_marginBottom="3dp" />
 
 </merge>

app_modular/appworks/src/main/res/layout/handler_charit_list.xml

@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="160dp"
         android:layout_marginTop="10dp"
-        custom:indicator_bottommargin="30dp"
+        custom:indicator_bottommargin="@dimen/padding"
         custom:indicator_radius="3dp"
         custom:indicator_selected_color="@color/white"
         custom:indicator_span="16dp"