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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -1,13 +1,14 @@
 package com.xzjmyk.pm.activity.ui.circle;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
-
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -20,7 +21,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
@@ -111,9 +111,9 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
 
 
         //判是否有从工作日报心得传来数据
-        final  Intent intent = getIntent();
+        final Intent intent = getIntent();
         dailyexperience = intent.getStringExtra("Experience");
-        if(!TextUtils.isEmpty(dailyexperience)){
+        if (!TextUtils.isEmpty(dailyexperience)) {
             mTextEdit.setText(dailyexperience);
         }
         if (mType == 0) {
@@ -216,7 +216,8 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         }
 
     }
-//public void senddailyshuoshuo(String experience){
+
+    //public void senddailyshuoshuo(String experience){
 //
 //}
     // 发布一条说说
@@ -236,10 +237,10 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         // 消息隐私范围 0=不可见；1=朋友可见；2=粉丝可见；3=广场
         params.put("visible", "3");
 
-        if(!TextUtils.isEmpty(dailyexperience)){
+        if (!TextUtils.isEmpty(dailyexperience)) {
 //            params.put("text", mTextEdit.getText().toString()+"\n\n[来自:工作日报>工作心得分享]");// 消息内容
-            params.put("text", mTextEdit.getText().toString()+"\t(我也去分享(^_^)/~~)\n\n");
-        }else{
+            params.put("text", mTextEdit.getText().toString() + "\t(我也去分享(^_^)/~~)\n\n");
+        } else {
             params.put("text", mTextEdit.getText().toString());// 消息内容
         }
 
@@ -288,26 +289,26 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                     intent.putExtra(AppConstant.EXTRA_MSG_ID, result.getData());
                     setResult(RESULT_OK, intent);
 
-                    if(!TextUtils.isEmpty(dailyexperience)){
-                       new AlertDialog
-                               .Builder(mContext)
-                               .setCancelable(false)  //设置点击对话框之外的对话框不消失
-                               .setTitle("分享成功")
-                               .setMessage("是否立即进入朋友圈查看")
-                               .setNegativeButton("编写日报", new DialogInterface.OnClickListener() {
-                                   @Override
-                                   public void onClick(DialogInterface dialog, int which) {
-                                       finish();
-                                   }
-                               })
-                               .setPositiveButton("立即进入", new DialogInterface.OnClickListener() {
-                                   @Override
-                                   public void onClick(DialogInterface dialog, int which) {
-                                       Intent intent1 = new Intent(ct,BusinessCircleActivity.class);
-                                       startActivity(intent1);
-                                   }
-                               }).show();
-                   }else{
+                    if (!TextUtils.isEmpty(dailyexperience)) {
+                        new AlertDialog
+                                .Builder(mContext)
+                                .setCancelable(false)  //设置点击对话框之外的对话框不消失
+                                .setTitle("分享成功")
+                                .setMessage("是否立即进入朋友圈查看")
+                                .setNegativeButton("编写日报", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        finish();
+                                    }
+                                })
+                                .setPositiveButton("立即进入", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Intent intent1 = new Intent(ct, BusinessCircleActivity.class);
+                                        startActivity(intent1);
+                                    }
+                                }).show();
+                    } else {
                         finish();
                     }
                 }
@@ -319,6 +320,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
 
     private ProgressDialog mProgressDialog;
 
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
@@ -336,7 +338,10 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                 if (mPhotoList.size() <= 0) {// 发文字
                     sendShuoshuo();
                 } else {//  图片+文字
-                    new UploadPhpto().execute();
+                    if (Build.VERSION.SDK_INT >= 11)
+                        new UploadPhpto().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                    else
+                        new UploadPhpto().execute();
                 }
                 break;
         }

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

@@ -139,7 +139,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     } else {
                         //没有班次
                         isWork = false;
-                        ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_workdata), Style.holoRedLight, 3000);
+                        ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_workdata), Style.holoRedLight, 3000);
                         setDataByNoDegree(jsonObject);
                     }
 //                     else {
@@ -185,7 +185,8 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     if (parseObject(message).containsKey("listdata")) {
                         setDataByLogs(parseObject(message).getJSONArray("listdata"));
                     } else {
-                        ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_workdata), Style.holoRedLight, 3000);
+                        ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_workdata), Style.holoRedLight, 3000);
+
                     }
                     break;
                 case 0x13:
@@ -535,10 +536,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             return false;
         }
         if (ListUtils.isEmpty(getDataByAdapter())) {
-            ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_work_message)
+            ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_work_message)
                     , Style.holoRedLight, 2000);
             if (companyDistance == -1) {
-                ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_addr_message)
+                ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_addr_message)
                         , Style.holoRedLight, 2000);
             }
             return false;
@@ -549,22 +550,22 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             return false;
         }
         if (isSignining) {
-            ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_signin_agin)
+            ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_signin_agin)
                     , Style.holoRedLight, 2000);
             return false;
         }
         if (!isWork) {
-            ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_workdata)
+            ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_workdata)
                     , Style.holoRedLight, 2000);
             if (companyDistance == -1) {
-                ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_addr_message)
+                ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_addr_message)
                         , Style.holoRedLight, 2000);
             }
             return false;
         }
 
         if (companyDistance == -1) {
-            ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_addr_message)
+            ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_addr_message)
                     , Style.holoRedLight, 2000);
             return false;
         }
@@ -742,7 +743,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 
     private void setDataForAdapter(List<SigninBean> beans) {
         if (companyDistance == -1 || (companyX == 0 && companyY == 0)) {
-            ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_addr_message)
+            ViewUtil.ToastMessageNoRepeat(ct, ct.getResources().getString(R.string.not_addr_message)
                     , Style.holoRedLight, 2000);
         }
         if (adapter == null) {

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

@@ -90,21 +90,72 @@ public class ViewUtil {
         return params.height;
     }
 
-//    private static String oldMsg;
-//    private static long time;
-//    private static String oldMsg2;
-//    private static long time2;
+    private static String oldMsg;
+    private static long time;
+    private static String oldMsg2;
+    private static long time2;
 
-    private static Crouton crouton;
+    /**
+     * 弹出Toast消息
+     * 间隔时间不超过三秒的重复信息不会反复弹出
+     *
+     * @param msg
+     * @author RaoMeng
+     */
+    public static void ToastMessageNoRepeat(Context cont, String msg) {
+        if (cont instanceof Activity) {
+            if (!msg.equals(oldMsg)) {
+                Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 3000).show();
+                time = System.currentTimeMillis();
+            } else {
+                if ((System.currentTimeMillis() - time) > 3000) {
+                    Crouton.makeText((Activity) cont, msg, Style.holoGreenLight, 3000).show();
+                    time = System.currentTimeMillis();
+                }
+            }
+            oldMsg = msg;
+        } else {
+            Toast.makeText(cont, msg, Toast.LENGTH_SHORT).show();
+        }
+
+    }
 
     /**
      * 弹出Toast消息
      * 间隔时间不超过三秒的重复信息不会反复弹出
-     * update for LiuJie
      *
      * @param msg
      * @author RaoMeng
      */
+    public static void ToastMessageNoRepeat(Context cont, String msg, int toastColor, int toastTime) {
+        if (cont instanceof Activity) {
+            if (!msg.equals(oldMsg2)) {
+                Crouton.makeText((Activity) cont, msg, toastColor, toastTime).show();
+                time2 = System.currentTimeMillis();
+            } else {
+                if ((System.currentTimeMillis() - time2) > 3000) {
+                    Crouton.makeText((Activity) cont, msg, toastColor, toastTime).show();
+                    time2 = System.currentTimeMillis();
+                }
+            }
+            oldMsg2 = msg;
+        } else {
+            Toast.makeText(cont, msg, Toast.LENGTH_SHORT).show();
+        }
+
+    }
+
+
+
+    private static  Crouton crouton;
+
+    /**
+     * 弹出Toast消息
+     *
+     *  update for LiuJie
+     * @param msg
+     * @author RaoMeng
+     */
     public static void ToastMessage(Context cont, String msg) {
         if (cont instanceof Activity) {
             if (crouton != null) {
@@ -123,7 +174,7 @@ public class ViewUtil {
 
     /**
      * 弹出Toast消息
-     * 间隔时间不超过三秒的重复信息不会反复弹出
+     *
      *
      * @param msg
      * @author RaoMeng

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

@@ -1,11 +1,13 @@
 package com.xzjmyk.pm.activity.ui.me;
 
+import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -216,13 +218,17 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                     }
                 }).create().show();
     }
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     private void clearCache() {
         String filePath = MyApplication.getInstance().mAppDir;
         //删除文件
         VideoFileDao.getInstance().deleteAllVideoFile(
                 VideoFileDao.getInstance().getVideoFiles(
                         MyApplication.getInstance().mLoginUser.getUserId()));
-        new ClearCacheAsyncTaska(filePath).execute(true);
+        if (Build.VERSION.SDK_INT >= 11)
+            new ClearCacheAsyncTaska(filePath).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,true);
+        else
+            new ClearCacheAsyncTaska(filePath).execute(true);
     }
 
     private class ClearCacheAsyncTaska extends AsyncTask<Boolean, String, Integer> {