打卡签到bug

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

@@ -128,11 +128,11 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         CommonUtil.setSharedPreferences(ct, "companyY", (float) companyY);
                         unoffice_mm.setText(setDistance());
                     }
-                    if (jsonObject.getBoolean("success")){
+                    if (jsonObject.getBoolean("success")) {
                         //有班次
                         isWork = true;
                         setDataByDegree(jsonObject);
-                    }else {
+                    } else {
                         //没有班次
                         isWork = false;
                         ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_workdata), Style.holoRedLight, 3000);
@@ -177,7 +177,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     }*/
                     break;
                 case 0x12:
-                    Log.i("handleMessage12: ",parseObject(message).toString());
+                    Log.i("handleMessage12: ", parseObject(message).toString());
                     if (parseObject(message).containsKey("listdata")) {
                         setDataByLogs(parseObject(message).getJSONArray("listdata"));
                     } else {
@@ -196,7 +196,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         }, 20000);
                         loadLog(selectTime == 0 ? TimeUtils.s_long_2_str(System.currentTimeMillis()) : TimeUtils.s_long_2_str(selectTime));
                     } else
-                        Crouton.makeText(ct, R.string.signin_error);
+                        ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.signin_error), Style.holoRedLight, 3000);
                     break;
                 case 0x15:
                     JSONObject object = JSON.parseObject(message);
@@ -229,7 +229,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 default:
                     JsonValidator validator = new JsonValidator();
                     if (validator.validate(message)) {
-                        Crouton.makeText(ct, message);
+                        ViewUtil.ToastMessage(ct,message,Style.holoRedLight,3000);
                     }
                     if (loginNum < 3 && StringUtils.isInclude(message, getResources().getString(R.string.session_out)) || StringUtils.isInclude(message, "程序错误")) {
                         returnLogin();
@@ -305,7 +305,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             case R.id.signin_btn:
                 if (isPlay()) {
                     if (!CommonUtil.isNetWorkConnected(ct)) {
-                        Crouton.makeText(ct, "当前网络不可用，请检查网络连接");
+                        Crouton.makeText(ct, "当前网络不可用，请检查网络连接",Style.holoRedLight,2000);
                         return;
                     }
                     //TODO 上传文件
@@ -337,7 +337,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 startActivityForResult(intent, 0x14);
                 break;
             default:
-                Crouton.makeText(ct, "系统没有找到你的排班信息，请联系管理员处理");
+                Crouton.makeText(ct, "系统没有找到你的排班信息，请联系管理员处理",Style.holoRedLight,2000);
                 ct.finish();
                 break;
         }
@@ -405,7 +405,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     setBaiduLocation();
                 } else {
                     if (resultCode == 62) {
-                        Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", 2000);
+                        Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", Style.holoRedLight,2000);
                     }
                 }
             }
@@ -520,7 +520,12 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             return false;
         }
         if (ListUtils.isEmpty(getDataByAdapter())) {
-            Crouton.makeText(ct, R.string.not_work_message);
+            ViewUtil.ToastMessage(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)
+                        , Style.holoRedLight, 2000);
+            }
             return false;
         }
         if (!StringUtils.isEmpty(macError)) {
@@ -533,7 +538,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     , Style.holoRedLight, 2000);
             return false;
         }
-        if (!isWork){
+        if (!isWork) {
             ViewUtil.ToastMessage(ct, ct.getResources().getString(R.string.not_workdata)
                     , Style.holoRedLight, 2000);
             if (companyDistance == -1) {
@@ -640,9 +645,9 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         if (!StringUtils.isEmpty(b.getWorkTime()) && !b.getWorkTime().equals("00:00"))
             beans.add(b);
         //没有排班情况
-        if (ListUtils.isEmpty(beans)) {
-            Crouton.makeText(ct, R.string.not_work_message);
-        }
+//        if (ListUtils.isEmpty(beans)) {
+//            Crouton.makeText(ct, R.string.not_work_message);
+//        }
         setDataForAdapter(beans);
     }