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

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

@@ -111,8 +111,8 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         }
 
                         if (currentId != 0) {
-                            mList.getRefreshableView().setSelection(currentId);
-                            mList.getRefreshableView().setSelection(0);
+//                            mList.getRefreshableView().setSelection(currentId);
+//                            mList.getRefreshableView().setSelection(0);
                         }
                         ToastMessage(getString(R.string.common_up_finish));
                         progressDialog.dismiss();
@@ -149,7 +149,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         getEmimids(array);
                     }
                     if (currentId != 0) {
-                        mList.getRefreshableView().setSelection(0);
+//                        mList.getRefreshableView().setSelection(0);
                     }
                     ToastMessage(getString(R.string.common_up_finish));
                     progressDialog.dismiss();
@@ -171,7 +171,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         handleImids(3, array);
                     }
                     if (currentId != 0) {
-                        mList.getRefreshableView().setSelection(0);
+//                        mList.getRefreshableView().setSelection(0);
                     }
                     ToastMessage(getString(R.string.common_up_finish));
                     progressDialog.dismiss();

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

@@ -137,6 +137,7 @@ public class FlihtsDateSelectActivity extends BaseActivity implements DatePicker
 
     private void daDateUpdate(List<FlightsModel> models, String date,int position) {
         String url = Constants.getAppBaseUrl(getApplicationContext())+"/mobile/updateEmpWorkDate.action";
+//        String url = "https://192.168.253.252:8080/ERP/"+"mobile/updateEmpWorkDate.action";
         Map<String,Object> param = new HashMap<>();
         param.put("deptcodes", models.get(position).getHrorgsModel().getEmployeecode());
         param.put("emcodes",models.get(position).getEmployeesModel().getEmployeecode() == null ? "":

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/utils/StepCountCheckUtil.java

@@ -7,6 +7,8 @@ import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Build;
 
+import com.xzjmyk.pm.activity.MyApplication;
+
 /**
  * Created by FANGLH
  * Date : 2017/4/13
@@ -25,8 +27,8 @@ public class StepCountCheckUtil {
     }
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
-    public boolean isSupportStepCountSensor() {
-        return context.getPackageManager()
+    public static boolean isSupportStepCountSensor() {
+        return MyApplication.getInstance().getPackageManager()
                 .hasSystemFeature(PackageManager.FEATURE_SENSOR_STEP_COUNTER);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepActivity.java

@@ -90,7 +90,9 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
         curSelDate = TimeUtil.getCurrentDate();
 //        curSelDate = TimeUtils.s_long_2_str(System.currentTimeMillis());
-        support_step = StepCountCheckUtil.isSupportStepCountSensor(this);
+        support_step = StepCountCheckUtil.isSupportStepCountSensor(this)
+                ||StepCountCheckUtil.isSupportStepCountSensor();
+        Log.i("support_step",support_step+"");
     }
 
     private void initData() {