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

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

Browse Source
This commit is contained in:
Max
2023-11-07 15:46:54 +08:00
parent 8ec2e32240 b935216b6e
commit 8d9781cf56
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/nnbc123/app/avroom/activity/AVRoomActivity.java
View File

@@ -889,7 +889,10 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
if (AvRoomDataManager.get().haveStartDragon) {
giveUpDragonBar();
}
if (singleRoomTipDialog != null && singleRoomTipDialog.isAdded()) {
singleRoomTipDialog.dismissAllowingStateLoss();
singleRoomTipDialog = null;
}
// 避免 ISE
if (mPwdDialogFragment != null && mPwdDialogFragment.isAdded()
&& !isFinishing()) {

4
app/src/main/java/com/nnbc123/app/avroom/activity/RoomSettingActivity.java
View File

@@ -535,8 +535,10 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
}
List<String> labels = new ArrayList<>();
for (RoomSettingTabInfo tabInfo : tabInfoList) {
if (tabInfo.getName() != null) {
labels.add(tabInfo.getName());
}
}
new SelectLabelDialog(this, "房间标签", labels, roomInfo.getRoomTag(), (label, data, position) -> {
mSelectTabInfo = tabInfoList.get(position);
selectLabel = (String) data;
@@ -565,8 +567,10 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
}
List<String> labels = new ArrayList<>();
for (SingleRoomSortInfo tabInfo : tabInfoList) {
if (tabInfo.getSortName() != null) {
labels.add(tabInfo.getSortName());
}
}
new SelectLabelDialog(this, "房间分类", labels, roomInfo.getRoomTag(), (label, data, position) -> {
singleRoomSortId = tabInfoList.get(position).getId();
singleRoomSortName = (String) data;

13
app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonLoadingDialog.java
View File

@@ -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();
}
}

3
app/src/main/res/layout/item_boss_micro.xml
View File

@@ -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="红队" />
<LinearLayout

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

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