yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、举报提交信息UI修改

Browse Source
This commit is contained in:
老皮 2024-10-09 16:34:50 +08:00
parent 800e1382a4
commit c1ef54e7b1
5 changed files with 189 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/res/values/strings.xml
View File

@ -618,7 +618,7 @@
<string name="video_my_video">My video</string> <string name="video_my_video">My video</string>
<string name="video_report_tip_1">Choose a reason to report</string> <string name="video_report_tip_1">Choose a reason to report</string>
<string name="video_report_tip_2">More content should be described in the description box (required)</string> <string name="video_report_tip_2">More content should be described in the description box (required)</string>
<string name="video_report_submit">Submission</string> <string name="video_report_submit">submit</string>
<string name="video_report_tip_3">Please select the reason for reporting</string> <string name="video_report_tip_3">Please select the reason for reporting</string>
<string name="video_report_tip_4">Report success</string> <string name="video_report_tip_4">Report success</string>
<string name="video_report_tip_5">Please fill in the report</string> <string name="video_report_tip_5">Please fill in the report</string>

7
live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java
View File

@ -117,6 +117,13 @@ public class SystemMessageNewAdapter extends RefreshAdapter<SystemMessageBean> {
img_content.setVisibility(View.GONE); img_content.setVisibility(View.GONE);
bannerImgLayout.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() { itemLayout.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

336
live/src/main/res/layout/activity_report_second.xml
View File

@ -32,181 +32,199 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
/> />
<TextView <ScrollView
android:id="@+id/textView5" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:scrollbars="none"
android:text="@string/report_second_2" app:layout_constraintTop_toBottomOf="@id/titleView"
android:textColor="#ff333333" >
android:layout_marginTop="30dp"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titleView" />
<TextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/textView8"
android:layout_width="8dp"
android:layout_height="15dp"
android:text="*"
android:textColor="#ffff870f"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/textView5"
app:layout_constraintStart_toEndOf="@+id/textView5"
app:layout_constraintTop_toTopOf="@+id/textView5" />
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="11dp"
android:layout_marginEnd="15dp"
app:cardBackgroundColor="#F7F7F7"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/textView5"
app:layout_constraintTop_toBottomOf="@+id/textView5">
<TextView
android:id="@+id/info_textView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="您舉報的用戶【用戶暱稱】，我們已對其進行重點觀察，並進一步判定，若發現違規將立刻處理，感謝您的監督~"
android:textColor="#ff777777"
android:textSize="11sp" />
</androidx.cardview.widget.CardView> <TextView
android:id="@+id/textView5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="@string/report_second_2"
android:textColor="#ff333333"
android:layout_marginTop="30dp"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView8"
android:layout_width="8dp"
android:layout_height="15dp"
android:text="*"
android:textColor="#ffff870f"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/textView5"
app:layout_constraintStart_toEndOf="@+id/textView5"
app:layout_constraintTop_toTopOf="@+id/textView5" />
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="11dp"
android:layout_marginEnd="15dp"
app:cardBackgroundColor="#F7F7F7"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/textView5"
app:layout_constraintTop_toBottomOf="@+id/textView5">
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/info_textView"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text="@string/report_second_3" android:layout_height="wrap_content"
android:textColor="#ff333333" android:layout_gravity="center_vertical"
android:textSize="15sp" android:layout_marginStart="10dp"
android:id="@+id/textView10" android:layout_marginEnd="10dp"
android:layout_marginTop="19dp" android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="@+id/textView5" android:layout_marginBottom="10dp"
app:layout_constraintTop_toBottomOf="@+id/cardView" /> android:text="您舉報的用戶【用戶暱稱】，我們已對其進行重點觀察，並進一步判定，若發現違規將立刻處理，感謝您的監督~"
android:textColor="#ff777777"
android:textSize="11sp" />
</androidx.cardview.widget.CardView>
<ImageView <TextView
android:layout_width="98dp" android:layout_width="wrap_content"
android:layout_height="98dp" android:layout_height="wrap_content"
android:id="@+id/image_1" android:text="@string/report_second_3"
app:layout_constraintStart_toStartOf="@id/textView5" android:textColor="#ff333333"
app:layout_constraintEnd_toStartOf="@id/image_2" android:textSize="15sp"
app:layout_constraintTop_toBottomOf="@id/textView10" android:id="@+id/textView10"
android:src="@mipmap/upload_image" android:layout_marginTop="19dp"
android:layout_marginTop="15dp" app:layout_constraintStart_toStartOf="@+id/textView5"
/> app:layout_constraintTop_toBottomOf="@+id/cardView" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@mipmap/cancel_upload"
app:layout_constraintCircle="@+id/image_1"
app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="60dp"
android:id="@+id/cancel_1"
android:visibility="gone"
tools:ignore="MissingConstraints" />
<ImageView <ImageView
android:layout_width="98dp" android:layout_width="98dp"
android:layout_height="98dp" android:layout_height="98dp"
android:id="@+id/image_2" android:id="@+id/image_1"
app:layout_constraintStart_toEndOf="@id/image_1" app:layout_constraintStart_toStartOf="@id/textView5"
app:layout_constraintEnd_toStartOf="@id/image_3" app:layout_constraintEnd_toStartOf="@id/image_2"
app:layout_constraintTop_toTopOf="@id/image_1" app:layout_constraintTop_toBottomOf="@id/textView10"
android:src="@mipmap/upload_image" android:src="@mipmap/upload_image"
/> android:layout_marginTop="15dp"
/>
<ImageView <ImageView
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:src="@mipmap/cancel_upload" android:src="@mipmap/cancel_upload"
app:layout_constraintCircle="@+id/image_2" app:layout_constraintCircle="@+id/image_1"
app:layout_constraintCircleAngle="45" app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="60dp" app:layout_constraintCircleRadius="60dp"
android:id="@+id/cancel_2" android:id="@+id/cancel_1"
android:visibility="gone" android:visibility="gone"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
<ImageView
android:layout_width="98dp"
android:layout_height="98dp"
android:id="@+id/image_3"
app:layout_constraintStart_toEndOf="@id/image_2"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="15dp"
app:layout_constraintTop_toTopOf="@id/image_1"
android:src="@mipmap/upload_image"
/>
<ImageView <ImageView
android:layout_width="20dp" android:layout_width="98dp"
android:layout_height="20dp" android:layout_height="98dp"
android:src="@mipmap/cancel_upload" android:id="@+id/image_2"
app:layout_constraintCircle="@+id/image_3" app:layout_constraintStart_toEndOf="@id/image_1"
app:layout_constraintCircleAngle="45" app:layout_constraintEnd_toStartOf="@id/image_3"
app:layout_constraintCircleRadius="60dp" app:layout_constraintTop_toTopOf="@id/image_1"
android:id="@+id/cancel_3" android:src="@mipmap/upload_image"
android:visibility="gone" />
tools:ignore="MissingConstraints" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@mipmap/cancel_upload"
app:layout_constraintCircle="@+id/image_2"
app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="60dp"
android:id="@+id/cancel_2"
android:visibility="gone"
tools:ignore="MissingConstraints" />
<ImageView
android:layout_width="98dp"
android:layout_height="98dp"
android:id="@+id/image_3"
app:layout_constraintStart_toEndOf="@id/image_2"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="15dp"
app:layout_constraintTop_toTopOf="@id/image_1"
android:src="@mipmap/upload_image"
/>
<TextView <ImageView
android:layout_width="wrap_content" android:layout_width="20dp"
android:layout_height="wrap_content" android:layout_height="20dp"
android:text="@string/report_second_4" android:src="@mipmap/cancel_upload"
android:textColor="#333333" app:layout_constraintCircle="@+id/image_3"
android:textSize="15sp" app:layout_constraintCircleAngle="45"
app:layout_constraintStart_toStartOf="@id/textView5" app:layout_constraintCircleRadius="60dp"
app:layout_constraintTop_toBottomOf="@id/image_1" android:id="@+id/cancel_3"
android:layout_marginTop="20dp" android:visibility="gone"
android:id="@+id/textView6" tools:ignore="MissingConstraints" />
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/report_second_4"
android:textColor="#333333"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="@id/textView5"
app:layout_constraintTop_toBottomOf="@id/image_1"
android:layout_marginTop="20dp"
android:id="@+id/textView6"
/>
<EditText
android:id="@+id/edit"
android:layout_width="0dp"
android:layout_height="127dp"
android:layout_marginTop="15dp"
android:background="@drawable/edit_background_f7"
android:gravity="top"
android:hint="@string/report_second_5"
android:maxLength="200"
android:padding="10dp"
android:textColor="@color/textColor"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="@+id/cardView"
app:layout_constraintStart_toStartOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@id/textView6" />
<TextView
android:id="@+id/btn_report"
android:layout_width="150dp"
android:layout_height="48dp"
android:background="@drawable/border_hui"
android:gravity="center"
android:text="@string/video_report_submit"
android:textColor="@color/white"
android:textSize="16sp"
android:clickable="false"
android:layout_marginTop="80dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/edit"
app:layout_constraintTop_toBottomOf="@+id/edit" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<EditText
android:id="@+id/edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@drawable/edit_background_f7"
android:gravity="top"
android:hint="@string/report_second_5"
android:maxLength="200"
android:minHeight="60dp"
android:padding="10dp"
android:textColor="@color/textColor"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="@+id/cardView"
app:layout_constraintStart_toStartOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@id/textView6" />
<TextView
android:id="@+id/btn_report"
android:layout_width="150dp"
android:layout_height="48dp"
android:background="@drawable/border_hui"
android:gravity="center"
android:text="@string/video_report_submit"
android:textColor="@color/white"
android:textSize="16sp"
android:clickable="false"
android:layout_marginTop="50dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/edit"
app:layout_constraintTop_toBottomOf="@+id/edit" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
live/src/main/res/values-zh/strings.xml
View File

@ -151,7 +151,7 @@
<string name="report_second_3">上傳圖片</string> <string name="report_second_3">上傳圖片</string>
<string name="report_second_4">舉報內容補充</string> <string name="report_second_4">舉報內容補充</string>
<string name="report_second_5">若您有其它補充信息，請在說明框中描述~</string> <string name="report_second_5">若您有其它補充信息，請在說明框中描述~</string>
<string name="report_second_6">已收到您的補充信息，我們正在加急處理中</string> <string name="report_second_6">已收到您的補充信息</string>
<string name="report_second_7">提交成功</string> <string name="report_second_7">提交成功</string>
<string name="live_room_push_to_new_task">點擊\n前往</string> <string name="live_room_push_to_new_task">點擊\n前往</string>

2
live/src/main/res/values/strings.xml
View File

@ -154,7 +154,7 @@
<string name="report_second_3">Upload pictures</string> <string name="report_second_3">Upload pictures</string>
<string name="report_second_4">Report content supplement</string> <string name="report_second_4">Report content supplement</string>
<string name="report_second_5">If you have additional information, please describe it in the description box</string> <string name="report_second_5">If you have additional information, please describe it in the description box</string>
<string name="report_second_6">Your supplementary information has been received. We are handling it urgently</string> <string name="report_second_6">Your supplementary information has been received</string>
<string name="report_second_7">Submitted successfully</string> <string name="report_second_7">Submitted successfully</string>
<string name="live_room_push_to_new_task">Click \nto go</string> <string name="live_room_push_to_new_task">Click \nto go</string>