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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/SubsActivity.java

@@ -7,7 +7,6 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -16,8 +15,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
+import com.xzjmyk.pm.activity.R;
 
 import java.text.DecimalFormat;
 
@@ -46,7 +45,7 @@ public class SubsActivity extends BaseActivity {
             title = "我的下属";
             top.setVisibility(View.VISIBLE);
         }
-       setTitle(title);
+        setTitle(title);
         String chche = getIntent().getStringExtra("data");
         if (!StringUtil.isEmpty(chche) && JSONUtil.validate(chche)) {
             JSONArray array = JSON.parseArray(chche);
@@ -88,7 +87,7 @@ public class SubsActivity extends BaseActivity {
                 holder.salea = (TextView) view.findViewById(R.id.salea);
                 holder.subs = (LinearLayout) view.findViewById(R.id.subs);
 
-                holder.custs = (RelativeLayout) view.findViewById(R.id.custs);
+                holder.custs = (LinearLayout) view.findViewById(R.id.custs);
                 holder.name_tv = (TextView) view.findViewById(R.id.name_tv);
                 holder.time = (TextView) view.findViewById(R.id.time);
                 holder.day = (TextView) view.findViewById(R.id.day);
@@ -107,12 +106,12 @@ public class SubsActivity extends BaseActivity {
                 JSONArray arrays = array.getJSONArray(i);
                 holder.subs.setVisibility(View.GONE);
                 holder.custs.setVisibility(View.VISIBLE);
-                holder.name_tv.setText("客戶："+getValues(arrays, 0));
+                holder.name_tv.setText("客戶：" + getValues(arrays, 0));
                 String time = getValues(arrays, 1);
                 holder.time.setText(time);
                 if (time.length() > 5)//容cuo
                 {
-                    int j = (int) ((System.currentTimeMillis() - DateFormatUtil.str2Long(time,DateFormatUtil.YMD)) / (60 * 1000 * 24 * 60));
+                    int j = (int) ((System.currentTimeMillis() - DateFormatUtil.str2Long(time, DateFormatUtil.YMD)) / (60 * 1000 * 24 * 60));
                     holder.day.setText("距离上次跟进" + j + "天");
                 }
             }
@@ -142,7 +141,7 @@ public class SubsActivity extends BaseActivity {
         class ViewHolder {
             LinearLayout subs;
             TextView name, plan, salea;
-            RelativeLayout custs;
+            LinearLayout custs;
             TextView name_tv, time, day;
 
 

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

@@ -4,412 +4,412 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <!--<com.core.widget.CustomerScrollView-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:fillViewport="true">-->
-
-    <LinearLayout
+    <com.core.widget.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:fillViewport="true">
 
         <LinearLayout
-            android:id="@+id/reply_ll"
-            style="@style/form_linear_customer">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="#008B00" />
-
-            <EditText
-                android:id="@+id/et_task_name"
-                style="@style/form_relative_right_text"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="10dp"
-                android:hint="@string/task_Reply_to_your_task_completiong" />
-
-            <Button
-                android:id="@+id/bt_task_huifu"
-                style="@style/button_style_one"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
-                android:text="@string/task_reply" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/ll_bt_task"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone"
-                android:weightSum="2">
+                android:id="@+id/reply_ll"
+                style="@style/form_linear_customer">
 
-                <Button
-                    android:id="@+id/bt_task_queren"
-                    style="@style/button_style_one"
-                    android:layout_width="0dp"
-                    android:layout_marginBottom="10dp"
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#008B00" />
+
+                <EditText
+                    android:id="@+id/et_task_name"
+                    style="@style/form_relative_right_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
                     android:layout_marginTop="10dp"
-                    android:layout_weight="1.0"
-                    android:text="@string/common_sure" />
+                    android:hint="@string/task_Reply_to_your_task_completiong" />
 
                 <Button
-                    android:id="@+id/bt_task_bohui"
+                    android:id="@+id/bt_task_huifu"
                     style="@style/button_style_one"
-                    android:layout_width="0dp"
                     android:layout_marginBottom="10dp"
                     android:layout_marginTop="10dp"
-                    android:layout_weight="1.0"
-                    android:text="@string/task_turn_down" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
-
-            <View
-                android:layout_width="40dp"
-                android:layout_height="5dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/shape_textview_line"
-                android:layerType="software" />
-
-            <TextView
-                android:id="@+id/textView1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:text="@string/taskdetail_info"
-                android:textColor="@color/yellow_home"
-                android:textSize="16sp" />
-
-            <View
-                android:layout_width="wrap_content"
-                android:layout_height="5dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/shape_textview_line"
-                android:layerType="software" />
-        </LinearLayout>
+                    android:text="@string/task_reply" />
 
-        <!--<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:paddingBottom="5dp">
+                <LinearLayout
+                    android:id="@+id/ll_bt_task"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    android:weightSum="2">
+
+                    <Button
+                        android:id="@+id/bt_task_queren"
+                        style="@style/button_style_one"
+                        android:layout_width="0dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_weight="1.0"
+                        android:text="@string/common_sure" />
+
+                    <Button
+                        android:id="@+id/bt_task_bohui"
+                        style="@style/button_style_one"
+                        android:layout_width="0dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_weight="1.0"
+                        android:text="@string/task_turn_down" />
+                </LinearLayout>
+            </LinearLayout>
 
             <LinearLayout
-                style="@style/linear_task_background"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
-                android:orientation="horizontal"
-                android:weightSum="4">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="@string/taskdetail_name"
-                    android:textColor="@color/black" />
+                android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/tv_task_name"
-                    style="@style/task_text_right"
+                <View
+                    android:layout_width="40dp"
+                    android:layout_height="5dp"
+                    android:layout_gravity="center_vertical"
                     android:layout_marginLeft="10dp"
-                    android:text="@string/common_noinput" />
-            </LinearLayout>
-
-            <View style="@style/line_horizontal_style_one" />
-
-            <LinearLayout
-                style="@style/linear_task_background"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="4">
+                    android:background="@drawable/shape_textview_line"
+                    android:layerType="software" />
 
                 <TextView
-                    android:layout_width="0dp"
+                    android:id="@+id/textView1"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="@string/taskdetail_sponsor"
-                    android:textColor="@color/black" />
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/taskdetail_info"
+                    android:textColor="@color/yellow_home"
+                    android:textSize="16sp" />
 
-                <TextView
-                    android:id="@+id/tv_task_emcode"
-                    style="@style/task_text_right"
-                    android:layout_marginLeft="10dp" />
+                <View
+                    android:layout_width="wrap_content"
+                    android:layout_height="5dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="10dp"
+                    android:background="@drawable/shape_textview_line"
+                    android:layerType="software" />
             </LinearLayout>
 
-            <View style="@style/line_horizontal_style_one" />
+            <!--<ScrollView-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:fillViewport="true">-->
 
             <LinearLayout
-                style="@style/linear_task_background"
+                style="@style/form_linear_customer"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="4">
+                android:paddingBottom="5dp">
 
-                <TextView
-                    android:layout_width="0dp"
+                <LinearLayout
+                    style="@style/linear_task_background"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="@string/taskdetail_executor"
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:id="@+id/tv_task_performer"
-                    style="@style/task_text_right" />
-            </LinearLayout>
-
-            <View style="@style/line_horizontal_style_one" />
-
-            <LinearLayout
-                style="@style/linear_task_background"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="4">
-
-                <TextView
-                    android:layout_width="0dp"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_name"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_name"
+                        style="@style/task_text_right"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/common_noinput" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="@string/taskdetail_startime"
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:id="@+id/tv_task_starttime"
-                    style="@style/task_text_right" />
-            </LinearLayout>
-
-            <View style="@style/line_horizontal_style_one" />
-
-            <LinearLayout
-                style="@style/linear_task_background"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="4">
-
-                <TextView
-                    android:layout_width="0dp"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_sponsor"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_emcode"
+                        style="@style/task_text_right"
+                        android:layout_marginLeft="10dp" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="@string/taskdetail_endtime"
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:id="@+id/tv_task_endtime"
-                    style="@style/task_text_right" />
-            </LinearLayout>
-
-            <View style="@style/line_horizontal_style_one" />
-
-            <LinearLayout
-                style="@style/linear_task_background"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone"
-                android:weightSum="4">
-
-                <TextView
-                    android:layout_width="0dp"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_executor"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_performer"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="@string/task_go_on_time"
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:id="@+id/tv_task_duration"
-                    style="@style/task_text_right" />
-            </LinearLayout>
-
-            <View
-                style="@style/line_horizontal_style_one"
-                android:visibility="gone" />
-
-            <LinearLayout
-                style="@style/linear_task_background"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="4">
-
-                <TextView
-                    android:layout_width="0dp"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_startime"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_starttime"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="@string/taskdetail_state"
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:id="@+id/tv_task_status"
-                    style="@style/task_text_right"
-                    android:textColor="@color/yellow_home" />
-            </LinearLayout>
-
-            <View style="@style/line_horizontal_style_one" />
-
-            <LinearLayout
-                style="@style/linear_task_background"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_endtime"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_endtime"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/task_go_on_time"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_duration"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View
+                    style="@style/line_horizontal_style_one"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_state"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_status"
+                        style="@style/task_text_right"
+                        android:textColor="@color/yellow_home" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginBottom="5dp"
                     android:layout_marginLeft="20dp"
-                    android:layout_marginTop="5dp"
-                    android:gravity="right|center"
-                    android:singleLine="true"
-                    android:text="@string/taskdetail_desc"
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:id="@+id/tv_task_describe"
-                    android:layout_width="match_parent"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginTop="5dp"
+                        android:gravity="right|center"
+                        android:singleLine="true"
+                        android:text="@string/taskdetail_desc"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_describe"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="2.0"
+                        android:gravity="center" />
+                </LinearLayout>
+
+                <View
+                    style="@style/line_horizontal_style_one"
+                    android:layout_marginTop="5dp" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="5dp"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="20dp"
+                        android:gravity="right|center"
+                        android:singleLine="true"
+                        android:text=""
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_weight="2.0"
+                        android:gravity="center" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/lay_voice_task"
+                    style="@style/linear_task_background"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="2.0"
-                    android:gravity="center" />
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:id="@+id/tv_voice_msg"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="语音"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/iv_recode"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="3"
+                        android:contentDescription="@string/app_name"
+                        android:gravity="center"
+                        android:padding="5dp"
+                        android:src="@drawable/icon_voice_black" />
+                </LinearLayout>
             </LinearLayout>
-
-            <View
-                style="@style/line_horizontal_style_one"
-                android:layout_marginTop="5dp" />
+            <!--</ScrollView>-->
 
             <LinearLayout
-                style="@style/linear_task_background"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
                 android:orientation="horizontal">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="5dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="20dp"
-                    android:gravity="right|center"
-                    android:singleLine="true"
-                    android:text=""
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:layout_width="match_parent"
+                <View
+                    android:layout_width="40dp"
                     android:layout_height="5dp"
+                    android:layout_gravity="center_vertical"
                     android:layout_marginLeft="10dp"
-                    android:layout_weight="2.0"
-                    android:gravity="center" />
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/lay_voice_task"
-                style="@style/linear_task_background"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:orientation="horizontal"
-                android:weightSum="4">
+                    android:background="@drawable/shape_textview_line"
+                    android:layerType="software" />
 
                 <TextView
-                    android:id="@+id/tv_voice_msg"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="语音"
-                    android:textColor="@color/black" />
-
-                <ImageView
-                    android:id="@+id/iv_recode"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="3"
-                    android:contentDescription="@string/app_name"
-                    android:gravity="center"
-                    android:padding="5dp"
-                    android:src="@drawable/icon_voice_black" />
+                    android:layout_marginLeft="10dp"
+                    android:text="@string/taskdetail_content_title"
+                    android:textColor="@color/yellow_home"
+                    android:textSize="16sp" />
+
+                <View
+                    android:layout_width="wrap_content"
+                    android:layout_height="5dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="10dp"
+                    android:background="@drawable/shape_textview_line"
+                    android:layerType="software" />
             </LinearLayout>
-        </LinearLayout>
-        <!--</ScrollView>-->
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
-
-            <View
-                android:layout_width="40dp"
-                android:layout_height="5dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/shape_textview_line"
-                android:layerType="software" />
-
-            <TextView
-                android:layout_width="wrap_content"
+            <com.core.widget.CustomerListView
+                android:id="@+id/iv_taskMsg"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:text="@string/taskdetail_content_title"
-                android:textColor="@color/yellow_home"
-                android:textSize="16sp" />
-
-            <View
-                android:layout_width="wrap_content"
-                android:layout_height="5dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:background="@drawable/shape_textview_line"
-                android:layerType="software" />
+                android:background="#EFEFEF"
+                android:divider="@color/Transpant"
+                android:dividerHeight="1dp"
+                android:fadingEdge="none"
+                android:listSelector="#00000000"
+                android:padding="5dp"
+                android:scrollbars="none" />
         </LinearLayout>
-
-        <com.core.widget.CustomerListView
-            android:id="@+id/iv_taskMsg"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#EFEFEF"
-            android:divider="@color/Transpant"
-            android:dividerHeight="1dp"
-            android:fadingEdge="none"
-            android:listSelector="#00000000"
-            android:padding="5dp"
-            android:scrollbars="none" />
-    </LinearLayout>
-    <!-- </com.core.widget.CustomerScrollView>-->
+    </com.core.widget.CustomerScrollView>
 </LinearLayout>

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

@@ -31,7 +31,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="50dp"
+                android:layout_marginLeft="45dp"
                 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="33dp"
+                android:layout_marginLeft="28dp"
                 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="15dp"
+                android:layout_marginLeft="10dp"
                 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="15dp"
+                android:layout_marginLeft="10dp"
                 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="15dp"
+                android:layout_marginLeft="10dp"
                 android:layout_toRightOf="@+id/tv_id3"
                 android:text="*"
                 android:textColor="@color/red" />

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

@@ -4,10 +4,10 @@
               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="match_parent"
@@ -101,260 +101,260 @@
             </LinearLayout>
 
             <!--<ScrollView-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:fillViewport="true">-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:fillViewport="true">-->
+
+            <LinearLayout
+                style="@style/form_linear_customer"
+                android:paddingBottom="5dp">
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginTop="10dp"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_name"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_name"
+                        style="@style/task_text_right"
+                        android:layout_marginLeft="10dp"
+                        android:text="@string/common_noinput" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
 
                 <LinearLayout
-                    style="@style/form_linear_customer"
-                    android:paddingBottom="5dp">
+                    style="@style/linear_task_background"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
 
-                    <LinearLayout
-                        style="@style/linear_task_background"
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginBottom="5dp"
-                        android:layout_marginTop="10dp"
-                        android:orientation="horizontal"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="@string/taskdetail_name"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_name"
-                            style="@style/task_text_right"
-                            android:layout_marginLeft="10dp"
-                            android:text="@string/common_noinput" />
-                    </LinearLayout>
-
-                    <View style="@style/line_horizontal_style_one" />
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
-                        android:orientation="horizontal"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="@string/taskdetail_sponsor"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_emcode"
-                            style="@style/task_text_right"
-                            android:layout_marginLeft="10dp" />
-                    </LinearLayout>
-
-                    <View style="@style/line_horizontal_style_one" />
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
-                        android:orientation="horizontal"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="@string/taskdetail_executor"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_performer"
-                            style="@style/task_text_right" />
-                    </LinearLayout>
-
-                    <View style="@style/line_horizontal_style_one" />
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
-                        android:orientation="horizontal"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="@string/taskdetail_startime"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_starttime"
-                            style="@style/task_text_right" />
-                    </LinearLayout>
-
-                    <View style="@style/line_horizontal_style_one" />
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
-                        android:orientation="horizontal"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="@string/taskdetail_endtime"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_endtime"
-                            style="@style/task_text_right" />
-                    </LinearLayout>
-
-                    <View style="@style/line_horizontal_style_one" />
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
-                        android:orientation="horizontal"
-                        android:visibility="gone"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="@string/task_go_on_time"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_duration"
-                            style="@style/task_text_right" />
-                    </LinearLayout>
-
-                    <View
-                        style="@style/line_horizontal_style_one"
-                        android:visibility="gone" />
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
-                        android:orientation="horizontal"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="@string/taskdetail_state"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_status"
-                            style="@style/task_text_right"
-                            android:textColor="@color/yellow_home" />
-                    </LinearLayout>
-
-                    <View style="@style/line_horizontal_style_one" />
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_sponsor"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_emcode"
+                        style="@style/task_text_right"
+                        android:layout_marginLeft="10dp" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_executor"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_performer"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_startime"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_starttime"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_endtime"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_endtime"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/task_go_on_time"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_duration"
+                        style="@style/task_text_right" />
+                </LinearLayout>
+
+                <View
+                    style="@style/line_horizontal_style_one"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="@string/taskdetail_state"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_status"
+                        style="@style/task_text_right"
+                        android:textColor="@color/yellow_home" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    style="@style/linear_task_background"
+                    android:layout_marginLeft="20dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginLeft="20dp"
+                        android:layout_marginTop="5dp"
+                        android:gravity="right|center"
+                        android:singleLine="true"
+                        android:text="@string/taskdetail_desc"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_describe"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="2.0"
+                        android:gravity="center" />
+                </LinearLayout>
+
+                <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"
+                        android:layout_gravity="center"
                         android:layout_marginLeft="20dp"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginTop="5dp"
-                            android:gravity="right|center"
-                            android:singleLine="true"
-                            android:text="@string/taskdetail_desc"
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tv_task_describe"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="2.0"
-                            android:gravity="center" />
-                    </LinearLayout>
-
-                    <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"
-                            android:layout_gravity="center"
-                            android:layout_marginLeft="20dp"
-                            android:gravity="right|center"
-                            android:singleLine="true"
-                            android:text=""
-                            android:textColor="@color/black" />
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="5dp"
-                            android:layout_marginLeft="10dp"
-                            android:layout_weight="2.0"
-                            android:gravity="center" />
-                    </LinearLayout>
-
-
-                    <LinearLayout
-                        android:id="@+id/lay_voice_task"
-                        style="@style/linear_task_background"
+                        android:gravity="right|center"
+                        android:singleLine="true"
+                        android:text=""
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="5dp"
+                        android:layout_marginLeft="10dp"
+                        android:layout_weight="2.0"
+                        android:gravity="center" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:id="@+id/lay_voice_task"
+                    style="@style/linear_task_background"
+                    android:layout_marginBottom="5dp"
+                    android:orientation="horizontal"
+                    android:weightSum="4">
+
+                    <TextView
+                        android:id="@+id/tv_voice_msg"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
                         android:layout_marginBottom="5dp"
-                        android:orientation="horizontal"
-                        android:weightSum="4">
-
-                        <TextView
-                            android:id="@+id/tv_voice_msg"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginBottom="5dp"
-                            android:layout_marginTop="5dp"
-                            android:layout_weight="1.0"
-                            android:gravity="right"
-                            android:text="语音"
-                            android:textColor="@color/black" />
-
-                        <ImageView
-                            android:id="@+id/iv_recode"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="3"
-                            android:contentDescription="@string/app_name"
-                            android:gravity="center"
-                            android:padding="5dp"
-                            android:src="@drawable/icon_voice_black" />
-                    </LinearLayout>
+                        android:layout_marginTop="5dp"
+                        android:layout_weight="1.0"
+                        android:gravity="right"
+                        android:text="语音"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/iv_recode"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="3"
+                        android:contentDescription="@string/app_name"
+                        android:gravity="center"
+                        android:padding="5dp"
+                        android:src="@drawable/icon_voice_black" />
                 </LinearLayout>
+            </LinearLayout>
             <!--</ScrollView>-->
 
             <LinearLayout
@@ -400,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

@@ -1054,13 +1054,15 @@
                 <LinearLayout
                     android:id="@+id/ll_data_more"
                     style="@style/LinearLayout_horizontal"
-                    android:padding="10dp">
+                    android:gravity="center_vertical">
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center"
+                        android:padding="10dp"
                         android:text="默认显示一个遗忘客户，点击显示更多"
                         android:textColor="@color/gray" />
 

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

@@ -31,7 +31,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:layout_marginLeft="50dp"
+                android:layout_marginLeft="45dp"
                 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="33dp"
+                android:layout_marginLeft="28dp"
                 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="15dp"
+                android:layout_marginLeft="10dp"
                 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="15dp"
+                android:layout_marginLeft="10dp"
                 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="15dp"
+                android:layout_marginLeft="10dp"
                 android:layout_toRightOf="@+id/tv_id3"
                 android:text="*"
                 android:textColor="@color/red" />

app_modular/applocation/src/main/java/com/uas/applocation/base/NativeLocationManager.java

@@ -46,7 +46,7 @@ import java.util.logging.Logger;
  * 本地定位，只负责定位
  */
 public class NativeLocationManager implements BaseLocationManager {
-    private final String DEF_OUT_CHS_COOE_TYPE = "WGS84";//bd09ll  //WGS84
+    private final String DEF_OUT_CHS_COOE_TYPE = "bd09ll";//bd09ll  //WGS84
     private final Logger MLOGGER = Logger.getLogger("NativeLocationManager");
 
     private static final String TAG = "NativeLocationManager";