From bdfda12d6888ed6cf0c34a1f9bb61148e7238323 Mon Sep 17 00:00:00 2001
From: khy <18814188563@163.com>
Date: Wed, 21 Sep 2016 16:28:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=97?=
=?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=B9=BF=E6=92=AD=E7=9A=84=E6=8E=A5=E6=94=B6?=
=?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 7 ++++
.../java/com/gh/common/util/ConcernUtils.java | 2 +-
.../java/com/gh/common/util/ShareUtils.java | 19 +++++++----
.../java/com/gh/gamecenter/MainActivity.java | 6 ++--
.../download/GameUpdateFragment.java | 3 --
.../receiver/ActivitySkipReceiver.java | 32 +++++++++++++++++++
6 files changed, 56 insertions(+), 13 deletions(-)
create mode 100644 app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2216792a4d..1c3b4b5d6b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -236,6 +236,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 17ebe0fd29..7b18d71878 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 c8a06fe993..2f670e0242 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -9,7 +9,6 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.net.Uri;
-import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -88,7 +87,6 @@ import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest;
import com.gh.gamecenter.volley.extended.StringExtendedRequest;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import com.tencent.stat.StatConfig;
import org.json.JSONArray;
import org.json.JSONException;
@@ -149,6 +147,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 +393,8 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
// 初始化gameMap
DownloadManager.getInstance(this).initGameMap();
+ mainActivity = this;
+
if (savedInstanceState != null) {
currentTab = savedInstanceState.getInt("currentTab");
} else {
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 96dcadd476..45f8e94001 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
@@ -63,9 +63,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);
+ }
+ }
+}
From d053fc9fea3390a946e68f2e1903f196a0eacfe7 Mon Sep 17 00:00:00 2001
From: khy <18814188563@163.com>
Date: Wed, 21 Sep 2016 18:26:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/java/com/gh/gamecenter/MainActivity.java | 4 ++--
app/src/main/res/layout/gamedetail_news_item.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index 2f670e0242..7a85d288ed 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -430,10 +430,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/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">