diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 0a23340f1..144bf48bb 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -618,7 +618,7 @@ My video Choose a reason to report More content should be described in the description box (required) - Submission + submit Please select the reason for reporting Report success Please fill in the report diff --git a/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java b/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java index e196ab41a..99c147efd 100644 --- a/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java @@ -117,6 +117,13 @@ public class SystemMessageNewAdapter extends RefreshAdapter { img_content.setVisibility(View.GONE); bannerImgLayout.setVisibility(View.GONE); } + + if (bean.getIs_report() == 1) { + if (bean.getIs_replenishment() != 1) { + layoutMore.setVisibility(View.VISIBLE); + } + } + itemLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/live/src/main/res/layout/activity_report_second.xml b/live/src/main/res/layout/activity_report_second.xml index 7194c4c2a..38dfc49f0 100644 --- a/live/src/main/res/layout/activity_report_second.xml +++ b/live/src/main/res/layout/activity_report_second.xml @@ -32,181 +32,199 @@ app:layout_constraintStart_toStartOf="parent" /> - + android:scrollbars="none" + app:layout_constraintTop_toBottomOf="@id/titleView" + > - - - - - - + android:layout_height="wrap_content"> - + + + + + - - - - + - + - - - - - + - + + + - + + + + + + + + + + + + + + + + + + + + + - - \ No newline at end of file diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml index ba0f0efda..41d6c6c5b 100644 --- a/live/src/main/res/values-zh/strings.xml +++ b/live/src/main/res/values-zh/strings.xml @@ -151,7 +151,7 @@ 上傳圖片 舉報內容補充 若您有其它補充信息,請在說明框中描述~ - 已收到您的補充信息,我們正在加急處理中 + 已收到您的補充信息 提交成功 點擊\n前往 diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index 37ef798a6..6c55a8167 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -154,7 +154,7 @@ Upload pictures Report content supplement If you have additional information, please describe it in the description box - Your supplementary information has been received. We are handling it urgently + Your supplementary information has been received Submitted successfully Click \nto go