commit msg

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

@@ -32,7 +32,6 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.AppWebViewActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ApprovalActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.setting.ComApprovalUtil;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -361,14 +360,14 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 LogUtil.i("url="+url);
                 String master = model.master == null ? CommonUtil.getSharedPreferences(ct, "erp_master") : model.master;
                 if (CommonUtil.isReleaseVersion()) {
-//                    CommonUtil.loadWebView(ct, url, title, master, null, null);
-                    Intent intent = new Intent(ct, AppWebViewActivity.class);
-                    intent.putExtra("url", url);
-                    intent.putExtra("p", title);
-                    intent.putExtra("master", master);
-                    intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(intent);
+                    CommonUtil.loadWebView(ct, url, title, master, null, null);
+//                    Intent intent = new Intent(ct, AppWebViewActivity.class);
+//                    intent.putExtra("url", url);
+//                    intent.putExtra("p", title);
+//                    intent.putExtra("master", master);
+//                    intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
+//                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//                    startActivity(intent);
                 } else {
                     Intent intent = new Intent(ct, ApprovalActivity.class);
                     intent.putExtra("imid", d_imids);

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

@@ -47,7 +47,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -321,7 +320,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
         window.getContentView().measure(0, 0);
         window.setHeight(DisplayUtil.dip2px(this, 190));
         window.setWidth(DisplayUtil.dip2px(this, 85));
-        window.setAnimationStyle(R.style.MenuAnimationFade);
+//        window.setAnimationStyle(R.style.MenuAnimationFade);
         window.setOutsideTouchable(false);
         window.setFocusable(true);
         //获取需要在其上方显示的控件的位置信息

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

@@ -1015,7 +1015,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             iApproval.showToast("正在提交请求，请不要重复提交", R.color.load_submit);
             return false;
         }
-        return false;
+        return true;
     }
 
     //判断要点

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

@@ -130,10 +130,15 @@ public class AutoErpService extends Service {
         public void onReceive(Context context, Intent intent) {
             try {
                 if (intent == null || StringUtils.isEmpty(intent.getAction())) return;
-                else if (intent.getAction().equals(UPDATA_ERP_CHANGE) || intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {//账套变更，重新刷新数据，初始化任务
-                    log(UPDATA_ERP_CHANGE);
-                    CommonInterface.getInstance().judgeManager(null);
-                    init();
+                else if (intent.getAction().equals(UPDATA_ERP_CHANGE)
+                        || intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {//账套变更，重新刷新数据，初始化任务
+                    log(intent.getAction());
+                    String falg = intent.getStringExtra("falg");
+                    LogUtil.i("falg=" + falg);
+                    if (StringUtils.isEmpty(falg) || falg.equals("home")) {
+                        CommonInterface.getInstance().judgeManager(null);
+                        init();
+                    }
                 } else if (intent.getAction().equals(CHANGE_WORK_TASK)) {//自动打卡任务变更
                     log(CHANGE_WORK_TASK);
                     canWork = intent.getBooleanExtra(CHANGE_WORK_TASK, true);//获取是否开启任务
@@ -314,7 +319,7 @@ public class AutoErpService extends Service {
                         isDNoticeRuning = true;
                         LogUtil.i("startDNoticeTask Runnable");
                         int i = DNOTICE_ITER - 1;
-                        Log.i("dnoticeIter",dnoticeIter+"");
+                        Log.i("dnoticeIter", dnoticeIter + "");
 
                         if (dnoticeIter == i) {
                             LogUtil.i("dnoticeIter == i");

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
+import com.xzjmyk.pm.activity.MyApplication;
 
 /**
  * Created by Bitliker on 2017/6/12.
@@ -13,6 +14,8 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 public class RecognizerDialogUtil {
 
     public static void showRecognizerDialog(Context context, RecognizerDialogListener recognizerDialogListener) {
+        if (context == null)
+            context = MyApplication.getInstance();
         RecognizerDialog dialog = new RecognizerDialog(context, null);
         dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
         dialog.setParameter(SpeechConstant.ACCENT, "mandarin");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/http/DepositNoticeUtil.java

@@ -65,7 +65,8 @@ public class DepositNoticeUtil {
                 case 0x01:
                     if (!StringUtils.isEmpty(result)) {
                         if (JSON.parseObject(result).getString("resultMsg") != null) {
-                            Toast.makeText(MyApplication.getInstance(), JSON.parseObject(result).getString("resultMsg"), Toast.LENGTH_LONG).show();
+                            //先不提示
+//                            Toast.makeText(MyApplication.getInstance(), JSON.parseObject(result).getString("resultMsg"), Toast.LENGTH_LONG).show();
                             return;
                         } else {
                             if (!ListUtils.isEmpty(mSureBookModel))
@@ -123,20 +124,21 @@ public class DepositNoticeUtil {
 
     /**
      * 判断model里面的数据是否符合提醒条件
+     *
      * @param models
      */
     public static void isNoticeTimeInMainLooper(List<SureBookModel> models) {
         for (SureBookModel model : models) {
             LatLng latLng = new LatLng(Double.valueOf(model.getAb_latitude()), Double.valueOf(model.getAb_longitude()));
             float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
-            if (distance == -1f){
+            if (distance == -1f) {
                 LogUtil.i("distance == -1f");
                 continue;
             }
-            if (model.getAb_starttime().compareTo(TimeUtils.f_long_2_str(System.currentTimeMillis())) > 0){
+            if (model.getAb_starttime().compareTo(TimeUtils.f_long_2_str(System.currentTimeMillis())) > 0) {
                 setNoticeTime(model.getAb_starttime(), latLng, distance);
             }
-            LogUtil.prinlnLongMsg("startTime,current_T",model.getAb_starttime()+","+TimeUtils.f_long_2_str(System.currentTimeMillis()));
+            LogUtil.prinlnLongMsg("startTime,current_T", model.getAb_starttime() + "," + TimeUtils.f_long_2_str(System.currentTimeMillis()));
 
         }
     }
@@ -148,6 +150,7 @@ public class DepositNoticeUtil {
     /**
      * 对于符合当前条件的预约，进行提前预约时间计算得出：开始提醒的具体时间点startNoticeTime
      * 然后：startNoticeTime <= 当前时间则开始进行通知提醒
+     *
      * @param startTime
      * @param location
      * @param dis
@@ -165,7 +168,7 @@ public class DepositNoticeUtil {
                                 if (dis != 0) {
                                     minTime = (int) (TimeUtils.f_str_2_long(startTime) - (dis / 3) * 1000 - 15 * 60 * 1000);
                                 } else {
-                                    minTime = (int) (TimeUtils.f_str_2_long(startTime) - 800 * 1000-15 * 60 * 1000);
+                                    minTime = (int) (TimeUtils.f_str_2_long(startTime) - 800 * 1000 - 15 * 60 * 1000);
                                 }
                             } else {
                                 for (DrivingRouteLine e : list) {
@@ -174,18 +177,18 @@ public class DepositNoticeUtil {
                                     }
                                 }
                             }
-                            long startNoticeTime = TimeUtils.f_str_2_long(startTime) - minTime * 1000-15 * 60 * 1000;
+                            long startNoticeTime = TimeUtils.f_str_2_long(startTime) - minTime * 1000 - 15 * 60 * 1000;
                             if (startNoticeTime <= System.currentTimeMillis()) {
                                 //TODO 提醒
-                                Log.i("notificationManage","开始提醒");
+                                Log.i("notificationManage", "开始提醒");
                                 notificationManage.sendNotification(MyApplication.getInstance(),
                                         "您有预约计划即将开始！", BookingListActivity.class);
-                            }else{
-                                Log.i("notificationManage","提醒时间不符合");
+                            } else {
+                                Log.i("notificationManage", "提醒时间不符合");
                             }
-                            LogUtil.i("minTime="+minTime);
-                            LogUtil.i("startNoticeTime="+TimeUtils.f_long_2_str(startNoticeTime));
-                            LogUtil.i("System.currentTimeMillis()="+TimeUtils.f_long_2_str( System.currentTimeMillis()));
+                            LogUtil.i("minTime=" + minTime);
+                            LogUtil.i("startNoticeTime=" + TimeUtils.f_long_2_str(startNoticeTime));
+                            LogUtil.i("System.currentTimeMillis()=" + TimeUtils.f_long_2_str(System.currentTimeMillis()));
                         } catch (Exception e) {
                             if (e != null)
                                 Log.i("setStartime Exception=", e.getMessage() + "");

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

@@ -65,7 +65,7 @@ public class QSearchPpwindowUtils{
         new android.os.Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
-                if (isqSearch[0]){
+                if (isqSearch[0]&&activity!=null&&!activity.isFinishing()){
                     RecognizerDialogUtil.showRecognizerDialog(activity,new RecognizerDialogListener() {
                         @Override
                         public void onResult(RecognizerResult recognizerResult, boolean b) {