From 3f413ba8e318a5172d632502a671d073b85d80aa Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Thu, 28 May 2020 16:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9DH5=EF=BC=8C=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E6=88=BF=E9=97=B4=E6=98=BE=E7=A4=BA=E9=93=AD=E7=89=8C?=
 =?UTF-8?q?=EF=BC=8C=E5=85=85=E5=80=BC=E9=A1=B5=E9=BB=98=E8=AE=A4=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=80=E4=B8=AA=E9=87=91=E9=A2=9D=EF=BC=8C=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=AF=A6=E6=83=85=E5=A4=B4=E9=A5=B0=E5=8A=A8=E6=95=88?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 12 +++----
 .../erban/avroom/widget/MessageView.java      | 33 +++++++++++++------
 .../yizhuan/erban/ui/pay/ChargeActivity.java  |  2 +-
 .../erban/ui/widget/SuperEditText.java        | 13 ++++++++
 app/src/main/res/drawable/color_cursor.xml    |  5 +++
 .../main/res/layout/activity_modify_pwd.xml   |  2 +-
 .../main/res/layout/fragment_game_home.xml    |  4 +--
 app/src/main/res/layout/layout_edit_eyes.xml  |  2 +-
 app/src/main/res/values/styles.xml            |  1 +
 .../dynamic/view/DynamicDetailActivity.java   | 10 ++++--
 10 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/drawable/color_cursor.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50e2a24f5..b5c3db1fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -364,12 +364,12 @@
                 android:resource="@xml/provider_paths" />
         </provider> <!-- 支付宝支付需要注册 -->
         <!--   注释这个声明，禁用支付宝h5支付     -->
-        <!--        <activity-->
-        <!--            android:name="com.alipay.sdk.app.H5PayActivity"-->
-        <!--            android:configChanges="orientation|keyboardHidden|navigation|screenSize"-->
-        <!--            android:exported="false"-->
-        <!--            android:screenOrientation="behind"-->
-        <!--            android:windowSoftInputMode="adjustResize|stateHidden" />-->
+                <activity
+                    android:name="com.alipay.sdk.app.H5PayActivity"
+                    android:configChanges="orientation|keyboardHidden|navigation|screenSize"
+                    android:exported="false"
+                    android:screenOrientation="behind"
+                    android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name="com.alipay.sdk.auth.AuthActivity"
             android:configChanges="orientation|keyboardHidden|navigation"
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
index 593b1d9e3..a8e8da14b 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
@@ -982,8 +982,14 @@ public class MessageView extends FrameLayout {
 
         private void setGameAiEnterMsg(ChatRoomMessage chatRoomMessage, TextView tvContent) {
             GameAttachment attachment = (GameAttachment) chatRoomMessage.getAttachment();
-            SpannableBuilder text = new SpannableBuilder(tvContent)
-                    .append(attachment.getGameInfo().nick, new ForegroundColorSpan(roomTipColor))
+            SpannableBuilder text = new SpannableBuilder(tvContent);
+            String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage);
+            String tvNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_WORD, chatRoomMessage);
+            if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己
+                text.appendBgAndContent(ivNamePlate, tvNamePlate, SizeUtils.dp2px(tvContent.getContext(), 62),
+                        SizeUtils.dp2px(tvContent.getContext(), 17));
+            }
+            text.append(attachment.getGameInfo().nick, new ForegroundColorSpan(roomTipColor))
                     .append(" 进入了房间 ", new ForegroundColorSpan(greyColor));
             tvContent.setText(text.build());
         }
@@ -1564,8 +1570,8 @@ public class MessageView extends FrameLayout {
             String tvOfficialMask = NobleUtil.getLevel(UserInfo.OAC_NAME, chatRoomMessage);
             String ivOfficialMask = NobleUtil.getLevel(UserInfo.OAC_ICON, chatRoomMessage);
             if (!TextUtils.isEmpty(tvOfficialMask) && !TextUtils.isEmpty(ivOfficialMask) && extension != null) { // extension != null 表示自己
-                text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 59),
-                        SizeUtils.dp2px(tvContent.getContext(), 15));
+                text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 62),
+                        SizeUtils.dp2px(tvContent.getContext(), 17));
             }
 
             //等级
@@ -1575,7 +1581,7 @@ public class MessageView extends FrameLayout {
             String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage);
             if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己
                 text.appendBgAndContent(ivNamePlate, tvNamePlate, SizeUtils.dp2px(tvContent.getContext(), 62),
-                        SizeUtils.dp2px(tvContent.getContext(), 15));
+                        SizeUtils.dp2px(tvContent.getContext(), 17));
             }
             text.append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(greyColor))
                     .append("：" + chatRoomMessage.getContent(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
@@ -1957,11 +1963,18 @@ public class MessageView extends FrameLayout {
                     .append(isOfficial ? ResourcesCompat.getDrawable(getResources(),
                             R.mipmap.ic_user_official_13dp, null) : null,
                             badgeWidth, badgeHeight)
-                    .append(newUser ? Constants.NEW_USER_ICON : "", badgeWidth, badgeHeight)
+                    .append(newUser ? Constants.NEW_USER_ICON : "", badgeWidth, badgeHeight);
                     //2018.12.24 @测试 陈陈琳，进房不显示贵族勋章
 //                    .append(NobleUtil.getLocalResourcePath(userBadge), badgeWidth, badgeHeight)
 //                    .append(userLevel, expLevelWidth, expLevelHeight)
-                    .append(senderNick, new ForegroundColorSpan(roomTipColor),
+
+            String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage);
+            String tvNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_WORD, chatRoomMessage);
+            if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己
+                text.appendBgAndContent(ivNamePlate, tvNamePlate, SizeUtils.dp2px(tvContent.getContext(), 62),
+                        SizeUtils.dp2px(tvContent.getContext(), 17));
+            }
+                    text.append(senderNick, new ForegroundColorSpan(roomTipColor),
                             new OriginalDrawStatusClickSpan() {
                                 @Override
                                 public void onClick(@NonNull View view) {
@@ -2164,8 +2177,8 @@ public class MessageView extends FrameLayout {
             String tvOfficialMask = NobleUtil.getLevel(UserInfo.OAC_NAME, chatRoomMessage);
             String ivOfficialMask = NobleUtil.getLevel(UserInfo.OAC_ICON, chatRoomMessage);
             if (!TextUtils.isEmpty(tvOfficialMask) && !TextUtils.isEmpty(ivOfficialMask) && extension != null) { // extension != null 表示自己
-                text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 59),
-                        SizeUtils.dp2px(tvContent.getContext(), 15));
+                text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 62),
+                        SizeUtils.dp2px(tvContent.getContext(), 17));
             }
 
 
@@ -2174,7 +2187,7 @@ public class MessageView extends FrameLayout {
             String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage);
             if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己
                 text.appendBgAndContent(ivNamePlate, tvNamePlate, SizeUtils.dp2px(tvContent.getContext(), 62),
-                        SizeUtils.dp2px(tvContent.getContext(), 15));
+                        SizeUtils.dp2px(tvContent.getContext(), 17));
             }
             text.append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()),
                             new ForegroundColorSpan(greyColor),
diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
index 8f75d615c..231571b23 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
@@ -262,7 +262,7 @@ public class ChargeActivity extends BaseActivity {
                     break;
                 }
             }
-            int selectedMoney = isExistOneYuan ? 1 : 48;
+            int selectedMoney = isExistOneYuan ? 1 : 6;
             for (int i = 0; i < chargeBeanList.size(); i++) {
                 ChargeBean chargeBean = chargeBeanList.get(i);
                 chargeBean.isSelected = chargeBean.getMoney() == selectedMoney;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java b/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java
index 007d85653..cfb4e0f9e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java
@@ -7,6 +7,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.text.InputType;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -66,6 +68,17 @@ public class SuperEditText extends FrameLayout {
         editText = findViewById(R.id.edit);
         editText.setHintTextColor(hintColor);
         editText.setTextColor(textColor);
+
+        editText.setCursorVisible(false);
+        editText.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (MotionEvent.ACTION_DOWN == event.getAction()) {
+                    editText.setCursorVisible(true);// 再次点击显示光标
+                }
+                return false;
+            }
+        });
         imageView = findViewById(R.id.iv_eyes);
         editText.setHint(hint);
         imageView.setOnClickListener(v -> {
diff --git a/app/src/main/res/drawable/color_cursor.xml b/app/src/main/res/drawable/color_cursor.xml
new file mode 100644
index 000000000..a38581641
--- /dev/null
+++ b/app/src/main/res/drawable/color_cursor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <size android:width="0.5dp" />
+    <solid android:color="#30F4F4F4"  />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_modify_pwd.xml b/app/src/main/res/layout/activity_modify_pwd.xml
index 66f7a2aa2..98f372d41 100644
--- a/app/src/main/res/layout/activity_modify_pwd.xml
+++ b/app/src/main/res/layout/activity_modify_pwd.xml
@@ -67,7 +67,7 @@
                 android:textSize="@dimen/dp_14"
                 android:layout_marginStart="@dimen/dp_25"
                 android:layout_marginEnd="@dimen/dp_25"
-                android:theme="@style/common_edittext_style"
+                android:background="@null"
                 android:maxLength="16"
                 tools:ignore="SpUsage" />
 
diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml
index b570d0410..bfdd516b9 100644
--- a/app/src/main/res/layout/fragment_game_home.xml
+++ b/app/src/main/res/layout/fragment_game_home.xml
@@ -210,10 +210,10 @@
 
                     <!--                </com.google.android.material.appbar.AppBarLayout>-->
 
-                    <androidx.viewpager.widget.ViewPager
+                    <com.yizhuan.erban.ui.widget.ContentWrapViewPager
                         android:id="@+id/view_pager_bottom"
                         android:layout_width="match_parent"
-                        android:layout_height="900dp"
+                        android:layout_height="wrap_content"
                         app:layout_constraintBottom_toTopOf="@+id/view"
                         app:layout_constraintTop_toBottomOf="@id/fl_indicator"
                         />
diff --git a/app/src/main/res/layout/layout_edit_eyes.xml b/app/src/main/res/layout/layout_edit_eyes.xml
index 7cbcf6241..8799cde2b 100644
--- a/app/src/main/res/layout/layout_edit_eyes.xml
+++ b/app/src/main/res/layout/layout_edit_eyes.xml
@@ -31,7 +31,7 @@
             android:textColor="@color/color_333333"
             android:textColorHint="@color/color_b3b3b3"
             android:textSize="@dimen/dp_14"
-            android:theme="@style/common_edittext_style"
+            android:background="@null"
             android:maxLength="16"
             tools:ignore="SpUsage" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f2c420cf0..67c95355f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -511,6 +511,7 @@
     <style name="common_edittext_style" parent="Theme.AppCompat.Light">
         <item name="colorControlNormal">#30F4F4F4</item>
         <item name="colorControlActivated">#30F4F4F4</item>
+        <item name="cursorColor">#30F4F4F4</item>
     </style>
 
     <style name="common_login_edit_style" parent="Theme.AppCompat.Light">
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
index a28664e12..e3ba64a7a 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
@@ -763,13 +763,17 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
         updateCommentCount();
 
         //头饰 贵族头饰
-        GlideApp.with(ivHeadWear.getContext()).clear(ivHeadWear);
+        String headwearEffect = bean.getHeadwearEffect();
         String headwearPic = bean.getHeadwearPic();
         String micDecorate = bean.getMicDecorate();
-        if (!TextUtils.isEmpty(headwearPic)) {
+        if (!TextUtils.isEmpty(headwearEffect)){
+            NobleUtil.loadHeadWear(headwearEffect, ivHeadWear);
+        } else if (!TextUtils.isEmpty(headwearPic)) {
             NobleUtil.loadHeadWear(headwearPic, ivHeadWear);
-        } else if (!TextUtils.isEmpty(micDecorate)) {
+        } else if (!TextUtils.isEmpty(micDecorate)){
             NobleUtil.loadResource(micDecorate, ivHeadWear);
+        } else {
+            ivHeadWear.setImageDrawable(null);
         }
 
         View.OnClickListener infoListener = v -> {