Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

光环助手V3.7.2 RELEASE(20200107-1830)测试问题汇总 6 https://gitlab.ghzs.com/pm/halo-app-issues/issues/752

Browse Source
This commit is contained in:
张玉久
2020-01-10 11:24:56 +08:00
parent 6b777d4ec8
commit cfd198b4ab
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
View File

@ -8,6 +8,7 @@ import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
@ -28,7 +29,6 @@ import com.gh.common.util.LoginHelper;
import com.gh.common.util.MtaHelper;
import com.gh.common.util.PackageUtils;
import com.gh.common.util.StringUtils;
import com.gh.common.view.ScrimAwareCollapsingToolbarLayout;
import com.gh.gamecenter.GameDetailActivity;
import com.gh.gamecenter.MainActivity;
import com.gh.gamecenter.MessageActivity;
@ -97,8 +97,6 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
@BindView(R.id.appbar)
AppBarLayout appbar;
@BindView(R.id.collapsingToolbar)
ScrimAwareCollapsingToolbarLayout collapsingToolbar;
@BindView(R.id.toolbar)
Toolbar toolbar;
@BindView(R.id.personal_sign)
@ -247,12 +245,14 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
int padding = Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT ? 0 : DisplayUtils.getStatusBarHeight(getResources());
toolbar.setPadding(0, padding, 0, 0);
int statusBarHeight = Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT ? 0 : DisplayUtils.getStatusBarHeight(getResources());
ViewGroup.LayoutParams params = toolbar.getLayoutParams();
params.height = DisplayUtils.dip2px(50) + statusBarHeight;
toolbar.setLayoutParams(params);
appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
int absOffset = Math.abs(verticalOffset);
int invisibleOffset = DisplayUtils.dip2px(30F);
int invisibleOffset = DisplayUtils.dip2px(40F);
if (absOffset <= invisibleOffset) {
mUserIconSmall.setVisibility(View.GONE);
mPersonalUserNameSmall.setVisibility(View.GONE);
@ -366,7 +366,7 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
MtaHelper.onEvent("我的光环", "个人中心");
MtaHelper.onEvent("我的光环_新", "头像", "点击头像");
//startActivity(UserInfoActivity.getIntent(getContext()));
DirectUtils.directToHomeActivity(getContext(), UserManager.getInstance().getUserId(), "", "我的光环");
DirectUtils.directToHomeActivity(requireContext(), UserManager.getInstance().getUserId(), "", "我的光环");
} else {
MtaHelper.onEvent("我的光环", "手机登录");
CheckLoginUtils.checkLogin(getContext(), "我的光环-手机登录", null);
@ -378,7 +378,7 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
MtaHelper.onEvent("我的光环", "个人中心");
MtaHelper.onEvent("我的光环_新", "昵称", "点击昵称");
//startActivity(UserInfoActivity.getIntent(getContext()));
DirectUtils.directToHomeActivity(getContext(), UserManager.getInstance().getUserId(), "", "我的光环");
DirectUtils.directToHomeActivity(requireContext(), UserManager.getInstance().getUserId(), "", "我的光环");
} else {
MtaHelper.onEvent("我的光环", "手机登录");
CheckLoginUtils.checkLogin(getContext(), "我的光环-手机登录", null);
@ -386,11 +386,13 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
break;
case R.id.iv_arrow:
case R.id.personal_home:
CheckLoginUtils.checkLogin(getContext(), "我的光环-个人主页", () -> {
if (mUserInfoEntity != null) {
MtaHelper.onEvent("我的光环", "个人主页");
MtaHelper.onEvent("我的光环_新", "个人主页", "进入个人主页");
DirectUtils.directToHomeActivity(getContext(), UserManager.getInstance().getUserId(), "", "我的光环");
});
DirectUtils.directToHomeActivity(requireContext(), UserManager.getInstance().getUserId(), "", "我的光环");
} else {
CheckLoginUtils.checkLogin(getContext(), "我的光环-个人主页", null);
}
break;
case R.id.personal_badge:
MtaHelper.onEvent("我的光环_新", "徽章中心", "进入徽章中心");