Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
This commit is contained in:
khy
2016-10-25 14:56:42 +08:00
parent 719177b816 190296e533
commit c2cf64dfa0
45 changed files with 443 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -677,7 +677,6 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
concernInfo.setPackageNames(packageNames);
concernManager.updateByConcern(concernInfo);
}
if (isNewFirstLaunch) {
//默认安装即为关注
if (!concernManager.isConcern(gameEntity.getId())) {
@ -685,7 +684,6 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
}
}
}
addConcernCount();
if (cCount == size) {
update();
@ -854,9 +852,11 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
new Response.Listener<JSONObject>() {
@Override
public void onResponse(JSONObject response) {
Gson gson = new Gson();
GameEntity gameEntity = gson.fromJson(response.toString(), GameEntity.class);
list.add(gameEntity);
if (response.length() != 0) {
Gson gson = new Gson();
GameEntity gameEntity = gson.fromJson(response.toString(), GameEntity.class);
list.add(gameEntity);
}
addCount();
if (count == size) {
processPluginData(list);
@ -993,18 +993,20 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
new Response.Listener<JSONObject>() {
@Override
public void onResponse(JSONObject response) {
try {
boolean isShow = response.getBoolean("isShow");
sp.edit().putBoolean("isShowDisclaimer", isShow).apply();
if (isShow) {
String content = response.getString("content");
sp.edit().putString("disclaimer", content).apply();
if (isFirst) {
DialogUtils.showDisclaimerDialog(MainActivity.this, content);
if (response.length() != 0) {
try {
boolean isShow = response.getBoolean("isShow");
sp.edit().putBoolean("isShowDisclaimer", isShow).apply();
if (isShow) {
String content = response.getString("content");
sp.edit().putString("disclaimer", content).apply();
if (isFirst) {
DialogUtils.showDisclaimerDialog(MainActivity.this, content);
}
}
} catch (JSONException e) {
e.printStackTrace();
}
} catch (JSONException e) {
e.printStackTrace();
}
}
}, null);
@ -1036,7 +1038,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
Intent toIntent = new Intent(MainActivity.this, clazz);
if ("NewsActivity".equals(to) || "NewsDetailActivity".equals(to)) {
toIntent.putExtra("newsId", getIntent().getExtras().getString("newsId"));
toIntent.putExtra("entrance", getIntent().getExtras().getString("entrance"));
toIntent.putExtra("entrance", "(插件跳转)");
} else if("DownloadManagerActivity".equals(to)) {
String packageName = getIntent().getExtras().getString("packageName");
if (packageName != null) {
@ -1045,7 +1047,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
}
} else if ("GameDetailsActivity".equals(to) || "GameDetailActivity".equals(to)) {
toIntent.putExtra("gameId", getIntent().getExtras().getString("gameId"));
toIntent.putExtra("entrance", getIntent().getExtras().getString("entrance"));
toIntent.putExtra("entrance", "(插件跳转)");
} else if ("SubjectActivity".equals(to)) {
toIntent.putExtra("id", getIntent().getExtras().getString("id"));
toIntent.putExtra("name", getIntent().getExtras().getString("name"));
@ -1067,12 +1069,12 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
startActivity(intent);
} else if (from.equals("mipush_news")) {
Intent intent = new Intent(MainActivity.this, NewsDetailActivity.class);
intent.putExtra("entrance", "小米推送");
intent.putExtra("entrance", "(小米推送)");
intent.putExtra("newsId", getIntent().getStringExtra("newsId"));
startActivity(intent);
} else if (from.equals("mipush_new_game")) {
Intent intent = new Intent(MainActivity.this, GameDetailActivity.class);
intent.putExtra("entrance", "小米推送");
intent.putExtra("entrance", "(小米推送)");
startActivity(intent);
} else if (from.equals("mipush_plugin")) {
Intent intent = new Intent(MainActivity.this, DownloadManagerActivity.class);
@ -1550,23 +1552,25 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene
new Response.Listener<JSONObject>() {
@Override
public void onResponse(JSONObject response) {
Gson gson = new Gson();
GameEntity gameEntity = gson.fromJson(response.toString(), GameEntity.class);
GameManager manager = new GameManager(getApplicationContext());
manager.addOrUpdate(gameEntity.getApk(), gameEntity.getId(), gameEntity.getName());
if (!concernManager.isConcern(id)) {
concernManager.addByEntity(gameEntity);
}
// 检查是否能插件化
if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
&& gameEntity.getApk() != null) {
for (ApkEntity apkEntity : gameEntity.getApk()) {
if (apkEntity.getPackageName().equals(packageName)
&& !TextUtils.isEmpty(apkEntity.getGhVersion())
&& !PackageUtils.isSignature(getApplicationContext(), apkEntity.getPackageName())) {
PackageManager.addUpdate(getGameUpdateEntity(gameEntity, apkEntity));
EventBus.getDefault().post(new EBDownloadStatus("plugin"));
break;
if (response.length() != 0) {
Gson gson = new Gson();
GameEntity gameEntity = gson.fromJson(response.toString(), GameEntity.class);
GameManager manager = new GameManager(getApplicationContext());
manager.addOrUpdate(gameEntity.getApk(), gameEntity.getId(), gameEntity.getName());
if (!concernManager.isConcern(id)) {
concernManager.addByEntity(gameEntity);
}
// 检查是否能插件化
if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0
&& gameEntity.getApk() != null) {
for (ApkEntity apkEntity : gameEntity.getApk()) {
if (apkEntity.getPackageName().equals(packageName)
&& !TextUtils.isEmpty(apkEntity.getGhVersion())
&& !PackageUtils.isSignature(getApplicationContext(), apkEntity.getPackageName())) {
PackageManager.addUpdate(getGameUpdateEntity(gameEntity, apkEntity));
EventBus.getDefault().post(new EBDownloadStatus("plugin"));
break;
}
}
}
}