From 62437564af241b85c5d0049b4fe4f747d8b092cb Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Wed, 13 May 2020 17:01:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E4=B8=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/home/fragment/HomeDynamicFragment.java | 13 ++++--------- .../erban/home/fragment/HomeTabHomeFragment.java | 6 +++++- .../ui/login/fragment/AddUserInfoFragment.java | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java index f8ed3e530..db92ec268 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java @@ -3,30 +3,25 @@ package com.yizhuan.erban.home.fragment; import android.annotation.SuppressLint; import android.graphics.Rect; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import android.os.Handler; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.coorchice.library.utils.LogUtils; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.home.adapter.HomeDynamicAdapter; import com.yizhuan.erban.home.bean.HomeDynamicInfo; - -import com.yizhuan.erban.home.bean.HomeTabMapInfo; import com.yizhuan.erban.home.event.HomeDynamicEvent; import com.yizhuan.erban.home.event.RefreshHomeDataEvent; import com.yizhuan.erban.home.model.HomeModel; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.LogUtil; import com.yizhuan.xchat_android_library.utils.SizeUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java index d4b07bab9..62819c2a8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java @@ -76,7 +76,7 @@ public class HomeTabHomeFragment extends LazyLoadFragment { @Override public void onPause() { super.onPause(); - stopTimer(); +// stopTimer(); } private void stopTimer(){ @@ -84,6 +84,10 @@ public class HomeTabHomeFragment extends LazyLoadFragment { runnable = null; } + @Override + public void onResume() { + super.onResume(); + } @Override public int getRootLayoutId() { diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java index a2e9bd0f6..27160ff12 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java @@ -94,7 +94,7 @@ public class AddUserInfoFragment extends BaseFragment String avatarUrlWX = thirdUserInfo.getUserIcon(); String nick = thirdUserInfo.getUserName(); String str_gender = thirdUserInfo.getUserGender()==null?"":thirdUserInfo.getUserGender(); - int gender = str_gender.equals("m")?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; + int gender = str_gender.equals("男")?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; commit(nick,avatarUrlWX,gender); }else { init(); From d452ca8569c831b643b3057d4e3d39d50a984e95 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Wed, 13 May 2020 17:26:56 +0800 Subject: [PATCH 2/2] Update AddUserInfoFragment.java --- .../yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java index 27160ff12..a2e9bd0f6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java @@ -94,7 +94,7 @@ public class AddUserInfoFragment extends BaseFragment String avatarUrlWX = thirdUserInfo.getUserIcon(); String nick = thirdUserInfo.getUserName(); String str_gender = thirdUserInfo.getUserGender()==null?"":thirdUserInfo.getUserGender(); - int gender = str_gender.equals("男")?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; + int gender = str_gender.equals("m")?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; commit(nick,avatarUrlWX,gender); }else { init();