合并代码

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

@@ -46,7 +46,7 @@
             android:id="@+id/company_tag"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="10dp"
             android:gravity="center"
             android:text="@string/visit_company"
             android:textColor="@color/text_main"
@@ -55,7 +55,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="65dp"
+            android:layout_toRightOf="@id/company_tag"
             android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>
@@ -93,7 +93,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="10dp"
             android:gravity="center"
             android:text="@string/visit_address"
             android:textColor="@color/text_main"
@@ -102,7 +102,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="65dp"
+            android:layout_toRightOf="@id/item_companyaddr_tag"
             android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>
@@ -137,7 +137,7 @@
             android:id="@+id/remark_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="10dp"
             android:gravity="center"
             android:minHeight="@dimen/misson_item_height"
             android:text="@string/visit_aim"
@@ -146,7 +146,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="65dp"
+            android:layout_toRightOf="@id/remark_tag"
             android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>
@@ -385,16 +385,18 @@
         android:paddingRight="@dimen/misson_item_pr">
 
         <TextView
+            android:id="@+id/item_reckontime_tag"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center"
             android:text="@string/expected_arrival_time"
+            android:layout_marginRight="10dp"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="96dp"
+            android:layout_toRightOf="@id/item_reckontime_tag"
             android:layout_marginTop="7dp"
             android:text="*"
             android:textColor="@color/red"/>

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

@@ -280,7 +280,7 @@
                         android:layout_weight="1"
                         android:gravity="center"
                         android:text="@string/oasubordinate_work_calendar"
-                        android:textSize="16dp" />
+                        android:textSize="16sp" />
 
                     <View
                         android:layout_width="2px"
@@ -296,7 +296,7 @@
                         android:gravity="center"
                         android:text="@string/oamy_work_calender"
                         android:textCursorDrawable="@color/yellow_home"
-                        android:textSize="16dp" />
+                        android:textSize="16sp" />
                 </LinearLayout>
 
                 <LinearLayout

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

@@ -11,14 +11,14 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="75sp"
         android:background="@color/white">
 
 
         <LinearLayout
             android:paddingTop="@dimen/padding"
             android:id="@+id/timeLl"
-            android:layout_width="45dp"
+            android:layout_width="50sp"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:gravity="center|right"

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

@@ -266,7 +266,7 @@
                         android:layout_weight="1"
                         android:gravity="center"
                         android:text="下属工作日历"
-                        android:textSize="16dp" />
+                        android:textSize="16sp" />
 
                     <View
                         android:layout_width="2px"
@@ -282,7 +282,7 @@
                         android:gravity="center"
                         android:text="@string/oamy_work_calender"
                         android:textCursorDrawable="@color/yellow_home"
-                        android:textSize="16dp" />
+                        android:textSize="16sp" />
                 </LinearLayout>
 
                 <LinearLayout

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

@@ -20,7 +20,7 @@
     <TextView
         android:id="@+id/title_tv"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:text="@string/perfect_company_name"
         android:textColor="@color/text_main"
@@ -57,7 +57,7 @@
     <TextView
         android:id="@+id/address_tv"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="40sp"
         android:layout_below="@id/name_ll"
         android:layout_marginTop="5dp"
         android:ellipsize="end"

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/presenter/SelectAimPresenter.java

@@ -41,7 +41,7 @@ public class SelectAimPresenter implements OnHttpResultListener {
     private ISelectAim iSelectAim;
     private final int LOAD = 0x11;
     private final int LOAD_CUSTOMER = 0x12;//拜访计划客户名称数据
-    private List<SelectAimModel> models;//从服务其返回的数据列表
+    private List<SelectAimModel> models=new ArrayList<>();//从服务其返回的数据列表
     private List<SelectAimModel> keyList;//搜索企业筛选的人员
     private int seachMapType = 0;//下拉百度地图数据类型  1.获取附近数据  2.获取全国数据  2.获取城市数据
     private String keyWork;