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

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

@@ -64,6 +64,7 @@ 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.utils.StepCountCheckUtil;
 
 import java.util.HashMap;
 import java.util.List;
@@ -411,7 +412,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             PushManager.stopWork(this);
         }
         int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
-        if (isUUStep != 0) {
+        if (isUUStep != 0 && StepCountCheckUtil.isSupportStepCountSensor(this)) {
             startService(new Intent(mContext, com.xzjmyk.pm.newpedo.service.StepService.class));
 //            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 1);
             PreferenceUtils.putInt(MainActivity.UU_STEP, 1);

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

@@ -162,7 +162,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 if (isChecked) {
                     PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
                     PushManager.resumeWork(MyApplication.getInstance());
-                    Toast.makeText(mContext, "您已开启UU运动", Toast.LENGTH_LONG).show();
+//
                     startActivity(new Intent(mContext, NewStepActivity.class));
                 } else {
                     PushManager.stopWork(MyApplication.getInstance());

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

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Build;
+import android.util.Log;
 
 /**
  * Created by FANGLH

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

@@ -19,6 +19,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -64,10 +65,8 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_newstep);
-
         initView();
         initData();
-        initListener();
     }
 
 
@@ -106,6 +105,8 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
 //            PreferenceUtils.putInt(NewStepActivity.UU_STEP_NOTICE, 0);
 //            PushManager.resumeWork(MyApplication.getInstance());
             ToastMessage("小提示:UU在关闭后无法继续统计您的步数数据");
+            Toast.makeText(mContext, "您已开启UU运动", Toast.LENGTH_LONG).show();
+            initListener();
         } else {
             totalStepsTv.setText("0");
             supportTv.setVisibility(View.VISIBLE);

WeiChat/src/main/res/layout/activity_newstep.xml

@@ -174,7 +174,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="该设备不支持计步"
+            android:text="设该备不支持UU计步,抱歉"
             android:textColor="@color/red"/>
 
     </LinearLayout>