From 202a78526c47fbb227c6a84dbd61855fa43f600b Mon Sep 17 00:00:00 2001 From: huangzhuanghua <401742778@qq.com> Date: Wed, 14 Sep 2016 17:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=AE=8C=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=85=B3=E6=B3=A8=E6=B8=B8=E6=88=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/GameDetailActivity.java | 6 ++- .../java/com/gh/gamecenter/MainActivity.java | 42 +++++++++++++++++-- .../gh/gamecenter/SplashScreenActivity.java | 12 +++--- .../gamecenter/news/News3FragmentAdapter.java | 16 +++++-- .../layout/home_list_item_newsimage_type.xml | 3 +- .../res/layout/news_list_item_category.xml | 10 +++-- 6 files changed, 69 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index b006565571..c3271fb23b 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -115,15 +115,16 @@ public class GameDetailActivity extends BaseActivity implements View.OnClickList RelativeLayout reuse_actionbar = (RelativeLayout) contentView.findViewById(R.id.reuse_actionbar); reuse_actionbar.addView(iv_share, params); + init(contentView); + gameId = getIntent().getStringExtra("gameId"); entrance = getIntent().getStringExtra("entrance"); if (gameId == null) { gameEntity = (GameEntity) AppController.get("GameEntity", true); gameId = gameEntity.getId(); + actionbar_tv_title.setText(gameEntity.getName()); } - init(contentView); - adapter = new GameDetailAdapter(this, gameId, entrance); gamedetail_rv_show.setLayoutManager(new LinearLayoutManager(this)); gamedetail_rv_show.setAdapter(adapter); @@ -413,6 +414,7 @@ public class GameDetailActivity extends BaseActivity implements View.OnClickList if (!isDestroy) { Gson gson = new Gson(); gameEntity = gson.fromJson(response.toString(), GameEntity.class); + actionbar_tv_title.setText(gameEntity.getName()); adapter.setGameEntity(gameEntity); adapter.getGameDetail(); } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index c0bb060ce8..461743182e 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -58,6 +58,7 @@ import com.gh.gamecenter.db.info.GameInfo; import com.gh.gamecenter.db.info.SuspectedGameInfo; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.AppEntity; +import com.gh.gamecenter.entity.GameDigestEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; @@ -262,7 +263,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } else { toast(downloadEntity.getName() + " - 下载完成"); } - if (downloadEntity.isPluggable()) { + if (!downloadEntity.isPluggable()) { if (sp.getBoolean("autoinstall", true)) { if (FileUtils.isEmptyFile(downloadEntity.getPath())) { toast("解析包错误"); @@ -408,15 +409,15 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); - if (!sp.getBoolean("isNewsFirstLaunch", true) + if (!sp.getBoolean("isNewFirstLaunch", true) && sp.getBoolean("autoupdate", true)) { checkUpdate(); } - if (sp.getBoolean("isNewsFirstLaunch", true)) { + if (sp.getBoolean("isNewFirstLaunch", true)) { getPluginUpdate(); getDisclaimer(true); - sp.edit().putBoolean("isNewsFirstLaunch", false).apply(); + sp.edit().putBoolean("isNewFirstLaunch", false).apply(); } else { getDisclaimer(false); handler.postDelayed(runnable, 500); @@ -1350,12 +1351,45 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } + if ("安装".equals(busFour.getType())) { + // 安装后关注游戏 + JsonObjectExtendedRequest request = new JsonObjectExtendedRequest( + Config.HOST + "v1d45/support/package/" + packageName + "/game/digest", + new Response.Listener() { + @Override + public void onResponse(JSONObject response) { + Gson gson = new Gson(); + GameDigestEntity gameDigestEntity = gson.fromJson( + response.toString(), GameDigestEntity.class); + concernGame(gameDigestEntity.getId()); + } + }, null); + AppController.addToRequestQueue(request, MainActivity.class); + } + Map map = new HashMap<>(); map.put("type", busFour.getType()); map.put("packageName", busFour.getPackageName()); DataCollectionManager.onEvent(this, "inorunstall", map); } + private void concernGame(String id) { + final ConcernManager concernManager = new ConcernManager(getApplicationContext()); + if (!concernManager.isConcern(id)) { + JsonObjectExtendedRequest request = new JsonObjectExtendedRequest( + Config.HOST + "v2d0/game/" + id + "/digest", + new Response.Listener() { + @Override + public void onResponse(JSONObject response) { + Gson gson = new Gson(); + GameEntity gameEntity = gson.fromJson(response.toString(), GameEntity.class); + concernManager.addByEntity(gameEntity); + } + }, null); + AppController.addToRequestQueue(request, MainActivity.class); + } + } + @Override public void finish() { // 上传数据 diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index b4a84aeea7..11411eda45 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -88,7 +88,7 @@ public class SplashScreenActivity extends BaseActivity { from = getIntent().getStringExtra("from"); - if (sp.getBoolean("isNewsFirstLaunch", true) + if (sp.getBoolean("isNewFirstLaunch", true) || sp.getInt("actionbar_height", 0) != 0) { setTheme(R.style.AppTheme_Guide); } else { @@ -105,7 +105,7 @@ public class SplashScreenActivity extends BaseActivity { } } - if (sp.getBoolean("isNewsFirstLaunch", true)) { + if (sp.getBoolean("isNewFirstLaunch", true)) { setContentView(R.layout.activity_splash_intro); ViewPager splash_viewPager = (ViewPager) findViewById(R.id.splash_viewPager); splash_viewPager.setAdapter(new ViewPagerAdapter()); @@ -156,7 +156,7 @@ public class SplashScreenActivity extends BaseActivity { @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) { - if (sp.getBoolean("isNewsFirstLaunch", true)) { + if (sp.getBoolean("isNewFirstLaunch", true)) { launch(); } else { return true; @@ -380,7 +380,7 @@ public class SplashScreenActivity extends BaseActivity { for (int i = 0, size = list.size(); i < size; i++) { final String packageName = list.get(i); JsonObjectExtendedRequest request = new JsonObjectExtendedRequest( - Config.HOST + "v1d45/support/package/" + list.get(i) + "/game/digest", + Config.HOST + "v1d45/support/package/" + packageName + "/game/digest", new Response.Listener() { @Override @@ -468,7 +468,7 @@ public class SplashScreenActivity extends BaseActivity { } entity.setTime(System.currentTimeMillis()); entity.setPackageNames(packageNames); - if (sp.getBoolean("isNewsFirstLaunch", true)) { + if (sp.getBoolean("isNewFirstLaunch", true)) { //默认安装即为关注 if (!concernManager.isConcern(entity.getId())) { concernManager.addByEntity(gameEntity); @@ -552,7 +552,7 @@ public class SplashScreenActivity extends BaseActivity { } } // 不是第一次启动 - if (!sp.getBoolean("isNewsFirstLaunch", true)) { + if (!sp.getBoolean("isNewFirstLaunch", true)) { int height = sp.getInt("actionbar_height", 0); if (height == 0) { final ActionBar actionBar = getActionBar(); diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java index 16c02bb0d6..93a0a3dcd1 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java @@ -24,6 +24,7 @@ import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.TimestampUtils; import com.gh.common.view.CardLinearLayout; +import com.gh.common.view.CardRelativeLayout; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.NewsFooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsHeadViewHolder; @@ -336,11 +337,20 @@ public class News3FragmentAdapter extends NewsHeadViewHolder viewHolder = (NewsHeadViewHolder) holder; if (position == position_today) { + CardRelativeLayout cardRelativeLayout = (CardRelativeLayout) viewHolder.itemView; + cardRelativeLayout.setmBottom(DisplayUtils.dip2px(context, 8)); viewHolder.headType.setText("今天"); viewHolder.headType.setTextColor(0xFF1BA4FC); } if (position == position_before) { + CardRelativeLayout cardRelativeLayout = (CardRelativeLayout) viewHolder.itemView; +// if (position_today == -1) { + cardRelativeLayout.setmTop(0); +// } else { +// cardRelativeLayout.setmTop(DisplayUtils.dip2px(context, 8)); +// } + cardRelativeLayout.setmBottom(DisplayUtils.dip2px(context, 8)); viewHolder.headType.setText("昨天/以前"); viewHolder.headType.setTextColor(0xFF3A3A3A); } @@ -392,7 +402,7 @@ public class News3FragmentAdapter extends from = "今天"; // 第一个 if (position - position_today - 1 == 0) { - ((CardLinearLayout) viewHolder.itemView).setmTop(DisplayUtils.dip2px(context, 8)); + ((CardLinearLayout) viewHolder.itemView).setmTop(0); viewHolder.news_line.setVisibility(View.GONE); } else { ((CardLinearLayout) viewHolder.itemView).setmTop(0); @@ -402,7 +412,7 @@ public class News3FragmentAdapter extends // 最后一个 if (position - position_today == todayNewsList.size()) { ((CardLinearLayout) viewHolder.itemView).setBottom(true); - ((CardLinearLayout) viewHolder.itemView).setmBottom(DisplayUtils.dip2px(context, 8)); + ((CardLinearLayout) viewHolder.itemView).setmBottom(0); } else { ((CardLinearLayout) viewHolder.itemView).setBottom(false); ((CardLinearLayout) viewHolder.itemView).setmBottom(0); @@ -413,7 +423,7 @@ public class News3FragmentAdapter extends from = "昨天/以前"; // 第一个 if (position - position_before - 1 == 0) { - ((CardLinearLayout) viewHolder.itemView).setmTop(DisplayUtils.dip2px(context, 8)); + ((CardLinearLayout) viewHolder.itemView).setmTop(0); viewHolder.news_line.setVisibility(View.GONE); } else { ((CardLinearLayout) viewHolder.itemView).setmTop(0); diff --git a/app/src/main/res/layout/home_list_item_newsimage_type.xml b/app/src/main/res/layout/home_list_item_newsimage_type.xml index f0ce1b442d..c23a7c4f70 100644 --- a/app/src/main/res/layout/home_list_item_newsimage_type.xml +++ b/app/src/main/res/layout/home_list_item_newsimage_type.xml @@ -7,8 +7,7 @@ android:orientation="horizontal" android:padding="8dp" app:left="8dp" - app:right="8dp" - app:top="8dp"> + app:right="8dp"> - + android:paddingTop="8dp" + app:left="8dp" + app:right="8dp"> - \ No newline at end of file + \ No newline at end of file