diff --git a/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java b/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java index 0bc78d407..9d3767442 100644 --- a/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java +++ b/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java @@ -10,6 +10,7 @@ import android.graphics.Color; import android.graphics.LinearGradient; import android.graphics.Shader; import android.view.ViewTreeObserver; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -84,6 +85,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow { protected void onCreate() { super.onCreate(); findViewById(R.id.close).setOnClickListener(v -> dismiss()); + ((ImageView) findViewById(R.id.close)).setImageResource(R.mipmap.icon_invite_close); findViewById(R.id.share_copy).setOnClickListener(v -> copyLink()); // findViewById(R.id.share_preview).setVisibility(GONE); findViewById(R.id.share_dialog).setBackgroundResource(R.mipmap.bg_dialog_inviet); @@ -148,7 +150,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow { ClipData clipData = ClipData.newPlainText("text", url); cm.setPrimaryClip(clipData); ToastUtil.show(WordUtil.getString(com.yunbao.common.R.string.copy_success)); - DialogUitl.showSimpleDialog(getContext(),url, new DialogUitl.SimpleCallback() { + DialogUitl.showSimpleDialog(getContext(), url, new DialogUitl.SimpleCallback() { @Override public void onConfirmClick(Dialog dialog, String content) { dialog.dismiss(); @@ -157,7 +159,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow { } public InvitePopDialog setUrl(String data) { - this.url = data+"&isGoogle="+ (CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0"); + this.url = data + "&isGoogle=" + (CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0"); return this; } } diff --git a/Share/src/main/res/layout/dialog_share.xml b/Share/src/main/res/layout/dialog_share.xml index 65b31da1c..b9f50abe4 100644 --- a/Share/src/main/res/layout/dialog_share.xml +++ b/Share/src/main/res/layout/dialog_share.xml @@ -33,7 +33,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginEnd="16dp" - app:srcCompat="@mipmap/icon_dialog_charge_close" /> + app:srcCompat="@mipmap/icon_share_close" /> diff --git a/Share/src/main/res/mipmap/icon_invite_close.png b/Share/src/main/res/mipmap/icon_invite_close.png new file mode 100644 index 000000000..e72e9a18a Binary files /dev/null and b/Share/src/main/res/mipmap/icon_invite_close.png differ diff --git a/Share/src/main/res/mipmap/icon_share_close.png b/Share/src/main/res/mipmap/icon_share_close.png new file mode 100644 index 000000000..9cb43acbd Binary files /dev/null and b/Share/src/main/res/mipmap/icon_share_close.png differ diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java index c27a9e024..9b628d1ab 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java @@ -76,7 +76,7 @@ public class LiveAnchorSayItemsAdapter extends RecyclerView.Adapter + android:layout_width="67dp" + android:layout_height="88dp"> + tools:text="已输入的\n内容已输\n入的内容\n已输入的" />