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

[Modify]修复线上bug

Browse Source
This commit is contained in:
wushaocheng
2023-08-18 15:42:09 +08:00
parent 8c47c3e717
commit ffab260d6a
17 changed files with 51 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/common/res/mipmap-xhdpi/ic_user_new_10dp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 604 B

After

Width:  |  Height:  |  Size: 767 B

BIN
app/src/common/res/mipmap-xhdpi/ic_user_new_13dp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/common/res/mipmap-xhdpi/ic_user_official_10dp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 692 B

BIN
app/src/common/res/mipmap-xhdpi/ic_user_official_13dp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 470 B

After

Width:  |  Height:  |  Size: 1.2 KiB

2
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -214,6 +214,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
!TextUtils.isEmpty(linkedInfo.getDynamicId())) {
DynamicDetailActivity.start(context, JavaUtil.str2long(linkedInfo.getDynamicId()),
JavaUtil.str2long(linkedInfo.getWorldId()), 6);
} else if (linkedInfo.getType().equals("7") && !TextUtils.isEmpty(linkedInfo.getUid())) {
NimP2PMessageActivity.start(context, linkedInfo.getUid());
} else {
return false;
}

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

@@ -2101,7 +2101,7 @@ public class MessageView extends FrameLayout {
builder.append(ivOfficialMask, SizeUtils.dp2px(tvContent.getContext(), 62), expLevelHeight);
}
//等級
builder.append(userLevel, expLevelWidth, expLevelHeight);
builder.append(userLevel, expLevelHeight);
//銘牌
String tvNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_WORD, chatRoomMessage).trim();
String ivNamePlate = NobleUtil.getNamePlate(UserInfo.NAMEPLATE_PIC, chatRoomMessage);

8
app/src/main/res/layout/item_user.xml
View File

@@ -145,9 +145,7 @@
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:minWidth="@dimen/dp_25"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
@@ -156,9 +154,7 @@
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:minWidth="@dimen/dp_25"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />

1
app/src/main/res/layout/list_item_friend.xml
View File

@@ -107,7 +107,6 @@
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_marginEnd="2dp"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"

15
app/src/main/res/layout/newbie_list_item.xml
View File

@@ -49,21 +49,18 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
android:layout_marginStart="2dp"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />

11
app/src/main/res/layout/nim_recent_contact_list_item.xml
View File

@@ -37,8 +37,9 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:layout_alignTop="@+id/tv_nickname"
android:layout_alignBottom="@+id/tv_nickname"
android:layout_toEndOf="@+id/iv_noble_level"
@@ -48,11 +49,11 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:layout_alignTop="@+id/tv_nickname"
android:layout_alignBottom="@+id/tv_nickname"
android:layout_marginEnd="2dp"
android:layout_toEndOf="@+id/iv_user_badge"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"

15
app/src/main/res/layout/nim_recent_contact_list_item_new.xml
View File

@@ -79,7 +79,7 @@
android:id="@+id/iv_user_gender"
android:layout_width="21dp"
android:layout_height="14dp"
android:layout_marginEnd="5dp"
android:layout_marginEnd="2dp"
android:scaleType="centerInside"
android:visibility="visible"
tools:src="@drawable/ic_gender_female"
@@ -89,7 +89,6 @@
android:id="@+id/iv_user_badge"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="5dp"
android:scaleType="fitCenter"
android:visibility="gone"
tools:src="@mipmap/ic_user_level_king"
@@ -97,18 +96,18 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="5dp"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="5dp"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />

14
app/src/main/res/layout/view_user_info.xml
View File

@@ -25,17 +25,15 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_marginStart="@dimen/dp_5"
android:layout_width="33dp"
android:layout_height="13dp"
android:scaleType="fitCenter"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
tools:src="@mipmap/ic_user_level" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_marginStart="@dimen/dp_5"
android:layout_width="29dp"
android:layout_height="13dp"
android:scaleType="fitCenter"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
tools:src="@drawable/ic_charm_level" />
</merge>

14
app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml
View File

@@ -49,20 +49,18 @@
<ImageView
android:id="@+id/iv_exp_level"
android:layout_width="@dimen/dp_33"
android:layout_height="@dimen/dp_13"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_4"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:src="@drawable/ic_user_charm_level"
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
app:layout_constraintStart_toEndOf="@+id/iv_gender" />
<ImageView
android:id="@+id/iv_charm_level"
android:layout_width="@dimen/dp_29"
android:layout_height="@dimen/dp_13"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_4"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:src="@drawable/ic_user_charm_level"
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
app:layout_constraintStart_toEndOf="@+id/iv_exp_level" />

14
app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml
View File

@@ -80,20 +80,18 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="34dp"
android:layout_height="14dp"
android:layout_marginEnd="2dp"
android:scaleType="fitXY"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="30dp"
android:layout_height="14dp"
android:layout_marginEnd="2dp"
android:scaleType="fitXY"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />

10
app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
View File

@@ -15,8 +15,9 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:layout_alignTop="@+id/tv_nickname"
android:layout_alignBottom="@+id/tv_nickname"
android:layout_toEndOf="@+id/iv_noble_level"
@@ -26,8 +27,9 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:layout_alignTop="@+id/tv_nickname"
android:layout_alignBottom="@+id/tv_nickname"
android:layout_marginEnd="2dp"

2
core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java
View File

@@ -12,7 +12,7 @@ public class LinkedInfo {
private String roomUid;
private String uid;
/**
* 2：房间 3：网页 4：家族首页 5：话题客态页 6：动态详情
* 2：房间 3：网页 4：家族首页 5：话题客态页 6：动态详情 7:私聊页
*/
private String type;
private boolean isNewUser;

4
gradle.properties
View File

@@ -29,8 +29,8 @@ COMPILE_SDK_VERSION=32
MIN_SDK_VERSION=21
TARGET_SDK_VERSION=32
version_name=1.10.0
version_code=1000
version_name=1.10.1
version_code=1001
#systemProp.https.proxyHost=127.0.0.1
#systemProp.https.proxyPort=4780