功能开发:搜索页面

app/src/main/java/com/sheep/gamegroup/gaiban/mainpage/mine/MineFragment.java

@@ -1,9 +1,13 @@
 package com.sheep.gamegroup.gaiban.mainpage.mine;
 
+import android.graphics.Color;
 import android.os.Bundle;
 
 import androidx.core.widget.NestedScrollView;
 
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
@@ -11,15 +15,21 @@ import com.sheep.jiuyan.samllsheep.databinding.MineFragmentBinding;
 
 import java.util.Objects;
 
+import rx.functions.Action1;
+
 public class MineFragment extends BaseFragment {
+    private UserEntity userEntity;
+
     @Override
     public int getLayoutId() {
         return R.layout.mine_fragment;
     }
 
+    MineFragmentBinding binding;
+
     @Override
     public void onViewCreated() {
-        MineFragmentBinding binding = MineFragmentBinding.bind(Objects.requireNonNull(getView()));
+        binding = MineFragmentBinding.bind(Objects.requireNonNull(getView()));
         binding.scrollView.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
             if (scrollY > oldScrollY) {
             } else {
@@ -43,7 +53,28 @@ public class MineFragment extends BaseFragment {
         binding.lianxiKefu.setOnClickListener(v -> {
             //todo 这里是显示客服的对话框
         });
+        //todo 这里要判断是否登录
+        initUserInfo();
+
+    }
+
+    private void initUserInfo() {
+        CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
+            @Override
+            public void call(UserEntity userEntity) {
+                if (userEntity != null) {
+                    MineFragment.this.userEntity = userEntity;
+                    //3.4.5个人中心隐藏邀请码相关功能
+//             ivRedpackage.setVisibility(userEntity.isKfzsPackageUser() ? View.GONE : View.VISIBLE);
+                    initWidget();
+                }
+            }
+        });
+    }
 
+    private void initWidget() {
+        GlideImageLoader.setAvatar(binding.ivAvatar, userEntity.getAvatar(), Color.argb(128, 255, 255, 255));
+        binding.tvNickname.setText(userEntity.getNickname());
     }
 
     public static MineFragment newInstance() {

app/src/main/java/com/sheep/gamegroup/module/search/ActSearch.java

@@ -1,12 +1,13 @@
 package com.sheep.gamegroup.module.search;
 
-import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.kfzs.android.view.tag.FlowLayout;
 import com.kfzs.android.view.tag.TagAdapter;
 import com.kfzs.android.view.tag.TagFlowLayout;
@@ -50,8 +51,6 @@ public class ActSearch extends BaseContainerActivity {
     TagFlowLayout hotListLayout;
     @BindView(R.id.history_list_layout)
     TagFlowLayout historyListLayout;
-    @BindView(R.id.seperator)
-    View seperator;
     @BindView(R.id.frame_container)
     View frame_container;
 
@@ -146,6 +145,7 @@ public class ActSearch extends BaseContainerActivity {
                                 frame_container.setVisibility(View.INVISIBLE);
                             }
                         })
+                .setTitleBackgroud(this, R.color.white_light)
                 .setRightBtn(this, "搜索", 0,
                         v -> toSearchApp());
     }

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -3173,7 +3173,8 @@ public class CommonUtil {
 
     //检查粘贴板
     public void checkCopyText() {
-        boolean enableCheckCopyText = DataUtil.getAsBoolean(Config.KEY_ENABLE_CHECK_COPY_TEXT, Config.dvbEnableCheckCopyText());
+//        boolean enableCheckCopyText = DataUtil.getAsBoolean(Config.KEY_ENABLE_CHECK_COPY_TEXT, Config.dvbEnableCheckCopyText());
+        boolean enableCheckCopyText = true;
         if (!enableCheckCopyText) {
             LogUtil.println("checkCopyText", "closed");
             return;

app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchApp.java

@@ -1,19 +1,21 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.graphics.Color;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
-
 import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.absBase.IHomePageSearch;
 import com.sheep.gamegroup.model.entity.SearchAppRecord;
@@ -125,6 +127,9 @@ public class ActSearchApp extends BaseActivity {
                 .setRightBtn(this, "搜索", 0,
                         v -> toSearchApp())
                 .setShowOrHide(this, true);
+        Button rightButton = TitleBarUtils.getInstance().getRightBtn(this);
+        rightButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+        rightButton.setTextColor(Color.parseColor("#00C1F7"));
         search_app_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
@@ -143,7 +148,7 @@ public class ActSearchApp extends BaseActivity {
         //初始化搜索历史
         List<SearchAppRecord> newSgrList = MyDbManager.getInstance().getAllSearchAppRecord();
         ListUtil.addAll(allSearchRecordList, newSgrList);
-        Collections.sort(allSearchRecordList, (item1,item2) -> item2.getCount() - item1.getCount());
+        Collections.sort(allSearchRecordList, (item1, item2) -> item2.getCount() - item1.getCount());
         ListUtil.addAll(searchRecordList, allSearchRecordList, 10);
         for (SearchAppRecord item : allSearchRecordList) {
             searchRecordMap.put(item.getInput(), item);

app/src/main/java/com/sheep/gamegroup/view/activity/ActSetting.java

@@ -114,11 +114,8 @@ public class ActSetting extends BaseActivity {
         binding.abourtUsLayout.setOnClickListener(this::goAboutUs);
         binding.clearLayout.setOnClickListener(this::clearCache);
         binding.tvSubmit.setOnClickListener(this::loginOut);
-        binding.copyTextLayout.setOnClickListener(this::toggleCopyText);
-        binding.changeLayout.setOnClickListener(this::goVersionChange);
         binding.feedbackLayout.setOnClickListener(this::goFeedback);
         binding.checkUpgradeView.setOnClickListener(this::checkUpgrade);
-        binding.executeUpgradeBtn.setOnClickListener(this::checkUpgrade);
         binding.privacyPolicy.setOnClickListener(this::openPrivacyPolicy);
         binding.personAgreement.setOnClickListener(this::openPersonAgreement);
         binding.destroyAccount.setOnClickListener(this::goDestroyAccount);
@@ -127,7 +124,6 @@ public class ActSetting extends BaseActivity {
     @Override
     public void initData() {
         initCacheSize();
-        initCopyState();
         checkVersionUpgrade();
     }
 
@@ -142,17 +138,14 @@ public class ActSetting extends BaseActivity {
                         int versionCode = ApkUtils.getCurrentPkgVersionCode(ActSetting.this);
                         if (versionCode == version.getVersion_number()) {
                             ViewUtil.setText(binding.checkUpgradeView, "已经是最新版本: V" + ApkUtils.getCurrentPkgVersionName(ActSetting.this));
-                            ViewUtil.setVisibility(binding.executeUpgradeBtn, false);
                         } else {
                             ViewUtil.setText(binding.checkUpgradeView, "发现新版本: V" + version.getVersion_name());
-                            ViewUtil.setVisibility(binding.executeUpgradeBtn, true);
                         }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         ViewUtil.setText(binding.checkUpgradeView, "当前版本: V" + ApkUtils.getCurrentPkgVersionName(ActSetting.this));
-                        ViewUtil.setVisibility(binding.executeUpgradeBtn, false);
                     }
                 });
     }
@@ -176,7 +169,6 @@ public class ActSetting extends BaseActivity {
 
     private void toggleCopyText(View v) {
         boolean opened = DataUtil.toggleAsBoolean(Config.KEY_ENABLE_CHECK_COPY_TEXT, Config.dvbEnableCheckCopyText());
-        initCopyState();
         if (opened) {
             ViewUtil.showMsgDialog(activity, getString(R.string.copy_assistant_tip));
         }
@@ -227,8 +219,5 @@ public class ActSetting extends BaseActivity {
         binding.clearItemTv.setText(TextUtils.isEmpty(size) || TextUtils.equals("0K", size) ? "无需清理" : size);
     }
 
-    private void initCopyState() {
-        ViewUtil.setImageRes(binding.copyTextIv, DataUtil.getAsBoolean(Config.KEY_ENABLE_CHECK_COPY_TEXT, Config.dvbEnableCheckCopyText()) ? R.mipmap.toggle_open : R.mipmap.toggle_close);
-    }
 
 }

app/src/main/res/drawable/search_fdj.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M9.899,9.9m-4.596,4.596a6.5,6.5 94.627,1 1,9.192 -9.192a6.5,6.5 94.627,1 1,-9.192 9.192"
+      android:fillColor="#00000000"
+      android:strokeColor="#999999"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M14.495,14.496L16.97,16.971"
+      android:fillColor="#00000000"
+      android:strokeColor="#999999"/>
+</vector>

app/src/main/res/drawable/shape_white_solid_rectangle_15.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="15dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

app/src/main/res/drawable/shape_white_solid_rectangle_20.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

app/src/main/res/layout/act_search.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg"
+    android:background="@color/white_light"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
@@ -21,53 +21,57 @@
                 android:id="@+id/hot_search_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
+
                 <TextView
-                    android:text="大家都在搜"
-                    android:textColor="@color/gray_999"
-                    android:textSize="16sp"
-                    android:gravity="center_vertical"
                     android:layout_width="wrap_content"
+                    android:layout_height="50dp"
                     android:layout_marginLeft="16dp"
-                    android:layout_height="50dp" />
+                    android:gravity="center_vertical"
+                    android:text="大家都在搜"
+                    android:textColor="@color/text33"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
                 <ImageView
                     android:id="@+id/refresh_btn"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_alignParentRight="true"
                     android:padding="18dp"
                     android:src="@mipmap/ic_change_one"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp" />
+                    android:visibility="gone" />
+
                 <com.kfzs.android.view.tag.TagFlowLayout
                     android:id="@+id/hot_list_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="50dp"
-                    android:paddingBottom="30dp"></com.kfzs.android.view.tag.TagFlowLayout>
+                    android:paddingBottom="30dp" />
             </RelativeLayout>
-
-            <View android:id="@+id/seperator"
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:background="@color/gray_F0F0F0"></View>
             <RelativeLayout
                 android:id="@+id/history_search_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
+
                 <TextView
-                    android:text="历史搜索"
-                    android:textColor="@color/gray_999"
-                    android:textSize="16sp"
-                    android:gravity="center_vertical"
                     android:layout_width="wrap_content"
+                    android:layout_height="50dp"
                     android:layout_marginLeft="16dp"
-                    android:layout_height="50dp" />
+                    android:gravity="center_vertical"
+                    android:text="历史搜索"
+                    android:textColor="@color/text33"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
                 <ImageView
                     android:id="@+id/clear_btn"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_alignParentRight="true"
                     android:padding="18dp"
                     android:src="@mipmap/cross_delete"
-                    android:tint="@color/gray_999"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp" />
+                    android:tint="@color/gray_999" />
+
                 <com.kfzs.android.view.tag.TagFlowLayout
                     android:id="@+id/history_list_layout"
                     android:layout_width="match_parent"

app/src/main/res/layout/act_setting.xml

@@ -13,201 +13,159 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/content_padding"
-            android:layout_marginBottom="@dimen/content_padding_15"
-            android:background="@color/white"
             android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/change_password_layout"
-                style="@style/style_item_container">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding"
+                android:layout_marginBottom="@dimen/content_padding_15"
+                android:background="@color/white"
+                android:orientation="vertical">
 
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="修改密码" />
+                <LinearLayout
+                    android:id="@+id/change_password_layout"
+                    style="@style/style_item_container">
 
-                <TextView style="@style/style_item_end_next" />
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="登录密码" />
 
-            </LinearLayout>
+                    <TextView style="@style/style_item_end_next" />
 
-            <View style="@style/style_item_line" />
+                </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/pay_pwd_layout"
-                style="@style/style_item_container">
+                <View style="@style/style_item_line" />
 
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="支付密码" />
+                <LinearLayout
+                    android:id="@+id/pay_pwd_layout"
+                    style="@style/style_item_container">
 
-                <TextView
-                    android:id="@+id/pay_pwd_flag"
-                    style="@style/style_item_label"
-                    android:gravity="right"
-                    android:text="已设置"
-                    android:textColor="@color/black_999999"
-                    android:textSize="12sp" />
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="支付密码" />
 
-                <TextView style="@style/style_item_end_next" />
-
-            </LinearLayout>
+                    <TextView
+                        android:id="@+id/pay_pwd_flag"
+                        style="@style/style_item_label"
+                        android:gravity="right"
+                        android:text="已设置"
+                        android:textColor="@color/black_999999"
+                        android:textSize="12sp" />
 
-            <View style="@style/style_item_line" />
+                    <TextView style="@style/style_item_end_next" />
 
-            <LinearLayout
-                android:id="@+id/copy_text_layout"
-                style="@style/style_item_container">
+                </LinearLayout>
 
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="@string/copy_assistant" />
+                <View style="@style/style_item_line" />
 
-                <ImageView
-                    android:id="@+id/copy_text_iv"
-                    android:layout_width="50dp"
-                    android:layout_height="30dp"
-                    android:src="@mipmap/toggle_open" />
+                <LinearLayout
+                    android:id="@+id/abourt_us_layout"
+                    style="@style/style_item_container">
 
-            </LinearLayout>
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="关于我们" />
 
+                    <TextView style="@style/style_item_end_next" />
 
-            <View style="@style/style_item_line" />
+                </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/clear_layout"
-                style="@style/style_item_container">
+                <View style="@style/style_item_line" />
 
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="清除缓存" />
+                <LinearLayout
+                    android:id="@+id/feedback_layout"
+                    style="@style/style_item_container">
 
-                <TextView
-                    android:id="@+id/clear_item_tv"
-                    style="@style/style_item_end"
-                    android:text="128MB" />
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="意见反馈" />
 
-            </LinearLayout>
+                    <TextView style="@style/style_item_end_next" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/content_padding"
-                android:background="@color/white_light"
-                android:minHeight="1px" />
+                </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/version_layout"
-                style="@style/style_item_container">
-
-                <TextView
-                    android:id="@+id/check_upgrade_view"
-                    style="@style/style_item_label"
-                    android:text="检查版本更新" />
-
-                <TextView
-                    android:id="@+id/execute_upgrade_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="26dp"
-                    android:background="@drawable/round_main_r25"
-                    android:gravity="center"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
-                    android:text="立即更新"
-                    android:textColor="@color/white"
-                    android:textSize="14sp"
-                    android:visibility="gone" />
+                <View style="@style/style_item_line" />
 
+                <LinearLayout
+                    android:id="@+id/destroy_account"
+                    style="@style/style_item_container">
 
-            </LinearLayout>
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="注销账号" />
 
-            <View style="@style/style_item_line" />
+                    <TextView style="@style/style_item_end_next" />
 
-            <LinearLayout
-                android:id="@+id/change_layout"
-                style="@style/style_item_container">
+                </LinearLayout>
 
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="新功能介绍" />
+                <View style="@style/style_item_line" />
 
-                <TextView style="@style/style_item_end_next" />
+                <LinearLayout
+                    android:id="@+id/clear_layout"
+                    style="@style/style_item_container">
 
-            </LinearLayout>
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="清除缓存" />
 
-            <View style="@style/style_item_line" />
+                    <TextView
+                        android:id="@+id/clear_item_tv"
+                        style="@style/style_item_end"
+                        android:text="128MB" />
 
-            <LinearLayout
-                android:id="@+id/abourt_us_layout"
-                style="@style/style_item_container">
+                </LinearLayout>
 
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="关于我们" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/content_padding"
+                    android:background="@color/white_light"
+                    android:minHeight="1px" />
+                <LinearLayout
+                    android:id="@+id/privacy_policy"
+                    style="@style/style_item_container">
 
-                <TextView style="@style/style_item_end_next" />
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="隐私政策" />
 
-            </LinearLayout>
+                    <TextView style="@style/style_item_end_next" />
 
-            <View style="@style/style_item_line" />
+                </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/privacy_policy"
-                style="@style/style_item_container">
+                <View style="@style/style_item_line" />
 
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="隐私政策" />
+                <LinearLayout
+                    android:id="@+id/person_agreement"
+                    style="@style/style_item_container">
 
-                <TextView style="@style/style_item_end_next" />
+                    <TextView
+                        style="@style/style_item_label"
+                        android:text="用户协议" />
 
-            </LinearLayout>
+                    <TextView style="@style/style_item_end_next" />
 
-            <View style="@style/style_item_line" />
-
-            <LinearLayout
-                android:id="@+id/person_agreement"
-                style="@style/style_item_container">
-
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="用户协议" />
-
-                <TextView style="@style/style_item_end_next" />
-
-            </LinearLayout>
-
-            <View style="@style/style_item_line" />
-
-            <LinearLayout
-                android:id="@+id/feedback_layout"
-                style="@style/style_item_container">
-
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="意见反馈" />
-
-                <TextView style="@style/style_item_end_next" />
+                </LinearLayout>
 
+                <View style="@style/style_item_line" />
             </LinearLayout>
 
-            <View style="@style/style_item_line" />
-
-            <LinearLayout
-                android:id="@+id/destroy_account"
-                style="@style/style_item_container">
-
-                <TextView
-                    style="@style/style_item_label"
-                    android:text="注销账号" />
-
-                <TextView style="@style/style_item_end_next" />
-
-            </LinearLayout>
-
-            <View style="@style/style_item_line" />
+            <TextView
+                android:id="@+id/check_upgrade_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="检查版本更新"
+                android:textColor="@color/text33"
+                android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/tv_submit"
-                style="@style/style_button"
+                style="@style/round_button_8_radius"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="70dp"
+                android:layout_marginEnd="20dp"
+                android:gravity="center"
                 android:text="退出登录" />
 
             <View

app/src/main/res/layout/keyword_label.xml

@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/user_label_tv"
-    style="@style/style_check_stroke3"
-    android:layout_marginLeft="12dp"
-    android:layout_marginTop="12dp"
-    android:text="小标签" />
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="4dp"
+    android:layout_marginTop="4dp"
+    android:layout_marginRight="4dp"
+    android:background="@drawable/shape_white_solid_rectangle_20"
+    android:gravity="center"
+    android:paddingStart="20dp"
+    android:paddingTop="4dp"
+    android:paddingEnd="20dp"
+    android:paddingBottom="4dp"
+    android:text="小标签"
+    android:textAlignment="center"
+    android:textColor="@color/text33"
+    android:textSize="14sp" />

app/src/main/res/layout/mine_fragment.xml

@@ -25,7 +25,7 @@
             android:layout_height="wrap_content">
 
             <ImageView
-                android:id="@+id/imageView5"
+                android:id="@+id/ivAvatar"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="68dp"
@@ -35,15 +35,15 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:id="@+id/textView2"
+                android:id="@+id/tvNickname"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:text="登录/注册"
                 android:textColor="#000000"
-                app:layout_constraintEnd_toEndOf="@+id/imageView5"
-                app:layout_constraintStart_toStartOf="@+id/imageView5"
-                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
+                app:layout_constraintEnd_toEndOf="@+id/ivAvatar"
+                app:layout_constraintStart_toStartOf="@+id/ivAvatar"
+                app:layout_constraintTop_toBottomOf="@+id/ivAvatar" />
 
             <LinearLayout
                 android:id="@+id/myDownload"
@@ -55,7 +55,7 @@
                 android:paddingTop="16dp"
                 android:paddingEnd="20dp"
                 android:paddingBottom="16dp"
-                app:layout_constraintTop_toBottomOf="@+id/textView2">
+                app:layout_constraintTop_toBottomOf="@+id/tvNickname">
 
                 <ImageView
                     android:layout_width="wrap_content"

app/src/main/res/layout/title.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/layout_navigationBar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="@color/white">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_navigationBar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="@color/white">
 
     <ImageView
         android:id="@+id/img_baseactivity_title"
@@ -11,11 +12,11 @@
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
         android:foreground="@drawable/selector_forground_circle_white"
-        tools:ignore="UnusedAttribute"
         android:gravity="center_vertical"
         android:minWidth="?attr/actionBarSize"
         android:scaleType="centerInside"
-        android:src="@drawable/narrow_back_black" />
+        android:src="@drawable/narrow_back_black"
+        tools:ignore="UnusedAttribute" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/title_tab"
@@ -46,20 +47,23 @@
         android:layout_width="match_parent"
         android:layout_height="30dp"
         android:layout_centerVertical="true"
-        android:layout_toEndOf="@+id/img_baseactivity_title"
         android:layout_marginRight="@dimen/view_size_60"
-        android:background="@drawable/shape_f5_solid_rectangle_15"
+        android:drawableLeft="@drawable/search_fdj"
+        android:layout_toEndOf="@+id/img_baseactivity_title"
+        android:background="@drawable/shape_white_solid_rectangle_15"
         android:drawablePadding="4dp"
         android:gravity="center|start"
-        android:visibility="gone"
         android:imeOptions="actionSearch"
         android:maxLength="40"
-        android:singleLine="true"
-        android:paddingEnd="6dp"
+        android:hint="123"
         android:paddingStart="6dp"
-        android:textColorHint="@color/G"
+        android:paddingEnd="6dp"
+        android:singleLine="true"
         android:textColor="@color/black_6_3"
-        android:textSize="14sp" />
+        android:textColorHint="@color/G"
+        android:textSize="14sp"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <!--右边按钮-->
 
@@ -78,41 +82,41 @@
             android:layout_height="@dimen/app_nav_toolbar_height"
             android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
-            android:foreground="@drawable/selector_forground_circle_white"
-            tools:ignore="UnusedAttribute"
             android:background="@color/translate"
+            android:foreground="@drawable/selector_forground_circle_white"
             android:gravity="center_vertical|end"
             android:lines="1"
             android:paddingStart="17dp"
             android:paddingEnd="17dp"
             android:textColor="@color/black_text_deep"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:ignore="UnusedAttribute" />
 
         <ImageView
             android:id="@+id/img_download_manager_dots"
             android:layout_width="6dp"
             android:layout_height="6dp"
             android:layout_alignParentRight="true"
-            android:foreground="@drawable/selector_forground_circle_white"
-            tools:ignore="UnusedAttribute"
             android:layout_marginTop="10dp"
             android:layout_marginRight="10dp"
+            android:foreground="@drawable/selector_forground_circle_white"
             android:src="@drawable/sp_dot_red"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:ignore="UnusedAttribute" />
     </RelativeLayout>
     <!--右边图片按钮-->
     <ImageButton
         android:id="@+id/ibtn_baseactivity_right"
         android:layout_width="?attr/actionBarSize"
         android:layout_height="match_parent"
-        android:foreground="@drawable/selector_forground_circle_white"
-        tools:ignore="UnusedAttribute"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:background="@color/translate"
+        android:foreground="@drawable/selector_forground_circle_white"
         android:gravity="center"
         android:minWidth="?attr/actionBarSize"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:ignore="UnusedAttribute" />
 
     <ImageButton
         android:id="@+id/ibtn_two_right"
@@ -120,28 +124,28 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:foreground="@drawable/selector_forground_circle_white"
-        tools:ignore="UnusedAttribute"
         android:layout_marginEnd="40dp"
         android:background="@color/translate"
+        android:foreground="@drawable/selector_forground_circle_white"
         android:gravity="center"
         android:minWidth="?attr/actionBarSize"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:ignore="UnusedAttribute" />
 
     <TextView
         android:id="@+id/title_end_tv"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
+        android:foreground="@drawable/selector_forground_circle_white"
         android:gravity="center"
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
-        android:foreground="@drawable/selector_forground_circle_white"
-        tools:ignore="UnusedAttribute"
         android:text="发表"
-        android:visibility="gone"
         android:textColor="#ff2ebef2"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        android:visibility="gone"
+        tools:ignore="UnusedAttribute" />
 
     <include
         layout="@layout/title_bottom_line"