From 1706ead392edd3e72948e369fcc00199074e804b Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 2 Nov 2017 15:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=B7=B2=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E7=9A=84=E6=B8=B8=E6=88=8F=E6=95=B0=E6=8D=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/util/DataCollectionUtils.java | 13 +- .../java/com/gh/gamecenter/MainActivity.java | 72 +++--- .../adapter/CommentDetailAdapter.java | 2 +- .../adapter/ConcernRecommendAdapter.java | 12 +- .../adapter/InstallFragmentAdapter.java | 14 +- .../adapter/KcSelectGameAdapter.java | 16 +- .../java/com/gh/gamecenter/db/ConcernDao.java | 179 -------------- .../com/gh/gamecenter/db/DatabaseHelper.java | 6 +- .../java/com/gh/gamecenter/db/InstallDao.java | 115 +++++++++ .../{ConcernInfo.java => InstallInfo.java} | 45 +--- .../download/GameUpdateFragmentAdapter.java | 8 +- .../gh/gamecenter/manager/ConcernManager.java | 225 ------------------ .../gh/gamecenter/manager/InstallManager.java | 127 ++++++++++ .../com/gh/gamecenter/news/News2Fragment.java | 35 ++- .../statistics/AppTrafficUtils.java | 6 +- app/src/main/res/layout/gamedetail_body.xml | 2 +- 16 files changed, 325 insertions(+), 552 deletions(-) delete mode 100644 app/src/main/java/com/gh/gamecenter/db/ConcernDao.java create mode 100644 app/src/main/java/com/gh/gamecenter/db/InstallDao.java rename app/src/main/java/com/gh/gamecenter/db/info/{ConcernInfo.java => InstallInfo.java} (72%) delete mode 100644 app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java create mode 100644 app/src/main/java/com/gh/gamecenter/manager/InstallManager.java diff --git a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java index 7a4564988e..1e5fe9adda 100644 --- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java +++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java @@ -3,17 +3,14 @@ package com.gh.common.util; import android.content.Context; import android.os.Build; -import com.lightgame.download.DownloadEntity; -import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.NewsDetailEntity; -import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; +import com.lightgame.download.DownloadEntity; import org.json.JSONArray; -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -118,18 +115,10 @@ public class DataCollectionUtils { // 上传用户数据 public static void uploadUser(Context context) { - ConcernManager concernManager = new ConcernManager(context); - ArrayList concernList = new ArrayList<>(); - for (ConcernInfo entity : concernManager.getAllConcern()) { - if (entity.isConcern()) { - concernList.add(entity.getGameName()); - } - } Map map = new HashMap<>(); map.put("type", Build.MODEL); map.put("system", Build.VERSION.SDK_INT + "=" + Build.VERSION.RELEASE); map.put("install", PackageManager.getInstalledList()); - map.put("concern", concernList); DataCollectionManager.upsert(context, "user", map); } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index f824fbcbde..ed0df8a4f4 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -35,7 +35,7 @@ import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.TrafficUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.db.info.ConcernInfo; +import com.gh.gamecenter.db.info.InstallInfo; import com.gh.gamecenter.db.info.GameInfo; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameDigestEntity; @@ -46,7 +46,7 @@ import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.fragment.MainFragment; -import com.gh.gamecenter.manager.ConcernManager; +import com.gh.gamecenter.manager.InstallManager; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.FilterManager; import com.gh.gamecenter.manager.GameManager; @@ -101,7 +101,7 @@ public class MainActivity extends BaseActivity { public final static String EB_MAINACTIVITY_TAG = "MainActivity"; public final static String EB_SKIP_GAMEFRAGMENT = "GameFragment"; private SharedPreferences sp; - private ConcernManager concernManager; + private InstallManager mInstallManager; private static final int SKIP_SETTING_REQUEST = 14; private boolean isSkipped; @@ -379,7 +379,7 @@ public class MainActivity extends BaseActivity { final CountDownLatch latch = ObservableUtil.latch(localList.size(), new Action1() { @Override public void call(Object o) { - updateConcern(); + updateInstall(); } }); @@ -396,7 +396,7 @@ public class MainActivity extends BaseActivity { gameInfo.setId(gameDigestEntity.getId()); gameInfo.setPackageName(packageName); gameInfo.setGameName(gameDigestEntity.getName()); - concernManager.updateByEntity(gameInfo); + mInstallManager.updateByEntity(gameInfo); } latch.countDown(); @@ -418,9 +418,12 @@ public class MainActivity extends BaseActivity { } } - private void updateConcern() { + /** + * 为已安装的游戏添加助手后台存在的包 + */ + private void updateInstall() { ArrayList concernIdList = new ArrayList<>(); - for (ConcernInfo entity : concernManager.getAllConcern()) { + for (InstallInfo entity : mInstallManager.getAllInstall()) { concernIdList.add(entity.getId()); } if (concernIdList.isEmpty()) { @@ -436,8 +439,8 @@ public class MainActivity extends BaseActivity { .subscribe(new Response() { @Override public void onNext(GameEntity response) { - ConcernInfo concernInfo = concernManager.findConcernById(response.getId()); - if (concernInfo != null && response.getApk().size() != 0) { + InstallInfo installInfo = mInstallManager.findInstallById(response.getId()); + if (installInfo != null && response.getApk().size() != 0) { HashMap packageNames = new HashMap<>(); for (ApkEntity apkEntity : response.getApk()) { if (PackageManager.isInstalled(apkEntity.getPackageName())) { @@ -446,9 +449,9 @@ public class MainActivity extends BaseActivity { packageNames.put(apkEntity.getPackageName(), false); } } - concernInfo.setTime(System.currentTimeMillis()); - concernInfo.setPackageNames(packageNames); - concernManager.updateByConcern(concernInfo); + installInfo.setTime(System.currentTimeMillis()); + installInfo.setPackageNames(packageNames); + mInstallManager.updateInstall(installInfo); } } @@ -460,8 +463,8 @@ public class MainActivity extends BaseActivity { } } - /* - * 更新关注列表数据 + /** + * 更新安装列表数据 */ private void update() { HaloApp.MAIN_EXECUTOR.execute(new Runnable() { @@ -469,8 +472,8 @@ public class MainActivity extends BaseActivity { public void run() { final List installed = new ArrayList<>(); TrafficUtils spy = TrafficUtils.getInstance(getApplicationContext(), true); - List concernList = concernManager.getAllConcern(); - for (ConcernInfo concernEntity : concernList) { + List concernList = mInstallManager.getAllInstall(); + for (InstallInfo concernEntity : concernList) { concernEntity.setTime(System.currentTimeMillis()); int quantity = 0; HashMap packageNames = new HashMap<>(); @@ -484,34 +487,15 @@ public class MainActivity extends BaseActivity { } } concernEntity.setPackageNames(packageNames); - concernEntity.setInstalled(quantity > 0); concernEntity.setInstalledQuantity(quantity); - String tag = null; int weight = 0; - if (concernEntity.isConcern() && concernEntity.isInstalled()) { - tag = "已关注,已安装"; - weight = 2; - } else if (concernEntity.isConcern() - && !concernEntity.isInstalled()) { - tag = "已关注"; - weight = 1; - } else if (!concernEntity.isConcern() - && concernEntity.isInstalled()) { - tag = "已安装"; - weight = 1; - } - concernEntity.setTag(tag); long traffic = spy.getTraffic(new ArrayList<>(concernEntity.getPackageNames().keySet())); concernEntity.setTraffic(traffic); if (traffic > 0) { weight++; } concernEntity.setWeight(weight); - if (weight == 0) { - concernManager.deleteConcern(concernEntity.getId()); - } else { - concernManager.updateByConcern(concernEntity); - } + mInstallManager.updateInstall(concernEntity); } // 更新用户已安装游戏 @@ -539,8 +523,8 @@ public class MainActivity extends BaseActivity { } private void checkGameUpdate() { - List infos = concernManager.getInstalledGame(); - for (ConcernInfo info : infos) { + List infos = mInstallManager.getAllInstall(); + for (InstallInfo info : infos) { for (String packageName : info.getPackageNames().keySet()) { if (info.getPackageNames().get(packageName) && PackageUtils.getMetaData(this, packageName, "gh_version") != null) { @@ -553,7 +537,7 @@ public class MainActivity extends BaseActivity { private void checkGamePlugin() { final List list = new ArrayList<>(); List> sequences = new ArrayList<>(); - for (ConcernInfo info : concernManager.getInstalledGame()) { + for (InstallInfo info : mInstallManager.getAllInstall()) { sequences.add(RetrofitManager.getInstance(this).getApi().getGameDigest(info.getId())); } Observable.merge(sequences) @@ -597,9 +581,9 @@ public class MainActivity extends BaseActivity { if (list == null || list.isEmpty()) { return; } - List infos = concernManager.getInstalledGame(); + List infos = mInstallManager.getAllInstall(); HashMap map; - for (ConcernInfo info : infos) { + for (InstallInfo info : infos) { for (GameEntity gameEntity : list) { if (gameEntity.getId().equals(info.getId()) && gameEntity.getTag() != null && gameEntity.getTag().size() != 0 @@ -644,7 +628,7 @@ public class MainActivity extends BaseActivity { replaceFragment(new MainFragment()); - concernManager = new ConcernManager(getApplicationContext()); + mInstallManager = new InstallManager(getApplicationContext()); if (!isNewFirstLaunch && sp.getBoolean("autoupdate", true)) { // 检查助手更新 @@ -887,12 +871,12 @@ public class MainActivity extends BaseActivity { GameManager gameManager = new GameManager(getApplicationContext()); GameInfo gameInfo = gameManager.findGame(packageName); if (gameInfo != null) { - concernManager.updateByEntity(gameInfo); + mInstallManager.updateByEntity(gameInfo); } } else if ("卸载".equals(busFour.getType())) { FilterManager filterManager = new FilterManager(getApplicationContext()); if (filterManager.isFilter(packageName)) { - concernManager.updateByPackageName(packageName); + mInstallManager.updateByPackageName(packageName); } } if ("卸载".equals(busFour.getType()) || "安装".equals(busFour.getType())) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index f1d89396be..a3c2208b90 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -121,7 +121,7 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { CommentUtils.setCommentTime(holder.commentTimeTv, commentEntity.getTime()); if (commentEntity.getParent() != null) { - holder.commentContentTv.setText("@dsdasd" + commentEntity.getParent().getUser().getName() + ": " + commentEntity.getContent()); + holder.commentContentTv.setText("@" + commentEntity.getParent().getUser().getName() + ": " + commentEntity.getContent()); } else { holder.commentContentTv.setText(commentEntity.getContent()); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index d3888e9ae5..dce1a8796f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -16,9 +16,9 @@ import com.gh.common.util.StringUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; -import com.gh.gamecenter.db.info.ConcernInfo; +import com.gh.gamecenter.db.info.InstallInfo; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.manager.ConcernManager; +import com.gh.gamecenter.manager.InstallManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseRecyclerAdapter; @@ -43,7 +43,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter mRecommendGameList; private List mConcernGameList; - private ConcernManager mConcernManager; + private InstallManager mInstallManager; private Toast mToast; @@ -55,7 +55,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter(); - mConcernManager = new ConcernManager(mContext); + mInstallManager = new InstallManager(mContext); init(); } @@ -63,8 +63,8 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter> sequences = new ArrayList<>(); - for (ConcernInfo concernInfo : mConcernManager.getInstalledGame()) { - sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(concernInfo.getId())); + for (InstallInfo installInfo : mInstallManager.getAllInstall()) { + sequences.add(RetrofitManager.getInstance(mContext).getApi().getGameDigest(installInfo.getId())); } Observable.merge(sequences) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index a78da084c3..c02b300627 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -32,12 +32,12 @@ import com.gh.gamecenter.InstallActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalSwipeViewHolder; -import com.gh.gamecenter.db.info.ConcernInfo; +import com.gh.gamecenter.db.info.InstallInfo; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameInfoEntity; import com.gh.gamecenter.kuaichuan.FileInfo; -import com.gh.gamecenter.manager.ConcernManager; +import com.gh.gamecenter.manager.InstallManager; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -101,8 +101,8 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { maxWidth = mContext.getResources().getDisplayMetrics().widthPixels; - ConcernManager cManager = new ConcernManager(mContext); - List runnableGame = cManager.getInstalledGame(); + InstallManager cManager = new InstallManager(mContext); + List runnableGame = cManager.getAllInstall(); if (runnableGame.isEmpty()) { mActivity.loadEmpty(); } else { @@ -139,9 +139,9 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { TrafficUtils trafficUtils = TrafficUtils.getInstance(mContext); - ConcernManager cManager = new ConcernManager(mContext); - List runnableGame = cManager.getInstalledGame(); - for (ConcernInfo concernEntity : runnableGame) { + InstallManager cManager = new InstallManager(mContext); + List runnableGame = cManager.getAllInstall(); + for (InstallInfo concernEntity : runnableGame) { for (Map.Entry entry : concernEntity.getPackageNames().entrySet()) { if (entry.getValue()) { GameInfoEntity info = new GameInfoEntity(); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java index 7f3484a7f1..05fcf46213 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java @@ -25,10 +25,10 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder; import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; -import com.gh.gamecenter.db.info.ConcernInfo; +import com.gh.gamecenter.db.info.InstallInfo; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.kuaichuan.FileInfo; -import com.gh.gamecenter.manager.ConcernManager; +import com.gh.gamecenter.manager.InstallManager; import com.gh.gamecenter.retrofit.Response; import com.halo.assistant.HaloApp; import com.lightgame.adapter.BaseRecyclerAdapter; @@ -79,13 +79,13 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { sendOverList = (List) HaloApp.get("FileInfo", false); - ConcernManager cManager = new ConcernManager(mContext); - List runnableGame = cManager.getInstalledGame(); + InstallManager cManager = new InstallManager(mContext); + List runnableGame = cManager.getAllInstall(); init(runnableGame); } //初始化 - private void init(final List runnableGame) { + private void init(final List runnableGame) { rx.Observable .create(new Observable.OnSubscribe() { @@ -97,9 +97,9 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { List arrInstallPackage = new ArrayList<>(); - for (ConcernInfo concernInfo : runnableGame) { - for (String s : concernInfo.getPackageNames().keySet()) { - if (concernInfo.getPackageNames().get(s)) { + for (InstallInfo installInfo : runnableGame) { + for (String s : installInfo.getPackageNames().keySet()) { + if (installInfo.getPackageNames().get(s)) { arrInstallPackage.add(s); } } diff --git a/app/src/main/java/com/gh/gamecenter/db/ConcernDao.java b/app/src/main/java/com/gh/gamecenter/db/ConcernDao.java deleted file mode 100644 index a60bbbe0dc..0000000000 --- a/app/src/main/java/com/gh/gamecenter/db/ConcernDao.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.gh.gamecenter.db; - -import android.content.Context; - -import com.gh.gamecenter.db.info.ConcernInfo; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.stmt.QueryBuilder; - -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -public class ConcernDao { - - private DatabaseHelper helper; - private Dao dao; - - public ConcernDao(Context context) { - try { - helper = DatabaseHelper.getHelper(context); - dao = helper.getDao(ConcernInfo.class); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - /** - * 获取权重和流量排序靠前的关注 - */ - public List get(int number) { - List concernEntities = new ArrayList(); - try { - QueryBuilder builder = dao.queryBuilder(); - - builder.orderBy("weight", false).orderBy("traffic", false); - - List list = builder.query(); - - if (number == 0 || number >= list.size()) { - return list; - } else { - for (int i = 0; i < number; i++) { - concernEntities.add(list.get(i)); - } - return concernEntities; - } - } catch (SQLException e) { - e.printStackTrace(); - } - return null; - } - - /** - * 获取所有的已关注游戏的集合 - */ - public List getConcern(int number) { - List concernEntities = new ArrayList(); - try { - QueryBuilder builder = dao.queryBuilder(); - builder.where().eq("isConcern", true); - - List list = builder.query(); - - if (number == 0 || number >= list.size()) { - return list; - } else { - for (int i = 0; i < number; i++) { - concernEntities.add(list.get(i)); - } - return concernEntities; - } - } catch (SQLException e) { - e.printStackTrace(); - } - return null; - } - - /** - * 获取所有的已安装游戏的集合 - */ - public List getInstalled() { - try { - QueryBuilder builder = dao.queryBuilder(); - builder.where().eq("isInstalled", true); - return builder.query(); - } catch (SQLException e) { - e.printStackTrace(); - } - return null; - } - - - /** - * 添加一个关注 - */ - public void add(ConcernInfo entity) { - try { - dao.create(entity); - } catch (SQLException e) { - - e.printStackTrace(); - } - } - - /** - * 添加多个关注 - */ - public void add(List list) { - try { - dao.create(list); - } catch (SQLException e) { - - e.printStackTrace(); - } - } - - /** - * 删除一个关注 - */ - public void delete(String id) { - try { - dao.deleteById(id); - } catch (SQLException e) { - - e.printStackTrace(); - } - } - - /** - * 删除多个关注 - */ - public void delete(List ids) { - try { - dao.deleteIds(ids); - } catch (SQLException e) { - - e.printStackTrace(); - } - } - - /** - * 根据id获取某一个关注 - */ - public ConcernInfo find(String id) { - try { - return dao.queryForId(id); - } catch (SQLException e) { - - e.printStackTrace(); - } - return null; - } - - /** - * 获取所有的关注 - */ - public List getAll() { - try { - return dao.queryForAll(); - } catch (SQLException e) { - - e.printStackTrace(); - } - return null; - } - - /** - * 更新关注 - */ - public void update(ConcernInfo entity) { - try { - dao.update(entity); - } catch (SQLException e) { - - e.printStackTrace(); - } - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java index 9947480dbe..12d7fa8e76 100644 --- a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java +++ b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java @@ -6,7 +6,7 @@ import android.support.v4.util.ArrayMap; import com.gh.gamecenter.db.info.AppRunTimeInfo; import com.gh.gamecenter.db.info.AppTrafficInfo; -import com.gh.gamecenter.db.info.ConcernInfo; +import com.gh.gamecenter.db.info.InstallInfo; import com.gh.gamecenter.db.info.DataCollectionInfo; import com.gh.gamecenter.db.info.FilterInfo; import com.gh.gamecenter.db.info.GameInfo; @@ -54,7 +54,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) { try { Utils.log("DatabaseHelper onCreate"); - TableUtils.createTable(connectionSource, ConcernInfo.class); + TableUtils.createTable(connectionSource, InstallInfo.class); TableUtils.createTable(connectionSource, SearchHistoryInfo.class); TableUtils.createTable(connectionSource, GameInfo.class); TableUtils.createTable(connectionSource, DataCollectionInfo.class); @@ -70,7 +70,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { public void onUpgrade(SQLiteDatabase database, ConnectionSource connectionSource, int oldVersion, int newVersion) { try { Utils.log("DatabaseHelper onUpgrade"); - TableUtils.dropTable(connectionSource, ConcernInfo.class, true); + TableUtils.dropTable(connectionSource, InstallInfo.class, true); TableUtils.dropTable(connectionSource, SearchHistoryInfo.class, true); TableUtils.dropTable(connectionSource, GameInfo.class, true); TableUtils.dropTable(connectionSource, FilterInfo.class, true); diff --git a/app/src/main/java/com/gh/gamecenter/db/InstallDao.java b/app/src/main/java/com/gh/gamecenter/db/InstallDao.java new file mode 100644 index 0000000000..2a6135da6c --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/db/InstallDao.java @@ -0,0 +1,115 @@ +package com.gh.gamecenter.db; + +import android.content.Context; + +import com.gh.gamecenter.db.info.InstallInfo; +import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.stmt.QueryBuilder; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +public class InstallDao { + + private DatabaseHelper helper; + private Dao dao; + + public InstallDao(Context context) { + try { + helper = DatabaseHelper.getHelper(context); + dao = helper.getDao(InstallInfo.class); + } catch (SQLException e) { + e.printStackTrace(); + } + } + + /** + * 获取权重和流量排序靠前的关注 + */ + public List get(int number) { + List concernEntities = new ArrayList(); + try { + QueryBuilder builder = dao.queryBuilder(); + + builder.orderBy("weight", false).orderBy("traffic", false); + + List list = builder.query(); + + if (number == 0 || number >= list.size()) { + return list; + } else { + for (int i = 0; i < number; i++) { + concernEntities.add(list.get(i)); + } + return concernEntities; + } + } catch (SQLException e) { + e.printStackTrace(); + } + return null; + } + + /** + * 添加一个游戏 + */ + public void add(InstallInfo entity) { + try { + dao.create(entity); + } catch (SQLException e) { + + e.printStackTrace(); + } + } + + /** + * 删除一个游戏 + */ + public void delete(String id) { + try { + dao.deleteById(id); + } catch (SQLException e) { + + e.printStackTrace(); + } + } + + /** + * 根据id获取某一个游戏 + */ + public InstallInfo find(String id) { + try { + return dao.queryForId(id); + } catch (SQLException e) { + + e.printStackTrace(); + } + return null; + } + + /** + * 获取所有的游戏 + */ + public List getAll() { + try { + return dao.queryForAll(); + } catch (SQLException e) { + + e.printStackTrace(); + } + return null; + } + + /** + * 更新游戏数据 + */ + public void update(InstallInfo entity) { + try { + dao.update(entity); + } catch (SQLException e) { + + e.printStackTrace(); + } + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/db/info/ConcernInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/InstallInfo.java similarity index 72% rename from app/src/main/java/com/gh/gamecenter/db/info/ConcernInfo.java rename to app/src/main/java/com/gh/gamecenter/db/info/InstallInfo.java index a8e8d82077..9fbf4d65f0 100644 --- a/app/src/main/java/com/gh/gamecenter/db/info/ConcernInfo.java +++ b/app/src/main/java/com/gh/gamecenter/db/info/InstallInfo.java @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.HashMap; @DatabaseTable(tableName = "tb_concern") -public class ConcernInfo implements Serializable { +public class InstallInfo implements Serializable { /** * @@ -27,15 +27,6 @@ public class ConcernInfo implements Serializable { @DatabaseField(columnName = "icon") private String icon; - @DatabaseField(columnName = "tag") - private String tag; - - @DatabaseField(columnName = "isConcern") - private boolean isConcern; - - @DatabaseField(columnName = "isInstalled") - private boolean isInstalled; - @DatabaseField(columnName = "installedQuantity") private int installedQuantity; @@ -48,12 +39,11 @@ public class ConcernInfo implements Serializable { @DatabaseField(columnName = "traffic") private long traffic; - public ConcernInfo() { + public InstallInfo() { } - public ConcernInfo(String id, long time, String gameName, String icon, - String tag, boolean isConcern, boolean isInstalled, + public InstallInfo(String id, long time, String gameName, String icon, int installedQuantity, HashMap packageNames, int weight, long traffic) { super(); @@ -61,9 +51,6 @@ public class ConcernInfo implements Serializable { this.time = time; this.gameName = gameName; this.icon = icon; - this.tag = tag; - this.isConcern = isConcern; - this.isInstalled = isInstalled; this.installedQuantity = installedQuantity; this.packageNames = packageNames; this.weight = weight; @@ -102,29 +89,6 @@ public class ConcernInfo implements Serializable { this.icon = icon; } - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - public boolean isConcern() { - return isConcern; - } - - public void setConcern(boolean isConcern) { - this.isConcern = isConcern; - } - - public boolean isInstalled() { - return isInstalled; - } - - public void setInstalled(boolean isInstalled) { - this.isInstalled = isInstalled; - } public int getInstalledQuantity() { return installedQuantity; @@ -161,8 +125,7 @@ public class ConcernInfo implements Serializable { @Override public String toString() { return "ConcernEntity [id=" + id + ", time=" + time + ", gameName=" - + gameName + ", icon=" + icon + ", tag=" + tag + ", isConcern=" - + isConcern + ", isInstalled=" + isInstalled + + gameName + ", icon=" + icon + ", installedQuantity=" + installedQuantity + ", packageNames=" + packageNames + ", weight=" + weight + ", traffic=" + traffic + "]"; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 91ad8979cf..ec60c37ddf 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -26,11 +26,11 @@ import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; import com.gh.gamecenter.adapter.viewholder.GameUpdateViewHolder; -import com.gh.gamecenter.db.info.ConcernInfo; +import com.gh.gamecenter.db.info.InstallInfo; import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadChanged; import com.gh.gamecenter.eventbus.EBSkip; -import com.gh.gamecenter.manager.ConcernManager; +import com.gh.gamecenter.manager.InstallManager; import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -222,8 +222,8 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { // 获取已安装游戏包名列表 private List getInstalledList() { List packages = new ArrayList<>(); - ConcernManager concernManager = new ConcernManager(mContext); - for (ConcernInfo info : concernManager.getInstalledGame()) { + InstallManager installManager = new InstallManager(mContext); + for (InstallInfo info : installManager.getAllInstall()) { for (String key : info.getPackageNames().keySet()) { if (info.getPackageNames().get(key) && PackageUtils.getMetaData(mContext, key, "gh_version") != null) { diff --git a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java b/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java deleted file mode 100644 index f987d98836..0000000000 --- a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java +++ /dev/null @@ -1,225 +0,0 @@ -package com.gh.gamecenter.manager; - -import android.content.Context; -import android.text.TextUtils; - -import com.gh.common.util.PackageUtils; -import com.gh.common.util.TrafficUtils; -import com.gh.gamecenter.R; -import com.gh.gamecenter.db.ConcernDao; -import com.gh.gamecenter.db.info.ConcernInfo; -import com.gh.gamecenter.entity.ApkEntity; -import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.eventbus.EBConcernChanged; - -import org.greenrobot.eventbus.EventBus; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - - -public class ConcernManager { - - private Context context; - private ConcernDao dao; - - public ConcernManager(Context context) { - this.context = context; - dao = new ConcernDao(context); - } - - /** - * 根据id判断是否已关注 - */ - public boolean isConcern(String id) { - if (TextUtils.isEmpty(id)) { - return false; - } - ConcernInfo concernEntity = dao.find(id); - return concernEntity != null && concernEntity.isConcern(); - } - - - private ConcernInfo createConcern(GameEntity gameEntity) { - ConcernInfo concernInfo = new ConcernInfo(); - concernInfo.setId(gameEntity.getId()); - concernInfo.setTime(System.currentTimeMillis()); - concernInfo.setIcon(gameEntity.getIcon()); - concernInfo.setGameName(gameEntity.getName()); - concernInfo.setConcern(true); - String tag = "已关注"; - HashMap packageNames = new HashMap<>(); - int weight = 1; - int quantity = 0; - for (ApkEntity apkEntity : gameEntity.getApk()) { - if (PackageManager.isInstalled(apkEntity.getPackageName())) { - quantity++; - packageNames.put(apkEntity.getPackageName(), true); - } else { - packageNames.put(apkEntity.getPackageName(), false); - } - } - if (quantity > 0) { - weight++; - tag = "已关注,已安装"; - } - concernInfo.setInstalledQuantity(quantity); - concernInfo.setInstalled(weight != 1); - concernInfo.setTag(tag); - concernInfo.setPackageNames(packageNames); - long traffic = TrafficUtils.getInstance(context).getTraffic(new ArrayList<>(packageNames.keySet())); - concernInfo.setTraffic(traffic); - if (traffic > 0) { - weight++; - } - concernInfo.setWeight(weight); - return concernInfo; - } - - - /** - * 获取某一个关注 - */ - public ConcernInfo findConcernById(String id) { - return dao.find(id); - } - - /** - * 添加一个关注 - */ - public void addConcern(ConcernInfo entity) { - dao.add(entity); - } - - /** - * 更新关注列表 - */ - public void updateByConcern(ConcernInfo entity) { - dao.update(entity); - } - - /** - * 根据GameEntity更新关注 - */ - public void updateByEntity(com.gh.gamecenter.db.info.GameInfo gameEntity) { - String packageName = gameEntity.getPackageName(); - ConcernInfo concernEntity = findConcernById(gameEntity.getId()); - if (concernEntity != null) { - concernEntity.setTime(System.currentTimeMillis()); - if (gameEntity.getGameName() != null) { - concernEntity.setGameName(gameEntity.getGameName()); - } - if ((concernEntity.isConcern() && concernEntity.isInstalled()) - || (!concernEntity.isConcern() && concernEntity - .isInstalled())) { - concernEntity.getPackageNames().put(packageName, true); - int quantity = 0; - for (String key : concernEntity.getPackageNames().keySet()) { - if (concernEntity.getPackageNames().get(key)) { - quantity++; - } - } - concernEntity.setInstalledQuantity(quantity); - updateByConcern(concernEntity); - } else if (concernEntity.isConcern() - && !concernEntity.isInstalled()) { - concernEntity.setTag("已关注,已安装"); - concernEntity.setInstalled(true); - concernEntity.setInstalledQuantity(1); - concernEntity.getPackageNames().put(packageName, true); - int weight = concernEntity.getWeight() + 1; - concernEntity.setWeight(weight); - updateByConcern(concernEntity); - } - } else { - concernEntity = new ConcernInfo(); - concernEntity.setId(gameEntity.getId()); - concernEntity.setTime(System.currentTimeMillis()); - HashMap packageNames = new HashMap<>(); - packageNames.put(packageName, true); - concernEntity.setPackageNames(packageNames); - concernEntity.setInstalled(true); - concernEntity.setConcern(false); - concernEntity.setTag(context.getString(R.string.installed)); - concernEntity.setWeight(1); - concernEntity.setInstalledQuantity(1); - if (gameEntity.getGameName() != null) { - concernEntity.setGameName(gameEntity.getGameName()); - } else { - concernEntity.setGameName(PackageUtils.getNameByPackageName( - context, packageName)); - } - addConcern(concernEntity); - } - } - - /** - * 获取已安装游戏的集合 - */ - public List getInstalledGame() { - return dao.getInstalled(); - } - - /** - * 根据包名 更新关注 - */ - public void updateByPackageName(String packageName) { - for (ConcernInfo concernEntity : getAllConcern()) { - Boolean isInstalled = concernEntity.getPackageNames().get(packageName); - if (isInstalled != null && isInstalled) { - concernEntity.getPackageNames().put(packageName, false); - int quantity = 0; - for (String key : concernEntity.getPackageNames().keySet()) { - if (concernEntity.getPackageNames().get(key)) { - quantity++; - } - } - if (quantity == 0) { - if (!concernEntity.isConcern() - && concernEntity.isInstalled()) { - deleteConcern(concernEntity.getId()); - } else { - concernEntity.setTime(System.currentTimeMillis()); - concernEntity.setTag("已关注"); - concernEntity.setInstalled(false); - concernEntity.setInstalledQuantity(0); - concernEntity.getPackageNames().put(packageName, false); - concernEntity.setWeight(concernEntity.getWeight() - 1); - updateByConcern(concernEntity); - } - } else { - concernEntity.setTime(System.currentTimeMillis()); - concernEntity.setInstalledQuantity(quantity); - concernEntity.getPackageNames().put(packageName, false); - updateByConcern(concernEntity); - } - } - } - } - - /** - * 获取关注列表 - */ - public List getAllConcern() { - return dao.getAll(); - } - - /** - * 删除一个关注 - */ - public void deleteConcern(String id) { - ConcernInfo concernEntity = findConcernById(id); - if (concernEntity.isConcern() && concernEntity.isInstalled()) { - concernEntity.setTime(System.currentTimeMillis()); - concernEntity.setConcern(false); - concernEntity.setWeight(concernEntity.getWeight() - 1); - concernEntity.setTag(context.getString(R.string.installed)); - updateByConcern(concernEntity); - } else { - dao.delete(id); - } - EventBus.getDefault().post(new EBConcernChanged(id, false)); - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/manager/InstallManager.java b/app/src/main/java/com/gh/gamecenter/manager/InstallManager.java new file mode 100644 index 0000000000..907396caa7 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/manager/InstallManager.java @@ -0,0 +1,127 @@ +package com.gh.gamecenter.manager; + +import android.content.Context; + +import com.gh.common.util.PackageUtils; +import com.gh.gamecenter.db.InstallDao; +import com.gh.gamecenter.db.info.InstallInfo; +import com.gh.gamecenter.eventbus.EBConcernChanged; + +import org.greenrobot.eventbus.EventBus; + +import java.util.HashMap; +import java.util.List; + + +public class InstallManager { + + private Context context; + private InstallDao dao; + + public InstallManager(Context context) { + this.context = context; + dao = new InstallDao(context); + } + + /** + * 添加一个已安装的游戏 + */ + public void addInstall(InstallInfo entity) { + dao.add(entity); + } + + /** + * 获取某一个安装的游戏 + */ + public InstallInfo findInstallById(String id) { + return dao.find(id); + } + + /** + * 更新关注列表 + */ + public void updateInstall(InstallInfo entity) { + dao.update(entity); + } + + /** + * 根据GameEntity更新已安装的游戏 + */ + public void updateByEntity(com.gh.gamecenter.db.info.GameInfo gameEntity) { + String packageName = gameEntity.getPackageName(); + InstallInfo concernEntity = findInstallById(gameEntity.getId()); + if (concernEntity != null) { + concernEntity.setTime(System.currentTimeMillis()); + if (gameEntity.getGameName() != null) { + concernEntity.setGameName(gameEntity.getGameName()); + } + concernEntity.getPackageNames().put(packageName, true); + int quantity = 0; + for (String key : concernEntity.getPackageNames().keySet()) { + if (concernEntity.getPackageNames().get(key)) { + quantity++; + } + } + concernEntity.setInstalledQuantity(quantity); + updateInstall(concernEntity); + } else { + concernEntity = new InstallInfo(); + concernEntity.setId(gameEntity.getId()); + concernEntity.setTime(System.currentTimeMillis()); + HashMap packageNames = new HashMap<>(); + packageNames.put(packageName, true); + concernEntity.setPackageNames(packageNames); + concernEntity.setWeight(1); + concernEntity.setInstalledQuantity(1); + if (gameEntity.getGameName() != null) { + concernEntity.setGameName(gameEntity.getGameName()); + } else { + concernEntity.setGameName(PackageUtils.getNameByPackageName( + context, packageName)); + } + addInstall(concernEntity); + } + } + + /** + * 根据包名 更新关注 + */ + public void updateByPackageName(String packageName) { + for (InstallInfo concernEntity : getAllInstall()) { + Boolean isInstalled = concernEntity.getPackageNames().get(packageName); + if (isInstalled != null && isInstalled) { + concernEntity.getPackageNames().put(packageName, false); + int quantity = 0; + for (String key : concernEntity.getPackageNames().keySet()) { + if (concernEntity.getPackageNames().get(key)) { + quantity++; + } + } + if (quantity == 0) { + deleteInstall(concernEntity.getId()); + } else { + concernEntity.setTime(System.currentTimeMillis()); + concernEntity.setInstalledQuantity(quantity); + concernEntity.getPackageNames().put(packageName, false); + updateInstall(concernEntity); + } + } + } + } + + /** + * 获取已安装列表 + */ + public List getAllInstall() { + return dao.getAll(); + } + + /** + * 删除一个关注 + */ + public void deleteInstall(String id) { + dao.delete(id); + EventBus.getDefault().post(new EBConcernChanged(id, false)); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index 047ed4cb2d..6ad405efbb 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -33,7 +33,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.ShareCardActivity; import com.gh.gamecenter.ShareCardPicActivity; import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.db.info.ConcernInfo; +import com.gh.gamecenter.db.info.InstallInfo; import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.LibaoEntity; @@ -43,7 +43,7 @@ import com.gh.gamecenter.entity.UserDataLibaoEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.gamecenter.manager.ConcernManager; +import com.gh.gamecenter.manager.InstallManager; import com.gh.gamecenter.retrofit.ObservableUtil; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -100,7 +100,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On private List recommendGameList; // 推荐关注的游戏 private List installGameList; // 安装的游戏 private Map concernMap; // 记录选择关注 - private ConcernManager concernManager; + private InstallManager mInstallManager; Runnable runnable = new Runnable() { @Override @@ -122,7 +122,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On recommendGameList = new ArrayList<>(); installGameList = new ArrayList<>(); - concernManager = new ConcernManager(getActivity()); + mInstallManager = new InstallManager(getActivity()); concernMap = new ArrayMap<>(); refreshLayout.setColorSchemeResources(R.color.theme); @@ -182,28 +182,28 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On concernMap.clear(); concern.setEnabled(true);//防止上一次关注按钮不可以，导致重新刷新后也不可用 - ObservableUtil.computation(new Observable.OnSubscribe>() { + ObservableUtil.computation(new Observable.OnSubscribe>() { @Override - public void call(Subscriber> subscriber) { - List installedList = concernManager.getInstalledGame(); + public void call(Subscriber> subscriber) { + List installedList = mInstallManager.getAllInstall(); // 获取第一次安装时间 HashMap packageNames; - for (ConcernInfo concernInfo : installedList) { + for (InstallInfo installInfo : installedList) { long time = 0; - packageNames = concernInfo.getPackageNames(); + packageNames = installInfo.getPackageNames(); for (String packageName : packageNames.keySet()) { long installedTime = PackageUtils.getInstalledTime(getActivity(), packageName); if (installedTime > time) { // 多版本获取最近安装版本时间 time = installedTime; } } - concernInfo.setTime(time); + installInfo.setTime(time); } // 对已安装的游戏排序 - Collections.sort(installedList, new Comparator() { + Collections.sort(installedList, new Comparator() { @Override - public int compare(ConcernInfo lhs, ConcernInfo rhs) { + public int compare(InstallInfo lhs, InstallInfo rhs) { return lhs.getTime() < rhs.getTime() ? -1 : (lhs.getTime() == rhs.getTime() ? 0 : 1); } }); @@ -211,9 +211,9 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On subscriber.onNext(installedList); subscriber.onCompleted(); } - }, new Action1>() { + }, new Action1>() { @Override - public void call(final List installedList) { + public void call(final List installedList) { final List gameList = new ArrayList<>(); List> sequences = new ArrayList<>(); @@ -247,8 +247,8 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On }); } - private void initRecommendConcern(List list, List gameList) { - for (ConcernInfo info : list) { + private void initRecommendConcern(List list, List gameList) { + for (InstallInfo info : list) { for (int i = 0; i < gameList.size(); i++) { if (info.getId().equals(gameList.get(i).getId())) { installGameList.add(gameList.get(i)); @@ -280,8 +280,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On // 推荐关注列表不足4个时，剩下的从已安装列表选取 if (recommendGameList.size() < 4) { for (GameEntity gameEntity : installGameList) { - if (recommendGameList.size() < 4 - && !concernManager.isConcern(gameEntity.getId())) { + if (recommendGameList.size() < 4) { for (int i = 0; i < recommendGameList.size(); i++) { GameEntity entity = recommendGameList.get(i); if (entity.getId().equals(gameEntity.getId())) { diff --git a/app/src/main/java/com/gh/gamecenter/statistics/AppTrafficUtils.java b/app/src/main/java/com/gh/gamecenter/statistics/AppTrafficUtils.java index d9235b7ca8..5e6280dab2 100644 --- a/app/src/main/java/com/gh/gamecenter/statistics/AppTrafficUtils.java +++ b/app/src/main/java/com/gh/gamecenter/statistics/AppTrafficUtils.java @@ -25,8 +25,8 @@ // // public static void appTraffic(Context context) { // try { -//// ConcernManager cManager = new ConcernManager(context); -//// List runnableGame = cManager.getInstalledGame(); +//// InstallManager cManager = new InstallManager(context); +//// List runnableGame = cManager.getInstalledGame(); //// if (runnableGame.size() == 0) return; // 没有安装光环助手已有的游戏 // // @@ -72,7 +72,7 @@ // // PackageManager pm = context.getPackageManager(); // -//// for (ConcernInfo concernInfo : runnableGame) {　// 记录光环助手包含的已安装的游戏流量使用情况 +//// for (InstallInfo concernInfo : runnableGame) {　// 记录光环助手包含的已安装的游戏流量使用情况 //// String pkgName = concernInfo.getPackageNames().keySet().iterator().next(); //// ApplicationInfo applicationInfo = pm.getApplicationInfo(pkgName, PackageManager.GET_META_DATA); //// int uid = applicationInfo.uid; diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml index edcb45d3b6..b04010debc 100644 --- a/app/src/main/res/layout/gamedetail_body.xml +++ b/app/src/main/res/layout/gamedetail_body.xml @@ -12,7 +12,7 @@ android:layout_height = "wrap_content" android:background = "@android:color/white" android:gravity = "center" - android:visibility = "visible" > + android:visibility = "gone" >