diff --git a/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java b/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java
index c33012e1f..2f67b9582 100644
--- a/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java
@@ -87,7 +87,7 @@ public class LiveTaskModel extends BaseModel {
public String getEndTime() {
if (!StringUtil.isEmpty(endTime)) {
- endTime =WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
+ endTime = new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
}
return endTime;
}
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java
index e5c0565d0..175748ff9 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java
@@ -147,7 +147,7 @@ public class LiveTaskDialog extends AbsDialogPopupWindow {
if (task.isNew()) {
newStarImg.setVisibility(VISIBLE);
newStarTime.setVisibility(VISIBLE);
- newStarTime.setText(task.getEndTime());
+ newStarTime.setText(WordUtil.isNewZh()?"新秀主播時效截止至 ":"The statute of limitations for new anchors expires " +task.getEndTime());
}
}
diff --git a/live/src/main/res/layout/dialog_live_task.xml b/live/src/main/res/layout/dialog_live_task.xml
index 46ffd45a9..33cbfd9ca 100644
--- a/live/src/main/res/layout/dialog_live_task.xml
+++ b/live/src/main/res/layout/dialog_live_task.xml
@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="600dp"
-
android:background="#000002">
= Build.VERSION_CODES.TIRAMISU) {
permissions = new String[]{
- Manifest.permission.READ_MEDIA_IMAGES,
+ //Manifest.permission.READ_MEDIA_IMAGES, 去掉选择图片的权限,到里面选择封面的时候再去申请
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
diff --git a/main/src/main/res/layout/dialog_message_status_config.xml b/main/src/main/res/layout/dialog_message_status_config.xml
index bdadca5f7..dc62aa917 100644
--- a/main/src/main/res/layout/dialog_message_status_config.xml
+++ b/main/src/main/res/layout/dialog_message_status_config.xml
@@ -23,7 +23,6 @@
android:background="@drawable/view_btn_chat_status_config"
android:bufferType="spannable"
android:button="@null"
- android:checked="true"
android:drawableTop="@drawable/view_btn_chat_status_config_online_color"
android:ellipsize="marquee"
android:gravity="center"
@@ -39,7 +38,6 @@
android:layout_height="100dp"
android:background="@drawable/view_btn_chat_status_config"
android:button="@null"
- android:checked="false"
android:drawableTop="@drawable/view_btn_chat_status_config_off_color"
android:gravity="center"
android:paddingTop="30dp"