Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/res/layout/activity_booking_detail.xml

@@ -128,6 +128,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
+                        android:drawablePadding="3dp"
+                        android:drawableRight="@drawable/navigation"
                         android:text="*****************"
                         android:textColor="@color/black" />
                 </LinearLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Jul 27 16:49:30 CST 2018
-debugName=519
+#Tue Jul 31 18:10:44 CST 2018
+debugName=525
 versionName=638
-debugCode=519
+debugCode=525
 versionCode=179

app_core/common/src/main/res/layout/activity_setting.xml

@@ -533,7 +533,6 @@
 
             <RelativeLayout
                 android:id="@+id/font_us_rl"
-                android:visibility="gone"
                 style="@style/commonSettingItem">
 
                 <TextView

app_modular/appbooking/src/main/res/layout/activity_bbooking_detail.xml

@@ -158,6 +158,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
+                        android:drawablePadding="3dp"
+                        android:drawableRight="@drawable/navigation"
                         android:text="*****************"
                         android:textColor="@color/black" />
                 </LinearLayout>

app_modular/appme/src/main/res/layout/activity_font_size.xml

@@ -4,11 +4,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
  <ScrollView
-   
      android:layout_width="match_parent"
-     android:layout_height="wrap_content">
+     android:layout_height="wrap_content"
+     android:layout_alignParentTop="true"
+     android:layout_marginBottom="@dimen/dp_10"
+     android:layout_above="@+id/rl_bottom">
      <LinearLayout
          android:id="@+id/ll_text_size"
          android:layout_width="match_parent"

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1100,8 +1100,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         //缓存问题
                         // model= (ViewModel) convertView.getTag();
                     }
-
                     final Data data = (Data) getItem(position);
+                    
                     HashMap<String, Object> results = isLastItem(position);
                     final Integer categoryIndex = (Integer) results.get("categoryIndex");
                     model.text.setText(data.getName());