diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e0731e441e..11909219c5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -237,6 +237,13 @@
+
+
+
+
+
diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.java b/app/src/main/java/com/gh/common/util/ConcernUtils.java
index ee1a49df0e..5bd982f8e6 100644
--- a/app/src/main/java/com/gh/common/util/ConcernUtils.java
+++ b/app/src/main/java/com/gh/common/util/ConcernUtils.java
@@ -114,7 +114,7 @@ public class ConcernUtils {
@Override
public void onResponse(String response) {
if (listener != null) {
- listener.downSucced("跟新设备关注成功");
+ listener.downSucced("更新设备关注成功");
}
}
}, new Response.ErrorListener() {
diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java
index 4ff2a5a5d3..8af8c156a7 100644
--- a/app/src/main/java/com/gh/common/util/ShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/ShareUtils.java
@@ -8,6 +8,7 @@ import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Matrix;
import android.os.Bundle;
+import android.os.Handler;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.Gravity;
@@ -61,6 +62,8 @@ public class ShareUtils {
private static IWXAPI api;
private static Tencent mTencent;
+ private Handler handler;
+
private int[] arrLogo = {R.drawable.share_wechat_logo, R.drawable.share_wechatmoments_logo, R.drawable.share_qq_logo
, R.drawable.share_qzone_logo, R.drawable.share_sinaweibo_logo, R.drawable.share_shortmessage_logo
, R.drawable.share_copyfont_logo, R.drawable.share_cancel_logo};
@@ -339,6 +342,7 @@ public class ShareUtils {
//新浪微博分享
private void sinaWeiboSahre(){
SinaWeibo.ShareParams sinaWeiboParams = new SinaWeibo.ShareParams();
+ handler = new Handler();
if (shareNewsTitle != null){
sinaWeiboParams.setText(shareNewsTitle + " " + shareUrl);
@@ -351,6 +355,12 @@ public class ShareUtils {
}
sinaWeiboParams.setImageUrl(shareIcon);
sharePlatform(sinaWeiboParams, SinaWeibo.NAME);
+ handler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ Utils.toast(context, "分享成功");
+ }
+ }, 3000);
}
//短信分享
@@ -426,14 +436,9 @@ public class ShareUtils {
@Override
public void onLoadingComplete(String s, View view, Bitmap bitmap) {
- String imgType = shareIcon.substring(shareIcon.length() - 3);
- Bitmap resultBp;
- if ("png".equals(imgType)){
- resultBp = addBackGround(bitmap);
- }else {
- resultBp = compressBitmap(bitmap);
- }
+ Bitmap compressBp = compressBitmap(bitmap);
+ Bitmap resultBp = addBackGround(compressBp);
msg.thumbData = Util.bmpToByteArray(resultBp, true);
api.sendReq(req);
}
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index 3b0e16e0bb..0320430db2 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -149,6 +149,8 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
private TextView app_btn_cancel;
private AppEntity appEntity;
+ public static MainActivity mainActivity = null;
+
// 黄壮华 添加观察者 修改2015/8/15
private DataWatcher dataWatcher = new DataWatcher() {
@Override
@@ -393,6 +395,8 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
// 初始化gameMap
DownloadManager.getInstance(this).initGameMap();
+ mainActivity = this;
+
if (savedInstanceState != null) {
currentTab = savedInstanceState.getInt("currentTab");
} else {
@@ -428,10 +432,10 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
if (isNewFirstLaunch) {
getPluginUpdate();
sp.edit().putBoolean("isNewFirstLaunch", false).apply();
- } else {
- handler.postDelayed(runnable, 500);
}
+ handler.postDelayed(runnable, 500);
+
getDisclaimer(isNewFirstLaunch);
// 初始化PlatformUtils
diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
index b96c24b586..6763366a6c 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
@@ -66,9 +66,6 @@ public class GameUpdateFragment extends Fragment {
if (savedInstanceState.containsKey("isUpdate")) {
isUpdate = savedInstanceState.getBoolean("isUpdate");
}
- } else {
- packageName = null;
- isUpdate = false;
}
view = View.inflate(getActivity(), R.layout.gameupdate, null);
diff --git a/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java
new file mode 100644
index 0000000000..8c92989e3d
--- /dev/null
+++ b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java
@@ -0,0 +1,32 @@
+package com.gh.gamecenter.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.gh.gamecenter.MainActivity;
+
+/**
+ * Created by khy on 2016/9/1.
+ */
+public class ActivitySkipReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if(intent.getAction().equals("com.gh.gamecenter.ACTIVITYSKIP")){
+ if (MainActivity.mainActivity != null){
+ MainActivity.mainActivity.finish();
+ }
+ Bundle params = intent.getExtras();
+ String to = params.getString("to");
+ if ("NewsActivity".equals(to)){
+ params.putString("to", "NewsDetailActivity");
+ }
+
+ Intent skipIntent = new Intent(context,MainActivity.class);
+ skipIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ skipIntent.putExtras(params);
+ context.startActivity(skipIntent);
+ }
+ }
+}
diff --git a/app/src/main/res/layout/gamedetail_news_item.xml b/app/src/main/res/layout/gamedetail_news_item.xml
index 587aa7ac1b..91114940f3 100644
--- a/app/src/main/res/layout/gamedetail_news_item.xml
+++ b/app/src/main/res/layout/gamedetail_news_item.xml
@@ -8,7 +8,6 @@
android:id="@+id/gamedetail_news_item_line"
android:layout_width="match_parent"
android:layout_height="1dp"
- android:layout_marginBottom="12dp"
android:background="#ededed"/>
+ android:paddingBottom="12dp"
+ android:paddingTop="12dp">