소스 검색

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

LiuJie 10 년 전
부모
커밋
c2cbf502fe

+ 3 - 3
WeiChat/src/main/java/com/sk/weichat/helper/FileDataHelper.java

@@ -101,7 +101,7 @@ public class FileDataHelper {
 	/**
 	 * 
 	 * @param context
-	 * @param result
+	 * @param
 	 */
 	public static <T> void readArrayData(final Context context, final String fileName, final Listener<T> listener, final Class<T> clazz) {
 		if (listener == null) {// 如果监听为null,那么读取数据就没意义,直接返回
@@ -191,7 +191,7 @@ public class FileDataHelper {
 	/**
 	 * 
 	 * @param context
-	 * @param result
+	 * @param
 	 */
 	public static <T> void readObjectData(final Context context, final String fileName,
 			final com.sk.weichat.volley.StringJsonObjectRequest.Listener<T> listener, final Class<T> clazz) {
@@ -257,7 +257,7 @@ public class FileDataHelper {
 	/**
 	 * 
 	 * @param context
-	 * @param result
+	 * @param
 	 */
 	public static <T> ObjectResult<T> readObjectDataSync(final Context context, final String fileName, final Class<T> clazz) {
 		BufferedReader reader = null;

+ 1 - 4
WeiChat/src/main/java/com/sk/weichat/ui/circle/BusinessCircleActivity.java

@@ -95,7 +95,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-
 		mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
 		mLoginNickName = MyApplication.getInstance().mLoginUser.getNickName();
 
@@ -437,7 +436,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 		if (isPullDwonToRefersh) {
 			mPageIndex = 0;
 		}
-		HashMap<String, String> params = new HashMap<String, String>();
+		HashMap<String, String> params = new HashMap<String,String>();
 		String messageId = null;
 		if (!isPullDwonToRefersh && mMessages.size() > 0) {
 			messageId = mMessages.get(mMessages.size() - 1).getMessageId();
@@ -460,7 +459,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 					List<PublicMessage> datas = result.getData();
 					if (isPullDwonToRefersh) {
 						mMessages.clear();
-
 					}
 					if (datas != null && datas.size() > 0) {// 没有更多数据
 						mPageIndex++;
@@ -471,7 +469,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 						mMessages.addAll(datas);
 					}
 					mAdapter.notifyDataSetChanged();
-
 				} else {
 
 				}

+ 754 - 703
WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/AddTaskActivity.java

@@ -1,20 +1,11 @@
 /**
- * 
+ *
  */
 package com.sk.weichat.ui.erp.activity;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import android.app.AlertDialog;
+import android.app.DatePickerDialog;
+import android.app.TimePickerDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
@@ -30,12 +21,14 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.widget.Button;
+import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.TimePicker;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
@@ -58,703 +51,761 @@ import com.sk.weichat.ui.erp.util.StringUtils;
 import com.sk.weichat.ui.erp.view.DateTimePickerDialog;
 import com.sk.weichat.ui.erp.view.SwitchView;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 /**
  * @author LiuJie
- *
  */
-public class AddTaskActivity extends BaseActivity implements OnClickListener{
-	
-	
-	@ViewInject(R.id.et_task_remark)
-	private EditText et_task_remark;
-	@ViewInject(R.id.et_task_people)
-	private EditText et_task_people;
-	@ViewInject(R.id.cb_task_reply)
-	private SwitchView cb_task_reply;
-	@ViewInject(R.id.et_task_startime)
-	private EditText et_task_startime;
-	@ViewInject(R.id.et_task_name)
-	private EditText et_task_name;
-	@ViewInject(R.id.bt_task_add)
-	private Button bt_task_add;
-	
-	
-	@ViewInject(R.id.iv_recode)
-	private ImageView  bt_recode;//录音
-	@ViewInject(R.id.ic_voice_center)
-	private RelativeLayout ic_voice_center;//麦克风布局
-	@ViewInject(R.id.voice_display_voice_layout)
-	private LinearLayout voice_display_voice_layout;//语音文件布局
-	//展示页面控件voice_display_voice_layout
-	@ViewInject(R.id.voice_display_voice_play)
-	private ImageView  bt_voice_play;//播放按钮
-	@ViewInject(R.id.voice_display_voice_progressbar)
-	private ProgressBar display_voice_progressbar;//进度
-	@ViewInject(R.id.voice_display_voice_time)
-	private TextView  display_voice_time;//秒
-	//麦克风布局文件控件
-	@ViewInject(R.id.tv_voice_times)
-	private TextView  tv_voice_times;//录音时间
-	@ViewInject(R.id.iv_record)
-	private ImageView iv_record;//声麦图片
-	@ViewInject(R.id.tv_voice_tips)
-	private TextView  tv_voice_tips;//麦克风信息提示
-	
-	private static final String PATH = "/sdcard/uu/record/";// 录音存储路径
-	private String typeAmr = ".amr";
-	
-	private static final int MAX_TIME = 60;// 最长录音时间
-	private static final int MIN_TIME = 2;// 最短录音时间
-	
-	private static final int RECORD_NO = 0; // 不在录音
-	private static final int RECORD_ING = 3; // 正在录音
-	private static final int RECORD_ED = 2; // 完成录音
-	private int mRecord_State = 0; // 录音的状态
-	private int mMAXVolume;// 最大音量高度
-	private int mMINVolume;// 最小音量高度
-	private boolean mPlayState; // 播放状态
-	
-	private int mPlayCurrentPosition;// 当前播放的时间
-	@ViewInject(R.id.lay_voice_layout)
-	private LinearLayout  lay_voice_layout;
-	@ViewInject(R.id.view_line)
-	private View view_line;
-	@ViewInject(R.id.iv_find)
-	private ImageView  iv_find;
-	
-	private DateTimePickerDialog dialog;
-	private final static  int LOAD_SUCCESS_ADD=1;
-
-	@ViewInject(R.id.iv_delete_voice)
-	private ImageView iv_delete_voice;
-
-	private Context ct;
-	
-	private Handler mhandler=new Handler(){
-		public void handleMessage(Message msg) {
-			switch (msg.what) {
-			case LOAD_SUCCESS_ADD:
+public class AddTaskActivity extends BaseActivity implements OnClickListener {
+
+
+    @ViewInject(R.id.et_task_remark)
+    private EditText et_task_remark;
+    @ViewInject(R.id.et_task_people)
+    private EditText et_task_people;
+    @ViewInject(R.id.cb_task_reply)
+    private SwitchView cb_task_reply;
+    @ViewInject(R.id.et_task_startime)
+    private EditText et_task_startime;
+    @ViewInject(R.id.et_task_name)
+    private EditText et_task_name;
+    @ViewInject(R.id.bt_task_add)
+    private Button bt_task_add;
+
+
+    @ViewInject(R.id.iv_recode)
+    private ImageView bt_recode;//录音
+    @ViewInject(R.id.ic_voice_center)
+    private RelativeLayout ic_voice_center;//麦克风布局
+    @ViewInject(R.id.voice_display_voice_layout)
+    private LinearLayout voice_display_voice_layout;//语音文件布局
+    //展示页面控件voice_display_voice_layout
+    @ViewInject(R.id.voice_display_voice_play)
+    private ImageView bt_voice_play;//播放按钮
+    @ViewInject(R.id.voice_display_voice_progressbar)
+    private ProgressBar display_voice_progressbar;//进度
+    @ViewInject(R.id.voice_display_voice_time)
+    private TextView display_voice_time;//秒
+    //麦克风布局文件控件
+    @ViewInject(R.id.tv_voice_times)
+    private TextView tv_voice_times;//录音时间
+    @ViewInject(R.id.iv_record)
+    private ImageView iv_record;//声麦图片
+    @ViewInject(R.id.tv_voice_tips)
+    private TextView tv_voice_tips;//麦克风信息提示
+
+    private static final String PATH = "/sdcard/uu/record/";// 录音存储路径
+    private String typeAmr = ".amr";
+
+    private static final int MAX_TIME = 60;// 最长录音时间
+    private static final int MIN_TIME = 2;// 最短录音时间
+
+    private static final int RECORD_NO = 0; // 不在录音
+    private static final int RECORD_ING = 3; // 正在录音
+    private static final int RECORD_ED = 2; // 完成录音
+    private int mRecord_State = 0; // 录音的状态
+    private int mMAXVolume;// 最大音量高度
+    private int mMINVolume;// 最小音量高度
+    private boolean mPlayState; // 播放状态
+
+    private int mPlayCurrentPosition;// 当前播放的时间
+    @ViewInject(R.id.lay_voice_layout)
+    private LinearLayout lay_voice_layout;
+    @ViewInject(R.id.view_line)
+    private View view_line;
+    @ViewInject(R.id.iv_find)
+    private ImageView iv_find;
+
+    private DateTimePickerDialog dialog;
+    private final static int LOAD_SUCCESS_ADD = 1;
+
+    @ViewInject(R.id.iv_delete_voice)
+    private ImageView iv_delete_voice;
+
+    private Context ct;
+
+    private Handler mhandler = new Handler() {
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case LOAD_SUCCESS_ADD:
 //				progressDialog.dismiss();
-				String result=msg.getData().getString("result");
-				Log.i(TAG, result);
-				JSONObject object=JSON.parseObject(result);
-				Boolean falg= object.getBoolean("success");
-				if (falg) {
-					ViewUtil.ShowMessageTitle(ct, "保存成功!");
-					mhandler.postDelayed(new Runnable() {
-						
-						@Override
-						public void run() {
-                            onBackPressed();							
-						}
-					}, 1000);
-				}else{
-					ViewUtil.ShowMessageTitle(ct, "保存失败!");
-				}
-				break;
-			case RECORD_NO://停止录音
-				
-				if (mRecord_State == RECORD_ING) {
-					mRecord_State = RECORD_ED;
-					try {
-						// 停止录音
-						mRecordUtil.stop();
-						// 初始化录音音量
-						mRecord_Volume = 0;
-						
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-					
-				}
-				break;
-			case RECORD_ING://正在录音
-				// 显示录音时间
-				tv_voice_times.setText((int) mRecord_Time + "″");
-				// 根据录音声音大小显示效果
-			
-				break;
-			case VOICE_UPDATE://麦克风更新界面
-				// 显示录音时间
-				tv_voice_times.setText((int) mRecord_Time + "/60″");// ((int)
-				display_voice_time.setText((int) mRecord_Time + "”");
-				// 音量大小的动画
-				if (mRecord_Volume < 300.0) {
-					iv_record
-							.setBackgroundResource(R.drawable.chat_icon_voice1);
-				} else if (mRecord_Volume >= 300.0 && mRecord_Volume < 1000) {
-					iv_record
-							.setBackgroundResource(R.drawable.chat_icon_voice2);
-				} else if (mRecord_Volume >= 1000.0 && mRecord_Volume < 2000) {
-					iv_record
-							.setBackgroundResource(R.drawable.chat_icon_voice3);
-				} else if (mRecord_Volume >= 2000.0 && mRecord_Volume < 4000) {
-					iv_record
-							.setBackgroundResource(R.drawable.chat_icon_voice4);
-				} else if (mRecord_Volume >= 4000.0 && mRecord_Volume < 10000) {
-					iv_record
-							.setBackgroundResource(R.drawable.chat_icon_voice5);
-				} else if (mRecord_Volume >= 10000.0) {
-					iv_record
-							.setBackgroundResource(R.drawable.chat_icon_voice6);
-				}
-				break;
-			case 6:
-			   String id= msg.getData().getString("id");
-			   saveTask(id);
-			break;
-			default:
-				break;
-			}
-		};
-	};
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		initView();
-		initData();
-
-	}
-
-	/* (non-Javadoc)
+                    String result = msg.getData().getString("result");
+                    Log.i(TAG, result);
+                    JSONObject object = JSON.parseObject(result);
+                    Boolean falg = object.getBoolean("success");
+                    if (falg) {
+                        ViewUtil.ShowMessageTitle(ct, "保存成功!");
+                        mhandler.postDelayed(new Runnable() {
+
+                            @Override
+                            public void run() {
+                                onBackPressed();
+                            }
+                        }, 1000);
+                    } else {
+                        ViewUtil.ShowMessageTitle(ct, "保存失败!");
+                    }
+                    break;
+                case RECORD_NO://停止录音
+
+                    if (mRecord_State == RECORD_ING) {
+                        mRecord_State = RECORD_ED;
+                        try {
+                            // 停止录音
+                            mRecordUtil.stop();
+                            // 初始化录音音量
+                            mRecord_Volume = 0;
+
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+
+                    }
+                    break;
+                case RECORD_ING://正在录音
+                    // 显示录音时间
+                    tv_voice_times.setText((int) mRecord_Time + "″");
+                    // 根据录音声音大小显示效果
+
+                    break;
+                case VOICE_UPDATE://麦克风更新界面
+                    // 显示录音时间
+                    tv_voice_times.setText((int) mRecord_Time + "/60″");// ((int)
+                    display_voice_time.setText((int) mRecord_Time + "”");
+                    // 音量大小的动画
+                    if (mRecord_Volume < 300.0) {
+                        iv_record
+                                .setBackgroundResource(R.drawable.chat_icon_voice1);
+                    } else if (mRecord_Volume >= 300.0 && mRecord_Volume < 1000) {
+                        iv_record
+                                .setBackgroundResource(R.drawable.chat_icon_voice2);
+                    } else if (mRecord_Volume >= 1000.0 && mRecord_Volume < 2000) {
+                        iv_record
+                                .setBackgroundResource(R.drawable.chat_icon_voice3);
+                    } else if (mRecord_Volume >= 2000.0 && mRecord_Volume < 4000) {
+                        iv_record
+                                .setBackgroundResource(R.drawable.chat_icon_voice4);
+                    } else if (mRecord_Volume >= 4000.0 && mRecord_Volume < 10000) {
+                        iv_record
+                                .setBackgroundResource(R.drawable.chat_icon_voice5);
+                    } else if (mRecord_Volume >= 10000.0) {
+                        iv_record
+                                .setBackgroundResource(R.drawable.chat_icon_voice6);
+                    }
+                    break;
+                case 6:
+                    String id = msg.getData().getString("id");
+                    saveTask(id);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        ;
+    };
+    private DatePickerDialog dialogCalendar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+
+    }
+
+    /* (non-Javadoc)
          * @see com.erp.base.BaseAcivity#initView()
          */
-	public void initView() {
-     setContentView(R.layout.act_task_add);
-     ViewUtils.inject(this);
-		ct=this;
-     TAG="AddTaskActivity";
-		getSupportActionBar().setTitle("添加任务");
-     String people=getIntent().getStringExtra("people")==null?"未填写": getIntent().getStringExtra("people");
-     bt_task_add.setOnClickListener(this);
-     et_task_startime.setOnTouchListener(new OnTouchListener() {
-
-		 @Override
-		 public boolean onTouch(View v, MotionEvent event) {
-			 showDialog(v);
-			 return true;
-		 }
-	 });
-     
-     
-     et_task_people.setText(people);
-     et_task_people.setOnKeyListener(null);
-     iv_find.setOnClickListener(this);
-     bt_voice_play.setOnClickListener(this);
-     bt_recode.setOnTouchListener(new VoiceTouchListen());
-		iv_delete_voice.setOnClickListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.erp.base.BaseAcivity#initData()
-	 */
-	public void initData() {
-	
-	}
-
-	@Override
-	public void onClick(View v) {
-     switch (v.getId()) {
-		 case R.id.iv_delete_voice:
-			 if (finalFile!=null&&finalFile.isFile()) {
-				 lay_voice_layout.setVisibility(View.GONE);//删除文件;sd卡未删除
-				 view_line.setVisibility(View.INVISIBLE);
-				 tempFiles.clear();
-				 mRecord_Time=0;
-				 finalFile=null;
-			 }
-			 break;
-     case R.id.iv_find:
-    	 Intent intent=new Intent(ct, DbfindListActivity.class);
-    	 startActivityForResult(intent, 2);
-    	 break;
-	   case R.id.bt_task_add:
-		  if (!StringUtils.isEmpty(et_task_startime.getText().toString())
-			&&!StringUtils.isEmpty(et_task_people.getText().toString())
-			&&!StringUtils.isEmpty(et_task_remark.getText().toString())) {
-			boolean falg= ViewUtil.isCheckDateTime(
-					  CommonUtil.getStringDate(System.currentTimeMillis()),
-					  et_task_startime.getText().toString(), "yyyy-MM-dd HH:mm:ss");
-			if (et_task_remark.getText().toString().length()<=200) {
-			if (!falg) {
-				if(!et_task_people.getText().toString().equals("未填写")){
-					//保存附件
-					if (finalFile!=null) {
-						saveAmrFile();//附件保存
-					}else{
-						saveTask(null); //无附件保存任务
-					}
-				}else{
-					ViewUtil.ShowMessageTitle(ct, "未选择处理人!");
-				}
-
-			  }else{
-				  ViewUtil.ShowMessageTitle(ct, "截止时间小于当前时间!");
-			  }
-			}else{
-				ViewUtil.ShowMessageTitleAutoDismiss(ct, "任务描述已经超过200字符的限制!", 1000);
-			} 
-		  }else{
-			  ViewUtil.ShowMessageTitle(ct, "请输入完整的信息!");
-		  }
-		  break;
-	   case R.id.et_task_startime:
-		   showDialog(v);
-		   break;
-	   case R.id.voice_display_voice_play:
-			// 播放录音
-			if (!mPlayState) {
-				mMediaPlayer = new MediaPlayer();
-				// 添加录音的路径
-				try {
-					mMediaPlayer.setDataSource(finalFile.getAbsolutePath());
-					// 准备
-					mMediaPlayer.prepare();
-					// 播放
-					mMediaPlayer.start();
-					// 修改播放状态
-					mPlayState = true;
-					// 根据时间修改界面
-					new Thread(new Runnable() {
-
-						public void run() {
-
-							display_voice_progressbar
-									.setMax((int) mRecord_Time);
-							mPlayCurrentPosition = 0;
-							while (mMediaPlayer.isPlaying()) {
-								mPlayCurrentPosition = mMediaPlayer
-										.getCurrentPosition() / 1000;
-								display_voice_progressbar
-										.setProgress(mPlayCurrentPosition);
-							}
-						}
-					}).start();
-					mPlayState = true;
-					// 修改播放图标
-					bt_voice_play
-							.setImageResource(R.drawable.globle_player_btn_stop);
-
-					mMediaPlayer
-					.setOnCompletionListener(new OnCompletionListener() {
-						// 播放结束后调用
-						public void onCompletion(MediaPlayer mp) {
-							// 停止播放
-							mMediaPlayer.stop();
-							// 修改播放状态
-							mPlayState = false;
-							// 停止播放图标
-							//stopRecordAnimation();
-							// 修改播放图标
-							bt_voice_play
-									.setImageResource(R.drawable.globle_player_btn_play);
-							// 初始化播放数据
-							mPlayCurrentPosition = 0;
-							display_voice_progressbar
-									.setProgress(mPlayCurrentPosition);
-
-						}
-					});
-				} catch (IllegalArgumentException e) {
-					e.printStackTrace();
-				} catch (SecurityException e) {
-					e.printStackTrace();
-				} catch (IllegalStateException e) {
-					e.printStackTrace();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-				
-			}else{
-				
-				if (mMediaPlayer != null) {
-					// 根据播放状态修改显示内容
-					if (mMediaPlayer.isPlaying()) {
-						mPlayState = false;
-						mMediaPlayer.stop();
-						// 修改播放图标
-						bt_voice_play
-								.setImageResource(R.drawable.globle_player_btn_play);
-						// 初始化播放数据
-						mPlayCurrentPosition = 0;
-						display_voice_progressbar
-								.setProgress(mPlayCurrentPosition);
-						// 停止播放图标
-						//stopRecordAnimation();
-
-					} else {
-						mPlayState = false;
-						bt_voice_play
-						.setImageResource(R.drawable.globle_player_btn_play);
-						// 初始化播放数据
-						mPlayCurrentPosition = 0;
-						display_voice_progressbar
-						.setProgress(mPlayCurrentPosition);
-						// 停止播放图标
-					//	stopRecordAnimation();
-
-					}
-				}
-			}
-		   
-	  
-	   break;
-	default:
-		break;
-	}		
-	}
-	
-	/**
-	  * @author Administrator
-	  * @功能:触摸事件
-	  */
-	class VoiceTouchListen implements OnTouchListener{
-		int yLeng = -50;// 划动的距离
-		@Override
-		public boolean onTouch(View v, MotionEvent event) {
-			Log.i("task_Y", event.getY()+"");
-			switch (event.getAction()) {
-			case MotionEvent.ACTION_DOWN://
-				startRecodeIng(v, event);
-				return true;
-			case MotionEvent.ACTION_MOVE://移动事件
-				
-				if (event.getY() < yLeng) {
-					tv_voice_tips.setText("松开手指,取消发送");
-					tv_voice_tips.setTextColor(Color.RED);
-				} else {
-					tv_voice_tips.setText("手指上滑,取消发送");
-					tv_voice_tips.setTextColor(Color.WHITE);
-				}
-				return true;
-			case MotionEvent.ACTION_UP://上滑事件
-				stopRecodeIng(v, event,yLeng);
-				//合成音频文件
-				Log.i("Voice","File path:"+mRecordPath);
-				File file=new File(mRecordPath);
-				tempFiles.add(file);
-				mergeARMFiles();
-				lay_voice_layout.setVisibility(View.VISIBLE);
-				view_line.setVisibility(View.VISIBLE);
-				//合成音频文件
-				return true;
-			default:
-				return false;
-			}
-			
-		}
-		
-	}
-	
-	//保存任务
-	private void saveTask(String id) {
-		 int type= cb_task_reply.isChecked()==true?1:0;
-		 String name="来自"+CommonUtil.getSharedPreferences(ct, "erp_username")+"的任务";
-		 String formStore;
-
-		 if (id==null) {
-			 formStore="{'name':'"+name+"'"
-				   		+ ",'startdate':'"+CommonUtil.getStringDate(System.currentTimeMillis())+"',"
-				   		+"'enddate':'"+et_task_startime.getText().toString()+"',"
-				   		+ "'type':'"+type+"','resourcename':'"+et_task_people.getText().toString()+"',"
-				   	    + "'description':'"+et_task_remark.getText().toString()+"'"
-				   	    + "}";
-		}else{
-			//上传附件
-		  formStore="{'name':'"+name+"'"
-		   		+ ",'startdate':'"+CommonUtil.getStringDate(System.currentTimeMillis())+"',"
-		   		+"'enddate':'"+et_task_startime.getText().toString()+"',"
-		   		+ "'type':'"+type+"','resourcename':'"+et_task_people.getText().toString()+"',"
-		   	    + "'description':'"+et_task_remark.getText().toString()+"',"
-		   	    +"'attachs':'"+id+"'"		
-		   	    + "}";
-		}
-	     Log.i("fromStore", formStore);
-		 sendDataToServer(formStore);
-	}
-	
-	//保存附件
-	private void saveAmrFile() {
-			RequestParams params = new RequestParams();
-			params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
-			params.addHeader("Cookie", "JSESSIONID="+CommonUtil.getSharedPreferences(ct, "sessionId"));
-			params.addBodyParameter("file", finalFile);
-			String url= Constants.getAppBaseUrl(ct)+"/mobile/uploadAttachs.action";
-			Log.i("url", "url:"+url);
-			Log.i("url","file:"+finalFile.getAbsolutePath());
-			HttpUtils http = new HttpUtils();
-			http.send(HttpMethod.POST,
-			    url,
-			    params,
-			    new RequestCallBack<String>() {
-
-			        @Override
-			        public void onStart() {
-			        	ViewUtil.ToastMessage(ct, "开始上传...");
-			        }
-
-			        @Override
-			        public void onLoading(long total, long current, boolean isUploading) {
-			            if (isUploading) {
-			            } else {
-			            }
-			        }
-
-			        @Override
-			        public void onSuccess(ResponseInfo<String> responseInfo) {
-			        	Log.i("json", responseInfo.result);
-			        	ViewUtil.ToastMessage(ct, "上传成功:");
-			            JSONObject root=JSON.parseObject(responseInfo.result);
-			            String id= root.getString("id");
-			            id=id.substring(1, id.length()-1);
-			            Bundle bundle=new Bundle();
-			            bundle.putString("id", id);
-			            Message message=new Message();
-			            		message.what=6;
-			            		message.setData(bundle);
-			            mhandler.sendMessage(message);	
-			        }
-
-			        @Override
-			        public void onFailure(HttpException error, String msg) {
-			        	ViewUtil.ToastMessage(ct, "上传失败:"+msg);
-			        }
-			});
-	}
-	
-	/**
-	  * @author Administrator
-	  * @功能:获取合并文件对象
-	  */
-	private File getSumFile(boolean isTempFile){
-		if (finalFile!=null&&finalFile.isFile()) {
-			return finalFile;
-		}
-		if (!Environment.getExternalStorageState().
-		equals(Environment.MEDIA_MOUNTED)) {
-		Log.w("Waring", "检测到你的手机没有插入SD卡,请插入SD后再试!");
-		}
-		try {
-		File parentFile= new File(Environment.getExternalStorageDirectory()
-		.getCanonicalFile()+"/uu/"+"recorder_sum");
-		if (!parentFile.exists()||parentFile==null) {//如果目录不存在
-			parentFile.mkdirs();//创建parentFile目录
-		}
-		finalFile=new File(parentFile, "real.amr");
-		} catch (IOException e) {
-		e.printStackTrace();
-		}
-		return finalFile;
-	}
-	
-	
-	/**
-	* 通过FileOutputStream、与FileInputStream方式
-	* 将多个文件进行合并,并删除原文件
-	* */
-	public void mergeARMFiles() {
-	if (tempFiles.isEmpty()) return;//如果还没录制则,不进行合并
-	File realFile=getSumFile(false);
-	try {
-	FileOutputStream fos=new FileOutputStream(realFile);
-	for (int i = 0; i < tempFiles.size(); i++) {//遍历tempFiles集合,合并所有临时文件
-	FileInputStream fis=new FileInputStream(tempFiles.get(i));
-	byte[] tmpBytes = new byte[fis.available()];
-	int length = tmpBytes.length;//文件长度
-	//头文件
-	if(i==0){
-	while(fis.read(tmpBytes)!=-1){
-	fos.write(tmpBytes,0,length);
-	}
-	}
-	//之后的文件,去掉头文件就可以了.amr格式的文件的头信息为 6字节
-	else{
-	while(fis.read(tmpBytes)!=-1){
-	fos.write(tmpBytes,6,length-6);
-	}
-	}
-	fos.flush();
-	fis.close();
-	}
-	fos.close();//所有的文件合并结束,关闭输出流
-	Log.i("info", "此次录音文件:"+realFile.getName()+" 已保存到:"+
-	realFile.getAbsolutePath()+"目录下");
-	} catch (Exception e) {
-	e.printStackTrace();
-	}
-	//删除合并过的临时文件
-	for (File file:tempFiles) {
-	if (file.exists()) {
-	//file.delete();
-	}
-	}
-	}
-	
-	
-	
-	/**用于存放要合并的文件的集合**/
-	private List<File> tempFiles=new ArrayList<File>();
-	/**合并之后的文件**/
-	private File finalFile;
-	
-	private static String mRecordPath = "";// 录音的存储名称
-	private MediaPlayer mMediaPlayer;
-	private RecordUtil mRecordUtil;
-	private float mRecord_Time = 0;// 录音的时间
-	private double mRecord_Volume;// 麦克风获取的音量值
-	private final static int VOICE_UPDATE=5;
-	/**
-	  * @author Administrator
-	  * @功能:录音
-	  */
-	private void startRecodeIng(View v, MotionEvent event) {
-		//v.setPressed(true);
-		ic_voice_center.setVisibility(View.VISIBLE);
-		tv_voice_tips.setText("松开手指,取消发送");
-		// 开始录音
-		// 修改录音状态
-		mRecord_State = RECORD_ING;
-		// 设置录音保存路径
-		mRecordPath = PATH + UUID.randomUUID().toString() + typeAmr;
-		// 实例化录音工具类
-		mRecordUtil = new RecordUtil(mRecordPath);
-		// 开始录音
-		try {
-			mRecordUtil.start();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				// 初始化录音时间
-				//mRecord_Time = 0;	
-				while(mRecord_State==RECORD_ING){
-					if (mRecord_Time>=MAX_TIME) {
-						//停止
-						mhandler.sendEmptyMessage(RECORD_NO);
-					}else{
-						// 每隔200毫秒就获取声音音量并更新界面显示
-						try {
-							Thread.sleep(200);
-						} catch (InterruptedException e) {
-							e.printStackTrace();
-						}
-						mRecord_Time += 0.2;
-						//更新音量
-						if(mRecord_State==RECORD_ING){
-							mRecord_Volume=mRecordUtil.getAmplitude();
-							mhandler.sendEmptyMessage(VOICE_UPDATE);
-						}
-					}
-				}
-			}
-		}).start();
-	}
-	
-	
-	/**
-	  * @author Administrator
-	  * @功能:停止录音   y滑动距离
-	  */
-	private void stopRecodeIng(View v, MotionEvent event,int y) {
-		ic_voice_center.setVisibility(View.INVISIBLE);
-	   if(mRecord_State == RECORD_ING){
-	   	   // 修改录音状态
-			mRecord_State = RECORD_ED;
-			try {
-				mRecordUtil.stop();
-				mRecord_Volume=0;
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			
-			if (event.getY()<y) {
-				// 显示提醒
-				Toast.makeText(ct, "放弃录音",
-						Toast.LENGTH_SHORT).show();
-				// 修改录音状态
-				mRecord_State = RECORD_NO;
-				// 修改录音时间
-				mRecord_Time = 0;
-				// 修改显示界面
-			}else{
-			   bt_voice_play
-			   .setImageResource(R.drawable.globle_player_btn_play);
-			   tv_voice_times.setText((int) mRecord_Time + "″");
-			   
-			}
-			
-	   }
-	
-	}
-	
-	/**
-	  * @author Administrator
-	  * @功能:添加任务
-	  */
-	public void sendDataToServer(String formStore){
+    public void initView() {
+        setContentView(R.layout.act_task_add);
+        ViewUtils.inject(this);
+        ct = this;
+        TAG = "AddTaskActivity";
+        getSupportActionBar().setTitle("添加任务");
+        String people = getIntent().getStringExtra("people") == null ? "未填写" : getIntent().getStringExtra("people");
+        bt_task_add.setOnClickListener(this);
+        et_task_startime.setOnTouchListener(new OnTouchListener() {
+
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                showDialog(v);
+                return true;
+            }
+        });
+
+
+        et_task_people.setText(people);
+        et_task_people.setOnKeyListener(null);
+        iv_find.setOnClickListener(this);
+        bt_voice_play.setOnClickListener(this);
+        bt_recode.setOnTouchListener(new VoiceTouchListen());
+        iv_delete_voice.setOnClickListener(this);
+    }
+
+    /* (non-Javadoc)
+     * @see com.erp.base.BaseAcivity#initData()
+     */
+    public void initData() {
+
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.iv_delete_voice:
+                if (finalFile != null && finalFile.isFile()) {
+                    lay_voice_layout.setVisibility(View.GONE);//删除文件;sd卡未删除
+                    view_line.setVisibility(View.INVISIBLE);
+                    tempFiles.clear();
+                    mRecord_Time = 0;
+                    finalFile = null;
+                }
+                break;
+            case R.id.iv_find:
+                Intent intent = new Intent(ct, DbfindListActivity.class);
+                startActivityForResult(intent, 2);
+                break;
+            case R.id.bt_task_add:
+                if (!StringUtils.isEmpty(et_task_startime.getText().toString())
+                        && !StringUtils.isEmpty(et_task_people.getText().toString())
+                        && !StringUtils.isEmpty(et_task_remark.getText().toString())) {
+                    boolean falg = ViewUtil.isCheckDateTime(
+                            CommonUtil.getStringDate(System.currentTimeMillis()),
+                            et_task_startime.getText().toString(), "yyyy-MM-dd HH:mm:ss");
+                    if (et_task_remark.getText().toString().length() <= 200) {
+                        if (!falg) {
+                            if (!et_task_people.getText().toString().equals("未填写")) {
+                                //保存附件
+                                if (finalFile != null) {
+                                    saveAmrFile();//附件保存
+                                } else {
+                                    saveTask(null); //无附件保存任务
+                                }
+                            } else {
+                                ViewUtil.ShowMessageTitle(ct, "未选择处理人!");
+                            }
+
+                        } else {
+                            ViewUtil.ShowMessageTitle(ct, "截止时间小于当前时间!");
+                        }
+                    } else {
+                        ViewUtil.ShowMessageTitleAutoDismiss(ct, "任务描述已经超过200字符的限制!", 1000);
+                    }
+                } else {
+                    ViewUtil.ShowMessageTitle(ct, "请输入完整的信息!");
+                }
+                break;
+            case R.id.et_task_startime:
+                showDialog(v);
+                break;
+            case R.id.voice_display_voice_play:
+                // 播放录音
+                if (!mPlayState) {
+                    mMediaPlayer = new MediaPlayer();
+                    // 添加录音的路径
+                    try {
+                        mMediaPlayer.setDataSource(finalFile.getAbsolutePath());
+                        // 准备
+                        mMediaPlayer.prepare();
+                        // 播放
+                        mMediaPlayer.start();
+                        // 修改播放状态
+                        mPlayState = true;
+                        // 根据时间修改界面
+                        new Thread(new Runnable() {
+
+                            public void run() {
+
+                                display_voice_progressbar
+                                        .setMax((int) mRecord_Time);
+                                mPlayCurrentPosition = 0;
+                                while (mMediaPlayer.isPlaying()) {
+                                    mPlayCurrentPosition = mMediaPlayer
+                                            .getCurrentPosition() / 1000;
+                                    display_voice_progressbar
+                                            .setProgress(mPlayCurrentPosition);
+                                }
+                            }
+                        }).start();
+                        mPlayState = true;
+                        // 修改播放图标
+                        bt_voice_play
+                                .setImageResource(R.drawable.globle_player_btn_stop);
+
+                        mMediaPlayer
+                                .setOnCompletionListener(new OnCompletionListener() {
+                                    // 播放结束后调用
+                                    public void onCompletion(MediaPlayer mp) {
+                                        // 停止播放
+                                        mMediaPlayer.stop();
+                                        // 修改播放状态
+                                        mPlayState = false;
+                                        // 停止播放图标
+                                        //stopRecordAnimation();
+                                        // 修改播放图标
+                                        bt_voice_play
+                                                .setImageResource(R.drawable.globle_player_btn_play);
+                                        // 初始化播放数据
+                                        mPlayCurrentPosition = 0;
+                                        display_voice_progressbar
+                                                .setProgress(mPlayCurrentPosition);
+
+                                    }
+                                });
+                    } catch (IllegalArgumentException e) {
+                        e.printStackTrace();
+                    } catch (SecurityException e) {
+                        e.printStackTrace();
+                    } catch (IllegalStateException e) {
+                        e.printStackTrace();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+
+                } else {
+
+                    if (mMediaPlayer != null) {
+                        // 根据播放状态修改显示内容
+                        if (mMediaPlayer.isPlaying()) {
+                            mPlayState = false;
+                            mMediaPlayer.stop();
+                            // 修改播放图标
+                            bt_voice_play
+                                    .setImageResource(R.drawable.globle_player_btn_play);
+                            // 初始化播放数据
+                            mPlayCurrentPosition = 0;
+                            display_voice_progressbar
+                                    .setProgress(mPlayCurrentPosition);
+                            // 停止播放图标
+                            //stopRecordAnimation();
+
+                        } else {
+                            mPlayState = false;
+                            bt_voice_play
+                                    .setImageResource(R.drawable.globle_player_btn_play);
+                            // 初始化播放数据
+                            mPlayCurrentPosition = 0;
+                            display_voice_progressbar
+                                    .setProgress(mPlayCurrentPosition);
+                            // 停止播放图标
+                            //	stopRecordAnimation();
+
+                        }
+                    }
+                }
+
+
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @author Administrator
+     * @功能:触摸事件
+     */
+    class VoiceTouchListen implements OnTouchListener {
+        int yLeng = -50;// 划动的距离
+
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            Log.i("task_Y", event.getY() + "");
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN://
+                    startRecodeIng(v, event);
+                    return true;
+                case MotionEvent.ACTION_MOVE://移动事件
+
+                    if (event.getY() < yLeng) {
+                        tv_voice_tips.setText("松开手指,取消发送");
+                        tv_voice_tips.setTextColor(Color.RED);
+                    } else {
+                        tv_voice_tips.setText("手指上滑,取消发送");
+                        tv_voice_tips.setTextColor(Color.WHITE);
+                    }
+                    return true;
+                case MotionEvent.ACTION_UP://上滑事件
+                    stopRecodeIng(v, event, yLeng);
+                    //合成音频文件
+                    Log.i("Voice", "File path:" + mRecordPath);
+                    File file = new File(mRecordPath);
+                    tempFiles.add(file);
+                    mergeARMFiles();
+                    lay_voice_layout.setVisibility(View.VISIBLE);
+                    view_line.setVisibility(View.VISIBLE);
+                    //合成音频文件
+                    return true;
+                default:
+                    return false;
+            }
+
+        }
+
+    }
+
+    //保存任务
+    private void saveTask(String id) {
+        int type = cb_task_reply.isChecked() == true ? 1 : 0;
+        String name = "来自" + CommonUtil.getSharedPreferences(ct, "erp_username") + "的任务";
+        String formStore;
+
+        if (id == null) {
+            formStore = "{'name':'" + name + "'"
+                    + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
+                    + "'enddate':'" + et_task_startime.getText().toString() + "',"
+                    + "'type':'" + type + "','resourcename':'" + et_task_people.getText().toString() + "',"
+                    + "'description':'" + et_task_remark.getText().toString() + "'"
+                    + "}";
+        } else {
+            //上传附件
+            formStore = "{'name':'" + name + "'"
+                    + ",'startdate':'" + CommonUtil.getStringDate(System.currentTimeMillis()) + "',"
+                    + "'enddate':'" + et_task_startime.getText().toString() + "',"
+                    + "'type':'" + type + "','resourcename':'" + et_task_people.getText().toString() + "',"
+                    + "'description':'" + et_task_remark.getText().toString() + "',"
+                    + "'attachs':'" + id + "'"
+                    + "}";
+        }
+        Log.i("fromStore", formStore);
+        sendDataToServer(formStore);
+    }
+
+    //保存附件
+    private void saveAmrFile() {
+        RequestParams params = new RequestParams();
+        params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+        params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        params.addBodyParameter("file", finalFile);
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/uploadAttachs.action";
+        Log.i("url", "url:" + url);
+        Log.i("url", "file:" + finalFile.getAbsolutePath());
+        HttpUtils http = new HttpUtils();
+        http.send(HttpMethod.POST,
+                url,
+                params,
+                new RequestCallBack<String>() {
+
+                    @Override
+                    public void onStart() {
+                        ViewUtil.ToastMessage(ct, "开始上传...");
+                    }
+
+                    @Override
+                    public void onLoading(long total, long current, boolean isUploading) {
+                        if (isUploading) {
+                        } else {
+                        }
+                    }
+
+                    @Override
+                    public void onSuccess(ResponseInfo<String> responseInfo) {
+                        Log.i("json", responseInfo.result);
+                        ViewUtil.ToastMessage(ct, "上传成功:");
+                        JSONObject root = JSON.parseObject(responseInfo.result);
+                        String id = root.getString("id");
+                        id = id.substring(1, id.length() - 1);
+                        Bundle bundle = new Bundle();
+                        bundle.putString("id", id);
+                        Message message = new Message();
+                        message.what = 6;
+                        message.setData(bundle);
+                        mhandler.sendMessage(message);
+                    }
+
+                    @Override
+                    public void onFailure(HttpException error, String msg) {
+                        ViewUtil.ToastMessage(ct, "上传失败:" + msg);
+                    }
+                });
+    }
+
+    /**
+     * @author Administrator
+     * @功能:获取合并文件对象
+     */
+    private File getSumFile(boolean isTempFile) {
+        if (finalFile != null && finalFile.isFile()) {
+            return finalFile;
+        }
+        if (!Environment.getExternalStorageState().
+                equals(Environment.MEDIA_MOUNTED)) {
+            Log.w("Waring", "检测到你的手机没有插入SD卡,请插入SD后再试!");
+        }
+        try {
+            File parentFile = new File(Environment.getExternalStorageDirectory()
+                    .getCanonicalFile() + "/uu/" + "recorder_sum");
+            if (!parentFile.exists() || parentFile == null) {//如果目录不存在
+                parentFile.mkdirs();//创建parentFile目录
+            }
+            finalFile = new File(parentFile, "real.amr");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return finalFile;
+    }
+
+
+    /**
+     * 通过FileOutputStream、与FileInputStream方式
+     * 将多个文件进行合并,并删除原文件
+     */
+    public void mergeARMFiles() {
+        if (tempFiles.isEmpty()) return;//如果还没录制则,不进行合并
+        File realFile = getSumFile(false);
+        try {
+            FileOutputStream fos = new FileOutputStream(realFile);
+            for (int i = 0; i < tempFiles.size(); i++) {//遍历tempFiles集合,合并所有临时文件
+                FileInputStream fis = new FileInputStream(tempFiles.get(i));
+                byte[] tmpBytes = new byte[fis.available()];
+                int length = tmpBytes.length;//文件长度
+                //头文件
+                if (i == 0) {
+                    while (fis.read(tmpBytes) != -1) {
+                        fos.write(tmpBytes, 0, length);
+                    }
+                }
+                //之后的文件,去掉头文件就可以了.amr格式的文件的头信息为 6字节
+                else {
+                    while (fis.read(tmpBytes) != -1) {
+                        fos.write(tmpBytes, 6, length - 6);
+                    }
+                }
+                fos.flush();
+                fis.close();
+            }
+            fos.close();//所有的文件合并结束,关闭输出流
+            Log.i("info", "此次录音文件:" + realFile.getName() + " 已保存到:" +
+                    realFile.getAbsolutePath() + "目录下");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //删除合并过的临时文件
+        for (File file : tempFiles) {
+            if (file.exists()) {
+                //file.delete();
+            }
+        }
+    }
+
+
+    /**
+     * 用于存放要合并的文件的集合
+     **/
+    private List<File> tempFiles = new ArrayList<File>();
+    /**
+     * 合并之后的文件
+     **/
+    private File finalFile;
+
+    private static String mRecordPath = "";// 录音的存储名称
+    private MediaPlayer mMediaPlayer;
+    private RecordUtil mRecordUtil;
+    private float mRecord_Time = 0;// 录音的时间
+    private double mRecord_Volume;// 麦克风获取的音量值
+    private final static int VOICE_UPDATE = 5;
+
+    /**
+     * @author Administrator
+     * @功能:录音
+     */
+    private void startRecodeIng(View v, MotionEvent event) {
+        //v.setPressed(true);
+        ic_voice_center.setVisibility(View.VISIBLE);
+        tv_voice_tips.setText("松开手指,取消发送");
+        // 开始录音
+        // 修改录音状态
+        mRecord_State = RECORD_ING;
+        // 设置录音保存路径
+        mRecordPath = PATH + UUID.randomUUID().toString() + typeAmr;
+        // 实例化录音工具类
+        mRecordUtil = new RecordUtil(mRecordPath);
+        // 开始录音
+        try {
+            mRecordUtil.start();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                // 初始化录音时间
+                //mRecord_Time = 0;
+                while (mRecord_State == RECORD_ING) {
+                    if (mRecord_Time >= MAX_TIME) {
+                        //停止
+                        mhandler.sendEmptyMessage(RECORD_NO);
+                    } else {
+                        // 每隔200毫秒就获取声音音量并更新界面显示
+                        try {
+                            Thread.sleep(200);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        mRecord_Time += 0.2;
+                        //更新音量
+                        if (mRecord_State == RECORD_ING) {
+                            mRecord_Volume = mRecordUtil.getAmplitude();
+                            mhandler.sendEmptyMessage(VOICE_UPDATE);
+                        }
+                    }
+                }
+            }
+        }).start();
+    }
+
+
+    /**
+     * @author Administrator
+     * @功能:停止录音 y滑动距离
+     */
+    private void stopRecodeIng(View v, MotionEvent event, int y) {
+        ic_voice_center.setVisibility(View.INVISIBLE);
+        if (mRecord_State == RECORD_ING) {
+            // 修改录音状态
+            mRecord_State = RECORD_ED;
+            try {
+                mRecordUtil.stop();
+                mRecord_Volume = 0;
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+            if (event.getY() < y) {
+                // 显示提醒
+                Toast.makeText(ct, "放弃录音",
+                        Toast.LENGTH_SHORT).show();
+                // 修改录音状态
+                mRecord_State = RECORD_NO;
+                // 修改录音时间
+                mRecord_Time = 0;
+                // 修改显示界面
+            } else {
+                bt_voice_play
+                        .setImageResource(R.drawable.globle_player_btn_play);
+                tv_voice_times.setText((int) mRecord_Time + "″");
+
+            }
+
+        }
+
+    }
+
+    /**
+     * @author Administrator
+     * @功能:添加任务
+     */
+    public void sendDataToServer(String formStore) {
 //		progressDialog.show();
-		String url=Constants.getAppBaseUrl(ct)+"plm/task/addbilltask.action";
-		Log.i(TAG, url);
-		Log.i(TAG, formStore);
-		Map<String, Object> param=new HashMap<String, Object>();
-		param.put("formStore", formStore);
-		//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, LOAD_SUCCESS_ADD, null, null, "get");
-	}
-	/**
-	  * @author Administrator
-	  * @功能:展示自定义对话框
-	  */
-	 public void showDialog(final View view) {
-	        if (dialog == null) {
-	            dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
-	        }
-	        dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
-	                public void OnDateTimeSet(AlertDialog dia, long date) {
-	                	EditText vEditText= (EditText)view;
-	                	vEditText.setText(CommonUtil.getStringDate(date));
-	                    /** @注释:保证 初始化当前时间 */
-	                    dialog = null;
-	                }
-	            });
-	        if (!dialog.isShowing()) {
-	            dialog.show();
-	        }
-	    }
-	 
-	 
-	 
-	 @Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		switch (requestCode) {
-        case 2:
-            if (data == null) {
-                return;
-             }
-            if (resultCode==2) {
-            	String en_name = data.getStringExtra("en_name");
-                et_task_people.setText(en_name);
-			}
-            if (resultCode==1) {
-            	 String values=data.getStringExtra("employees");
-                 et_task_people.setText(values);
-			}
-            break;
-        case 1:
-             
-        	break;
-        default:
-            break;
+        String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
+        Log.i(TAG, url);
+        Log.i(TAG, formStore);
+        Map<String, Object> param = new HashMap<String, Object>();
+        param.put("formStore", formStore);
+        //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, LOAD_SUCCESS_ADD, null, null, "get");
+    }
+
+//    private year
+    /**
+     * @author Administrator
+     * @功能:展示自定义对话框
+     * @update by gongpm 修改为日历形式
+     */
+    public void showDialog(final View view) {
+//        showSelectCalendarDialog(view);
+        Calendar calendar=new GregorianCalendar();
+        if (dialogCalendar==null){
+            dialogCalendar=new DatePickerDialog(mContext, new DatePickerDialog.OnDateSetListener() {
+                @Override
+                public void onDateSet(DatePicker datePicker, int year, int monthOfYear, int DayOfMonth) {
+                    showSelectTimeDialog(year,monthOfYear+1,DayOfMonth);
+                }
+            },calendar.get(Calendar.YEAR),calendar.get(Calendar.MONTH),calendar.get(Calendar.DAY_OF_MONTH));
+        }
+        dialogCalendar.show();
+
+//	        if (dialog == null) {
+//	            dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
+//	        }
+//	        dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
+//	                public void OnDateTimeSet(AlertDialog dia, long date) {
+//	                	EditText vEditText= (EditText)view;
+//	                	vEditText.setText(CommonUtil.getStringDate(date));
+//	                    /** @注释:保证 初始化当前时间 */
+//	                    dialog = null;
+//	                }
+//	            });
+//	        if (!dialog.isShowing()) {
+//	            dialog.show();
+//	        }
+    }
+
+    private void dismissDialog(AlertDialog dialog){
+        if (dialog.isShowing()){
+            Log.i("gongpengming","进来销毁");
+            dialog.dismiss();
+            dismissDialog(dialog);
+        }
+    }
+    //by gongpm 时间选择
+    private void showSelectTimeDialog(final int y, final int m, final int d) {
+        Calendar calendar=new GregorianCalendar();
+        final TimePickerDialog dialogTime=new TimePickerDialog(mContext ,new TimePickerDialog.OnTimeSetListener() {
+            @Override
+            public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                et_task_startime.setText(y+"-"+m+"-"+d+"  "+timePicker.getCurrentHour()+":"+timePicker.getCurrentMinute());
+                if (dialogCalendar!=null ){
+                    dismissDialog(dialogCalendar);
+//                    dialogCalendar.dismiss();
+                }
+            }
+        },calendar.get(Calendar.HOUR_OF_DAY),
+                calendar.get(Calendar.MINUTE), true);
+        dialogTime.show();
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case 2:
+                if (data == null) {
+                    return;
+                }
+                if (resultCode == 2) {
+                    String en_name = data.getStringExtra("en_name");
+                    et_task_people.setText(en_name);
+                }
+                if (resultCode == 1) {
+                    String values = data.getStringExtra("employees");
+                    et_task_people.setText(values);
+                }
+                break;
+            case 1:
+
+                break;
+            default:
+                break;
         }
-		super.onActivityResult(requestCode, resultCode, data); 
-	}
+        super.onActivityResult(requestCode, resultCode, data);
+    }
 }

+ 9 - 3
WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/SaleSelectActivity.java

@@ -45,6 +45,7 @@ import android.os.Message;
 import android.os.Parcelable;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -602,10 +603,15 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
 
 		@Override
 		public int getCount() {
-			if ((List<?>) data.get("listdata") == null) {
+			if (data!=null) {
+				if ((List<?>) data.get("listdata") == null) {
+					return 0;
+				} else {
+					return ((List<?>) data.get("listdata")).size();
+				}
+			}else{
+				Log.i("gongpengming","为空");
 				return 0;
-			} else {
-				return ((List<?>) data.get("listdata")).size();
 			}
 		}
 

+ 2 - 13
WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java

@@ -44,7 +44,6 @@ import com.sk.weichat.sortlist.PingYinUtil;
 import com.sk.weichat.ui.MainActivity;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.base.EasyFragment;
-import com.sk.weichat.ui.erp.activity.InformActivity;
 import com.sk.weichat.ui.erp.activity.NewsTwoActivity;
 import com.sk.weichat.ui.erp.activity.NoticeMenuActivity;
 import com.sk.weichat.ui.erp.activity.NoticesActivity;
@@ -57,7 +56,6 @@ import com.sk.weichat.ui.erp.util.CommonUtil;
 import com.sk.weichat.ui.erp.util.Constants;
 import com.sk.weichat.ui.erp.util.FlexJsonUtil;
 import com.sk.weichat.ui.erp.util.ObjectUtils;
-import com.sk.weichat.ui.erp.util.ViewUtil;
 import com.sk.weichat.util.HtmlUtils;
 import com.sk.weichat.util.ProgressDialogUtil;
 import com.sk.weichat.util.StringUtils;
@@ -100,7 +98,6 @@ public class MessageFragment extends EasyFragment {
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals(MsgBroadcast.ACTION_MSG_UI_UPDATE)) {
                 if (isResumed()) {
-                    Log.i("MessageFragment", "更新ui界面广播开始...........................");
                     loadData();
                 } else {
                     mNeedUpdate = true;
@@ -114,16 +111,13 @@ public class MessageFragment extends EasyFragment {
         @Override
         public void onReceive(Context context, Intent intent) {
             if ("home".equals(intent.getStringExtra("falg"))) {
-                Log.i("gongpengming", "更新ui界面广播开始...........................");
                 refreshUI();
-
             }
         }
     };
     private BaseActivity mActivity;
 
     public MessageFragment() {
-//        getActivity().registerReceiver(receiver,inputFilter);
         mOriginalFriendList = new ArrayList<BaseSortModel<Friend>>();
         mFriendList = new ArrayList<BaseSortModel<Friend>>();
     }
@@ -138,8 +132,6 @@ public class MessageFragment extends EasyFragment {
         if (createView) {
             initView();
         }
-//        inputFilter=new IntentFilter("com.app.home.update");
-
     }
 
     @Override
@@ -264,8 +256,8 @@ public class MessageFragment extends EasyFragment {
         });
     }
 
+    //by gongpm 刷新数据提取方法
     private void refreshUI() {
-        Log.i("gongpengming", "进入下拉刷新页面");
         upDataFriend();
         loadData();
         FriendDao.getInstance().markUserMessageRead(
@@ -285,9 +277,6 @@ public class MessageFragment extends EasyFragment {
         isRefeshed = true;
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("access_token", MyApplication.getInstance().mAccessToken);
-//		Log.i("LinksManFragment", MyApplication.getInstance().mAccessToken);
-//		Log.i("LinksManFragment", MyApplication.getInstance().getConfig().FRIENDS_ATTENTION_LIST);
-//		Log.i("LinksManFragment", "http://192.168.253.155:8092/friends/attention/list");
         StringJsonArrayRequest<AttentionUser> request = new StringJsonArrayRequest<AttentionUser>(
                 MyApplication.getInstance().getConfig().FRIENDS_ATTENTION_LIST, new ErrorListener() {
             @Override
@@ -321,7 +310,7 @@ public class MessageFragment extends EasyFragment {
 
     /**
      * 请求加载新的筛选条件的数据
-     * <p/>
+     * <p>
      * 是下拉刷新,还是上拉加载
      */
     private void loadData() {