UU运动初步调试备份，下步开始手动关闭UU互动在不杀死uu前提下

WeiChat/src/main/java/basepedo/service/StepService.java

@@ -98,7 +98,7 @@ public class StepService extends Service implements SensorEventListener {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         initTodayData();
-        updateNotification("今日步数：" + (int)StepDcretor.CURRENT_SETP + " 步");
+        updateNotification("今日步数：" + StepDcretor.CURRENT_SETP + " 步");
         return START_STICKY;
     }
 

WeiChat/src/main/java/basepedo/ui/MyPedometerActivity.java

@@ -12,7 +12,10 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
@@ -48,13 +51,23 @@ public class MyPedometerActivity extends BaseActivity implements Handler.Callbac
 
         }
     };
+    private Button close_step;
 
     @Override
     public boolean handleMessage(Message msg) {
         switch (msg.what) {
             case Constant.MSG_FROM_SERVER:
                 // 更新界面上的步数
-                text_step.setText(msg.getData().getInt("step") + "\t步");
+                int step_num = msg.getData().getInt("step");
+                if (step_num < 9000){
+                    text_step.setText("今天的你已经走了"+ step_num + "\t步，继续努力!");
+                }else if (step_num < 10000 && step_num >= 9000){
+                    text_step.setText("今天的你已经走了"+ step_num + "\t步，加油，快到10000步了!");
+                }else if (step_num > 10000 && step_num <=20000){
+                    text_step.setText("今天的你已经走了"+ step_num + "\t步，真棒!");
+                }else {
+                    text_step.setText("今天的你已经走了"+ step_num + "\t步，太棒了!天呐，你一定是用了洪荒之力吧，注意休息哦!");
+                }
                 delayHandler.sendEmptyMessageDelayed(Constant.REQUEST_SERVER, TIME_INTERVAL);
                 break;
             case Constant.REQUEST_SERVER:
@@ -76,10 +89,23 @@ public class MyPedometerActivity extends BaseActivity implements Handler.Callbac
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pedometer);
         init();
+        Toast.makeText(MyPedometerActivity.this, "您已开启UU运动，UU将记录您的运动步数并告知在通知栏", Toast.LENGTH_LONG).show();
+
     }
     private void init() {
         text_step = (TextView) findViewById(R.id.text_step);
+        close_step = (Button) findViewById(R.id.close_uu_step_bt);
         delayHandler = new Handler(this);
+
+        close_step.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+//                stopService(new Intent(mContext, StepService.class));
+//                onDestroy();
+//                Toast.makeText(MyPedometerActivity.this, "您已关闭UU运动，消息栏将不再显示您的运动步数", Toast.LENGTH_LONG).show();
+                ToastMessage("该功能尚未完善");
+            }
+        });
     }
 
     @Override
@@ -109,6 +135,7 @@ public class MyPedometerActivity extends BaseActivity implements Handler.Callbac
     protected void onDestroy() {
         super.onDestroy();
         unbindService(conn);
+        finish();
     }
 
     @Override

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

@@ -1,25 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin">
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="测试须知"
+        android:layout_gravity="center_horizontal"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="计步功能：暂时只测试了放在裤子口袋里计步，晃动幅度判断"
+        />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="计步功能：暂时只测试了放在裤子口袋里计步。
-屏蔽功能：连续运动一定时间才开始计步，屏蔽细微移动或者驾车时震动所带来的干扰。
-停止运动超过5秒，便重新开启屏蔽功能。提示：10秒做一次数据存储"
+        android:text="屏蔽功能：连续运动一定时间才开始计步，屏蔽细微移动或者驾车时震动所带来的干扰，停止运动超过5秒，便重新开启屏蔽功能"
         />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="通知栏提醒：, 后面是微动次数不算步数的,目前只是为了方便测试"
+        />
+
     <TextView
         android:id="@+id/text_step"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#000000"
+        android:textColor="#00cc00"
         android:layout_centerInParent="true"
-        android:textSize="30sp" />
+        android:textSize="20sp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="200dp"
+        />
+    <Button
+        android:id="@+id/close_uu_step_bt"
+        style="@style/from_button_base_bule"
+        android:layout_marginTop="60dp"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
+        android:text="关闭UU运动" />
 
-</RelativeLayout>
+</LinearLayout>