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

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -866,6 +866,8 @@
 
         <activity android:name=".ui.erp.activity.oa.SearchLocationActivity" />
         <activity android:name=".ui.erp.activity.oa.SelectDepartmentActivity"></activity>
+        <activity android:name=".ui.me.TimeStatisticsActivity"
+            android:label="时间统计"/>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -9,6 +9,7 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.StrictMode;
 import android.support.multidex.MultiDex;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.volley.RequestQueue;
@@ -34,9 +35,11 @@ import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.ui.SplashActivity;
+import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.SharedUtil;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 
 import org.apache.http.cookie.Cookie;
@@ -178,6 +181,17 @@ public class MyApplication extends Application {
         // 释放数据库
         // SQLiteHelper.release();
         android.os.Process.killProcess(android.os.Process.myPid());
+
+        //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+        String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+        String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Killed);
+
+        if (!TextUtils.isEmpty(saved_time)){
+            PreferenceUtils.putString(TimeStatisticsActivity.Killed,saved_time + "," + nowtime);
+        }else {
+            PreferenceUtils.putString(TimeStatisticsActivity.Killed,nowtime);
+
+        }
     }
 
     /*********************

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/ErrorMagDao.java

@@ -74,7 +74,6 @@ public class ErrorMagDao {
 
     //插入一个数据
     public boolean insert(ErrorEntity bean) {
-        delete(bean);
         SQLiteDatabase db = null;
         long i = 0;
         try {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -28,8 +28,11 @@ import com.xzjmyk.pm.activity.ui.account.RegisterActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.Md5Util;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
@@ -231,6 +234,15 @@ public class SplashActivity extends BaseActivity {
                 }
                 if (success) {// 登陆IM成功
                     startActivity(new Intent(SplashActivity.this, MainActivity.class));
+                    //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+                    String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+                    String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_In);
+
+                    if (!TextUtils.isEmpty(saved_time)){
+                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In,saved_time + "," + nowtime);
+                    }else {
+                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In,nowtime);
+                    }
                 } else {// 登录失败
                     jump();
                 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -18,10 +18,12 @@ import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.Md5Util;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -153,6 +155,16 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 if (success) {// 登陆IM成功
                     login_manage(phoneNumber, password);//登录管理平台
+
+                    //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+                    String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+                    String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_In);
+
+                    if (!TextUtils.isEmpty(saved_time)){
+                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In,saved_time + "," + nowtime);
+                    }else {
+                        PreferenceUtils.putString(TimeStatisticsActivity.Login_In,nowtime);
+                    }
                 } else {// 登录失败
                     String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();
                     ToastUtil.showToast(mContext, message);

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

@@ -570,6 +570,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
+                            }else {
+                                im_ids.add("");
                             }
 
                             //获取process审批人姓名
@@ -587,6 +589,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             //取process之后的审批人名字
                             if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMANNAME())) {
                                 afpeople_names.add(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMANNAME());
+                            }else{
+                                afpeople_names.add("");
                             }
                             //取process之后的imid
                             if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMAN())) {
@@ -612,6 +616,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
+                            }else {
+                                im_ids.add("");
                             }
                         }
                     }

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

@@ -31,11 +31,16 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.iflytek.cloud.speech.RecognizerResult;
+import com.iflytek.cloud.speech.SpeechError;
+import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.xzjmyk.pm.activity.audio.voicerecognition.VoiceToWord;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
@@ -74,7 +79,7 @@ import java.util.Map;
  * @desc:企业架构
  * @author：Arison on 2016/10/31
  */
-public class CompanyContactsActivity extends BaseActivity {
+public class CompanyContactsActivity extends BaseActivity implements RecognizerDialogListener {
 
     private Context ct;
     //关键变量
@@ -87,7 +92,8 @@ public class CompanyContactsActivity extends BaseActivity {
     public CustomerListView mlistleft;
     @ViewInject(R.id.edt_search)
     public ClearEditText mEditText;
-
+    @ViewInject(R.id.voice_search_iv)
+    private ImageView voice_search;
 
     private LayoutInflater mInflater;
     @ViewInject(R.id.ll_list)
@@ -603,7 +609,14 @@ public class CompanyContactsActivity extends BaseActivity {
 
             }
         });
-
+        final VoiceToWord voice = new VoiceToWord(CompanyContactsActivity.this,"534e3fe2");
+        voice.setRecognizerDialogListener(this);  //自己调用自己
+        voice_search.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                voice.GetWordFromVoice();
+            }
+        });
 
     }
 
@@ -964,6 +977,17 @@ public class CompanyContactsActivity extends BaseActivity {
     public static final int LIST_TOP_MODE = 2;
     public static final int LIST_RIGHT_MODE = 1;
 
+    @Override
+    public void onResult(RecognizerResult recognizerResult, boolean b) {
+        String text = JsonParser.parseIatResult(recognizerResult.getResultString());
+        mEditText.setText(mEditText.getText().toString() + CommonUtil.getPlaintext(text));
+    }
+
+    @Override
+    public void onError(SpeechError speechError) {
+
+    }
+
     /**
      * @注释：右边列表
      */

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

@@ -380,7 +380,7 @@ public class MyFriendActivity extends BaseActivity implements RecognizerDialogLi
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        search_edit.setText(search_edit.getText().toString() + text);
+        search_edit.setText(search_edit.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -216,7 +216,7 @@ public class BusinessDetailActivty extends BaseActivity implements RecognizerDia
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        search_edit.setText(search_edit.getText().toString() + text);
+        search_edit.setText(search_edit.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -267,7 +267,7 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        search_edit.setText(search_edit.getText().toString() + text);
+        search_edit.setText(search_edit.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -161,7 +161,7 @@ public class CustomerListSelectActivity extends BaseActivity implements Recogniz
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        search_edit.setText(search_edit.getText().toString() + text);
+        search_edit.setText(search_edit.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -524,7 +524,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        etSearch.setText(etSearch.getText().toString() + text);
+        etSearch.setText(etSearch.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -25,9 +25,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.iflytek.cloud.speech.RecognizerResult;
+import com.iflytek.cloud.speech.SpeechError;
+import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.xzjmyk.pm.activity.audio.voicerecognition.VoiceToWord;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -46,10 +51,12 @@ import java.util.Map;
  * @desc:
  * @author：Arison on 2016/11/1
  */
-public class ProcessMsgActivity extends BaseActivity implements View.OnClickListener {
+public class ProcessMsgActivity extends BaseActivity implements View.OnClickListener ,RecognizerDialogListener{
 
     @ViewInject(R.id.edt_search)
     ClearEditText mEditText;
+    @ViewInject(R.id.voice_search_iv)
+    private ImageView voice_search;
     @ViewInject(R.id.lv_process)
     PullToRefreshListView mList;
 
@@ -254,7 +261,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         break;
                 }
 
-                String master=model.master==null?CommonUtil.getSharedPreferences(ct,"erp_master"):model.master;
+                String master = model.master == null ? CommonUtil.getSharedPreferences(ct, "erp_master") : model.master;
                 CommonUtil.loadWebView(ct, url, title, master, null, null);
             }
         });
@@ -283,6 +290,15 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 }
             }
         });
+
+        final VoiceToWord voice = new VoiceToWord(ProcessMsgActivity.this,"534e3fe2");
+        voice.setRecognizerDialogListener(this);  //自己调用自己
+        voice_search.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                voice.GetWordFromVoice();
+            }
+        });
     }
 
 
@@ -383,6 +399,17 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
         
     }
 
+    @Override
+    public void onResult(RecognizerResult recognizerResult, boolean b) {
+        String text = JsonParser.parseIatResult(recognizerResult.getResultString());
+        mEditText.setText(mEditText.getText().toString() + CommonUtil.getPlaintext(text));
+    }
+
+    @Override
+    public void onError(SpeechError speechError) {
+
+    }
+
     public class ProcessAdapter extends BaseAdapter implements Filterable {
 
         private Context ct;

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

@@ -274,6 +274,8 @@ public class DailydetailsActivity extends BaseActivity {
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
+                            }else {
+                                im_ids.add("");
                             }
 
                             //获取process审批人姓名
@@ -291,6 +293,8 @@ public class DailydetailsActivity extends BaseActivity {
                             //取process之后的审批人名字
                             if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMANNAME())){
                                 afpeople_names.add(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMANNAME());
+                            }else {
+                                afpeople_names.add("");
                             }
                             //取process之后的imid
                             if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getData().get(j).getJP_NODEDEALMAN())){
@@ -316,6 +320,8 @@ public class DailydetailsActivity extends BaseActivity {
                                 }catch (Exception e){
                                     e.printStackTrace();
                                 }
+                            }else {
+                                im_ids.add("");
                             }
                         }
                     }

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

@@ -236,7 +236,7 @@ public class MeetingActivity extends BaseActivity implements RecognizerDialogLis
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        search_edit.setText(search_edit.getText().toString() + text);
+        search_edit.setText(search_edit.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -547,10 +547,13 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         //执行重新提交之更改单据状态操作
         if ((!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0) ||
                 (!TextUtils.isEmpty(resubmit) && resubmit.equals("unsub_tosub")&& mkeyValue != 0)) {
-            String sb_summary = string2Json(last_change_summary);
-            String sb_plan = string2Json(last_change_plan);
-            String sb_experience = string2Json(last_change_experience);
+//            String sb_summary = string2Json(last_change_summary);
+//            String sb_plan = string2Json(last_change_plan);
+//            String sb_experience = string2Json(last_change_experience);
 
+            String sb_summary = last_change_summary;
+            String sb_plan = last_change_plan;
+            String sb_experience = last_change_experience;
             Map<String, Object> formStoreMap2 = new HashMap<>();
             formStoreMap2.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
             formStoreMap2.put("wd_comment", sb_summary);
@@ -571,9 +574,9 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
 
         } else {
             // 执行第一次直接提交
-            s1 = string2Json(s1);
-            s2 = string2Json(s2);
-            s3 = string2Json(s3);
+//            s1 = string2Json(s1);
+//            s2 = string2Json(s2);
+//            s3 = string2Json(s3);
             Map<String, Object> formStoreMap = new HashMap<>();
             formStoreMap.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
             formStoreMap.put("wd_comment", s1);

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

@@ -383,7 +383,7 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        mSearchEt.setText(mSearchEt.getText().toString() + text);
+        mSearchEt.setText(mSearchEt.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -594,7 +594,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        search_edit.setText(search_edit.getText().toString() + text);
+        search_edit.setText(search_edit.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

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

@@ -1385,5 +1385,29 @@ public class CommonUtil {
         return -1;
     }
 
+    /**
+     * @param ：去除一段字符串中的标点只保留文字
+     * @author: FANGlh 2017-2-9
+     */
+
+    public static String getPlaintext(String stringInfo){
+        Pattern p=Pattern.compile("[.,，？！。\"\\?!:']");//增加对应的标点
+
+        Matcher m=p.matcher(stringInfo);
+
+        String first=m.replaceAll(""); //把英文标点符号替换成空，即去掉英文标点符号
 
+        p=Pattern.compile(" {2,}");//去除多余空格
+
+        m=p.matcher(first);
+
+        String second=m.replaceAll(" ");
+
+        String nulltext = "";
+        if (!TextUtils.isEmpty(second)){
+            return second;
+        }else {
+            return nulltext;
+        }
+    }
 }

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

@@ -180,8 +180,8 @@ public class Constants {
     public static final String ERROR_MESSAGE = "CREATE TABLE error_mag ("
             + "id integer primary key autoincrement,"
             + "time varchar(20),"//时间
-            + "title  varchar(20)," //出错位置
-            + "msg  varchar(100)" //出错信息
+            + "title  varchar(20)," //出错位置,操作动作名称
+            + "msg  varchar(100)" //动作信息
             + ")";
 
     //考勤地址表

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/auto/AutoErpService.java

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.xzjmyk.pm.activity.AppConfig;
@@ -26,6 +27,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -166,8 +168,20 @@ public class AutoErpService extends Service {
     public void onDestroy() {
         super.onDestroy();
         unregisterReceiver(updateReceiver);
+
+        //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+        String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+        String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Killed);
+
+        if (!TextUtils.isEmpty(saved_time)){
+            PreferenceUtils.putString(TimeStatisticsActivity.Killed,saved_time + "," + nowtime);
+        }else {
+            PreferenceUtils.putString(TimeStatisticsActivity.Killed,nowtime);
+
+        }
     }
 
+
     /**
      * 初始化广播
      */

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -277,11 +277,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             }
         });
 
-        //UU计步调试
-        findViewById(R.id.uu_sport_step).setOnClickListener(new View.OnClickListener() {
+        //TODO UU登入、登出、被杀死时间统计
+        findViewById(R.id.time_statistics_rl).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(ct, OfficeAddressSettingsActivity.class));
+                startActivity(new Intent(ct,TimeStatisticsActivity.class));
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SettingActivity.java

@@ -43,6 +43,7 @@ import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
 import com.xzjmyk.pm.activity.util.GetFileSizeUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.basepedo.ui.MyPedometerActivity;
 
@@ -228,6 +229,16 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                         ViewUtil.clearAccount(mContext);
                         LoginHelper.broadcastLogout(mContext);
                         SettingActivity.this.finish();
+                        //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+                        String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+                        String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Login_Exit);
+
+                        if (!TextUtils.isEmpty(saved_time)){
+                            PreferenceUtils.putString(TimeStatisticsActivity.Login_Exit,saved_time + "," + nowtime);
+                        }else {
+                            PreferenceUtils.putString(TimeStatisticsActivity.Login_Exit,nowtime);
+
+                        }
                     }
                 }).create().show();
     }
@@ -316,7 +327,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         clearCache();
-                        Log.i("clearCache","clearCache");
+                        Log.i("clearCache", "clearCache");
                     }
                 }).create().show();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/TimeStatisticsActivity.java

@@ -0,0 +1,299 @@
+package com.xzjmyk.pm.activity.ui.me;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.view.MyListView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/2/9.
+ * function:统计显示UU登入、登出、以及被杀死的时间记录
+ */
+public class TimeStatisticsActivity extends BaseActivity {
+    @ViewInject(R.id.login_in_lv)
+    private MyListView login_in_lv;
+    @ViewInject(R.id.login_exit_lv)
+    private MyListView login_exit_lv;
+    @ViewInject(R.id.killed_lv)
+    private MyListView killed_lv;
+    @ViewInject(R.id.delete_loogin_in_time)
+    private TextView delete_loogin_in_time;
+    @ViewInject(R.id.delete_loogin_exit_time)
+    private TextView delete_loogin_exit_time;
+
+    public static List<String> login_in_times = new ArrayList<>();
+    public static List<String> login_exit_times = new ArrayList<>();
+    public static List<String> killed_times = new ArrayList<>();
+    private LoginInTimeAdapter mloginInTimeAdapter;
+    private LoginExitAdapter mloginExitAdapter;
+    private KilledTimeAdapter mkilledTimeAdapter;
+    public static String Login_In = "LOGIN_IN";
+    public static String Login_Exit = "LOGIN_EXIT";
+    public static String Killed = "KILLED";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.time_statistics);
+        ViewUtils.inject(this);
+        initView();
+        initData();
+        clickEvent();
+    }
+
+    private void clickEvent() {
+        delete_loogin_in_time.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                PreferenceUtils.putString(TimeStatisticsActivity.Login_In,"");
+                login_in_times.remove(login_in_times);
+                mloginInTimeAdapter.setLogin_in_times(login_in_times);
+                mloginInTimeAdapter.notifyDataSetChanged();
+            }
+        });
+        delete_loogin_exit_time.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                PreferenceUtils.putString(TimeStatisticsActivity.Login_Exit,"");
+                login_exit_times.remove(login_exit_times);
+                mloginExitAdapter.setLogin_exit_times(login_exit_times);
+                mloginExitAdapter.notifyDataSetChanged();
+            }
+        });
+
+    }
+
+    private void initView() {
+        login_in_times = new ArrayList<>();
+        mloginInTimeAdapter = new LoginInTimeAdapter();
+        login_in_lv.setAdapter(mloginInTimeAdapter);
+
+        login_exit_times = new ArrayList<>();
+        mloginExitAdapter = new LoginExitAdapter();
+        login_exit_lv.setAdapter(mloginExitAdapter);
+
+        killed_times = new ArrayList<>();
+        mkilledTimeAdapter = new KilledTimeAdapter();
+        killed_lv.setAdapter(mkilledTimeAdapter);
+    }
+
+    private void initData() {
+        String getloginintime = PreferenceUtils.getString(MyApplication.getInstance(),TimeStatisticsActivity.Login_In);
+        if (!TextUtils.isEmpty(getloginintime)){
+            String[] split = getloginintime.split(",");
+            for (int i = 0; i < split.length; i++) {
+                login_in_times.add(split[i]);
+            }
+            Log.i("login_in_times",login_in_times + "");
+            if (!ListUtils.isEmpty(login_in_times)){
+                mloginInTimeAdapter.setLogin_in_times(login_in_times);
+                mloginInTimeAdapter.notifyDataSetChanged();
+            }
+        }
+
+
+        String getloginexittime = PreferenceUtils.getString(MyApplication.getInstance(),TimeStatisticsActivity.Login_Exit);
+        if (!TextUtils.isEmpty(getloginexittime)){
+            String[] split = getloginexittime.split(",");
+            for (int i = 0; i < split.length; i++) {
+                login_exit_times.add(split[i]);
+            }
+            Log.i("login_exit_times",login_exit_times + "");
+            if (!ListUtils.isEmpty(login_exit_times)){
+                mloginExitAdapter.setLogin_exit_times(login_exit_times);
+                mloginExitAdapter.notifyDataSetChanged();
+            }
+        }
+
+
+        String getkilledtime = PreferenceUtils.getString(MyApplication.getInstance(),TimeStatisticsActivity.Killed);
+        if (!TextUtils.isEmpty(getkilledtime)){
+            String[] split = getkilledtime.split(",");
+            for (int i = 0; i < split.length; i++) {
+                killed_times.add(split[i]);
+            }
+
+            Log.i("killed_times",killed_times +"");
+            if (!ListUtils.isEmpty(killed_times)){
+                mkilledTimeAdapter.setKilled_times(killed_times);
+                mkilledTimeAdapter.notifyDataSetChanged();
+            }
+        }
+
+    }
+
+
+    public class LoginInTimeAdapter extends BaseAdapter{
+        private List<String> login_in_times;
+
+        public List<String> getLogin_in_times() {
+            return login_in_times;
+        }
+
+        public void setLogin_in_times(List<String> login_in_times) {
+            this.login_in_times = login_in_times;
+        }
+
+        @Override
+        public int getCount() {
+            return login_in_times == null ? 0 :login_in_times.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return login_in_times.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder = null;
+            if (convertView == null){
+                viewHolder = new ViewHolder();
+                convertView =  View.inflate(mContext, R.layout.item_comdoc_am,null);
+                viewHolder.docmainmsg_list = (TextView) convertView.findViewById(R.id.item_comdoc_am_list_tv);
+                viewHolder.docmainmsg_value = (TextView) convertView.findViewById(R.id.item_comdoc_am_value_tv);
+                convertView.setTag(viewHolder);
+
+            }else {
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+            int nums = position + 1;
+            viewHolder.docmainmsg_list.setText("UU登入时间" + nums);
+            if (!TextUtils.isEmpty(getLogin_in_times().get(position))){
+                viewHolder.docmainmsg_value.setText(getLogin_in_times().get(position));
+            }
+            return convertView;
+        }
+
+        class ViewHolder{
+            TextView docmainmsg_list;
+            TextView docmainmsg_value;
+        }
+    }
+
+    public class LoginExitAdapter extends BaseAdapter{
+        private List<String> login_exit_times;
+
+        public List<String> getLogin_exit_times() {
+            return login_exit_times;
+        }
+
+        public void setLogin_exit_times(List<String> login_exit_times) {
+            this.login_exit_times = login_exit_times;
+        }
+
+        @Override
+        public int getCount() {
+            return login_exit_times == null ? 0 : login_exit_times.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return login_exit_times.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder = null;
+            if (convertView == null){
+                viewHolder = new ViewHolder();
+                convertView =  View.inflate(mContext, R.layout.item_comdoc_am,null);
+                viewHolder.docmainmsg_list = (TextView) convertView.findViewById(R.id.item_comdoc_am_list_tv);
+                viewHolder.docmainmsg_value = (TextView) convertView.findViewById(R.id.item_comdoc_am_value_tv);
+                convertView.setTag(viewHolder);
+
+            }else {
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+            int nums = position + 1;
+            viewHolder.docmainmsg_list.setText("UU登出时间" +  nums);
+            if (!TextUtils.isEmpty(getLogin_exit_times().get(position))){
+                viewHolder.docmainmsg_value.setText(getLogin_exit_times().get(position));
+            }
+            return convertView;
+        }
+
+        class ViewHolder{
+            TextView docmainmsg_list;
+            TextView docmainmsg_value;
+        }
+    }
+
+    public class KilledTimeAdapter extends BaseAdapter{
+        private List<String> killed_times;
+
+        public List<String> getKilled_times() {
+            return killed_times;
+        }
+
+        public void setKilled_times(List<String> killed_times) {
+            this.killed_times = killed_times;
+        }
+
+        @Override
+        public int getCount() {
+            return killed_times == null ? 0 : killed_times.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return killed_times.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder = null;
+            if (convertView == null){
+                viewHolder = new ViewHolder();
+                convertView =  View.inflate(mContext, R.layout.item_comdoc_am,null);
+                viewHolder.docmainmsg_list = (TextView) convertView.findViewById(R.id.item_comdoc_am_list_tv);
+                viewHolder.docmainmsg_value = (TextView) convertView.findViewById(R.id.item_comdoc_am_value_tv);
+                convertView.setTag(viewHolder);
+
+            }else {
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+            int nums = position + 1;
+            viewHolder.docmainmsg_list.setText("UU被杀死时间" +  nums);
+            if (!TextUtils.isEmpty(getKilled_times().get(position))){
+                viewHolder.docmainmsg_value.setText(getKilled_times().get(position));
+            }
+            return convertView;
+        }
+
+        class ViewHolder{
+            TextView docmainmsg_list;
+            TextView docmainmsg_value;
+        }
+    }
+}

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

@@ -21,7 +21,6 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -141,7 +140,7 @@ public class MessageFragment extends EasyFragment implements RecognizerDialogLis
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-        mClearEditText.setText(mClearEditText.getText().toString() + text);
+        mClearEditText.setText(mClearEditText.getText().toString() + CommonUtil.getPlaintext(text));
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/TimeUtils.java

@@ -334,6 +334,7 @@ public class TimeUtils {
     public static SimpleDateFormat friendly_format1 = new SimpleDateFormat("HH:mm");
     public static SimpleDateFormat friendly_format2 = new SimpleDateFormat("MM-dd HH:mm");
     public static SimpleDateFormat friendly_format3 = new SimpleDateFormat("yyy年MM月dd日 HH:mm");
+    public static SimpleDateFormat friendly_format4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 
     public static String getFriendlyTimeDesc( long time) {
@@ -341,6 +342,10 @@ public class TimeUtils {
 
     }
 
+    public static String getPreciseTimeDesc(long time){
+        return friendly_format4.format(new Date(time*1000));
+    }
+
 
     /**
      * 获取友好的时间显示

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

@@ -27,7 +27,17 @@
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp"/>
-
+        <ImageView
+            android:id="@+id/voice_search_iv"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@drawable/btn_yuyin_nor"
+            android:visibility="visible"
+            android:layout_marginRight="25dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignRight="@+id/search_edit"
+            android:layout_marginTop="3dp"
+            />
     </RelativeLayout>
     <com.xzjmyk.pm.activity.view.SuperSwipeRefreshLayout
         android:id="@+id/refresh_top"

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

@@ -28,6 +28,17 @@
             android:textColorHint="@color/grey"
             android:textSize="15sp" />
 
+        <ImageView
+            android:id="@+id/voice_search_iv"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@drawable/btn_yuyin_nor"
+            android:visibility="visible"
+            android:layout_marginRight="25dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignRight="@+id/search_edit"
+            android:layout_marginTop="3dp"
+            />
     </RelativeLayout>
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/lv_process"

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

@@ -514,7 +514,7 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/uu_sport_step"
+            android:id="@+id/time_statistics_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
             android:background="@drawable/selector_me_menu_item_bg"
@@ -524,10 +524,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/uu_step"
+                android:drawableLeft="@drawable/icon_uu_setting"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="办公地址设置"
+                android:text="UU登入、登出、被杀死时间统计"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 

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

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/delete_loogin_in_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:text="UU登入时间统计"
+                android:textColor="#575757"
+                android:layout_marginTop="5dp"
+                />
+
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:id="@+id/login_in_lv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </com.xzjmyk.pm.activity.view.MyListView>
+
+            <TextView
+                android:id="@+id/delete_loogin_exit_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:text="UU登出时间统计"
+                android:textColor="#575757"
+                android:layout_marginTop="20dp"
+                />
+
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:id="@+id/login_exit_lv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </com.xzjmyk.pm.activity.view.MyListView>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:text="UU被杀死时间统计"
+                android:textColor="#575757"
+                android:layout_marginTop="20dp"
+                />
+
+            <com.xzjmyk.pm.activity.view.MyListView
+                android:id="@+id/killed_lv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </com.xzjmyk.pm.activity.view.MyListView>
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>