1、集成最新版本百度云推送

2、修改通讯录页面刷新头样式

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="71"
-    android:versionName="5.5.7">
+    android:versionCode="73"
+    android:versionName="5.5.9">
 
     <uses-sdk
         android:minSdkVersion="11"

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -42,7 +42,7 @@ public class BdLocationHelper {
         mLocationClient.registerLocationListener(mMyLocationListener); // 注册监听函数
         LocationClientOption option = new LocationClientOption();
         option.setLocationMode(LocationClientOption.LocationMode.Hight_Accuracy);//可选，默认高精度，设置定位模式，高精度，低功耗，仅设备
-        option.setCoorType("bd09ll");//可选，默认gcj02，设置返回的定位结果坐标系
+        option.setCoorType("bd0911");//可选，默认gcj02，设置返回的定位结果坐标系
         option.setScanSpan(5000);// 设置发起定位请求的间隔时间为10s;//可选，默认0，即仅定位一次，设置发起定位请求的间隔需要大于等于1000ms才是有效的
         option.setIsNeedAddress(true);//可选，设置是否需要地址信息，默认不需要
         option.setOpenGps(true);//可选，默认false,设置是否使用gps

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/BaseInfoActivity.java

@@ -66,6 +66,8 @@ import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 
+import static com.xzjmyk.pm.activity.R.id.me_nickname_tv;
+
 /**
  * 个人资料页面
  */
@@ -73,7 +75,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
 
     @ViewInject(R.id.me_heard_tv)
     private ImageView iv_headImage;
-    @ViewInject(R.id.me_nickname_tv)
+    @ViewInject(me_nickname_tv)
     private TextView tv_nickname;
     @ViewInject(R.id.me_sex_tv)
     private TextView tv_sex;
@@ -152,6 +154,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
 
     public void initData() {
         // clone一份临时数据，用来存数变化的值，返回的时候对比有无变化
+        tv_nickname.setText(MyApplication.getInstance().mLoginUser.getNickName());
         try {
             mTempData = (User) mUser.clone();
         } catch (CloneNotSupportedException e) {
@@ -173,10 +176,10 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         String whichsys = CommonUtil.getSharedPreferences(this, "erp_master");
         List<EmployeesEntity> entities = dbManager.select_getEmployee(new String[]{userId, whichsys}, "em_imid=? and whichsys=?");
         if (ListUtils.isEmpty(entities)) {
-            tv_nickname.setText(mTempData.getNickName());
+//            tv_nickname.setText(mTempData.getNickName());
             mNickname = mTempData.getNickName();
         } else {
-            tv_nickname.setText(entities.get(0).getEM_NAME());
+//            tv_nickname.setText(entities.get(0).getEM_NAME());
             tv_name.setText(entities.get(0).getEM_NAME());
             tv_tel.setText(mTempData.getTelephone());
             tv_depart.setText(entities.get(0).getEM_DEFAULTORNAME());
@@ -184,14 +187,14 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             mNickname = entities.get(0).getEM_NAME();
         }
         // mNameEdit.setText(mTempData.getNickName());
-      
-        if(!StringUtils.isEmpty(Area.getCityAreaString(0, mTempData.getAreaId()))){
+
+        if (!StringUtils.isEmpty(Area.getCityAreaString(0, mTempData.getAreaId()))) {
             tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId())
                     + "-" + Area.getCityAreaString(0, mTempData.getAreaId()));
-        }else{
+        } else {
             tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()));
         }
-        if (Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()).contains("海外")){
+        if (Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()).contains("海外")) {
             tv_address.setText("海外");
         }
         AvatarHelper.getInstance().displayAvatar(mTempData.getUserId(), iv_headImage, true);
@@ -304,12 +307,12 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 Log.i(TAG, "onDateTimePicked:" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
                 GregorianCalendar calendar = new GregorianCalendar(Integer.parseInt(year), Integer.parseInt(month) - 1, Integer.parseInt(day));
-              
+
                 long currentTime = System.currentTimeMillis() / 1000;
                 long birthdayTime = calendar.getTime().getTime() / 1000;
                 if (birthdayTime > currentTime) {
                     ToastUtil.showToast(mContext, "亲!您的出生日期已经超过现在了哦!");
-                }else{
+                } else {
                     mTempData.setBirthday(TimeUtils.getSpecialBeginTime(tv_birthday, calendar.getTime().getTime() / 1000));
                     updateData();
                 }
@@ -387,13 +390,13 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                 // String country_name = data.getStringExtra(Constant.EXTRA_COUNTRY_NAME);
                 String province_name = data.getStringExtra(SelectAreaActivity.EXTRA_PROVINCE_NAME);
                 String city_name = data.getStringExtra(SelectAreaActivity.EXTRA_CITY_NAME);
-                String county_name=data.getStringExtra(SelectAreaActivity.EXTRA_COUNTY_NAME);
-                if (StringUtils.isEmpty(county_name)){
+                String county_name = data.getStringExtra(SelectAreaActivity.EXTRA_COUNTY_NAME);
+                if (StringUtils.isEmpty(county_name)) {
                     tv_address.setText(province_name + "-" + city_name);
-                }else{
-                    tv_address.setText(province_name + "-" + city_name+"-"+county_name);
+                } else {
+                    tv_address.setText(province_name + "-" + city_name + "-" + county_name);
                 }
-                if ("海外".equals(province_name)){
+                if ("海外".equals(province_name)) {
                     tv_address.setText(province_name);
                 }
                 LogUtil.d("省：" + provinceId + "市：" + cityId + "县：" + countryId);
@@ -401,13 +404,13 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                 mTempData.setProvinceId(provinceId);
                 mTempData.setCityId(cityId);
                 mTempData.setAreaId(countyId);
-                
+
                 updateData();//更新数据
             }
         } else if (requestCode == UPDATE_NICKNAME && data != null) {
             mNickname = data.getStringExtra("newnickname");
             if (mNickname != null) {
-                tv_nickname.setText(mNickname);
+//                tv_nickname.setText(mNickname);
                 mTempData.setNickName(mNickname);
                 updateData();
             }
@@ -464,7 +467,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(mConfig.USER_UPDATE, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                Log.i("gongepngming","arg0="+arg0.getMessage());
+                Log.i("gongepngming", "arg0=" + arg0.getMessage());
                 ProgressDialogUtil.dismiss(mProgressDialog);
                 ToastUtil.showErrorNet(BaseInfoActivity.this);
             }
@@ -563,8 +566,8 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                     BaseInfoActivity.this.sendBroadcast(intent);
                     AvatarHelper.getInstance().deleteAvatar(loginUserId);
                     ToastUtil.showToast(BaseInfoActivity.this, R.string.upload_avatar_success);
-                    mCurrentFile=null;
-                    mProgressDialog=null;
+                    mCurrentFile = null;
+                    mProgressDialog = null;
                 } else {
                     ToastUtil.showToast(BaseInfoActivity.this, R.string.upload_avatar_failed);
                 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmService.java

@@ -52,7 +52,7 @@ public class AlarmService extends Service {
 
     public void alarm() {
         ReckonAlarmTimeUtil util = new ReckonAlarmTimeUtil();
-        Map<String, Number> map = util.reckoAlarmAndAuto(getApplicationContext());
+        Map<String, Number> map = util.reckoAlarmAndAuto();
         if (map == null) return;
         long time = (long) map.get("time");
         int type = (int) map.get("type");//1 自动打卡 2.上班提醒  3.下班提醒

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/ReckonAlarmTimeUtil.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.util.alarm;
 
 import android.content.Context;
 
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 import com.xzjmyk.pm.activity.db.dao.SigninDao;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -17,28 +18,35 @@ import static com.xzjmyk.pm.activity.AppConfig.ALARMA_CLICK;
 import static com.xzjmyk.pm.activity.AppConfig.AUTO_SIGNIN;
 
 /**
+ * 计算提醒时间
  * Created by pengminggong on 2016/11/10.
  */
-
 public class ReckonAlarmTimeUtil {
 
 
-    public Map<String, Number> reckoAlarmAndAuto(Context ct) {
-        boolean isAlarm = CommonUtil.getSharedPreferencesBoolean(ct, ALARMA_CLICK, false);//是否自动打卡
-        boolean isAuto = CommonUtil.getSharedPreferencesBoolean(ct, AUTO_SIGNIN, false);//是否提醒
-        if (!isAlarm && !isAuto) {
+    /**
+     * @return map<String,Number> map
+     * type  1.自动打卡 2.上班提醒  3.下班提醒  4.远离办公地点
+     * time  提醒时间
+     */
+    public Map<String, Number> reckoAlarmAndAuto() {
+        boolean isAlarm = CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), ALARMA_CLICK, false);//是否自动打卡
+        boolean isAuto = CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), AUTO_SIGNIN, false);//是否提醒
+        if (!isAlarm && !isAuto)
             return null;
-        }
+
+
         Map<String, Number> map = new HashMap<>();
-        if (isAuto) {
+        if (isAuto) {//自动打卡
             map.put("type", 1);
-            long time = nextAuto(ct);
+            long time = nextAuto(MyApplication.getInstance());
             map.put("time", time);
             return map;
-        } else if (isAlarm) {
-            nextAlarm(ct, map);
+        } else if (isAlarm) {//提醒
+            nextAlarm(MyApplication.getInstance(), map);
             return map;
         }
+
         return null;
     }
 

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

@@ -182,7 +182,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             }
         }
     };
-    private SelectPicPopupWindow menuWindow;
 
     public MeFragment() {
     }