隐藏一会

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/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -81,11 +81,14 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))){
                             String save_address_result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("save_address_result", save_address_result);
-                            Toast.makeText(ct,"办公地址" + saved_num + "保存成功",Toast.LENGTH_SHORT).show();
-                            if (saved_num == address_names.size())
-                            {
-                                progressDialog.dismiss();
+                            for (int i = 1; i <= address_names.size(); i++) {
+                                if (saved_num == address_names.size())
+                                {
+                                    progressDialog.dismiss();
+                                }
+                                Toast.makeText(ct,"办公地址" + i + "保存成功",Toast.LENGTH_SHORT).show();
                             }
+
                             saved_num++;
                         }
                     }
@@ -100,7 +103,6 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
             }
         }
     };
-    private boolean first_address;
 
 
     @Override
@@ -168,7 +170,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
             public void onClick(View v) {
                 String[] distance = getResources().getStringArray(R.array.sign_distance);
                 int requestCode = SIGN_RANGE_REQUESTCODE;
-                doSelectTime(distance, requestCode);
+                doSelectRange(distance, requestCode);
             }
         });
 
@@ -177,7 +179,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
             public void onClick(View v) {
                 String[] distance = getResources().getStringArray(R.array.work_distance);
                 int requestCode = WORK_RANGE_REQUESTCODE;
-                doSelectTime(distance, requestCode);
+                doSelectRange(distance, requestCode);
             }
         });
         add_address.setOnClickListener(new View.OnClickListener() {
@@ -195,7 +197,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
         });
     }
 
-    private void doSelectTime(String[] distance,int requestCode) {
+    private void doSelectRange(String[] distance,int requestCode) {
        
         ArrayList<SelectBean> beans = new ArrayList<>();
         SelectBean bean = null;
@@ -208,7 +210,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity{
         Intent intent = new Intent(ct, SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putParcelableArrayListExtra("data", beans);
-        intent.putExtra("title", "选择时间");
+        intent.putExtra("title", "选择范围");
         startActivityForResult(intent, requestCode);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/basepedo/service/StepService.java

@@ -215,11 +215,11 @@ public class StepService extends Service implements SensorEventListener {
         startForeground(0, notification);
 
         nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-//        if (PreferenceUtils.getInt(this,MyPedometerActivity.UU_STEP_NOTICE) == 1){
+        if (PreferenceUtils.getInt(this,MyPedometerActivity.UU_STEP_NOTICE) == 1){
             nm.notify(R.string.app_name, notification);
-//        }else if(PreferenceUtils.getInt(this,MyPedometerActivity.UU_STEP_NOTICE) == 0){
-//            nm.cancelAll();
-//        }
+        }else if(PreferenceUtils.getInt(this,MyPedometerActivity.UU_STEP_NOTICE) == 0){
+            nm.cancelAll();
+        }
         try {
             unlock();
         }catch (SecurityException s){

WeiChat/src/main/java/com/xzjmyk/pm/basepedo/ui/MyPedometerActivity.java

@@ -19,9 +19,12 @@ import android.view.View;
 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.basepedo.config.Constant;
 import com.xzjmyk.pm.basepedo.service.StepService;
 import com.xzjmyk.pm.basepedo.slidinguppanel.SlidingUpPanelLayout;
@@ -123,8 +126,8 @@ public class MyPedometerActivity extends BaseActivity implements Handler.Callbac
         delayHandler = new Handler(this);
         setupService();
 
-//        PreferenceUtils.putInt(MyPedometerActivity.UU_STEP_NOTICE, 0);
-//        PushManager.resumeWork(MyApplication.getInstance());
+        PreferenceUtils.putInt(MyPedometerActivity.UU_STEP_NOTICE, 0);
+        PushManager.resumeWork(MyApplication.getInstance());
     }
 
     private void dataEvent() {

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

@@ -16,7 +16,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        >
         <ImageView
             android:id="@+id/head_background_im"
             android:layout_width="match_parent"