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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/OAListAdapter.java

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

@@ -1,92 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <ScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/sv_top"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sv_top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
+
+    <LinearLayout
+        android:id="@+id/ll_top"
+       
         android:layout_width="match_parent"
-        android:fillViewport="true"
         android:layout_height="match_parent"
-        tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
-        <LinearLayout
-            android:id="@+id/ll_top"
+        android:orientation="vertical">
+
+        <com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller
+            android:id="@+id/lv_datas"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
-            <com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller
-                android:id="@+id/lv_datas"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:dividerHeight="0.1dp"
-                android:listSelector="@color/transparent"
-                android:divider="@color/item_line"/>
-            <LinearLayout
-                android:id="@+id/ll_item_add"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/selector_me_menu_item_bg"
-                android:visibility="gone"
-                android:orientation="vertical">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:id="@+id/tv_item_add"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textColor="@color/titleBlue"
-                    android:text="+ 新增明细"/>
-            </LinearLayout>
+            android:divider="@color/item_line"
+            android:dividerHeight="0.1dp"
+            android:listSelector="@color/transparent" />
+
+        <LinearLayout
+            android:id="@+id/ll_item_add"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:orientation="vertical"
+            android:visibility="gone">
 
-            <Button
-                android:id="@+id/click_btn"
+            <View
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/info"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="20dp"
-                android:background="@drawable/bg_blue_button"
-                android:padding="10dp"
-                android:text="提交"
-                android:visibility="gone"
-                android:textColor="@color/white"
-                android:layout_marginBottom="80dp"
-                android:textSize="@dimen/text_main" />
+                android:layout_height="0.5dp"
+                android:background="@color/item_line" />
 
-           <Button
-                android:id="@+id/btn_update"
+            <TextView
+                android:id="@+id/tv_item_add"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/info"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="20dp"
-                android:background="@drawable/bg_blue_button"
-                android:padding="10dp"
-                android:visibility="gone"
-                android:text="更新"
-                android:textColor="@color/white"
-                android:layout_marginBottom="80dp"
-                android:textSize="@dimen/text_main" />
-            <!--    <Button
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="+ 新增明细"
+                android:textColor="@color/titleBlue" />
+        </LinearLayout>
 
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/info"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginTop="20dp"
-                    android:background="@drawable/bg_orange_btn"
-                    android:padding="10dp"
-                    android:text="反提交"
-                    android:textColor="@color/white"
-                    android:visibility="gone"
-                    android:textSize="@dimen/text_main" />-->
+        <Button
+            android:id="@+id/click_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/info"
+            android:layout_marginBottom="80dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="提交"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
+            android:visibility="gone"
+             />
 
-        </LinearLayout>
-    </ScrollView>
+        <Button
+            android:id="@+id/btn_update"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/info"
+            android:layout_marginBottom="80dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:text="更新"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
+            android:visibility="gone" />
+    </LinearLayout>
+</ScrollView>