yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v1.5.0/optimize' into v1.5.0/test

Browse Source
This commit is contained in:
Max
2023-11-07 22:44:54 +08:00
parent c65e7bfc3b fab25bd4f6
commit bf5c6436da
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java
View File

@@ -284,9 +284,9 @@ public class MessageView extends FrameLayout {
sysIconHeight = Utils.dip2px(context, 14); sysIconHeight = Utils.dip2px(context, 14);
smallFace = Utils.dip2px(context, 22); smallFace = Utils.dip2px(context, 22);
bigFace = Utils.dip2px(context, 30); bigFace = Utils.dip2px(context, 30);
//经验等级图片后台已经更换尺寸了，公屏同步下，尺寸是38:18 //经验等级图片后台已经更换尺寸了，公屏同步下，尺寸是36:19
expLevelHeight = Utils.dip2px(context, 18); expLevelHeight = Utils.dip2px(context, 19);
expLevelWidth = expLevelHeight * 38 / 18;//expLevelHeight * 114 / 45 expLevelWidth = expLevelHeight * 36 / 19;
giftLength = Utils.dip2px(context, 35); giftLength = Utils.dip2px(context, 35);
// 内容区域 // 内容区域
layoutManger = new LinearLayoutManager(context, RecyclerView.VERTICAL, false); layoutManger = new LinearLayoutManager(context, RecyclerView.VERTICAL, false);

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

@@ -223,7 +223,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level" android:id="@+id/iv_user_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17" android:layout_height="19dp"
android:layout_marginEnd="@dimen/dp_4" android:layout_marginEnd="@dimen/dp_4"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="visible" android:visibility="visible"
@@ -232,7 +232,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm" android:id="@+id/iv_user_charm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17" android:layout_height="19dp"
android:layout_marginEnd="3dp" android:layout_marginEnd="3dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="visible" android:visibility="visible"

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

@@ -178,7 +178,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level" android:id="@+id/iv_user_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20" android:layout_height="19dp"
android:layout_marginEnd="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_5"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="gone" android:visibility="gone"
@@ -188,7 +188,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm" android:id="@+id/iv_user_charm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20" android:layout_height="19dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="gone" android:visibility="gone"

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

@@ -71,8 +71,8 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level" android:id="@+id/iv_noble_level"
android:layout_width="17dp" android:layout_width="36dp"
android:layout_height="17dp" android:layout_height="19dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:visibility="gone" android:visibility="gone"
tools:src="@mipmap/ic_user_level_king" tools:src="@mipmap/ic_user_level_king"
@@ -80,8 +80,8 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level" android:id="@+id/iv_user_level"
android:layout_width="@dimen/dp_19" android:layout_width="36dp"
android:layout_height="@dimen/dp_19" android:layout_height="19dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" android:visibility="gone"

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

@@ -191,7 +191,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level" android:id="@+id/iv_user_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="17dp" android:layout_height="19dp"
android:layout_marginEnd="@dimen/dp_3" android:layout_marginEnd="@dimen/dp_3"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="visible" android:visibility="visible"
@@ -200,7 +200,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm" android:id="@+id/iv_user_charm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="17dp" android:layout_height="19dp"
android:layout_marginEnd="3dp" android:layout_marginEnd="3dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:visibility="visible" android:visibility="visible"

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

@@ -80,8 +80,8 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level" android:id="@+id/iv_user_level"
android:layout_width="@dimen/dp_19" android:layout_width="36dp"
android:layout_height="@dimen/dp_19" android:layout_height="19dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" android:visibility="gone"
@@ -91,8 +91,8 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level" android:id="@+id/iv_charm_level"
android:layout_width="@dimen/dp_19" android:layout_width="36dp"
android:layout_height="@dimen/dp_19" android:layout_height="19dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" android:visibility="gone"

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

@@ -122,7 +122,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_exper" android:id="@+id/iv_user_exper"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20" android:layout_height="19dp"
android:layout_marginEnd="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_5"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:minWidth="@dimen/dp_25" android:minWidth="@dimen/dp_25"
@@ -133,7 +133,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm" android:id="@+id/iv_user_charm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20" android:layout_height="19dp"
android:layout_marginEnd="5.5dp" android:layout_marginEnd="5.5dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:minWidth="@dimen/dp_25" android:minWidth="@dimen/dp_25"

4
app/src/module_community/res/layout/layout_dy_nick_detail.xml
View File

@@ -77,7 +77,7 @@
<ImageView <ImageView
android:id="@+id/iv_user_wealth_level" android:id="@+id/iv_user_wealth_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20" android:layout_height="19dp"
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_5"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitXY" android:scaleType="fitXY"
@@ -88,7 +88,7 @@
<ImageView <ImageView
android:id="@+id/iv_user_charm_level" android:id="@+id/iv_user_charm_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20" android:layout_height="19dp"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitXY" android:scaleType="fitXY"

4
app/src/module_labour_union/res/layout/item_member.xml
View File

@@ -75,7 +75,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level" android:id="@+id/iv_user_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="17dp" android:layout_height="19dp"
android:layout_marginStart="3dp" android:layout_marginStart="3dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:visibility="gone" android:visibility="gone"
@@ -85,7 +85,7 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm_level" android:id="@+id/iv_user_charm_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="17dp" android:layout_height="19dp"
android:layout_marginStart="3dp" android:layout_marginStart="3dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:visibility="gone" android:visibility="gone"