任性，应该，应该，应该测试狗

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

@@ -245,7 +245,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                                 error = "数据获取失败，请稍后重试";
                             if (System.currentTimeMillis() - lastTime > 8000) {
                                 lastTime = System.currentTimeMillis();
-                                Crouton.showToast(ct, error, R.color.load_warning);
+                                if(!StringUtils.isEmpty(workDailyAdd) && "WorkDailyAdd".equals(workDailyAdd)){
+                                }else {
+                                    Crouton.showToast(ct, error, R.color.load_warning);
+                                }
                             }
                         } catch (Exception e) {
 
@@ -262,6 +265,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     private float moveY;
     private int adminStatus;//管理员状态 1.管理员  0.非管理员
     private boolean isB2b;
+    private String workDailyAdd;
 
     private Set<Integer> getDay(JSONArray array) {
         JSONObject object = null;
@@ -496,6 +500,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     }
 
     private void initView() {
+        Intent intent = getIntent();
+        workDailyAdd = intent.getStringExtra("WorkDailyAdd");
         isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         //设置为空显示列表
         emptyLayout = new EmptyLayout(ct, oa_listview);
@@ -976,9 +982,11 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 }
                 break;
             case R.id.oamain_special_attendance_tv://特殊考勤
-                startActivity(new Intent(activity, DataFormDetailActivity.class).putExtra("caller", "SpeAttendance"));
+                if (!(ApiUtils.getApiModel() instanceof ApiPlatform)) {
+                    startActivity(new Intent(activity, DataFormDetailActivity.class).putExtra("caller", "SpeAttendance"));
+                }
                 break;
-            case R.id.oamain_sign_statistical_tv:
+            case R.id.oamain_sign_statistical_tv: //考勤统计
                 startActivity(new Intent(activity, StatisticsActivity.class));
                 break;
         }

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

@@ -407,7 +407,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         voice_summary.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                voice_summary.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice_type = 1;
                 voice.GetWordFromVoice();
             }
@@ -416,7 +415,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         voice_plan.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                voice_plan.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice_type = 2;
                 voice.GetWordFromVoice();
             }
@@ -425,7 +423,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         voice_experience.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                voice_experience.setImageResource(R.drawable.btn_yuyin_pressed);
                 voice_type = 3;
                 voice.GetWordFromVoice();
             }
@@ -434,7 +431,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {
         String text = JsonParser.parseIatResult(recognizerResult.getResultString());
-
         if (voice_type == 1){
             add_summary.setText(add_summary.getText().toString() + text);
         }else if (voice_type == 2){
@@ -445,9 +441,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
     }
 
     @Override
-    public void onError(SpeechError speechError) {
-
-    }
+    public void onError(SpeechError speechError) {}
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
@@ -502,7 +496,8 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                                 }else if (!TextUtils.isEmpty(fromqzone) && "fromqzone".equals(fromqzone)){
 
                                 }else {
-                                    startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                                    startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class)
+                                    .putExtra("WorkDailyAdd","WorkDailyAdd"));
                                 }
                                 finish();
                             }
@@ -510,7 +505,8 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
             } else if (!TextUtils.isEmpty(fromqzone) && "fromqzone".equals(fromqzone)){
                 finish();
             } else{
-                startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class)
+                        .putExtra("WorkDailyAdd","WorkDailyAdd"));
                 finish();
             }
         }
@@ -530,7 +526,8 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                     .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                            startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class)
+                                    .putExtra("WorkDailyAdd","WorkDailyAdd"));
                             if (!TextUtils.isEmpty(resubmit) && "unsub_tosub".equals(resubmit)){
                                 if (!platform){
                                     startActivity(new Intent(WorkDailyAddActivity.this,WorkDailyShowActivity.class));
@@ -538,13 +535,15 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                                     startActivity(new Intent(WorkDailyAddActivity.this,PlatDailyShowActivity.class));
                                 }
                             }else {
-                                startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+                                startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class)
+                                        .putExtra("WorkDailyAdd","WorkDailyAdd"));
                             }
                             finish();
                         }
                     }).show();
         } else {
-            startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));
+            startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class)
+                    .putExtra("WorkDailyAdd","WorkDailyAdd"));
             finish();
         }
 

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

@@ -259,25 +259,28 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
     private void initData() {
         //初次进来获取考勤地址设置接口请求
         if (!MyApplication.getInstance().isNetworkActive()){
+            ToastMessage("当前网络不可用，请稍后重试!");
             progressDialog.dismiss();
             return;
+        }else {
+            if (!platform) {
+                String url = Constants.getAppBaseUrl(getApplicationContext()) + "/mobile/getcomaddressset.action";
+                Map<String, Object> param = new HashMap<>();
+                LinkedHashMap headers = new LinkedHashMap();
+                headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+                ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, GET_SIGN_DDRESSS, null, null, "post");
+            } else {
+                //  平台办公地址获取
+                String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().sign_get_office_url;
+                Map<String, Object> param = new HashMap<>();
+                param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+                param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+                LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+                ViewUtil.httpSendRequest(this, url, param, handler, headers, GET_PLAT_SIGN_ADDRESS, null, null, "get");
+            }
         }
-        if (!platform) {
-            String url = Constants.getAppBaseUrl(getApplicationContext()) + "/mobile/getcomaddressset.action";
-            Map<String, Object> param = new HashMap<>();
-            LinkedHashMap headers = new LinkedHashMap();
-            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
-            ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, GET_SIGN_DDRESSS, null, null, "post");
-        } else {
-            //  平台办公地址获取
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().sign_get_office_url;
-            Map<String, Object> param = new HashMap<>();
-            param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-            ViewUtil.httpSendRequest(this, url, param, handler, headers, GET_PLAT_SIGN_ADDRESS, null, null, "get");
-        }
+
 
     }
 

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

@@ -242,25 +242,31 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
         serious_late_time_tv.setText(default_serious_late_time);
         leave_early_tv.setText(default_leave_early_time);
         absenteeism_time_tv.setText(default_absenteeism_time);
-
-        //获取考勤高级设置时间请求
-        if (!platform){
-            String url_getconfigs = Constants.getAppBaseUrl(getApplicationContext()) + "/mobile/getconfigs.action";
-            Map<String, Object> param = new HashMap<>();
-            param.put("code", 1);
-            LinkedHashMap headers = new LinkedHashMap();
-            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
-            ViewUtil.httpSendRequest(getApplicationContext(), url_getconfigs, param, handler, headers, GET_SENIOR_CONFIGS_TIME, null, null, "post");
-        }else {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().get_plat_senior_setting_url;
-            Map<String,Object> param = new HashMap<>();
-            param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-            LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-            ViewUtil.httpSendRequest(this, url, param, handler, headers, GET_PLAT_SENIOR_SETTING, null, null, "get");
+        if (!MyApplication.getInstance().isNetworkActive()){
+            ToastMessage("当前网络不可用，请稍后重试!");
+            progressDialog.dismiss();
+            return;
+        }else{
+            //获取考勤高级设置时间请求
+            if (!platform){
+                String url_getconfigs = Constants.getAppBaseUrl(getApplicationContext()) + "/mobile/getconfigs.action";
+                Map<String, Object> param = new HashMap<>();
+                param.put("code", 1);
+                LinkedHashMap headers = new LinkedHashMap();
+                headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+                ViewUtil.httpSendRequest(getApplicationContext(), url_getconfigs, param, handler, headers, GET_SENIOR_CONFIGS_TIME, null, null, "post");
+            }else {
+                String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().get_plat_senior_setting_url;
+                Map<String,Object> param = new HashMap<>();
+                param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+                param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+                LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+                ViewUtil.httpSendRequest(this, url, param, handler, headers, GET_PLAT_SENIOR_SETTING, null, null, "get");
+            }
         }
 
+
     }
 
     //每次进入高级设置界面时请求url后返回要显示的设置时间