设置栏uu运动开关，已经基本稳定；下一步规划完善UU运动主页，仿微信

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -195,7 +195,7 @@ public class StepService extends Service implements SensorEventListener {
         PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
                 new Intent(this, MyPedometerActivity.class), 0);
         builder.setContentIntent(contentIntent);
-        builder.setSmallIcon(R.drawable.icon_crm_links);
+        builder.setSmallIcon(R.drawable.uuu);
         builder.setTicker("UU运动");
         builder.setContentTitle("UU运动");
         //设置不可清除

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

@@ -56,7 +56,10 @@ public class MyPedometerActivity extends BaseActivity implements Handler.Callbac
             case Constant.MSG_FROM_SERVER:
                 // 更新界面上的步数
                 int step_num = msg.getData().getInt("step");
-                if (step_num < 3000){
+                if (step_num < 2000){
+                    text_step.setText("今天的你已经走了"+ step_num + "\t步，继续锻炼运动喔!");
+                }
+                else if (step_num < 3000 && step_num >= 2000){
                     text_step.setText("今天的你已经走了"+ step_num + "\t步，还不错!继续努力!");
                 }else if (step_num < 6000 && step_num >= 3000){
                     text_step.setText("今天的你已经走了"+ step_num + "\t步，加油!快到6000步了!");

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

@@ -414,6 +414,11 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         if (isPush == 0) {
             PushManager.stopWork(this);
         }
+        // TODO 判断上一个状态UU运动是否已关闭
+        int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
+        if (isUUStep == 1){
+            startService(new Intent(mContext,StepService.class));
+        }
         //TODO 发布版本关闭
         if (AppConfig.COMPANY){
 //            startService(new Intent(this, AlarmService.class));

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

@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -60,7 +61,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 
     @ViewInject(R.id.uu_step_rl)
     private RelativeLayout uu_step_rl;
-
+    @ViewInject(R.id.uu_step_im)
+    private ImageView uu_step_im;
     @ViewInject(R.id.uu_step_reply)
     private  SwitchView uu_step_reply;
 
@@ -133,13 +135,11 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         uas_website_tv.setText(CommonUtil.getSharedPreferences(this, "erp_baseurl"));
 
 
-        //UU开关的根据StepService是否开启显示状态
+        //UU开关的 根据StepService是否开启显示状态
         int isStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
 
-        if (isServiceRunning(uustep_service_name)){
+        if (isServiceRunning(uustep_service_name)&&(isStep == -1 || isStep == 1)){
             uu_step_reply.setChecked(true);
-            uu_step_reply.setFocusable(false);
-            uu_step_reply.setClickable(false);
         }else {
             uu_step_reply.setChecked(false);
         }
@@ -150,8 +150,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 if (isChecked) {
                     PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
                     PushManager.resumeWork(MyApplication.getInstance());
-                    uu_step_reply.setFocusable(false);
-                    uu_step_reply.setClickable(false);
+                    Toast.makeText(mContext, "您已开启UU运动", Toast.LENGTH_LONG).show();
                     startActivity(new Intent(mContext, MyPedometerActivity.class));
                 } else {
                     PushManager.stopWork(MyApplication.getInstance());
@@ -174,7 +173,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         });
     }
 
-    private boolean isServiceRunning(String servicename) { //判断某个服务是否已经运行
+    private boolean isServiceRunning(String servicename) { // 判断某个服务是否已经运行
         ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
         for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
             if (servicename.equals(service.service.getClassName())) {

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

@@ -65,8 +65,18 @@
                     android:gravity="center"
                     android:text=" UU 运动"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                   />
 
+                <ImageView
+                    android:id="@+id/uu_step_im"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/uu_step"
+                    android:layout_toRightOf="@+id/uu_step_text"
+                    android:layout_centerVertical="true"
+                    android:visibility="gone"
+                    />
                 <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
                     android:id="@+id/uu_step_reply"
                     android:layout_width="40dp"