提交类型 处理bug

提交内容   处理测试部门提出的bug

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

@@ -7,20 +7,13 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcelable;
-import android.text.Editable;
-import android.text.Selection;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.PopupWindow;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -31,7 +24,6 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
@@ -692,71 +684,25 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         }
     }
 
-    private TextView title_tv;
     private PopupWindow popupWindow = null;
 
     private void doEditShortName(final SelectAimModel model) {
-        // 一个自定义的布局，作为显示的内容
-        View contentView = LayoutInflater.from(ct).inflate(
-                R.layout.item_select_aim_pop, null);
-
-        // 设置按钮的点击事件
-        final EditText company_et = (EditText) contentView.findViewById(R.id.company_et);
-        TextView address_tv = (TextView) contentView.findViewById(R.id.address_tv);
-        title_tv = (TextView) contentView.findViewById(R.id.title_tv);
-        title_tv.setText(getString(R.string.ws_client_address_name));
-        company_et.setText(model.getName());
-        address_tv.setText(getString(R.string.client_customer_address) + model.getAddress());
-        Editable etext = company_et.getText();
-        Selection.setSelection(etext, etext.length());
-        DisplayMetrics dm = getResources().getDisplayMetrics();
-        int w_screen = dm.widthPixels;
-        int h_screen = dm.heightPixels;
-        w_screen = DisplayUtil.dip2px(this, 300);
-        h_screen = DisplayUtil.dip2px(this, 185);
-
-        contentView.findViewById(R.id.goto_tv).setOnClickListener(new View.OnClickListener() {
+        if (popupWindow != null) {
+            popupWindow.dismiss();
+            popupWindow = null;
+        }
+        popupWindow = PopupWindowHelper.create(this, getString(com.modular.booking.R.string.perfect_company_name), model, new PopupWindowHelper.OnClickListener() {
             @Override
-            public void onClick(View view) {
+            public void result(SelectAimModel model) {
                 tv_customer_login.setText(model.getName() + "");
                 tv_address_login.setText(model.getAddress() + "");
-                popupWindow.dismiss();
-            }
-        });
-        contentView.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String com = company_et.getText().toString();
-                if (!StringUtil.isEmpty(com)) {
-                    tv_customer_login.setText(com);
-                } else {
-                    tv_customer_login.setText(model.getName() + "");
-                }
-                tv_address_login.setText(model.getAddress());
-                popupWindow.dismiss();
             }
-        });
-        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
-        popupWindow.setTouchable(true);
-        popupWindow.setOutsideTouchable(false);
-        // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
-        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
-        // 设置好参数之后再show
-        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
-        setbg(0.4f);
-    }
+        }, null);
 
-    private void setbg(float alpha) {
-        setBackgroundAlpha(this, alpha);
-        if (popupWindow == null) return;
-        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                setBackgroundAlpha(VisitReportAddActivity.this, 1f);
-            }
-        });
     }
 
+
+
     /**
      * 设置页面的透明度
      * 兼容华为手机（在个别华为手机上 设置透明度会不成功）

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

@@ -5,403 +5,407 @@
     android:orientation="vertical">
 
     <!--<com.core.widget.CustomerScrollView-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:fillViewport="true">-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="match_parent"-->
+    <!--android:fillViewport="true">-->
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:id="@+id/reply_ll"
+            style="@style/form_linear_customer">
 
-            <LinearLayout
-                android:id="@+id/reply_ll"
-                style="@style/form_linear_customer">
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#008B00" />
 
-                <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" />
 
-                <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" />
+
+            <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_huifu"
+                    android:id="@+id/bt_task_queren"
                     style="@style/button_style_one"
+                    android:layout_width="0dp"
                     android:layout_marginBottom="10dp"
                     android:layout_marginTop="10dp"
-                    android:text="@string/task_reply" />
+                    android:layout_weight="1.0"
+                    android:text="@string/common_sure" />
 
-                <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>
+                <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>
+
+        <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>
+        <!--  <ScrollView-->
+        <LinearLayout
+            style="@style/form_linear_customer"
+            android:layout_height="wrap_content"
+            android:minHeight="220dp"
+            android:paddingBottom="5dp">
+
+            <LinearLayout
+                style="@style/linear_task_background"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:weightSum="4">
 
-                <View
-                    android:layout_width="40dp"
-                    android:layout_height="5dp"
-                    android:layout_gravity="center_vertical"
+                <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:background="@drawable/shape_textview_line"
-                    android:layerType="software" />
+                    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">
 
                 <TextView
-                    android:id="@+id/textView1"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:text="@string/taskdetail_info"
-                    android:textColor="@color/yellow_home"
-                    android:textSize="16sp" />
+                    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" />
 
-                <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" />
+                <TextView
+                    android:id="@+id/tv_task_emcode"
+                    style="@style/task_text_right"
+                    android:layout_marginLeft="10dp" />
             </LinearLayout>
-          <!--  <ScrollView-->
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <LinearLayout
-                    style="@style/form_linear_customer"
-                    android:layout_height="300dp"
-                    android:minHeight="220dp"
-                    android:paddingBottom="5dp">
-
-                    <LinearLayout
-                        style="@style/linear_task_background"
-                        android:layout_marginBottom="5dp"
-                        android:layout_height="wrap_content"
-                        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:layout_height="wrap_content"
-                        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:layout_height="wrap_content"
-                        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:layout_height="wrap_content"
-                        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:layout_height="wrap_content"
-                        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:layout_height="wrap_content"
-                        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:layout_height="wrap_content"
-                        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:orientation="horizontal"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="20dp">
-
-                        <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: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>
-         <!--   </ScrollView>-->
+
+            <View style="@style/line_horizontal_style_one" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                style="@style/linear_task_background"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:weightSum="4">
 
-                <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="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: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: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_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:text="@string/taskdetail_content_title"
-                    android:textColor="@color/yellow_home"
-                    android:textSize="16sp" />
+                    android:layout_marginTop="5dp"
+                    android:layout_weight="2.0"
+                    android:gravity="center" />
+            </LinearLayout>
 
-                <View
+            <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_vertical"
+                    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:background="@drawable/shape_textview_line"
-                    android:layerType="software" />
+                    android:layout_weight="2.0"
+                    android:gravity="center" />
             </LinearLayout>
 
-            <com.core.widget.CustomerListView
-                android:id="@+id/iv_taskMsg"
-                android:layout_width="match_parent"
+
+            <LinearLayout
+                android:id="@+id/lay_voice_task"
+                style="@style/linear_task_background"
                 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" />
+                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>
         </LinearLayout>
-   <!-- </com.core.widget.CustomerScrollView>-->
+        <!--   </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"
+                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" />
+        </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>-->
 </LinearLayout>

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

@@ -99,6 +99,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_toRightOf="@+id/type_left"
                     android:background="@null"
+                    android:layout_marginRight="@dimen/next_width"
                     android:ellipsize="end"
                     android:gravity="center_vertical|right"
                     android:hint="@string/common_select1"

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

@@ -11,7 +11,7 @@
     <TextView
         android:id="@+id/title_tv"
         android:layout_width="match_parent"
-        android:layout_height="20dp"
+        android:layout_height="20sp"
         android:gravity="center"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jul 23 18:23:11 CST 2018
-debugName=518
+#Wed Jul 25 09:05:14 CST 2018
+debugName=519
 versionName=639
-debugCode=518
+debugCode=519
 versionCode=180

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

@@ -18,7 +18,7 @@
         <LinearLayout
             android:paddingTop="@dimen/padding"
             android:id="@+id/timeLl"
-            android:layout_width="50sp"
+            android:layout_width="47sp"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:gravity="center|right"
@@ -43,7 +43,7 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="55sp"
+            android:layout_marginLeft="56sp"
             android:layout_marginRight="8dp" />
 
         <View

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

@@ -26,13 +26,7 @@
                 android:paddingRight="@dimen/padding"
                 android:paddingTop="@dimen/paddingMin">
 
-                <TextView
-                    android:id="@+id/oa_meeting_name_tv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="title"
-                    android:textColor="@color/text_main"
-                    android:textSize="@dimen/text_main" />
+
 
                 <TextView
                     android:id="@+id/oa_meeting_status_tv"
@@ -41,6 +35,14 @@
                     android:layout_alignParentRight="true"
                     android:textColor="@color/hintColor"
                     android:textSize="@dimen/text_hine" />
+                <TextView
+                    android:id="@+id/oa_meeting_name_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toLeftOf="@id/oa_meeting_status_tv"
+                    android:text="title"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
             </RelativeLayout>
 
 

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -31,6 +31,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baidu.mapapi.model.LatLng;
 import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
@@ -201,7 +202,14 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
         tv_title = (TextView) findViewById(R.id.tv_title);
         ivResult = (ImageView) findViewById(R.id.iv_result);
         ll_bottom = (LinearLayout) findViewById(R.id.ll_bottom);
-
+        tvAddress.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent("com.modular.appworks.NavigationActivity");
+                intent.putExtra("toLocation", new LatLng(Float.valueOf(model.getAb_latitude()),Float.valueOf(model.getAb_longitude())));
+                startActivityForResult(intent, 0x23);
+            }
+        });
         animation = AnimationUtils.loadAnimation(this, R.anim.anim_translate_bookingprogress);
         if (getIntent() != null && getIntent().getExtras() != null) {
             isShared = getIntent().getExtras().getBoolean("isShared");

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

@@ -3,11 +3,41 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/ll_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+        <Button
+            android:id="@+id/bt_change"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/bg_bule_btn1"
+            android:text="@string/booking_change" />
+
+        <!--  <View style="@style/app_line_v_1dp"></View>-->
+
+        <Button
+            android:id="@+id/bt_cancle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/linearLayout"
+            android:layout_weight="1"
+            android:background="@drawable/select_weixin_list_item"
+            android:text="@string/cancel" />
+    </LinearLayout>
     <com.core.widget.CustomerScrollView
         android:id="@+id/sv_top"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="50dp"
+        android:layout_above="@id/ll_bottom"
         android:visibility="gone"
         android:fillViewport="true">
 
@@ -227,34 +257,5 @@
 
         </RelativeLayout>
     </com.core.widget.CustomerScrollView>
-    <LinearLayout
-        android:id="@+id/ll_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_alignParentBottom="true"
-        android:visibility="gone"
-        android:orientation="horizontal"
-        android:weightSum="2">
-
-        <Button
-            android:id="@+id/bt_change"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@drawable/bg_bule_btn1"
-            android:text="@string/booking_change" />
 
-      <!--  <View style="@style/app_line_v_1dp"></View>-->
-
-        <Button
-            android:id="@+id/bt_cancle"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignTop="@+id/linearLayout"
-            android:layout_weight="1"
-            android:background="@drawable/select_weixin_list_item"
-            android:text="@string/cancel" />
-    </LinearLayout>
 </RelativeLayout>

app_modular/applocation/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.uas.applocation">
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"
         tools:ignore="MockLocation,ProtectedPermissions" />

app_modular/applocation/src/main/java/com/uas/applocation/test/LocationTestSetActivity.java

@@ -65,7 +65,7 @@ public class LocationTestSetActivity extends AppCompatActivity {
                         .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialogInterface, int i) {
-                                UASLocation mUASLocation=getInventedUASLocation();
+                                UASLocation mUASLocation = getInventedUASLocation();
                                 UasLocationHelper.getInstance().testStopLocation(mUASLocation);
                                 currentInfoTv.setText(mUASLocation.toString());
                             }
@@ -101,6 +101,7 @@ public class LocationTestSetActivity extends AppCompatActivity {
                 AreaUtils.type = b ? UASLocation.TYPE_NATIVE : UASLocation.TYPE_BAIDU;
                 UasLocationHelper.getInstance().initConfig(LocationTestSetActivity.this);
                 inventedRl.setVisibility(b ? View.VISIBLE : View.GONE);
+                AreaUtils.setType(LocationTestSetActivity.this, AreaUtils.type);
             } else if (inventedCb == compoundButton) {
                 showInventedLL(b);
             }

app_modular/applocation/src/main/java/com/uas/applocation/utils/AreaUtils.java

@@ -3,10 +3,12 @@ package com.uas.applocation.utils;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.uas.applocation.model.UASLocation;
 
@@ -25,11 +27,28 @@ public class AreaUtils {
      */
     public static void initArea(Context context) {
         type = isChinaSimCard(context) ? UASLocation.TYPE_BAIDU : UASLocation.TYPE_NATIVE;
-        if(type==UASLocation.TYPE_NATIVE&&!isOPen(context)){
-            openGPS(context);
-        }
+//        int ty = getType(context);
+//        if (ty == 0) {
+//            type = isChinaSimCard(context) ? UASLocation.TYPE_BAIDU : UASLocation.TYPE_NATIVE;
+//        } else {
+//            type = ty;
+//        }
+//        if (type == UASLocation.TYPE_NATIVE&&!isOPen(context)) {
+//            openGPS(context);
+//        }
+    }
+
+    public static int getType(Context ct) {
+        SharedPreferences sPreferences = ct.getSharedPreferences("area", Context.MODE_PRIVATE);
+        return sPreferences.getInt("type", 0);
     }
 
+    public static void setType(Context ct, int intV) {
+        SharedPreferences sPreferences = ct.getSharedPreferences("area", Context.MODE_PRIVATE);
+        sPreferences.edit().putInt("type", intV).apply();
+    }
+
+
     public static int getLocationServiceType() {
         return type;
     }
@@ -108,11 +127,10 @@ public class AreaUtils {
         // 通过GPS卫星定位，定位级别可以精确到街（通过24颗卫星定位，在室外和空旷的地方定位准确、速度快）
         boolean gps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
         // 通过WLAN或移动网络(3G/2G)确定的位置（也称作AGPS，辅助GPS定位。主要用于在室内或遮盖物（建筑群或茂密的深林等）密集的地方定位）
-        boolean network = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
-        if (gps || network) {
+        Log.i("gong", "gpsgpsgps=" + gps);
+        if (gps) {
             return true;
         }
-
         return false;
     }
 
@@ -122,13 +140,13 @@ public class AreaUtils {
      * @param context
      */
     public static final void openGPS(Context context) {
-        Intent GPSIntent = new Intent();
-        GPSIntent.setClassName("com.android.settings",
-                "com.android.settings.widget.SettingsAppWidgetProvider");
-        GPSIntent.addCategory("android.intent.category.ALTERNATIVE");
-        GPSIntent.setData(Uri.parse("custom:3"));
+        Log.i("gong", "openGPS");
+        Intent gpsIntent = new Intent();
+        gpsIntent.setClassName("com.android.settings", "com.android.settings.widget.SettingsAppWidgetProvider");
+        gpsIntent.addCategory("android.intent.category.ALTERNATIVE");
+        gpsIntent.setData(Uri.parse("custom:3"));
         try {
-            PendingIntent.getBroadcast(context, 0, GPSIntent, 0).send();
+            PendingIntent.getBroadcast(context, 0, gpsIntent, 0).send();
         } catch (PendingIntent.CanceledException e) {
             e.printStackTrace();
         }

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -12,7 +12,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -36,6 +35,7 @@ import com.common.system.DisplayUtil;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.model.Approval;
 import com.core.model.OAConfig;
 import com.core.model.SelectBean;
@@ -187,8 +187,7 @@ public class ApprovalActivity extends BaseActivity implements IApproval, Approva
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+        AndroidBug5497Workaround.assistActivity(this);
         setContentView(R.layout.activity_approval);
         initView();
     }

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/MessageWebActivity.java

@@ -3,6 +3,7 @@ package com.modular.appmessages.activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
@@ -182,10 +183,23 @@ public class MessageWebActivity extends BaseActivity {
     }
 
     protected boolean loadUrlViewClient(WebView view, String url) {
-        LogUtil.i("shouldOverrideUrlLoading url=" + url);
         if (needCookie) {
             synCookies(ct, url);
         }
+        try{
+            if(url.startsWith("baidu://")||
+                    url.startsWith("weixin://") //微信
+                    || url.startsWith("alipays://") //支付宝
+                    || url.startsWith("mailto://") //邮件
+                    || url.startsWith("tel://")//电话
+                    || url.startsWith("dianping://")){
+                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                startActivity(intent);
+                return true;
+            }
+        }catch (Exception e){
+            return false;
+        }
         view.loadUrl(url);
         return true;
     }

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

@@ -12,7 +12,7 @@
     <TextView
         android:id="@+id/title_tv"
         android:layout_width="match_parent"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
         android:textStyle="bold"
         android:gravity="center"
         android:text="@string/common_dialog_title"

app_modular/apputils/src/main/res/values/style.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="dialog_not_hite_bg" parent="AppBaseTheme">
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -19,6 +19,8 @@
         <item name="android:listViewStyle">@style/IMListView</item>
         <item name="homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
         <item name="android:windowDisablePreview">true</item>
+        <item name="android:windowTranslucentStatus" tools:ignore="NewApi">true</item>
+        <item name="android:windowTranslucentNavigation" tools:ignore="NewApi">false</item>
         <item name="styleLoadingLayout">@style/LoadingLayoutStyle</item>
         <item name="android:homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/AutoErpSigninUitl.java

@@ -235,6 +235,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
 
         String formStore = JSONUtil.map2JSON(form);
         param.put("formStore", formStore);
+        param.put("facecard", 1);
         param.put("emcode", getSharedPreferences(ct, "erp_username"));
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url :
                 "mobile/saveCardLog.action";