From 8f63571307c9c8369314ae130f9b4a5c49980440 Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 15 Nov 2022 17:31:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=88=86=E4=BA=AB=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XChatConstants.java | 4 +- .../java/com/mango/core/share/ShareModel.java | 104 +++++++++--------- 2 files changed, 53 insertions(+), 55 deletions(-) diff --git a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java index a5372d2f0..a632b1953 100644 --- a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java @@ -128,12 +128,12 @@ public class XChatConstants { /** * 分享房间文本 */ - public static final String SHARE_ROOM_TEXT = "人美声甜带上分，一起来玩吧~"; + public static final String SHARE_ROOM_TEXT = "这个房间很好玩，推荐给你，快来和我一起玩吧~"; /** * 分享房间标题 */ - public static final String SHARE_ROOM_TITLE = "来魔力，用声音交真挚的朋友"; + public static final String SHARE_ROOM_TITLE = "聆听声音，分享快乐"; /** * 分享房间 URL diff --git a/core/src/main/java/com/mango/core/share/ShareModel.java b/core/src/main/java/com/mango/core/share/ShareModel.java index 13485d1a3..36d278027 100644 --- a/core/src/main/java/com/mango/core/share/ShareModel.java +++ b/core/src/main/java/com/mango/core/share/ShareModel.java @@ -45,25 +45,15 @@ import retrofit2.http.Query; public class ShareModel extends BaseModel implements IShareModel { - private interface MSG { - String success = "分享成功"; - String failed = "分享失败，请重试"; - String cancel = "分享取消"; - } - private final Api api = RxNet.create(Api.class); - private static final class Helper { - public static final ShareModel INSTANCE = new ShareModel(); + private ShareModel() { } public static ShareModel get() { return Helper.INSTANCE; } - private ShareModel() { - } - @Override public Single shareH5(final WebJsBeanInfo.DataBean webViewInfo, Platform platform) { return shareH5(webViewInfo, platform, false); @@ -150,17 +140,17 @@ public class ShareModel extends BaseModel implements IShareModel { //无UI API if (userInfo != null && platform != null) { Platform.ShareParams sp = new Platform.ShareParams(); - sp.setText(XChatConstants.SHARE_ROOM_TEXT); + sp.setText(title + XChatConstants.SHARE_ROOM_TEXT); sp.setTitle(XChatConstants.SHARE_ROOM_TITLE); sp.setImageUrl(userInfo.getAvatar()); final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL + AuthModel.get().getCurrentUid() + "&uid=" + roomUid + "&room_name=" + URLEncoder.encode(title, "utf8") + "&room_id=" + roomId + "&room_avatar=" + URLEncoder.encode(room_avatar, "utf8") + "&share_name=" + - URLEncoder.encode( UserModel.get().getCacheLoginUserInfo().getNick(), "utf8"); + URLEncoder.encode(UserModel.get().getCacheLoginUserInfo().getNick(), "utf8"); //QQ空间分享 - sp.setSite(XChatConstants.SHARE_ROOM_TEXT); + sp.setSite(title + XChatConstants.SHARE_ROOM_TEXT); sp.setSiteUrl(siteUrl); //QQ分享 sp.setTitleUrl(siteUrl); @@ -194,7 +184,6 @@ public class ShareModel extends BaseModel implements IShareModel { } - /** * 向我们服务器报告分享 * @@ -217,13 +206,13 @@ public class ShareModel extends BaseModel implements IShareModel { api.getShareRedPacket( - String.valueOf(AuthModel.get().getCurrentUid()), - roomUid, - String.valueOf(shareType), - sharePageId + "", - shareUrl, - AuthModel.get().getTicket() - ) + String.valueOf(AuthModel.get().getCurrentUid()), + roomUid, + String.valueOf(shareType), + sharePageId + "", + shareUrl, + AuthModel.get().getTicket() + ) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(); @@ -324,7 +313,6 @@ public class ShareModel extends BaseModel implements IShareModel { } - @Override public Single shareText(Platform platform, String text) { return Single.create(emitter -> { @@ -450,42 +438,41 @@ public class ShareModel extends BaseModel implements IShareModel { } - @Override public Single shareCommon(Platform platform, ShareCommonInfo info, boolean toast) { return Single.create((SingleOnSubscribe) emitter -> { - Platform.ShareParams sp = new Platform.ShareParams(); - sp.setTitle(info.getTitle()); - sp.setText(info.getContent()); - sp.setImageUrl(info.getImageUrl()); - String siteUrl = info.getSiteUrl(); - //QQ空间分享 - sp.setSite(info.getTitle()); - sp.setSiteUrl(siteUrl); - //QQ分享 - sp.setTitleUrl(siteUrl); - //微信朋友圈分享 - sp.setUrl(siteUrl); - sp.setShareType(Platform.SHARE_WEBPAGE); - platform.setPlatformActionListener(new PlatformActionListener() { - @Override - public void onComplete(Platform platform1, int i, HashMap hashMap) { - emitter.onSuccess(MSG.success); - } + Platform.ShareParams sp = new Platform.ShareParams(); + sp.setTitle(info.getTitle()); + sp.setText(info.getContent()); + sp.setImageUrl(info.getImageUrl()); + String siteUrl = info.getSiteUrl(); + //QQ空间分享 + sp.setSite(info.getTitle()); + sp.setSiteUrl(siteUrl); + //QQ分享 + sp.setTitleUrl(siteUrl); + //微信朋友圈分享 + sp.setUrl(siteUrl); + sp.setShareType(Platform.SHARE_WEBPAGE); + platform.setPlatformActionListener(new PlatformActionListener() { + @Override + public void onComplete(Platform platform1, int i, HashMap hashMap) { + emitter.onSuccess(MSG.success); + } - @Override - public void onError(Platform platform1, int i, Throwable throwable) { - emitter.onError(new Throwable(MSG.failed)); - } + @Override + public void onError(Platform platform1, int i, Throwable throwable) { + emitter.onError(new Throwable(MSG.failed)); + } - @Override - public void onCancel(Platform platform1, int i) { - emitter.onError(new Throwable(MSG.cancel)); - } - }); - platform.share(sp); - }) + @Override + public void onCancel(Platform platform1, int i) { + emitter.onError(new Throwable(MSG.cancel)); + } + }); + platform.share(sp); + }) .doOnSuccess(s -> { if (toast) { SingleToastUtil.showToast(s); @@ -498,6 +485,13 @@ public class ShareModel extends BaseModel implements IShareModel { }); } + private interface MSG { + String success = "分享成功"; + String failed = "分享失败，请重试"; + String cancel = "分享取消"; + } + + interface Api { /** @@ -520,4 +514,8 @@ public class ShareModel extends BaseModel implements IShareModel { @Query("ticket") String ticket); } + private static final class Helper { + public static final ShareModel INSTANCE = new ShareModel(); + } + }