From cfd198b4ab8fc129d0cb899c33c819df20e1bf6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Fri, 10 Jan 2020 11:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.7.2=20RE?=
 =?UTF-8?q?LEASE(20200107-1830)=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=206=20https://gitlab.ghzs.com/pm/halo-app-is?=
 =?UTF-8?q?sues/issues/752?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gamecenter/personal/PersonalFragment.java | 24 ++++++++++---------
 app/src/main/res/layout/fragment_personal.xml | 21 ++++++++++++----
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
index 057f6f68f7..5a7e4f58e8 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
@@ -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("我的光环_新", "徽章中心", "进入徽章中心");
diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml
index 8f9acae941..256deda623 100644
--- a/app/src/main/res/layout/fragment_personal.xml
+++ b/app/src/main/res/layout/fragment_personal.xml
@@ -163,13 +163,24 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="50dp"
                 app:layout_collapseMode="pin"
-                app:navigationIcon="@null">
+                app:navigationIcon="@null"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin">
+
+                <com.gh.common.view.StatusBarView
+                    android:id="@+id/statusBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="50dp">
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/statusBar">
 
                     <com.facebook.drawee.view.SimpleDraweeView
                         android:id="@+id/personal_user_small_icon"
@@ -238,7 +249,7 @@
                             android:visibility="gone" />
                     </RelativeLayout>
                 </RelativeLayout>
-            </androidx.appcompat.widget.Toolbar>
+            </RelativeLayout>
         </com.gh.common.view.ScrimAwareCollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -257,4 +268,4 @@
             android:layout_marginRight="20dp"
             android:overScrollMode="never" />
     </RelativeLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file