配置文件冲突解决

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -64,7 +64,6 @@ import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
-import com.xzjmyk.pm.newpedo.view.NewStepActivity;
 
 import java.util.HashMap;
 import java.util.List;
@@ -412,9 +411,10 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             PushManager.stopWork(this);
         }
         int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
-        if (isUUStep == 1) {
+        if (isUUStep != 0) {
             startService(new Intent(mContext, com.xzjmyk.pm.newpedo.service.StepService.class));
-            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 1);
+//            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 1);
+            PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
             PushManager.resumeWork(MyApplication.getInstance());
         }
         startService(new Intent(this, AutoErpService.class));

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

@@ -149,7 +149,6 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 
         //UU开关的 根据StepService是否开启显示状态
         int isStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
-         boolean sbb = isServiceRunning(newStep_service_name);
         if (isServiceRunning(newStep_service_name)&&(isStep == -1 || isStep == 1)){
             uu_step_reply.setChecked(true);
         }else {

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

@@ -20,12 +20,9 @@ import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.baidu.android.pushservice.PushManager;
-import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.me.SettingActivity;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 import com.xzjmyk.pm.newpedo.calendar.BeforeOrAfterCalendarView;
 import com.xzjmyk.pm.newpedo.constant.Constant;
@@ -61,6 +58,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     private StepDataDao stepDataDao;
     private LinearLayout steps_history_ll;
     private TextView steps_history_tv;
+    private Boolean support_step;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,6 +83,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
         curSelDate = TimeUtil.getCurrentDate();
 
+        support_step = StepCountCheckUtil.isSupportStepCountSensor(this);
     }
 
     private void initData() {
@@ -99,15 +98,13 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         /**
          * 这里判断当前设备是否支持计步
          */
-        if (StepCountCheckUtil.isSupportStepCountSensor(this)) {
+        if (support_step) {
             getRecordList();
             supportTv.setVisibility(View.GONE);
             setDatas();
             setupService();
-
-            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 0);
-            PushManager.resumeWork(MyApplication.getInstance());
-
+//            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 0);
+//            PushManager.resumeWork(MyApplication.getInstance());
             ToastMessage("小提示:UU在关闭后无法继续统计您的步数数据");
         } else {
             totalStepsTv.setText("0");