From 6ba4f05b17de38c1ec5c4c8532efda040b9efefd Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 7 Nov 2023 10:23:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=BA=A6=E4=BD=8D-PK?= =?UTF-8?q?=E9=98=9F=E5=90=8D=E4=B8=8E=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?= =?UTF-8?q?=E9=87=8D=E5=8F=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/list_item_micro.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/list_item_micro.xml b/app/src/main/res/layout/list_item_micro.xml index 34461e4d1..5596545ee 100644 --- a/app/src/main/res/layout/list_item_micro.xml +++ b/app/src/main/res/layout/list_item_micro.xml @@ -107,7 +107,7 @@ android:layout_width="34dp" android:layout_height="15dp" android:layout_centerHorizontal="true" - android:layout_marginTop="55dp" + android:layout_marginTop="45dp" android:background="@drawable/shape_pk_mic_queue_mark_red" android:gravity="center" android:textColor="@color/color_FFFFFF" From 49810b42b012c1c75fbc5d44cda25f850bc41d74 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 7 Nov 2023 10:47:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=8E=92?= =?UTF-8?q?=E9=BA=A6-=E7=82=B9=E5=87=BB=E6=8A=B1=E4=B8=8A=E9=97=AA?= =?UTF-8?q?=E9=80=80=E9=97=AE=E9=A2=98=EF=BC=88CommonLoadingDialog?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/widget/dialog/CommonLoadingDialog.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonLoadingDialog.java b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonLoadingDialog.java index d33aadc60..efea2b299 100644 --- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonLoadingDialog.java +++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonLoadingDialog.java @@ -8,6 +8,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.nnbc123.app.R; +import com.opensource.svgaplayer.SVGAImageView; /** * @author jack @@ -19,7 +20,7 @@ public class CommonLoadingDialog extends BaseDialog { private String msg = "加载中..."; private TextView tvTip; - private ImageView ivLoading; + private SVGAImageView ivLoading; public CommonLoadingDialog(Context context, String tip) { super(context, R.style.dialog); @@ -36,8 +37,7 @@ public class CommonLoadingDialog extends BaseDialog { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.layout_progress_dialog); - ivLoading = findViewById(R.id.iv_loading); - ((AnimationDrawable) ivLoading.getDrawable()).start(); + ivLoading = findViewById(R.id.iv_loading_icon); tvTip = (TextView) findViewById(R.id.tv_tip); tvTip.setText(msg); } @@ -60,4 +60,11 @@ public class CommonLoadingDialog extends BaseDialog { super.show(); return this; } + + @Override + public void onDetachedFromWindow() { + super.onDetachedFromWindow(); + ivLoading.stopAnimation(); + ivLoading.clear(); + } } From 2e812f60f512ed1fb56f11cf70440da7681d7565 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 7 Nov 2023 10:53:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=BC=B9=E7=AA=97=E6=9C=AA=E5=8F=8A=E6=97=B6?= =?UTF-8?q?=E9=94=80=E6=AF=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nnbc123/app/avroom/activity/AVRoomActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nnbc123/app/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/nnbc123/app/avroom/activity/AVRoomActivity.java index 75978b6ed..647033f36 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/nnbc123/app/avroom/activity/AVRoomActivity.java @@ -889,7 +889,10 @@ public class AVRoomActivity extends BaseMvpActivity Date: Tue, 7 Nov 2023 11:10:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=BA=A6-PK?= =?UTF-8?q?=E9=98=9F=E5=90=8D=E4=B8=8E=E6=98=B5=E7=A7=B0=E9=87=8D=E5=8F=A0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_boss_micro.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml index 2b8143e1c..0ccdf4a90 100644 --- a/app/src/main/res/layout/item_boss_micro.xml +++ b/app/src/main/res/layout/item_boss_micro.xml @@ -117,12 +117,13 @@ android:layout_width="34dp" android:layout_height="15dp" android:layout_centerHorizontal="true" - android:layout_marginTop="67dp" + android:layout_marginTop="45dp" android:background="@drawable/shape_pk_mic_queue_mark_red" android:gravity="center" android:textColor="@color/color_FFFFFF" android:textSize="9dp" android:visibility="gone" + tools:visibility="visible" tools:text="红队" /> Date: Tue, 7 Nov 2023 11:23:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nnbc123/app/avroom/activity/RoomSettingActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nnbc123/app/avroom/activity/RoomSettingActivity.java b/app/src/main/java/com/nnbc123/app/avroom/activity/RoomSettingActivity.java index f908e415e..8c91641dc 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/activity/RoomSettingActivity.java +++ b/app/src/main/java/com/nnbc123/app/avroom/activity/RoomSettingActivity.java @@ -537,7 +537,9 @@ public class RoomSettingActivity extends BaseMvpActivity labels = new ArrayList<>(); for (RoomSettingTabInfo tabInfo : tabInfoList) { - labels.add(tabInfo.getName()); + if (tabInfo.getName() != null) { + labels.add(tabInfo.getName()); + } } new SelectLabelDialog(this, "房间标签", labels, roomInfo.getRoomTag(), (label, data, position) -> { mSelectTabInfo = tabInfoList.get(position); @@ -567,7 +569,9 @@ public class RoomSettingActivity extends BaseMvpActivity labels = new ArrayList<>(); for (SingleRoomSortInfo tabInfo : tabInfoList) { - labels.add(tabInfo.getSortName()); + if (tabInfo.getSortName() != null) { + labels.add(tabInfo.getSortName()); + } } new SelectLabelDialog(this, "房间分类", labels, roomInfo.getRoomTag(), (label, data, position) -> { singleRoomSortId = tabInfoList.get(position).getId();