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