moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支付宝H5，进入房间显示铭牌，充值页默认选中一个金额，动态详情头饰动效，

Browse Source
This commit is contained in:
oujunhui
2020-05-28 16:47:49 +08:00
parent 18e07a6777
commit 3f413ba8e3
10 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/AndroidManifest.xml
View File

@@ -364,12 +364,12 @@
android:resource="@xml/provider_paths" /> android:resource="@xml/provider_paths" />
</provider> <!-- 支付宝支付需要注册 --> </provider> <!-- 支付宝支付需要注册 -->
<!-- 注释这个声明，禁用支付宝h5支付 --> <!-- 注释这个声明，禁用支付宝h5支付 -->
<!-- <activity--> <activity
<!-- android:name="com.alipay.sdk.app.H5PayActivity"--> android:name="com.alipay.sdk.app.H5PayActivity"
<!-- android:configChanges="orientation|keyboardHidden|navigation|screenSize"--> android:configChanges="orientation|keyboardHidden|navigation|screenSize"
<!-- android:exported="false"--> android:exported="false"
<!-- android:screenOrientation="behind"--> android:screenOrientation="behind"
<!-- android:windowSoftInputMode="adjustResize|stateHidden" />--> android:windowSoftInputMode="adjustResize|stateHidden" />
<activity <activity
android:name="com.alipay.sdk.auth.AuthActivity" android:name="com.alipay.sdk.auth.AuthActivity"
android:configChanges="orientation|keyboardHidden|navigation" android:configChanges="orientation|keyboardHidden|navigation"

33
app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
View File

@@ -982,8 +982,14 @@ public class MessageView extends FrameLayout {
private void setGameAiEnterMsg(ChatRoomMessage chatRoomMessage, TextView tvContent) { private void setGameAiEnterMsg(ChatRoomMessage chatRoomMessage, TextView tvContent) {
GameAttachment attachment = (GameAttachment) chatRoomMessage.getAttachment(); GameAttachment attachment = (GameAttachment) chatRoomMessage.getAttachment();
SpannableBuilder text = new SpannableBuilder(tvContent) SpannableBuilder text = new SpannableBuilder(tvContent);
.append(attachment.getGameInfo().nick, 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(attachment.getGameInfo().nick, new ForegroundColorSpan(roomTipColor))
.append(" 进入了房间 ", new ForegroundColorSpan(greyColor)); .append(" 进入了房间 ", new ForegroundColorSpan(greyColor));
tvContent.setText(text.build()); tvContent.setText(text.build());
} }
@@ -1564,8 +1570,8 @@ public class MessageView extends FrameLayout {
String tvOfficialMask = NobleUtil.getLevel(UserInfo.OAC_NAME, chatRoomMessage); String tvOfficialMask = NobleUtil.getLevel(UserInfo.OAC_NAME, chatRoomMessage);
String ivOfficialMask = NobleUtil.getLevel(UserInfo.OAC_ICON, chatRoomMessage); String ivOfficialMask = NobleUtil.getLevel(UserInfo.OAC_ICON, chatRoomMessage);
if (!TextUtils.isEmpty(tvOfficialMask) && !TextUtils.isEmpty(ivOfficialMask) && extension != null) { // extension != null 表示自己 if (!TextUtils.isEmpty(tvOfficialMask) && !TextUtils.isEmpty(ivOfficialMask) && extension != null) { // extension != null 表示自己
text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 59), text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 62),
SizeUtils.dp2px(tvContent.getContext(), 15)); SizeUtils.dp2px(tvContent.getContext(), 17));
} }
//等级 //等级
@@ -1575,7 +1581,7 @@ public class MessageView extends FrameLayout {
String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage); String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage);
if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己 if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己
text.appendBgAndContent(ivNamePlate, tvNamePlate, SizeUtils.dp2px(tvContent.getContext(), 62), 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)) text.append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(greyColor))
.append("：" + chatRoomMessage.getContent(), new ForegroundColorSpan(getResources().getColor(R.color.white))) .append("：" + chatRoomMessage.getContent(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
@@ -1957,11 +1963,18 @@ public class MessageView extends FrameLayout {
.append(isOfficial ? ResourcesCompat.getDrawable(getResources(), .append(isOfficial ? ResourcesCompat.getDrawable(getResources(),
R.mipmap.ic_user_official_13dp, null) : null, R.mipmap.ic_user_official_13dp, null) : null,
badgeWidth, badgeHeight) badgeWidth, badgeHeight)
.append(newUser ? Constants.NEW_USER_ICON : "", badgeWidth, badgeHeight) .append(newUser ? Constants.NEW_USER_ICON : "", badgeWidth, badgeHeight);
//2018.12.24 @测试 陈陈琳，进房不显示贵族勋章 //2018.12.24 @测试 陈陈琳，进房不显示贵族勋章
// .append(NobleUtil.getLocalResourcePath(userBadge), badgeWidth, badgeHeight) // .append(NobleUtil.getLocalResourcePath(userBadge), badgeWidth, badgeHeight)
// .append(userLevel, expLevelWidth, expLevelHeight) // .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() { new OriginalDrawStatusClickSpan() {
@Override @Override
public void onClick(@NonNull View view) { public void onClick(@NonNull View view) {
@@ -2164,8 +2177,8 @@ public class MessageView extends FrameLayout {
String tvOfficialMask = NobleUtil.getLevel(UserInfo.OAC_NAME, chatRoomMessage); String tvOfficialMask = NobleUtil.getLevel(UserInfo.OAC_NAME, chatRoomMessage);
String ivOfficialMask = NobleUtil.getLevel(UserInfo.OAC_ICON, chatRoomMessage); String ivOfficialMask = NobleUtil.getLevel(UserInfo.OAC_ICON, chatRoomMessage);
if (!TextUtils.isEmpty(tvOfficialMask) && !TextUtils.isEmpty(ivOfficialMask) && extension != null) { // extension != null 表示自己 if (!TextUtils.isEmpty(tvOfficialMask) && !TextUtils.isEmpty(ivOfficialMask) && extension != null) { // extension != null 表示自己
text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 59), text.appendBgAndContent(ivOfficialMask, tvOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 62),
SizeUtils.dp2px(tvContent.getContext(), 15)); SizeUtils.dp2px(tvContent.getContext(), 17));
} }
@@ -2174,7 +2187,7 @@ public class MessageView extends FrameLayout {
String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage); String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage);
if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己 if (!TextUtils.isEmpty(tvNamePlate) && !TextUtils.isEmpty(ivNamePlate)) { // extension != null 表示自己
text.appendBgAndContent(ivNamePlate, tvNamePlate, SizeUtils.dp2px(tvContent.getContext(), 62), 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()), text.append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()),
new ForegroundColorSpan(greyColor), new ForegroundColorSpan(greyColor),

2
app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
View File

@@ -262,7 +262,7 @@ public class ChargeActivity extends BaseActivity {
break; break;
} }
} }
int selectedMoney = isExistOneYuan ? 1 : 48; int selectedMoney = isExistOneYuan ? 1 : 6;
for (int i = 0; i < chargeBeanList.size(); i++) { for (int i = 0; i < chargeBeanList.size(); i++) {
ChargeBean chargeBean = chargeBeanList.get(i); ChargeBean chargeBean = chargeBeanList.get(i);
chargeBean.isSelected = chargeBean.getMoney() == selectedMoney; chargeBean.isSelected = chargeBean.getMoney() == selectedMoney;

13
app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java
View File

@@ -7,6 +7,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import android.text.InputType; import android.text.InputType;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
@@ -66,6 +68,17 @@ public class SuperEditText extends FrameLayout {
editText = findViewById(R.id.edit); editText = findViewById(R.id.edit);
editText.setHintTextColor(hintColor); editText.setHintTextColor(hintColor);
editText.setTextColor(textColor); 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); imageView = findViewById(R.id.iv_eyes);
editText.setHint(hint); editText.setHint(hint);
imageView.setOnClickListener(v -> { imageView.setOnClickListener(v -> {

5
app/src/main/res/drawable/color_cursor.xml Normal file
View File

@@ -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>

2
app/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -67,7 +67,7 @@
android:textSize="@dimen/dp_14" android:textSize="@dimen/dp_14"
android:layout_marginStart="@dimen/dp_25" android:layout_marginStart="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_25" android:layout_marginEnd="@dimen/dp_25"
android:theme="@style/common_edittext_style" android:background="@null"
android:maxLength="16" android:maxLength="16"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />

4
app/src/main/res/layout/fragment_game_home.xml
View File

@@ -210,10 +210,10 @@
<!-- </com.google.android.material.appbar.AppBarLayout>--> <!-- </com.google.android.material.appbar.AppBarLayout>-->
<androidx.viewpager.widget.ViewPager <com.yizhuan.erban.ui.widget.ContentWrapViewPager
android:id="@+id/view_pager_bottom" android:id="@+id/view_pager_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="900dp" android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/view" app:layout_constraintBottom_toTopOf="@+id/view"
app:layout_constraintTop_toBottomOf="@id/fl_indicator" app:layout_constraintTop_toBottomOf="@id/fl_indicator"
/> />

2
app/src/main/res/layout/layout_edit_eyes.xml
View File

@@ -31,7 +31,7 @@
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textColorHint="@color/color_b3b3b3" android:textColorHint="@color/color_b3b3b3"
android:textSize="@dimen/dp_14" android:textSize="@dimen/dp_14"
android:theme="@style/common_edittext_style" android:background="@null"
android:maxLength="16" android:maxLength="16"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />

1
app/src/main/res/values/styles.xml
View File

@@ -511,6 +511,7 @@
<style name="common_edittext_style" parent="Theme.AppCompat.Light"> <style name="common_edittext_style" parent="Theme.AppCompat.Light">
<item name="colorControlNormal">#30F4F4F4</item> <item name="colorControlNormal">#30F4F4F4</item>
<item name="colorControlActivated">#30F4F4F4</item> <item name="colorControlActivated">#30F4F4F4</item>
<item name="cursorColor">#30F4F4F4</item>
</style> </style>
<style name="common_login_edit_style" parent="Theme.AppCompat.Light"> <style name="common_login_edit_style" parent="Theme.AppCompat.Light">

10
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -763,13 +763,17 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
updateCommentCount(); updateCommentCount();
//头饰 贵族头饰 //头饰 贵族头饰
GlideApp.with(ivHeadWear.getContext()).clear(ivHeadWear); String headwearEffect = bean.getHeadwearEffect();
String headwearPic = bean.getHeadwearPic(); String headwearPic = bean.getHeadwearPic();
String micDecorate = bean.getMicDecorate(); 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); NobleUtil.loadHeadWear(headwearPic, ivHeadWear);
} else if (!TextUtils.isEmpty(micDecorate)) { } else if (!TextUtils.isEmpty(micDecorate)){
NobleUtil.loadResource(micDecorate, ivHeadWear); NobleUtil.loadResource(micDecorate, ivHeadWear);
} else {
ivHeadWear.setImageDrawable(null);
} }
View.OnClickListener infoListener = v -> { View.OnClickListener infoListener = v -> {