我的任务添加结束时间

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

@@ -1,11 +1,5 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import android.content.Context;
 import android.content.Intent;
 import android.media.MediaPlayer;
@@ -16,8 +10,8 @@ import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -34,14 +28,20 @@ import com.lidroid.xutils.exception.HttpException;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * @author :LiuJie 2015年12月1日 下午2:57:11
@@ -50,491 +50,496 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 public class DetailTaskActivity extends BaseActivity implements OnClickListener {
 
 
-	@ViewInject(R.id.bt_task_huifu)
-	private Button bt_task_huifu;
-	@ViewInject(R.id.bt_task_queren)
-	private Button bt_task_queren;
-	@ViewInject(R.id.bt_task_bohui)
-	private Button bt_task_bohui;
-	@ViewInject(R.id.ll_bt_task)
-	private LinearLayout ll_bt_task;
-	@ViewInject(R.id.et_task_name)
-	private EditText et_task_name;
-
-	@ViewInject(R.id.tv_task_name)
-	private TextView tv_task_name;
-	@ViewInject(R.id.tv_task_emcode)
-	private TextView tv_task_emcode;
-	@ViewInject(R.id.tv_task_performer)
-	private TextView tv_task_performer;
-	@ViewInject(R.id.tv_task_starttime)
-	private TextView tv_task_starttime;
-	@ViewInject(R.id.tv_task_duration)
-	private TextView tv_task_duration;
-	@ViewInject(R.id.tv_task_status)
-	private TextView tv_task_status;
-	@ViewInject(R.id.tv_task_describe)
-	private TextView tv_task_describe;
-
-	@ViewInject(R.id.lay_voice_task)
-	private LinearLayout lay_voice_task;// 语音展示
-	@ViewInject(R.id.iv_recode)
-	private ImageView iv_recode;// 播放
-	@ViewInject(R.id.tv_voice_msg)
-	private TextView tv_voice_msg;
-	
-	@ViewInject(R.id.iv_taskMsg)
-	private CustomerListView iv_taskMsg;
-	
-	SimpleAdapter adapter;
-
-	private Context ct;
-
-
-	private String taskId;
-	private final static int LOAD_EM_NAME = 6;
-	private final static int LOAD_FILE_SUCCESS = 2;
-	private Handler mhandler = new Handler() {
-		public void handleMessage(android.os.Message msg) {
-			switch (msg.what) {
-			case Constants.LOAD_SUCCESS:
-				String result = msg.getData().getString("result");
-				Log.i(TAG, result);
-//				progressDialog.dismiss();
-				Log.i(TAG, result);
-				JSONObject object = JSON.parseObject(result);
-				Boolean falg = object.getBoolean("success");
-				if (falg) {
-					ViewUtil.ShowMessageTitle(ct, "操作成功！");
-					goBackMenu();
-				} else {
-					ViewUtil.ShowMessageTitle(ct, "操作失败！");
-				}
-				break;
-			case LOAD_EM_NAME:
-				result = msg.getData().getString("result");
-				Log.i(TAG, result);
+    @ViewInject(R.id.bt_task_huifu)
+    private Button bt_task_huifu;
+    @ViewInject(R.id.bt_task_queren)
+    private Button bt_task_queren;
+    @ViewInject(R.id.bt_task_bohui)
+    private Button bt_task_bohui;
+    @ViewInject(R.id.ll_bt_task)
+    private LinearLayout ll_bt_task;
+    @ViewInject(R.id.et_task_name)
+    private EditText et_task_name;
+
+    @ViewInject(R.id.tv_task_endtime)
+    private TextView tv_task_endtime;
+    @ViewInject(R.id.tv_task_name)
+    private TextView tv_task_name;
+    @ViewInject(R.id.tv_task_emcode)
+    private TextView tv_task_emcode;
+    @ViewInject(R.id.tv_task_performer)
+    private TextView tv_task_performer;
+    @ViewInject(R.id.tv_task_starttime)
+    private TextView tv_task_starttime;
+    @ViewInject(R.id.tv_task_duration)
+    private TextView tv_task_duration;
+    @ViewInject(R.id.tv_task_status)
+    private TextView tv_task_status;
+    @ViewInject(R.id.tv_task_describe)
+    private TextView tv_task_describe;
+
+    @ViewInject(R.id.lay_voice_task)
+    private LinearLayout lay_voice_task;// 语音展示
+    @ViewInject(R.id.iv_recode)
+    private ImageView iv_recode;// 播放
+    @ViewInject(R.id.tv_voice_msg)
+    private TextView tv_voice_msg;
+
+    @ViewInject(R.id.iv_taskMsg)
+    private CustomerListView iv_taskMsg;
+
+    SimpleAdapter adapter;
+
+    private Context ct;
+
+
+    private String taskId;
+    private final static int LOAD_EM_NAME = 6;
+    private final static int LOAD_FILE_SUCCESS = 2;
+    private Handler mhandler = new Handler() {
+        public void handleMessage(android.os.Message msg) {
+            switch (msg.what) {
+                case Constants.LOAD_SUCCESS:
+                    String result = msg.getData().getString("result");
+                    Log.i("gongpengming", result);
+                    JSONObject object = JSON.parseObject(result);
+                    Boolean falg = object.getBoolean("success");
+                    if (falg) {
+                        ViewUtil.ShowMessageTitle(ct, "操作成功！");
+                        goBackMenu();
+                    } else {
+                        ViewUtil.ShowMessageTitle(ct, "操作失败！");
+                    }
+                    break;
+                case LOAD_EM_NAME:
+                    result = msg.getData().getString("result");
+
 //				progressDialog.dismiss();
-				object = JSON.parseObject(result);
-				String em_name = object.getString("em_name");
-				if (!StringUtils.isEmpty(em_name)) {
-					CommonUtil.setSharedPreferences(ct, "erp_emname", em_name);
-				}
-				break;
-			case LOAD_FILE_SUCCESS:
-				result = msg.getData().getString("result");
-				Log.i(TAG, result);
-				JSONObject root = JSON.parseObject(result);
-				String fileUrl = root.getString("url");
-				if (fileUrl.length() > 2) {
-					lay_voice_task.setVisibility(View.VISIBLE);
-					fileUrl = fileUrl.substring(1, fileUrl.length() - 1).split(", ")[0];
-					String url = Constants.getAppBaseUrl(ct);
-					String ipaddress = url.split("//")[1].split("/")[0];
-					String file_url = "http://" + ipaddress + "/" + "postattach" + fileUrl.split("postattach")[1];
-					downFileToSD(fileUrl, file_url);
-				} else {
-					lay_voice_task.setVisibility(View.GONE);
-				}
-				break;
-			case LOAD_SUCCESS_MSGTASK:
-				result = msg.getData().getString("result");
-				if (adapter==null) {
-					adapter=new SimpleAdapter(ct, JSON.parseObject(result).getJSONArray("taskmsg"));
-					iv_taskMsg.setAdapter(adapter);
-				}else{
-					adapter.notifyDataSetChanged();
-				}
-				Log.i(TAG, "回复内容："+result);
+                    object = JSON.parseObject(result);
+                    String em_name = object.getString("em_name");
+                    if (!StringUtils.isEmpty(em_name)) {
+                        CommonUtil.setSharedPreferences(ct, "erp_emname", em_name);
+                    }
+                    break;
+                case LOAD_FILE_SUCCESS:
+                    result = msg.getData().getString("result");
+                    JSONObject root = JSON.parseObject(result);
+                    String fileUrl = root.getString("url");
+                    if (fileUrl.length() > 2) {
+                        lay_voice_task.setVisibility(View.VISIBLE);
+                        fileUrl = fileUrl.substring(1, fileUrl.length() - 1).split(", ")[0];
+                        String url = Constants.getAppBaseUrl(ct);
+                        String ipaddress = url.split("//")[1].split("/")[0];
+                        String file_url = "http://" + ipaddress + "/" + "postattach" + fileUrl.split("postattach")[1];
+                        downFileToSD(fileUrl, file_url);
+                    } else {
+                        lay_voice_task.setVisibility(View.GONE);
+                    }
+                    break;
+                case LOAD_SUCCESS_MSGTASK:
+                    result = msg.getData().getString("result");
+                    Log.i("gongpengming", result);
+                    if (adapter == null) {
+                        adapter = new SimpleAdapter(ct, JSON.parseObject(result).getJSONArray("taskmsg"));
+                        iv_taskMsg.setAdapter(adapter);
+                    } else {
+                        adapter.notifyDataSetChanged();
+                    }
+                    Log.i(TAG, "回复内容：" + result);
 //				progressDialog.dismiss();
-				break;
-			case Constants.APP_SOCKETIMEOUTEXCEPTION:
-				result = msg.getData().getString("result");
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    result = msg.getData().getString("result");
 //				progressDialog.dismiss();
-				ViewUtil.ShowMessageTitleAutoDismiss(ct, result, 1000);
-				break;
-			default:
-				break;
-			}
-		}
-
-	};
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		initView();
-		initData();
-	}
-
-	public void initView() {
-		 setContentView(R.layout.act_task_detail);
-		 ViewUtils.inject(this);
-		 ct=this;
-		 getSupportActionBar().setTitle("任务处理");
-		 TAG = "DetailTask";
-		 bt_task_bohui.setOnClickListener(this);
-		 bt_task_huifu.setOnClickListener(this);
-		 bt_task_queren.setOnClickListener(this);
-		 iv_recode.setOnClickListener(this);
-
-	}
-
-	public void initData() {
-		//loadDataMsgTask(ra_id);
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		Intent intent = getIntent();
-		tv_task_name.setText(intent.getStringExtra("taskname") == null ? "未填写" : intent.getStringExtra("taskname"));
-		// 提出人
-		tv_task_emcode
-				.setText(intent.getStringExtra("taskemcode") == null ? "未填写" : intent.getStringExtra("taskemcode"));
-		// 执行人performer
-		tv_task_performer
-				.setText(intent.getStringExtra("performer") == null ? "未填写" : intent.getStringExtra("performer"));
-		tv_task_status.setText(intent.getStringExtra("status") == null ? "未填写" : intent.getStringExtra("status"));
-		tv_task_duration.setText(intent.getStringExtra("duration") == null ? "未填写" : intent.getStringExtra("duration"));
-		tv_task_describe
-				.setText(intent.getStringExtra("description") == null ? "未填写" : intent.getStringExtra("description"));
-		tv_task_starttime
-				.setText(intent.getStringExtra("tasktime") == null ? "未填写" : intent.getStringExtra("tasktime"));
-		taskId = intent.getStringExtra("taskid");
-		String ra_taskid=intent.getStringExtra("ra_taskid");
-		// String taskcode=intent.getStringExtra("taskcode");
-		String attachs = intent.getStringExtra("attachs");
-		if (!StringUtils.isEmpty(attachs)) {
-			// 加载语音文件
-			// String
-			// url=Constants.getAppBaseUrl(ct)+"/mobile/getAttachByTaskcode.action";
-			String url = Constants.getAppBaseUrl(ct) + "/common/downloadbyId.action?id=" + attachs.split(";")[0];
-			downFileToSD("/uu/recorder_download/" + attachs.split(";")[0] + ".amr", url);
-		} else {
-			// 没有语音文件
-			lay_voice_task.setVisibility(View.GONE);
-		}
-
-		String status = intent.getStringExtra("status");
-		String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
-		if ("进行中".equals(status)) {
-			// 执行人
-			if (intent.getStringExtra("performer").equals(emname)) {
-				ll_bt_task.setVisibility(View.GONE);
-				bt_task_huifu.setVisibility(View.VISIBLE);
-				et_task_name.setVisibility(View.VISIBLE);
-			} else {
-				et_task_name.setVisibility(View.GONE);
-				ll_bt_task.setVisibility(View.GONE);
-				bt_task_huifu.setVisibility(View.GONE);
-			}
-
-		} else if ("待确认".equals(status)) {
-			// 提出人等于当前用户
-			if (intent.getStringExtra("taskemcode").equals(emname)) {
-				ll_bt_task.setVisibility(View.VISIBLE);
-				bt_task_huifu.setVisibility(View.GONE);
-				et_task_name.setVisibility(View.VISIBLE);
-			} else {
-				et_task_name.setVisibility(View.GONE);
-				ll_bt_task.setVisibility(View.GONE);
-				bt_task_huifu.setVisibility(View.GONE);
-			}
-
-		} else if ("已完成".equals(status)) {
-			et_task_name.setVisibility(View.GONE);
-			ll_bt_task.setVisibility(View.GONE);
-			bt_task_huifu.setVisibility(View.GONE);
-		}
-		
-		//加载任务回复内容
-		loadDataMsgTask(ra_taskid);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see android.view.View.OnClickListener#onClick(android.view.View)
-	 */
-	@Override
-	public void onClick(View v) {
-		switch (v.getId()) {
-		case R.id.bt_task_huifu:
-			Map<String, String> param = new HashMap<String, String>();
-			if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
-				param.put("ra_id", taskId);
-
-				param.put("record", et_task_name.getText().toString());
-				sendDataToServer("plm/record/endBillTask.action", param);
-			} else {
-				ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
-			}
-			break;
-		case R.id.bt_task_bohui:
-			if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
-				param = new HashMap<String, String>();
-				param.put("ra_id", taskId);
-				param.put("record", et_task_name.getText().toString());
-				sendDataToServer("plm/record/noConfirmBillTask.action", param);
-			} else {
-				ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
-			}
-
-			break;
-		case R.id.bt_task_queren:
-			if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
-				param = new HashMap<String, String>();
-				param.put("ra_id", taskId);
-				param.put("record", et_task_name.getText().toString());
-				sendDataToServer("plm/record/confirmBillTask.action", param);
-			} else {
-				ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
-			}
-			break;
-		case R.id.iv_recode:
-			if (filepath != null) {
-				tv_voice_msg.setText("正在播放...");
-				playVolice(filepath);
-			}
-			break;
-		default:
-			break;
-		}
-	}
-
-	public void sendDataToServer(String url, Map<String, String> param) {
+                    ViewUtil.ShowMessageTitleAutoDismiss(ct, result, 1000);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+    }
+
+    public void initView() {
+        setContentView(R.layout.act_task_detail);
+        ViewUtils.inject(this);
+        ct = this;
+        getSupportActionBar().setTitle("任务处理");
+        TAG = "DetailTask";
+        bt_task_bohui.setOnClickListener(this);
+        bt_task_huifu.setOnClickListener(this);
+        bt_task_queren.setOnClickListener(this);
+        iv_recode.setOnClickListener(this);
+
+    }
+
+    public void initData() {
+        //loadDataMsgTask(ra_id);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Intent intent = getIntent();
+
+        tv_task_name.setText(intent.getStringExtra("taskname") == null ? "未填写" : intent.getStringExtra("taskname"));
+        // 提出人
+        tv_task_emcode
+                .setText(intent.getStringExtra("taskemcode") == null ? "未填写" : intent.getStringExtra("taskemcode"));
+        // 执行人performer
+        tv_task_performer
+                .setText(intent.getStringExtra("performer") == null ? "未填写" : intent.getStringExtra("performer"));
+        tv_task_status.setText(intent.getStringExtra("status") == null ? "未填写" : intent.getStringExtra("status"));
+        tv_task_duration.setText(intent.getStringExtra("duration") == null ? "未填写" : intent.getStringExtra("duration"));
+        tv_task_describe
+                .setText(intent.getStringExtra("description") == null ? "未填写" : intent.getStringExtra("description"));
+        tv_task_starttime
+                .setText(intent.getStringExtra("tasktime") == null ? "未填写" : intent.getStringExtra("tasktime"));
+        taskId = intent.getStringExtra("taskid");
+        tv_task_endtime.setText(intent.getStringExtra("endtime") == null ? "未填写" : intent.getStringExtra("endtime"));
+        String ra_taskid = intent.getStringExtra("ra_taskid");
+        // String taskcode=intent.getStringExtra("taskcode");
+        String attachs = intent.getStringExtra("attachs");
+        if (!StringUtils.isEmpty(attachs)) {
+            // 加载语音文件
+            // String
+            // url=Constants.getAppBaseUrl(ct)+"/mobile/getAttachByTaskcode.action";
+            String url = Constants.getAppBaseUrl(ct) + "/common/downloadbyId.action?id=" + attachs.split(";")[0];
+            downFileToSD("/uu/recorder_download/" + attachs.split(";")[0] + ".amr", url);
+        } else {
+            // 没有语音文件
+            lay_voice_task.setVisibility(View.GONE);
+        }
+
+        String status = intent.getStringExtra("status");
+        String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
+        if ("进行中".equals(status)) {
+            // 执行人
+            if (intent.getStringExtra("performer").equals(emname)) {
+                ll_bt_task.setVisibility(View.GONE);
+                bt_task_huifu.setVisibility(View.VISIBLE);
+                et_task_name.setVisibility(View.VISIBLE);
+            } else {
+                et_task_name.setVisibility(View.GONE);
+                ll_bt_task.setVisibility(View.GONE);
+                bt_task_huifu.setVisibility(View.GONE);
+            }
+
+        } else if ("待确认".equals(status)) {
+            // 提出人等于当前用户
+            if (intent.getStringExtra("taskemcode").equals(emname)) {
+                ll_bt_task.setVisibility(View.VISIBLE);
+                bt_task_huifu.setVisibility(View.GONE);
+                et_task_name.setVisibility(View.VISIBLE);
+            } else {
+                et_task_name.setVisibility(View.GONE);
+                ll_bt_task.setVisibility(View.GONE);
+                bt_task_huifu.setVisibility(View.GONE);
+            }
+
+        } else if ("已完成".equals(status)) {
+            et_task_name.setVisibility(View.GONE);
+            ll_bt_task.setVisibility(View.GONE);
+            bt_task_huifu.setVisibility(View.GONE);
+        }
+
+        //加载任务回复内容
+        loadDataMsgTask(ra_taskid);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see android.view.View.OnClickListener#onClick(android.view.View)
+     */
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.bt_task_huifu:
+                Map<String, String> param = new HashMap<String, String>();
+                if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
+                    param.put("ra_id", taskId);
+
+                    param.put("record", et_task_name.getText().toString());
+                    sendDataToServer("plm/record/endBillTask.action", param);
+                } else {
+                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                }
+                break;
+            case R.id.bt_task_bohui:
+                if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
+                    param = new HashMap<String, String>();
+                    param.put("ra_id", taskId);
+                    param.put("record", et_task_name.getText().toString());
+                    sendDataToServer("plm/record/noConfirmBillTask.action", param);
+                } else {
+                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                }
+
+                break;
+            case R.id.bt_task_queren:
+                if (!StringUtils.isEmpty(et_task_name.getText().toString())) {
+                    param = new HashMap<String, String>();
+                    param.put("ra_id", taskId);
+                    param.put("record", et_task_name.getText().toString());
+                    sendDataToServer("plm/record/confirmBillTask.action", param);
+                } else {
+                    ViewUtil.ShowMessageTitle(ct, "输入完整信息！");
+                }
+                break;
+            case R.id.iv_recode:
+                if (filepath != null) {
+                    tv_voice_msg.setText("正在播放...");
+                    playVolice(filepath);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    public void sendDataToServer(String url, Map<String, String> param) {
 //		progressDialog.show();
-		url = Constants.getAppBaseUrl(ct) + url;
-		Log.i(TAG, url);
-		param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-		ViewUtil.startNetThread(ct, url, param, mhandler, Constants.LOAD_SUCCESS, null, null, "get");
-	}
+        url = Constants.getAppBaseUrl(ct) + url;
+        Log.i(TAG, url);
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.startNetThread(ct, url, param, mhandler, Constants.LOAD_SUCCESS, null, null, "get");
+    }
 
-	public void sendDataToServer(String url, Map<String, Object> param, int what) {
+    public void sendDataToServer(String url, Map<String, Object> param, int what) {
 //		progressDialog.show();
-		url = Constants.getAppBaseUrl(ct) + url;
-		Log.i(TAG, url);
-		param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-		LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-		headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-		ViewUtil.httpSendRequest(ct, url, param, mhandler, headers, what, null, null, "get");
-	}
-
-	public void getAMRFileForServer(String url, Map<String, Object> param) {
-		LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-		headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-		ViewUtil.httpSendRequest(ct, url, param, mhandler, headers, LOAD_FILE_SUCCESS, null, null, "get");
-	}
-
-	private MediaPlayer mMediaPlayer;
-
-	public void download(final String url, final String path) {
-		Log.i(TAG, "版本号：" + getAndroidSDKVersion());
-		Log.i(TAG, "url path:" + url);
-		Log.i(TAG, "SD path:" + path);
-		if (getAndroidSDKVersion() > 19) {
-			new Thread(new Runnable() {
-
-				@Override
-				public void run() {
-					filepath = HttpUtil.download(url, path);
-				}
-			}).start();
-		} else {
-			// 判断版本号
-			HttpUtils http = new HttpUtils();
-			http.download(url, path, false, // 如果目标文件存在，接着未完成的部分继续下载。服务器不支持RANGE时将从新下载。
-					false, // 如果从请求返回信息中获取到文件名，下载完成后自动重命名。
-					new RequestCallBack<File>() {
-
-						@Override
-						public void onStart() {
-							ViewUtil.ToastMessage(ct, "开始下载");
-						}
-
-						@Override
-						public void onLoading(long total, long current, boolean isUploading) {
-						}
-
-						@Override
-						public void onSuccess(ResponseInfo<File> responseInfo) {
-							ViewUtil.ToastMessage(ct, "下载成功");
-							filepath = responseInfo.result.getAbsolutePath();
-
-						}
-
-						@Override
-						public void onFailure(HttpException error, String msg) {
-							ViewUtil.ToastMessage(ct, msg);
-							Log.i("result", msg);
-						}
-					});
-		}
-
-	}
-
-	private String filepath;
-
-	/**
-	 * @author Administrator
-	 * @功能:播放声音
-	 */
-	public void playVolice(String path) {
-		if (mMediaPlayer == null) {
-			mMediaPlayer = new MediaPlayer();
-			// 添加录音的路径
-			try {
-				File file = new File(path);
-				// final FileInputStream fis = new FileInputStream(file);
-				mMediaPlayer.setDataSource(path);
-				// 准备
-				mMediaPlayer.prepare();
-				mMediaPlayer.start();
-				mMediaPlayer.setOnCompletionListener(new OnCompletionListener() {
-
-					@Override
-					public void onCompletion(MediaPlayer mp) {
-						// 停止播放
-						if (mMediaPlayer != null) {
-							mMediaPlayer.stop();
-							mMediaPlayer = null;
-							tv_voice_msg.setText("语音");
-							ViewUtil.ToastMessage(ct, "播放完毕！");
-
-						}
-
-					}
-				});
-			} catch (IllegalArgumentException e) {
-				e.printStackTrace();
-			} catch (SecurityException e) {
-				e.printStackTrace();
-			} catch (IllegalStateException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		} else {
-			if (mMediaPlayer != null) {
-				mMediaPlayer.stop();
-				mMediaPlayer = null;
-				tv_voice_msg.setText("语音");
-			}
-		}
-
-	}
-
-	private void downFileToSD(String sd_path, String file_url) {
-		if (CommonUtil.isExitsSdcard()) {
-			Log.i(TAG, file_url);
-			String path = null;
-			try {
-				path = Environment.getExternalStorageDirectory().getCanonicalFile() + sd_path;
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			File file = new File(path);
-			if (file.isFile() && file != null) {
-				filepath = path;
-			} else {
-				download(file_url, path);
-			}
-
-		} else {
-			ViewUtil.ShowMessageTitle(ct, "没有插入SD卡");
-		}
-	};
-
-	public int getAndroidSDKVersion() {
-		int version = 0;
-		try {
-			version = Integer.valueOf(android.os.Build.VERSION.SDK);
-		} catch (NumberFormatException e) {
-			e.printStackTrace();
-		}
-		return version;
-	}
-
-	final int LOAD_SUCCESS_MSGTASK = 8;
-
-	/**
-	 * @author Administrator
-	 * @功能:获取信息任务
-	 */
-	public void loadDataMsgTask(String ra_id) {
+        url = Constants.getAppBaseUrl(ct) + url;
+        Log.i(TAG, url);
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, mhandler, headers, what, null, null, "get");
+    }
+
+    public void getAMRFileForServer(String url, Map<String, Object> param) {
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, mhandler, headers, LOAD_FILE_SUCCESS, null, null, "get");
+    }
+
+    private MediaPlayer mMediaPlayer;
+
+    public void download(final String url, final String path) {
+        Log.i(TAG, "版本号：" + getAndroidSDKVersion());
+        Log.i(TAG, "url path:" + url);
+        Log.i(TAG, "SD path:" + path);
+        if (getAndroidSDKVersion() > 19) {
+            new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    filepath = HttpUtil.download(url, path);
+                }
+            }).start();
+        } else {
+            // 判断版本号
+            HttpUtils http = new HttpUtils();
+            http.download(url, path, false, // 如果目标文件存在，接着未完成的部分继续下载。服务器不支持RANGE时将从新下载。
+                    false, // 如果从请求返回信息中获取到文件名，下载完成后自动重命名。
+                    new RequestCallBack<File>() {
+
+                        @Override
+                        public void onStart() {
+                            ViewUtil.ToastMessage(ct, "开始下载");
+                        }
+
+                        @Override
+                        public void onLoading(long total, long current, boolean isUploading) {
+                        }
+
+                        @Override
+                        public void onSuccess(ResponseInfo<File> responseInfo) {
+                            ViewUtil.ToastMessage(ct, "下载成功");
+                            filepath = responseInfo.result.getAbsolutePath();
+
+                        }
+
+                        @Override
+                        public void onFailure(HttpException error, String msg) {
+                            ViewUtil.ToastMessage(ct, msg);
+                            Log.i("result", msg);
+                        }
+                    });
+        }
+
+    }
+
+    private String filepath;
+
+    /**
+     * @author Administrator
+     * @功能:播放声音
+     */
+    public void playVolice(String path) {
+        if (mMediaPlayer == null) {
+            mMediaPlayer = new MediaPlayer();
+            // 添加录音的路径
+            try {
+                File file = new File(path);
+                // final FileInputStream fis = new FileInputStream(file);
+                mMediaPlayer.setDataSource(path);
+                // 准备
+                mMediaPlayer.prepare();
+                mMediaPlayer.start();
+                mMediaPlayer.setOnCompletionListener(new OnCompletionListener() {
+
+                    @Override
+                    public void onCompletion(MediaPlayer mp) {
+                        // 停止播放
+                        if (mMediaPlayer != null) {
+                            mMediaPlayer.stop();
+                            mMediaPlayer = null;
+                            tv_voice_msg.setText("语音");
+                            ViewUtil.ToastMessage(ct, "播放完毕！");
+
+                        }
+
+                    }
+                });
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+            } catch (SecurityException e) {
+                e.printStackTrace();
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            if (mMediaPlayer != null) {
+                mMediaPlayer.stop();
+                mMediaPlayer = null;
+                tv_voice_msg.setText("语音");
+            }
+        }
+
+    }
+
+    private void downFileToSD(String sd_path, String file_url) {
+        if (CommonUtil.isExitsSdcard()) {
+            Log.i(TAG, file_url);
+            String path = null;
+            try {
+                path = Environment.getExternalStorageDirectory().getCanonicalFile() + sd_path;
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            File file = new File(path);
+            if (file.isFile() && file != null) {
+                filepath = path;
+            } else {
+                download(file_url, path);
+            }
+
+        } else {
+            ViewUtil.ShowMessageTitle(ct, "没有插入SD卡");
+        }
+    }
+
+    ;
+
+    public int getAndroidSDKVersion() {
+        int version = 0;
+        try {
+            version = Integer.valueOf(android.os.Build.VERSION.SDK);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return version;
+    }
+
+    final int LOAD_SUCCESS_MSGTASK = 8;
+
+    /**
+     * @author Administrator
+     * @功能:获取信息任务
+     */
+    public void loadDataMsgTask(String ra_id) {
 //		progressDialog.show();
-		String url ="plm/record/msgTask.action";
-		Map<String, Object> param = new HashMap<String, Object>();
-		param.put("ra_id", ra_id);
-		sendDataToServer(url, param, LOAD_SUCCESS_MSGTASK);
-	}
-	
-	
-	private void goBackMenu() {
-		mhandler.postDelayed(new Runnable() {
-			
-			@Override
-			public void run() {
-				onBackPressed();
-			}
-		}, 800);
-	}
-
-
-	public class SimpleAdapter extends BaseAdapter{
-		
-		private JSONArray jsonArray;
-		private LayoutInflater inflater;
-		
-		
-		public SimpleAdapter(Context ct,JSONArray data) {
-			this.inflater=LayoutInflater.from(ct);
-			this.jsonArray=data;
-		}
-
-
-		@Override
-		public int getCount() {
-			return jsonArray.size();
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return jsonArray.getJSONArray(position);
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public View getView(int position, View view, ViewGroup parent) {
-			ViewModel model=null;
-			if (view==null) {
-				view=inflater.inflate(R.layout.items_taskmsg_card, parent,false);
-				model=new ViewModel();
-				model.template_man=(TextView) view.findViewById(R.id.tv_task_man);
-				model.template_time=(TextView) view.findViewById(R.id.tv_task_time);
-				model.template_content=(TextView) view.findViewById(R.id.tv_task_content);
-			    view.setTag(model);
-			}else{
-				model=(ViewModel) view.getTag();
-			}
-			
-			model.template_man.setText(jsonArray.getJSONObject(position).getString("录入人"));
-			model.template_time.setText(jsonArray.getJSONObject(position).getString("时间"));
-			model.template_content.setText(jsonArray.getJSONObject(position).getString("内容"));
-		
-			return view;
-		}
-		
-		class ViewModel{
-			TextView template_man;
-			TextView template_time;
-			TextView template_content;
-		}
-		
-	}
+        Log.i("gongpengming", "loadDataMsgTask");
+        String url = "plm/record/msgTask.action";
+        Map<String, Object> param = new HashMap<String, Object>();
+        param.put("ra_id", ra_id);
+        sendDataToServer(url, param, LOAD_SUCCESS_MSGTASK);
+    }
+
+
+    private void goBackMenu() {
+        mhandler.postDelayed(new Runnable() {
+
+            @Override
+            public void run() {
+                onBackPressed();
+            }
+        }, 800);
+    }
+
+
+    public class SimpleAdapter extends BaseAdapter {
+
+        private JSONArray jsonArray;
+        private LayoutInflater inflater;
+
+
+        public SimpleAdapter(Context ct, JSONArray data) {
+            this.inflater = LayoutInflater.from(ct);
+            this.jsonArray = data;
+        }
+
+
+        @Override
+        public int getCount() {
+            return jsonArray.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return jsonArray.getJSONArray(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View view, ViewGroup parent) {
+            ViewModel model = null;
+            if (view == null) {
+                view = inflater.inflate(R.layout.items_taskmsg_card, parent, false);
+                model = new ViewModel();
+                model.template_man = (TextView) view.findViewById(R.id.tv_task_man);
+                model.template_time = (TextView) view.findViewById(R.id.tv_task_time);
+                model.template_content = (TextView) view.findViewById(R.id.tv_task_content);
+                view.setTag(model);
+            } else {
+                model = (ViewModel) view.getTag();
+            }
+
+            model.template_man.setText(jsonArray.getJSONObject(position).getString("录入人"));
+            model.template_time.setText(jsonArray.getJSONObject(position).getString("时间"));
+            model.template_content.setText(jsonArray.getJSONObject(position).getString("内容"));
+
+            return view;
+        }
+
+        class ViewModel {
+            TextView template_man;
+            TextView template_time;
+            TextView template_content;
+        }
+
+    }
 }

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

@@ -88,7 +88,7 @@ public class TaskActivity extends BaseActivity {
             }
             if (msg.what == 2) {
                 String result = msg.getData().getString("result");
-                System.out.println("query result:" + result);
+                Log.i("gongpengming",result);
                 JSONObject dataroot = JSON.parseObject(result);
                 JSONArray data = dataroot.getJSONArray("data");
                 allList.clear();
@@ -112,6 +112,7 @@ public class TaskActivity extends BaseActivity {
                         process.setRa_resourcecode(item.getString("ra_resourcecode"));
                         process.setTaskcode(item.getString("taskcode"));
                         process.setAttachs(item.getString("attachs"));
+                        process.setEndTime(item.getString("ra_enddate"));
                         allList.add(process);
                     }
                     adapter = new SchedultAdapter(TaskActivity.this, allList);
@@ -206,6 +207,9 @@ public class TaskActivity extends BaseActivity {
                 intent.putExtra("taskcode", store.taskCode);//处理人编号
                 intent.putExtra("ra_taskid", store.task_id);//取回复内容id
                 intent.putExtra("attachs", store.attachs);
+                Log.i("gongpengming", store.tv_task_duration);
+
+                intent.putExtra("endtime", store.tv_task_duration);
                 startActivity(intent);
             }
 
@@ -229,7 +233,6 @@ public class TaskActivity extends BaseActivity {
                     if (master == null) {
                         master = CommonUtil.getSharedPreferences(context, "erp_master");
                     }
-                    System.out.println("item url=" + url);
                     intent.putExtra("url", url);
                     intent.putExtra("t", t);
                     intent.putExtra("d", d);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SchedultAdapter.java

@@ -10,9 +10,9 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
+import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -106,13 +106,13 @@ public class SchedultAdapter extends BaseAdapter {
                 store.pTextView2.setText(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
                         .format(fields_object.getDatetime()));
             }
+            store.tv_task_duration = fields_object.getEndTime();
             store.tv_ra_resourcecode = fields_object.getRa_resourcecode();
             store.taskCode = fields_object.getTaskcode();
             store.pTextView4.setText(fields_object.getTaskname());
             store.pTextView3.setText(fields_object.getTaskid());
             store.tv_task_status.setText(fields_object.getMainname());
             store.tv_task_description = fields_object.getDescribe() == null ? "未填写" : fields_object.getDescribe();
-            store.tv_task_duration = fields_object.getDuration() == null ? "未填写" : fields_object.getDuration();
             store.tv_task_performer = fields_object.getDealpersoncode() == null ? "未填写" : fields_object.getDealpersoncode();
             store.attachs = fields_object.getAttachs();
             store.task_id = fields_object.getRa_taskid();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/entity/AllProcess.java

@@ -25,16 +25,22 @@ public class AllProcess implements Serializable{
 	private String caller;//流程callr
 	private String link;//对应URL地址
 	private String master;//所属的帐套
-	
+	private String endTime; //结束时间
 	private String describe="";//任务描述
 	private String duration="";//持续时间
 	private String ra_resourcecode;//执行人编号
 	private String taskcode;//取语音
 	private String attachs;//附件id
-	
 
-	
-	
+
+	public String getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
 	public String getAttachs() {
 		return attachs;
 	}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java

@@ -159,7 +159,6 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 break;
         }
     }
-
     public LinksManFragment() {
         mSortFriends = new ArrayList<BaseSortModel<Friend>>();
         sortFrientSeach = new ArrayList<BaseSortModel<Friend>>();
@@ -180,18 +179,13 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         getActivity().registerReceiver(receiver, inputFilter);
         setHasOptionsMenu(true);
     }
-
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
-
         if (createView) {
             ct = getActivity();
             initView();
         }
-
     }
-
-
     private void getDataByDB(List<Friend> friend) {  //企业通讯录好友
         if (manager == null)
             manager = new DBManager(ct);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MucChatActivity.java

@@ -188,9 +188,7 @@ public class MucChatActivity extends ActionBackActivity
                 if (mChatBottomView != null) {
                     mChatBottomView.setVisibility(View.GONE);
                 }
-
             }
-
         }
     };
 

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

@@ -2,339 +2,367 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
     <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-    <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" >
-        <LinearLayout 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="回复您的任务完成情况..." />
+        android:fillViewport="true">
 
-            <Button
-                android:id="@+id/bt_task_huifu"
-                style="@style/button_style_one"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
-                android:text="回复" />
-            <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"
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout 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:layout_weight="1.0"
-                    android:text="确认" />
+                    android:hint="回复您的任务完成情况..." />
 
                 <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="驳回" />
+                    android:text="回复" />
+
+                <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="确认" />
+
+                    <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="驳回" />
+                </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" />
-
-            <TextView
-                android:id="@+id/textView1"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:text="任务信息"
-                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" />
-        </LinearLayout>
-
-        <LinearLayout
-            style="@style/form_linear_customer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="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="任务名称"
-                    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="未填写" />
-            </LinearLayout>
-
-            <View style="@style/line_horizontal_style_one" />
-
-            <LinearLayout
-                style="@style/linear_task_background"
-                android:orientation="horizontal"
-                android:weightSum="4" >
+                    android:background="@drawable/shape_textview_line" />
 
                 <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="提出人"
-                    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: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="执行人"
-                    android:textColor="@color/black" />
+                    android:layout_marginLeft="10dp"
+                    android:text="任务信息"
+                    android:textColor="@color/yellow_home"
+                    android:textSize="16sp" />
 
-                <TextView
-                    android:id="@+id/tv_task_performer"
-                    style="@style/task_text_right" />
+                <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" />
             </LinearLayout>
 
-            <View style="@style/line_horizontal_style_one" />
-
             <LinearLayout
-                style="@style/linear_task_background"
-                android:orientation="horizontal"
-                android:weightSum="4" >
+                style="@style/form_linear_customer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp">
 
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                <LinearLayout
+                    style="@style/linear_task_background"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="开始时间"
-                    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:visibility="gone"
-                android:weightSum="4" >
-
-                <TextView
-                    android:layout_width="0dp"
-                    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="任务名称"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_task_name"
+                        style="@style/task_text_right"
+                        android:layout_marginLeft="10dp"
+                        android:text="未填写" />
+                </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="提出人"
+                        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="执行人"
+                        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="开始时间"
+                        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="结束时间"
+                        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="持续时间"
+                        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="状态"
+                        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">
+
+                    <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="任务描述"
+                        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="1.0"
+                        android:gravity="center" />
+                </LinearLayout>
+
+                <View style="@style/line_horizontal_style_one" />
+
+                <LinearLayout
+                    android:id="@+id/lay_voice_task"
+                    style="@style/linear_task_background"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_weight="1.0"
-                    android:gravity="right"
-                    android:text="持续时间"
-                    android:textColor="@color/black" />
-
-                <TextView
-                    android:id="@+id/tv_task_duration"
-                    style="@style/task_text_right" />
+                    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: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="状态"
-                    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" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
 
-            <LinearLayout
-                style="@style/linear_task_background"
-                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" />
 
                 <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="任务描述"
-                    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="1.0"
-                    android:gravity="center" />
-            </LinearLayout>
-
-            <View style="@style/line_horizontal_style_one" />
-
-            <LinearLayout
-                android:id="@+id/lay_voice_task"
-                style="@style/linear_task_background"
-                android:layout_marginBottom="5dp"
-                android:orientation="horizontal"
-                android:weightSum="4" >
+                    android:text="回复内容"
+                    android:textColor="@color/yellow_home"
+                    android:textSize="16sp" />
 
-                <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" />
+                <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" />
             </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" />
-
-            <TextView
-                android:layout_width="wrap_content"
+            <com.xzjmyk.pm.activity.ui.erp.view.CustomerListView
+                android:id="@+id/iv_taskMsg"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:text="回复内容"
-                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:background="#EFEFEF"
+                android:divider="@color/Transpant"
+                android:dividerHeight="1dp"
+                android:fadingEdge="none"
+                android:listSelector="#00000000"
+                android:padding="5dp"
+                android:scrollbars="none"></com.xzjmyk.pm.activity.ui.erp.view.CustomerListView>
         </LinearLayout>
-
-        <com.xzjmyk.pm.activity.ui.erp.view.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" >
-        </com.xzjmyk.pm.activity.ui.erp.view.CustomerListView>
-    </LinearLayout>
-</com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
 </LinearLayout>

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

@@ -2,72 +2,76 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         style="@style/linear_task_background"
         android:layout_marginTop="10dp"
         android:orientation="horizontal"
-        android:weightSum="4" >
+        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="录入人"
-                android:textColor="@color/black" />
+        <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="录入人"
+            android:textColor="@color/black" />
 
-             <TextView
-                 android:id="@+id/tv_task_man"
-                 style="@style/task_text_right"
-                 android:layout_marginLeft="10dp"
-                 android:text="未填写" />
+        <TextView
+            android:id="@+id/tv_task_man"
+            style="@style/task_text_right"
+            android:layout_marginLeft="10dp"
+            android:text="未填写" />
 
-        </LinearLayout>
-<View style="@style/line_horizontal_style_one"/>
-<LinearLayout
-             style="@style/linear_task_background"
-             android:orientation="horizontal"
-             android:weightSum="4" >
+    </LinearLayout>
 
-            <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="时间"
-                android:textColor="@color/black" />
+    <View style="@style/line_horizontal_style_one" />
 
-           <TextView
-               android:id="@+id/tv_task_time"
-               style="@style/task_text_right"
-               android:layout_marginLeft="10dp" />
+    <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="时间"
+            android:textColor="@color/black" />
+
+        <TextView
+            android:id="@+id/tv_task_time"
+            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" >
+    </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="内容"
-                android:textColor="@color/black" />
+        <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="内容"
+            android:textColor="@color/black" />
 
-           <TextView
-                android:id="@+id/tv_task_content"
-                style="@style/task_text_right" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/tv_task_content"
+            style="@style/task_text_right" />
+    </LinearLayout>
 
 </LinearLayout>