弱网闪退解决

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

@@ -12,6 +12,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -67,8 +68,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-//            new MaterialDialog.Builder(this).content(stackTraceString)
-//                    .build().show();
+            new MaterialDialog.Builder(this).content(stackTraceString)
+                    .build().show();
             try {
                 getCode();
             } catch (Exception e) {

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

@@ -274,6 +274,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     String del_result = msg.getData().getString("result");
                     LogUtil.prinlnLongMsg("del_result", del_result);
                     Toast.makeText(getApplicationContext(), "单据删除成功", Toast.LENGTH_LONG).show();
+                    progressDialog.dismiss();
                     FormListSelectActivity.isdelete = true;
                     FormListSelectActivity.reload=false;
                     finish();
@@ -683,6 +684,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
             }
         } catch (JSONException e) {
             e.printStackTrace();
+        }catch (Exception e){
+            e.printStackTrace();
         }
         getemcodefromAF();
     }
@@ -799,6 +802,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             .setPositiveButton("确认", new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {  //反提交
+                                    progressDialog.show();
                                     String url = Constants.getAppBaseUrl(ct) + "/mobile/commonres.action";
                                     Map<String, Object> params = new HashMap<>();
                                     params.put("caller", mCaller);

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

@@ -142,7 +142,6 @@ public class DailydetailsActivity extends BaseActivity {
                                 Toast.makeText(ct, "工作日报删除成功", Toast.LENGTH_LONG).show();
 //                                    startActivity(new Intent(activity,WorkDailyShowActivity.class)
 //                                    .putExtra("fromwhere","delete_succeed"));
-
                                 if (!TextUtils.isEmpty(fromwhere) && "submitdaily".equals(fromwhere)){
                                     startActivity(new Intent(DailydetailsActivity.this,WorkDailyShowActivity.class));
                                     finish();
@@ -150,10 +149,12 @@ public class DailydetailsActivity extends BaseActivity {
                                     Intent intent = new Intent();
                                     intent.putExtra("delete_succeed","delete_succeed");
                                     intent.putExtra("deleted_id",mkeyValue);
-                                    setResult(DELETE_SUCCEED,intent);
+                                    setResult(DELETE_SUCCEED, intent);
+                                    progressDialog.dismiss();
                                     finish();
                                 }
                             }
+                            progressDialog.dismiss();
                         }
                     }
                     break;
@@ -523,6 +524,7 @@ public class DailydetailsActivity extends BaseActivity {
 
     // 反提交之操作：清除审批流和更改单据状态
     private void doresubmit(String retype) {
+        progressDialog.show();
         String resubmit_url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/mobile/commonres.action";//这个接口仅仅是反提交操作
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", mkeyValue);

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

@@ -97,6 +97,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
 
                             } else {
                                 Crouton.makeText(ct, "工作日报提交失败");
+                                progressDialog.dismiss();
                             }
                         }
                     }
@@ -142,8 +143,8 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                                 doGrabJobContent(mkeyValue);
                             } else {
                                 Crouton.makeText(ct, "工作日报重新提交失败");
+                                progressDialog.dismiss();
                             }
-
                         }
                     }
                     break;
@@ -201,6 +202,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
     private String last_change_summary;
 
     public void jumptododetail(int mkeyValue) {
+        progressDialog.dismiss();
         Intent intent = new Intent(activity, DailydetailsActivity.class);
         intent.putExtra("Date", TimeUtils.s_long_2_str(System.currentTimeMillis()));
         intent.putExtra("caller", "WorkDaily");
@@ -544,6 +546,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
     }
 
     private void sendWorkDailyByErp(String s1, String s2, String s3) {
+        progressDialog.show();
         //执行重新提交之更改单据状态操作
         if ((!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0) ||
                 (!TextUtils.isEmpty(resubmit) && resubmit.equals("unsub_tosub")&& mkeyValue != 0)) {

WeiChat/src/main/java/com/xzjmyk/pm/basepedo/service/StepService.java

@@ -246,14 +246,14 @@ public class StepService extends Service implements SensorEventListener {
                 .getSystemService(SENSOR_SERVICE);
         getLock(this);
        // android4.4以后可以使用计步传感器
-        int VERSION_CODES = Build.VERSION.SDK_INT;
-        if (VERSION_CODES >= 19) {
-            addCountStepListener();
-        } else {
-            addBasePedoListener();
-        }
-
-        addBasePedoListener();
+//               int VERSION_CODES = Build.VERSION.SDK_INT;
+//        if (VERSION_CODES >= 19) {
+//            addCountStepListener();
+//        } else {
+//            addBasePedoListener();
+//        }
+
+//        addBasePedoListener();
         addCountStepListener();
     }
 
@@ -264,7 +264,7 @@ public class StepService extends Service implements SensorEventListener {
             sensorManager.registerListener(StepService.this, detectorSensor, SensorManager.SENSOR_DELAY_UI);
         } else if (countSensor != null) {
             sensorManager.registerListener(StepService.this, countSensor, SensorManager.SENSOR_DELAY_UI);
-            //        addBasePedoListener();
+                    addBasePedoListener();
         } else {
             Log.v(TAG, "Count sensor not available!");
         }
@@ -279,8 +279,7 @@ public class StepService extends Service implements SensorEventListener {
         // sensorManager.unregisterListener(stepDetector);
         sensorManager.registerListener(stepDetector, sensor,
                 SensorManager.SENSOR_DELAY_UI);
-        stepDetector
-                .setOnSensorChangeListener(new StepDcretor.OnSensorChangeListener() {
+        stepDetector.setOnSensorChangeListener(new StepDcretor.OnSensorChangeListener() {
 
                     @Override
                     public void onChange() {