修改朋友数据库

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

@@ -216,9 +216,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             else if (checkedId == R.id.main_tab_five) {
                 if (mMeFragment == null) {
                     mMeFragment = new MeFragment();
-                    if (isUnReadWork){
-                        mMeFragment.setChangerRemain(false);
-                    }
                 }
                 changeFragment(mMeFragment, TAG_ME);//我
                 getSupportActionBar().setTitle(R.string.me);

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

@@ -134,6 +134,8 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         super.onDestroy();
     }
 
+    boolean isRetuen = false;
+
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
@@ -187,6 +189,7 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (0x21 == requestCode) {
+            isRetuen = true;
             if (resultCode == LocationMapActivity.REQUCODE) {
                 PoiInfo info = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
                 if (info != null) {
@@ -225,8 +228,8 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     private void initview() {
         num_tv.setOnClickListener(this);
         date_tv.setText(TimeUtils.day_long_2_str(System.currentTimeMillis()) +
-                  " " + TimeUtils.getWeek(System.currentTimeMillis()) +
-                  " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
+                " " + TimeUtils.getWeek(System.currentTimeMillis()) +
+                " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
         num_tv.setText("" + sigNum);
         String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);
@@ -246,7 +249,8 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
             public void result(boolean isOk) {
                 int resultCode = MyApplication.getInstance().getBdLocationHelper().getResultCode();
                 if (isOk) {
-                    setLocation();
+                    if (!isRetuen)
+                        setLocation();
                 } else {
                     if (resultCode == 62) {
                         Crouton.makeText(ct, "定位失败，请查看是否开启定位权限", 2000);

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

@@ -612,7 +612,6 @@ public class ViewUtil {
                     }
                     if (!params.containsKey("master")) {
                         params.put("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
-
                     }
                     if (!params.containsKey("sessionUser"))
                         params.put("sessionUser", CommonUtil.getSharedPreferences(ct, "erp_username"));

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

@@ -209,7 +209,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         if (createView) {
             setHasOptionsMenu(true);
             initView();
-//            CrashReport.testJavaCrash();
+            iv_remain.setVisibility(MainActivity.isUnReadWork ? View.GONE : View.VISIBLE);
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/nearby/UserListActivity.java

@@ -89,15 +89,15 @@ public class UserListActivity extends BaseActivity {
                 startActivity(intent);
             }
         });
-
         requestData(true);
     }
 
     private void requestData(final boolean isPullDwonToRefersh) {
         if (isPullDwonToRefersh) {
             mPageIndex = 0;
+        } else {
+            mPageIndex++;
         }
-
         HashMap<String, String> params = new HashMap<String, String>();
         params.put("pageIndex", String.valueOf(mPageIndex));
         params.put("pageSize", String.valueOf(AppConfig.PAGE_SIZE));
@@ -105,7 +105,7 @@ public class UserListActivity extends BaseActivity {
         if (!TextUtils.isEmpty(mKeyWord)) {
             params.put("nickname", mKeyWord);
         }
-        if (mSex !=2) {
+        if (mSex != 2) {
             params.put("sex", String.valueOf(mSex));
         }