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

# Conflicts:
#	WeiChat/src/main/res/layout/act_task_detail.xml
#	WeiChat/src/main/res/layout/activity_save_meet.xml
#	WeiChat/version.properties

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <!--<com.core.widget.CustomerScrollView-->
     <!--android:layout_width="match_parent"-->
@@ -10,7 +10,7 @@
     <!--android:fillViewport="true">-->
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
@@ -99,11 +99,15 @@
                 android:background="@drawable/shape_textview_line"
                 android:layerType="software" />
         </LinearLayout>
-        <!--  <ScrollView-->
+
+        <!--<ScrollView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:fillViewport="true">-->
+
         <LinearLayout
             style="@style/form_linear_customer"
             android:layout_height="wrap_content"
-            android:minHeight="220dp"
             android:paddingBottom="5dp">
 
             <LinearLayout
@@ -362,7 +366,7 @@
                     android:src="@drawable/icon_voice_black" />
             </LinearLayout>
         </LinearLayout>
-        <!--   </ScrollView>-->
+        <!--</ScrollView>-->
 
         <LinearLayout
             android:layout_width="wrap_content"

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

@@ -1,8 +1,9 @@
 <?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:layout_width="match_parent"
-    android:layout_height="match_parent">
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SaveMeetActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,13 +32,13 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
-                android:lines="5"
+                android:minLines="5"
                 android:paddingTop="5dp"
                 android:textColor="@color/text_hine"
                 android:textColorHint="@color/grey"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_main"
+                tools:text="大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近" />
         </LinearLayout>
 
         <LinearLayout
@@ -62,13 +63,13 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
                 android:minLines="5"
                 android:paddingTop="5dp"
                 android:textColor="@color/text_hine"
                 android:textColorHint="@color/grey"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_main"
+                tools:text="大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近"/>
         </LinearLayout>
 
         <LinearLayout
@@ -93,7 +94,6 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
                 android:minLines="5"
                 android:paddingTop="5dp"
@@ -124,7 +124,6 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
                 android:minLines="5"
                 android:paddingTop="5dp"

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

@@ -31,7 +31,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="60dp"
+                android:layout_marginLeft="50dp"
                 android:layout_toRightOf="@+id/name_text"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -61,7 +61,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="43dp"
+                android:layout_marginLeft="33dp"
                 android:layout_toRightOf="@+id/sex_text"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -91,7 +91,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="25dp"
+                android:layout_marginLeft="15dp"
                 android:layout_toRightOf="@+id/tv_id1"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -124,7 +124,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="25dp"
+                android:layout_marginLeft="15dp"
                 android:layout_toRightOf="@+id/tv_id2"
                 android:text="*"
                 android:textColor="@color/red" />
@@ -158,7 +158,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="25dp"
+                android:layout_marginLeft="15dp"
                 android:layout_toRightOf="@+id/tv_id3"
                 android:text="*"
                 android:textColor="@color/red" />

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="8dp">
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:padding="8dp">
 
     <LinearLayout
         android:id="@+id/subs"
@@ -36,10 +36,11 @@
             android:text=" 万元" />
     </LinearLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/custs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:visibility="gone">
 
         <TextView
@@ -48,28 +49,30 @@
             android:layout_marginLeft="10dp"
             android:text="深圳优软科技有限公司" />
 
-        <TextView
-            android:id="@+id/tag"
-            style="@style/TextView_Basic"
-            android:layout_alignLeft="@id/name_tv"
-            android:layout_below="@id/name_tv"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="最后跟进时间  " />
+            android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/tag"
-            android:layout_toRightOf="@+id/tag"
-            android:text="最后跟进时间" />
+            <TextView
+                android:id="@+id/tag"
+                style="@style/TextView_Basic"
+                android:layout_marginLeft="10dp"
+                android:text="最后跟进时间  " />
 
-        <TextView
-            android:id="@+id/day"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/tag"
-            android:text="距离上次跟进188天" />
-    </RelativeLayout>
+            <TextView
+                android:id="@+id/time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="最后跟进时间" />
+
+            <TextView
+                android:id="@+id/day"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:text="距离上次跟进188天" />
+        </LinearLayout>
+    </LinearLayout>
 </FrameLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jul 26 17:43:34 CST 2018
-debugName=524
-versionName=639
-debugCode=524
-versionCode=180
+#Thu Jul 26 09:29:14 CST 2018
+debugName=517
+versionName=640
+debugCode=517
+versionCode=181

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

@@ -19,8 +19,8 @@ public class Constants {
     //IM测试地址
     public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
     //询价服务正式地址
-//    public static final String API_INQUIRY = "https://api-inquiry.usoftmall.com/";
-    public static final String API_INQUIRY = "http://218.17.158.219:24000/";
+    public static final String API_INQUIRY = "https://api-inquiry.usoftmall.com/";
+//    public static final String API_INQUIRY = "http://218.17.158.219:24000/";
 //    public static final String API_INQUIRY = "http://10.1.51.82:24002/";
 
     public static String IM_BASE_URL() {

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
-    <com.core.widget.CustomerScrollView
+<!--    <com.core.widget.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true">
+        android:fillViewport="true">-->
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
 
@@ -67,6 +67,7 @@
                         android:text="@string/task_turn_down" />
                 </LinearLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -98,10 +99,12 @@
                     android:background="@drawable/shape_textview_line"
                     android:layerType="software" />
             </LinearLayout>
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-               >
+
+            <!--<ScrollView-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:fillViewport="true">-->
+
                 <LinearLayout
                     style="@style/form_linear_customer"
                     android:paddingBottom="5dp">
@@ -269,8 +272,8 @@
 
                     <LinearLayout
                         style="@style/linear_task_background"
-                        android:orientation="horizontal"
-                        android:layout_marginLeft="20dp">
+                        android:layout_marginLeft="20dp"
+                        android:orientation="horizontal">
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -294,11 +297,15 @@
                             android:layout_weight="2.0"
                             android:gravity="center" />
                     </LinearLayout>
-                    <View style="@style/line_horizontal_style_one"
-                        android:layout_marginTop="5dp"/>
+
+                    <View
+                        style="@style/line_horizontal_style_one"
+                        android:layout_marginTop="5dp" />
+
                     <LinearLayout
                         style="@style/linear_task_background"
                         android:orientation="horizontal">
+
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="5dp"
@@ -308,6 +315,7 @@
                             android:singleLine="true"
                             android:text=""
                             android:textColor="@color/black" />
+
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="5dp"
@@ -347,7 +355,7 @@
                             android:src="@drawable/icon_voice_black" />
                     </LinearLayout>
                 </LinearLayout>
-            </ScrollView>
+            <!--</ScrollView>-->
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -392,5 +400,5 @@
                 android:padding="5dp"
                 android:scrollbars="none" />
         </LinearLayout>
-    </com.core.widget.CustomerScrollView>
+    <!--</com.core.widget.CustomerScrollView>-->
 </LinearLayout>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/bg_underlying"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@color/bg_underlying"
+              android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -12,8 +12,8 @@
         android:background="#6A6A6A"
         android:orientation="horizontal"
         android:padding="10dp"
-        android:weightSum="4"
-        android:visibility="gone">
+        android:visibility="gone"
+        android:weightSum="4">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -103,11 +103,13 @@
                 android:textColor="#ffffff" />
         </LinearLayout>
     </LinearLayout>
+
     <com.handmark.pulltorefresh.library.PullToRefreshScrollView
         android:id="@+id/client_ptrsv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="false">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -120,28 +122,29 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp">
+                    android:layout_height="wrap_content">
 
                     <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
+                        android:layout_toLeftOf="@+id/iv_icon1"
+                        android:src="@drawable/crm_left" />
 
                     <TextView
                         android:id="@+id/iv_icon1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:text="@string/crm_icon1"  />
+                        android:text="@string/crm_icon1"
+                        android:textColor="#62B7F2" />
+
                     <ImageView
-                        android:layout_toRightOf="@+id/iv_icon1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
+                        android:layout_toRightOf="@+id/iv_icon1"
+                        android:src="@drawable/crm_right" />
 
                     <TextView
                         android:id="@+id/ib_ranking_condition"
@@ -187,11 +190,11 @@
 
                         <TextView
                             android:id="@+id/tv_rank_rirun_left"
-                            style="@style/crm_tv_ranking_left"/>
+                            style="@style/crm_tv_ranking_left" />
 
                         <TextView
                             android:id="@+id/tv_rank_rirun_right"
-                            style="@style/crm_tv_ranking_right"/>
+                            style="@style/crm_tv_ranking_right" />
                     </LinearLayout>
                 </LinearLayout>
 
@@ -210,7 +213,7 @@
                         <TextView
                             android:id="@+id/tv_rank_visit_left"
                             style="@style/crm_tv_ranking_left"
-                            android:text="@string/crm_di_ming"/>
+                            android:text="@string/crm_di_ming" />
 
                         <TextView
                             android:id="@+id/tv_rank_visit_right"
@@ -239,7 +242,7 @@
                         <TextView
                             android:id="@+id/tv_rank_income_right"
                             style="@style/crm_tv_ranking_right"
-                            android:text="@string/crm_ge"/>
+                            android:text="@string/crm_ge" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
@@ -254,26 +257,28 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
+
                     <ImageView
-                        android:layout_toLeftOf="@+id/iv_sale"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
-                  
+                        android:layout_toLeftOf="@+id/iv_sale"
+                        android:src="@drawable/crm_left" />
+
                     <TextView
                         android:id="@+id/iv_sale"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:text="@string/crm_icon2"  />
+                        android:text="@string/crm_icon2"
+                        android:textColor="#62B7F2" />
+
                     <ImageView
-                        android:layout_toRightOf="@+id/iv_sale"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
+                        android:layout_toRightOf="@+id/iv_sale"
+                        android:src="@drawable/crm_right" />
 
                     <!--   <ImageButton style="@style/crm_ib_card_topRight"
                            android:id="@+id/ib_sale_condition" />-->
@@ -483,26 +488,28 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
+
                     <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
+                        android:layout_toLeftOf="@+id/iv_icon3"
+                        android:src="@drawable/crm_left" />
 
                     <TextView
                         android:id="@+id/iv_icon3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:text="@string/crm_icon3"  />
+                        android:text="@string/crm_icon3"
+                        android:textColor="#62B7F2" />
+
                     <ImageView
-                        android:layout_toRightOf="@+id/iv_icon3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
+                        android:layout_toRightOf="@+id/iv_icon3"
+                        android:src="@drawable/crm_right" />
 
                     <!-- <ImageButton style="@style/crm_ib_card_topRight"
                          android:id="@+id/ib_em_condition" />-->
@@ -537,9 +544,9 @@
 
                 <LinearLayout
                     android:id="@+id/ll_data_one"
-                    android:visibility="gone"
                     style="@style/LinearLayout_horizontal"
-                    android:padding="8dp">
+                    android:padding="8dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tv_em_a"
@@ -568,9 +575,9 @@
 
                 <LinearLayout
                     android:id="@+id/ll_data_two"
-                    android:visibility="gone"
                     style="@style/LinearLayout_horizontal"
-                    android:padding="8dp">
+                    android:padding="8dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tv_em_b"
@@ -599,9 +606,9 @@
 
                 <LinearLayout
                     android:id="@+id/ll_data_three"
-                    android:visibility="gone"
                     style="@style/LinearLayout_horizontal"
-                    android:padding="8dp">
+                    android:padding="8dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tv_em_c"
@@ -834,28 +841,29 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="40dp">
+                    android:layout_height="wrap_content">
 
                     <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
+                        android:layout_toLeftOf="@+id/iv_icon4"
+                        android:src="@drawable/crm_left" />
 
                     <TextView
                         android:id="@+id/iv_icon4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:text="@string/crm_icon4"  />
+                        android:text="@string/crm_icon4"
+                        android:textColor="#62B7F2" />
+
                     <ImageView
-                        android:layout_toRightOf="@+id/iv_icon4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
+                        android:layout_toRightOf="@+id/iv_icon4"
+                        android:src="@drawable/crm_right" />
 
                     <TextView
                         android:id="@+id/ib_index_condition"
@@ -935,26 +943,28 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
+
                     <ImageView
-                        android:layout_toLeftOf="@+id/iv_icon5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_left"/>
+                        android:layout_toLeftOf="@+id/iv_icon5"
+                        android:src="@drawable/crm_left" />
 
                     <TextView
                         android:id="@+id/iv_icon5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:text="@string/crm_icon5" />
+                        android:text="@string/crm_icon5"
+                        android:textColor="#62B7F2" />
+
                     <ImageView
-                        android:layout_toRightOf="@+id/iv_icon5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:src="@drawable/crm_right"/>
+                        android:layout_toRightOf="@+id/iv_icon5"
+                        android:src="@drawable/crm_right" />
 
                     <TextView
                         android:id="@+id/tv_cu_count"
@@ -973,8 +983,8 @@
 
                 <LinearLayout
                     android:id="@+id/ll_customer_lost"
-                    android:visibility="gone"
-                    style="@style/LinearLayout_vertical">
+                    style="@style/LinearLayout_vertical"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tv_customer_name"
@@ -1044,20 +1054,21 @@
                 <LinearLayout
                     android:id="@+id/ll_data_more"
                     style="@style/LinearLayout_horizontal"
-                    android:layout_margin="10dp">
+                    android:padding="10dp">
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:textColor="@color/gray"
-                        android:text="默认显示一个遗忘客户，点击显示更多" />
+                        android:text="默认显示一个遗忘客户，点击显示更多"
+                        android:textColor="@color/gray" />
+
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center"
                         android:layout_marginRight="10dp"
+                        android:gravity="center"
                         android:src="@drawable/ic_more_blue_arrow" />
 
                 </LinearLayout>

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

@@ -1,9 +1,9 @@
 <?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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SaveMeetActivity">
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SaveMeetActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,13 +32,13 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
                 android:minLines="5"
                 android:paddingTop="5dp"
                 android:textColor="@color/text_hine"
                 android:textColorHint="@color/grey"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_main"
+                tools:text="大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近" />
         </LinearLayout>
 
         <LinearLayout
@@ -63,13 +63,13 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
                 android:minLines="5"
                 android:paddingTop="5dp"
                 android:textColor="@color/text_hine"
                 android:textColorHint="@color/grey"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_main"
+                tools:text="大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近大家佛前二五i附近"/>
         </LinearLayout>
 
         <LinearLayout
@@ -94,7 +94,6 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
                 android:minLines="5"
                 android:paddingTop="5dp"
@@ -125,7 +124,6 @@
                 android:background="@null"
                 android:gravity="top|left"
                 android:hint="请填写备注"
-                android:inputType="text"
                 android:minHeight="100dp"
                 android:minLines="5"
                 android:paddingTop="5dp"

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:whatever="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
+            xmlns:tools="http://schemas.android.com/tools"
+            xmlns:whatever="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,16 +31,16 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="60dp"
+                android:layout_marginLeft="50dp"
                 android:layout_toRightOf="@+id/name_text"
                 android:text="*"
                 android:textColor="@color/red" />
             <!--  android:drawableRight="@drawable/nav_icon_search_default"-->
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_name"
-                style="@style/form_relative_right_text"
-                android:hint="请输入"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_name"
+                                                   style="@style/form_relative_right_text"
+                                                   android:hint="请输入"
+                                                   editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -61,17 +61,17 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="43dp"
+                android:layout_marginLeft="33dp"
                 android:layout_toRightOf="@+id/sex_text"
                 android:text="*"
                 android:textColor="@color/red" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_executive"
-                style="@style/form_relative_right_text"
-                android:drawableRight="@drawable/nav_icon_search_default"
-                android:hint="请选择"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_executive"
+                                                   style="@style/form_relative_right_text"
+                                                   android:drawableRight="@drawable/nav_icon_search_default"
+                                                   android:hint="请选择"
+                                                   editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -91,17 +91,17 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="25dp"
+                android:layout_marginLeft="15dp"
                 android:layout_toRightOf="@+id/tv_id1"
                 android:text="*"
                 android:textColor="@color/red" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_date_start"
-                style="@style/form_relative_right_text"
-                android:drawableRight="@drawable/nav_icon_search_default"
-                android:hint="请选择"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_date_start"
+                                                   style="@style/form_relative_right_text"
+                                                   android:drawableRight="@drawable/nav_icon_search_default"
+                                                   android:hint="请选择"
+                                                   editTextFormExample:testType="nocheck" />
 
         </RelativeLayout>
 
@@ -124,17 +124,17 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="25dp"
+                android:layout_marginLeft="15dp"
                 android:layout_toRightOf="@+id/tv_id2"
                 android:text="*"
                 android:textColor="@color/red" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_date"
-                style="@style/form_relative_right_text"
-                android:drawableRight="@drawable/nav_icon_search_default"
-                android:hint="请选择"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_date"
+                                                   style="@style/form_relative_right_text"
+                                                   android:drawableRight="@drawable/nav_icon_search_default"
+                                                   android:hint="请选择"
+                                                   editTextFormExample:testType="nocheck" />
 
         </RelativeLayout>
 
@@ -158,17 +158,17 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="25dp"
+                android:layout_marginLeft="15dp"
                 android:layout_toRightOf="@+id/tv_id3"
                 android:text="*"
                 android:textColor="@color/red" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_priority"
-                style="@style/form_relative_right_text"
-                android:drawableRight="@drawable/nav_icon_search_default"
-                android:hint="请选择"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_priority"
+                                                   style="@style/form_relative_right_text"
+                                                   android:drawableRight="@drawable/nav_icon_search_default"
+                                                   android:hint="请选择"
+                                                   editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -189,11 +189,11 @@
                 android:textSize="@dimen/text_main" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_type"
-                style="@style/form_relative_right_text"
-                android:focusable="false"
-                android:text="任务"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_type"
+                                                   style="@style/form_relative_right_text"
+                                                   android:focusable="false"
+                                                   android:text="任务"
+                                                   editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -216,10 +216,10 @@
                 android:textSize="@dimen/text_main" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_customer"
-                style="@style/form_relative_right_text"
-                android:hint="请选择"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_customer"
+                                                   style="@style/form_relative_right_text"
+                                                   android:hint="请选择"
+                                                   editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 
@@ -244,10 +244,10 @@
 
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_notice"
-                style="@style/form_relative_right_text"
-                android:hint="请选择"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_notice"
+                                                   style="@style/form_relative_right_text"
+                                                   android:hint="请选择"
+                                                   editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 
@@ -271,12 +271,12 @@
                 android:textSize="@dimen/text_main" />
 
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/tv_content"
-                style="@style/form_relative_right_text"
-                android:gravity="top|left"
-                android:minLines="4"
-                android:padding="5dp"
-                editTextFormExample:testType="nocheck" />
+                                                   android:id="@+id/tv_content"
+                                                   style="@style/form_relative_right_text"
+                                                   android:gravity="top|left"
+                                                   android:minLines="4"
+                                                   android:padding="5dp"
+                                                   editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
 

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="8dp">
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:padding="8dp">
 
     <LinearLayout
         android:id="@+id/subs"
@@ -36,10 +36,11 @@
             android:text=" 万元" />
     </LinearLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/custs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:visibility="gone">
 
         <TextView
@@ -48,28 +49,30 @@
             android:layout_marginLeft="10dp"
             android:text="深圳优软科技有限公司" />
 
-        <TextView
-            android:id="@+id/tag"
-            style="@style/TextView_Basic"
-            android:layout_alignLeft="@id/name_tv"
-            android:layout_below="@id/name_tv"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="最后跟进时间  " />
+            android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/tag"
-            android:layout_toRightOf="@+id/tag"
-            android:text="最后跟进时间" />
+            <TextView
+                android:id="@+id/tag"
+                style="@style/TextView_Basic"
+                android:layout_marginLeft="10dp"
+                android:text="最后跟进时间  " />
 
-        <TextView
-            android:id="@+id/day"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/tag"
-            android:text="距离上次跟进188天" />
-    </RelativeLayout>
+            <TextView
+                android:id="@+id/time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="最后跟进时间" />
+
+            <TextView
+                android:id="@+id/day"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:text="距离上次跟进188天" />
+        </LinearLayout>
+    </LinearLayout>
 </FrameLayout>