From 2dabd5492f33b1ba4d6c3cb5c0921c0cdcafea35 Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Thu, 24 Nov 2016 17:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E2=80=9C=E4=BB=8E=E4=B8=8D=E2=80=9D=E7=9A=84=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1=E5=A5=BD=E5=8F=8B?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=B8=8D=E8=83=BD=E6=89=AB=E6=8F=8F=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 4 +- .../com/gh/common/util/MessageShareUtils.java | 39 +++++++++++++------ .../java/com/gh/gamecenter/MainActivity.java | 2 +- .../gh/gamecenter/adapter/PluginAdapter.java | 1 - .../gh/gamecenter/adapter/SubjectAdapter.java | 4 +- .../res/layout/activity_messagedetail.xml | 2 +- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 563cdfdf81..bd2bc1ed0c 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -144,9 +144,9 @@ public class DialogUtils { } public static void showPluginDialog(Context context, final ConfiremListener listener) { - Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能,此过程将" + Spanned spanned = Html.fromHtml("您将进行插件化安装以实现插件功能，此过程将" + "卸载" + "当前使用的版本并" - + "安装插件版本" + "。"); + + "安装插件版本"); showWarningDialog(context, "插件化安装", spanned, listener); } diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index f991fd6e9e..92275f7728 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -1,6 +1,7 @@ package com.gh.common.util; import android.app.Activity; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; @@ -265,19 +266,33 @@ public class MessageShareUtils { private void wechatSahre(){ Utils.toast(context,"分享跳转中..."); - WXImageObject imgObj = new WXImageObject(); - imgObj.setImagePath(context.getExternalCacheDir().getPath() + "/ShareImg/" + picName); - WXMediaMessage msg = new WXMediaMessage(); - msg.mediaObject = imgObj; + //官方分享 +// WXImageObject imgObj = new WXImageObject(); +// imgObj.setImagePath(context.getExternalCacheDir().getPath() + "/ShareImg/" + picName); +// WXMediaMessage msg = new WXMediaMessage(); +// msg.mediaObject = imgObj; +// +// SendMessageToWX.Req req = new SendMessageToWX.Req(); +// req.transaction = buildTransaction("img"); +// req.message = msg; +// req.scene = SendMessageToWX.Req.WXSceneSession; +// +// Bitmap compressBp = compressBitmap(shareBm); +// msg.thumbData = Util.bmpToByteArray(compressBp, true); +// api.sendReq(req); - SendMessageToWX.Req req = new SendMessageToWX.Req(); - req.transaction = buildTransaction("img"); - req.message = msg; - req.scene = SendMessageToWX.Req.WXSceneSession; - - Bitmap compressBp = compressBitmap(shareBm); - msg.thumbData = Util.bmpToByteArray(compressBp, true); - api.sendReq(req); + //调用手机系统分享 + try { + Intent intent = new Intent(Intent.ACTION_SEND); + intent.setType("image/*"); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + context.getExternalCacheDir().getPath() + "/ShareImg/" + picName)); + intent.setComponent(new ComponentName("com.tencent.mm", "com.tencent.mm.ui.tools.ShareImgUI")); + context.startActivity(intent); + } catch (Exception e) { + Utils.toast(context,"分享失败!请检查是否已安装微信"); + e.printStackTrace(); + } if (popupWindow == null) return; popupWindow.dismiss(); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 72a9fbe989..25819f9efd 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1163,7 +1163,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene if ("EVERY_TIME_OPEN".equals(appEntity.getAlert())) { // 每次都提示 showUpdateDialog(updateMD5); - } else { // TODO 加一个从不提示更新 NEVER + } else if (!"NEVER".equals(appEntity.getAlert())){ // 一天提示一次 String showUpdateTime = sp.getString("show_update_tiem", null); SimpleDateFormat format = new SimpleDateFormat( diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java index 600b5e2d1c..da38657fa9 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -155,7 +155,6 @@ public class PluginAdapter extends RecyclerView.Adapter viewHolder.home1_game_order.setVisibility(View.GONE); -// ImageUtils.getInstance(context).display(gameEntity.getIcon(), viewHolder.gameThumb); viewHolder.gameThumb.setImageURI(gameEntity.getIcon()); if (gameEntity.isPluggable()) { viewHolder.gameNameAndSize.setText(gameEntity.getName() + " - " + diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java index 69b17aab38..b23cbab587 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java @@ -254,8 +254,10 @@ public class SubjectAdapter extends RecyclerView.Adapter