Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
This commit is contained in:
kehaoyuan
2017-05-17 18:35:37 +08:00
109 changed files with 1478 additions and 1113 deletions

View File

@ -262,12 +262,7 @@ public class MessageShareUtils {
//调用手机系统分享
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://" + mContext.getExternalCacheDir().getPath() + "/ShareImg/" + picName));
intent.setComponent(new ComponentName("com.tencent.mm", "com.tencent.mm.ui.tools.ShareImgUI"));
mContext.startActivity(intent);
mContext.startActivity(IntentUtils.getWechatShareIntent(mContext, picName));
} catch (Exception e) {
Utils.toast(mContext, "分享失败!请检查是否已安装微信");
e.printStackTrace();