diff --git a/common/src/main/res/mipmap-mdpi/icon_black_back.webp b/common/src/main/res/mipmap-mdpi/icon_black_back.webp new file mode 100644 index 000000000..0846a3cd5 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/icon_black_back.webp differ diff --git a/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java b/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java index 6b6051880..156055e55 100644 --- a/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/ReportSecondActivity.java @@ -63,6 +63,12 @@ public class ReportSecondActivity extends AbsActivity implements View.OnClickLis cancel_1 = findViewById(R.id.cancel_1); cancel_2 = findViewById(R.id.cancel_2); cancel_3 = findViewById(R.id.cancel_3); + findViewById(R.id.btn_back).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); imageUtilInit(); diff --git a/live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java b/live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java index beecf5097..3a09f6768 100644 --- a/live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java @@ -65,7 +65,6 @@ public class SystemMessageActivity extends AbsActivity { // if ("".equals(nowUid)) { mSystemMessageViewHolder = new SystemMessageViewHolder(mContext, (ViewGroup) findViewById(R.id.root), SystemMessageActivity.this); mSystemMessageViewHolder.addToParent(); - mSystemMessageViewHolder.loadData(); // } else { // mSystemMessageViewHolder = new SystemMessageViewHolder(mContext, (ViewGroup) findViewById(R.id.root)); // mSystemMessageViewHolder.addToParent(); @@ -120,6 +119,15 @@ public class SystemMessageActivity extends AbsActivity { } } + + @Override + protected void onResume() { + super.onResume(); + if (mSystemMessageViewHolder != null){ + mSystemMessageViewHolder.loadData(); + } + } + @Override protected void onDestroy() { if (mSystemMessageViewHolder != null) { diff --git a/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java b/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java index 8234d581c..3e31490fe 100644 --- a/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java @@ -382,6 +382,14 @@ public class SystemMessageViewHolder extends AbsViewHolder implements View.OnCli }); } + @Override + public void onResume() { + super.onResume(); + if (mAdapter != null) { + mRefreshView.initData(); + } + } + //非单聊列表适配 private void setSysApt() { if (SystemMessageActivity.type.equals("1") || SystemMessageActivity.type.equals("4")) { diff --git a/live/src/main/res/layout/activity_report_second.xml b/live/src/main/res/layout/activity_report_second.xml index 08dca1070..7194c4c2a 100644 --- a/live/src/main/res/layout/activity_report_second.xml +++ b/live/src/main/res/layout/activity_report_second.xml @@ -8,6 +8,7 @@