From 560c34afed44e37b04738a2d28583136e241533c Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Tue, 17 Jan 2017 11:06:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=93=E9=A2=98?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8D=E7=9B=96=E4=BD=8F=E8=BD=AE=E6=92=AD?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 4 +- .../java/com/gh/common/util/QRCodeUtils.java | 10 ++- .../java/com/gh/gamecenter/MainActivity.java | 7 ++- .../com/gh/gamecenter/ShareCardActivity.java | 3 +- .../gh/gamecenter/ShareCardPicActivity.java | 3 +- .../adapter/LibaoDetailAdapter.java | 8 ++- .../com/gh/gamecenter/game/GameFragment.java | 61 +++++++++---------- .../gamecenter/game/GameFragmentAdapter.java | 11 ++-- .../gh/gamecenter/geetest/GeetestUtils.java | 1 + .../com/gh/gamecenter/geetest/GtDialog.java | 2 +- .../newsdetail/NewsDetailAdapter.java | 34 ++++++++++- .../statistics/AppStaticService.java | 44 ++++++++++--- .../statistics/StatisticsUtils.java | 2 +- .../gamecenter/statistics/TrafficUtils.java | 35 +++++++---- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/game_normal_item.xml | 13 ++-- app/src/main/res/layout/game_test_item.xml | 14 +++-- .../main/res/layout/game_viewpager_item.xml | 2 +- 18 files changed, 172 insertions(+), 86 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 6277717c50..fc473cd31f 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -99,10 +99,10 @@ public class DialogUtils { // 标题 TextView alertdialog_title = (TextView) view.findViewById(R.id.installhint_title); alertdialog_title.setText("重要提示"); - Spanned content = Html.fromHtml("如果您使用的是"+ "华为" +"手机或"+ + Spanned content = Html.fromHtml("如果您使用的是"+ "华为" +"或"+ "OPPO" +"手机，安装游戏时请选择“" + "继续安装" + - "”（请记住不要选择“官方推荐”或“软件商店安装”）"); + "”（记住不要选择“官方推荐”或“软件商店安装”）"); // 内容 TextView alertdialog_content = (TextView) view.findViewById(R.id.installhint_content); alertdialog_content.setText(content); diff --git a/app/src/main/java/com/gh/common/util/QRCodeUtils.java b/app/src/main/java/com/gh/common/util/QRCodeUtils.java index e35ef249ad..519b534305 100644 --- a/app/src/main/java/com/gh/common/util/QRCodeUtils.java +++ b/app/src/main/java/com/gh/common/util/QRCodeUtils.java @@ -1,5 +1,6 @@ package com.gh.common.util; +import android.content.Context; import android.graphics.Bitmap; import com.google.zxing.BarcodeFormat; @@ -9,6 +10,7 @@ import com.google.zxing.common.BitMatrix; import com.google.zxing.qrcode.QRCodeWriter; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.util.HashMap; @@ -27,7 +29,7 @@ public class QRCodeUtils { * @param filePath 用于存储二维码图片的文件路径 * @return 生成二维码及保存文件是否成功 */ - public static boolean createQRImage(String content, int widthPix, int heightPix, String filePath) { + public static boolean createQRImage(String content, int widthPix, int heightPix, String filePath, Context context) { try { if (content == null || "".equals(content)) { return false; @@ -60,6 +62,12 @@ public class QRCodeUtils { Bitmap bitmap = Bitmap.createBitmap(widthPix, heightPix, Bitmap.Config.ARGB_8888); bitmap.setPixels(pixels, 0, widthPix, 0, 0, widthPix, heightPix); + //检查上级路径 + File file = new File(context.getExternalCacheDir().getPath() + "/ShareImg"); + if (!file.exists()) { + file.mkdirs(); + } + FileOutputStream fileOutputStream = new FileOutputStream(filePath); //必须使用compress方法将bitmap保存到文件中再进行读取。直接返回的bitmap是没有任何压缩的，内存消耗巨大！ return bitmap != null && bitmap.compress(Bitmap.CompressFormat.JPEG, 100, new FileOutputStream(filePath)); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 8e95669309..4e3773b964 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; +import android.graphics.Color; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -1067,9 +1068,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene ivGame.setImageResource(R.drawable.ic_game_unselect); ivNews.setImageResource(R.drawable.ic_news_unselect); ivPersonal.setImageResource(R.drawable.ic_user_unselect); - tvGame.setTextColor(getResources().getColor(R.color.title)); - tvNews.setTextColor(getResources().getColor(R.color.title)); - tvPersonal.setTextColor(getResources().getColor(R.color.title)); + tvGame.setTextColor(Color.parseColor("#a7a8b2")); + tvNews.setTextColor(Color.parseColor("#a7a8b2")); + tvPersonal.setTextColor(Color.parseColor("#a7a8b2")); } // 将所有的Fragment都置为隐藏状态。 diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index cbac8c92e5..5323e16acb 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -108,7 +108,8 @@ public class ShareCardActivity extends BaseActivity { @Override public void run() { final String filePath = getExternalCacheDir().getPath() + "/ShareImg/ShareQRCode.jpg"; - boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html?source=appshare200", 200, 200, filePath); + boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html?source=appshare200" + , 200, 200, filePath, ShareCardActivity.this); if (success) { runOnUiThread(new Runnable() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index 358052366f..8abf4aacc0 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -152,7 +152,8 @@ public class ShareCardPicActivity extends BaseActivity { @Override public void run() { final String filePath = getExternalCacheDir().getPath() + "/ShareImg/ShareQRCode.jpg"; - boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html?source=appshare200", 200, 200, filePath); + boolean success = QRCodeUtils.createQRImage("http://www.ghzhushou.com/article/" + newsId+ ".html?source=appshare200" + , 200, 200, filePath, ShareCardPicActivity.this); if (success) { runOnUiThread(new Runnable() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index e67e1b2ccf..05ddf4cdc7 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -112,13 +112,15 @@ public class LibaoDetailAdapter extends RecyclerView.Adapter= today && day < today + 86400 * 1000) { + long min = new Date().getTime()/1000 - day/1000; + int hour = (int) (min/ (60 * 60)); + if (hour == 0) { + if (min < 60) { + time.setText("刚刚"); + } else { + time.setText(String.format(Locale.getDefault(), "%d分钟前", (int) (min / 60))); + } + } else { + time.setText(String.format(Locale.getDefault(), "%d小时前", hour)); + } + } else if (day >= today - 86400 * 1000 && day < today) { + format.applyPattern("HH:mm"); + time.setText("昨天 "); + } else { + format.applyPattern("yyyy-MM-dd"); + time.setText(format.format(day)); + } + } catch (ParseException e) { + e.printStackTrace(); + format.applyPattern("yyyy-MM-dd"); + time.setText(format.format(commentEntity.getTime() * 1000)); + } + if (commentEntity.getVote() == 0) { likeCount.setVisibility(View.GONE); } else { // 检查是否已点赞 diff --git a/app/src/main/java/com/gh/gamecenter/statistics/AppStaticService.java b/app/src/main/java/com/gh/gamecenter/statistics/AppStaticService.java index 5327b36e42..e00a0b4be3 100644 --- a/app/src/main/java/com/gh/gamecenter/statistics/AppStaticService.java +++ b/app/src/main/java/com/gh/gamecenter/statistics/AppStaticService.java @@ -4,6 +4,8 @@ import android.app.ActivityManager; import android.app.Service; import android.content.Context; import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; import android.os.IBinder; import android.os.PowerManager; import android.support.annotation.Nullable; @@ -11,6 +13,7 @@ import android.support.annotation.Nullable; import com.gh.common.util.Utils; import com.gh.gamecenter.db.AppRunTimeDao; +import java.util.ArrayList; import java.util.List; import static java.lang.Thread.sleep; @@ -29,7 +32,9 @@ public class AppStaticService extends Service { private String mPrePackageName; // 切换app前的应用包名 private String mNextPackageName; // 切换app后的应用包名 - private String homePackage = "com.huawei.android.launcher"; //桌面包名 以华为为例 +// private String homePackage = "com.huawei.android.launcher"; //桌面包名 以华为为例 + + private ArrayList homePackage; private int mRunTime; AppRunTimeDao runTimeDao; @@ -48,6 +53,17 @@ public class AppStaticService extends Service { mNextPackageName = getPackageName(); runTimeDao = new AppRunTimeDao(getApplicationContext()); + homePackage = new ArrayList<>(); + + List packages = getPackageManager() + .getInstalledPackages(0); + + for (PackageInfo aPackage : packages) { + if ((aPackage.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) > 0) { + Utils.log("============系统应用" + aPackage.packageName); + homePackage.add(aPackage.packageName); + } + } // PackageManager packageManager = getApplication().getPackageManager(); // Intent intent = new Intent(Intent.ACTION_MAIN); // intent.addCategory(Intent.CATEGORY_HOME); @@ -69,9 +85,9 @@ public class AppStaticService extends Service { mTopTaskInfo = mTaskInfo.get(0); mNextPackageName = mTopTaskInfo.topActivity.getPackageName(); - if (homePackage.equals(mNextPackageName)) { // 跳转至桌面 - if (homePackage.equals(mPrePackageName)) { // 桌面跳转至桌面 不统计 - Utils.log("============ 桌面跳转至桌面 不统计"); + if (homePackage.contains(mNextPackageName)) { // 跳转至桌面 + if (homePackage.contains(mPrePackageName)) { // 桌面跳转至桌面 不统计 + Utils.log("============ 桌面跳转至桌面 不统计" + mNextPackageName); } else { // 非桌面跳转至桌面 // TODO 计时结束 存储数据 writeToStorage(); @@ -79,16 +95,24 @@ public class AppStaticService extends Service { } } else { // 跳转至非桌面 - if (mNextPackageName.equals(mPrePackageName)) { //如果nextPackageName和prePackageName相同(无跳转操作)，那么计时增加 + if (homePackage.contains(mPrePackageName)) { + // mNextPackageName不是桌面 mPrePackageName是桌面，从桌面到非桌面，计时开始 // TODO 计时开始 mRunTime = mRunTime + 1; mPrePackageName = mNextPackageName; //身份转换 + Utils.log("============ 跳转至非桌面 计时开始"); + } else { - Utils.log("============ 计时开始"); - } else { // 非桌面跳转至非桌面 mPrePackageName的计时结束，mNextPackageName的计时开始 - // TODO 计时结束 存储数据 - Utils.log("============ 非桌面跳转至非桌面 计时结束 存储数据22"+ mRunTime); - writeToStorage(); + if (mPrePackageName.equals(mNextPackageName)) { + //如果mNextPackageName和mPrePackageName相同(无跳转操作)，那么计时增加 + mRunTime = mRunTime + 1; + Utils.log("============ 无跳转操作"); + } else { + // TODO 计时结束 存储数据 + // 非桌面跳转至非桌面 mPrePackageName的计时结束，mNextPackageName的计时开始 + Utils.log("============ 非桌面跳转至非桌面 计时结束 存储数据22"+ mRunTime); + writeToStorage(); + } } } } else { diff --git a/app/src/main/java/com/gh/gamecenter/statistics/StatisticsUtils.java b/app/src/main/java/com/gh/gamecenter/statistics/StatisticsUtils.java index 261d659a9a..72959ef32e 100644 --- a/app/src/main/java/com/gh/gamecenter/statistics/StatisticsUtils.java +++ b/app/src/main/java/com/gh/gamecenter/statistics/StatisticsUtils.java @@ -13,7 +13,7 @@ public class StatisticsUtils { if (runTimeDao.isExist(packageName)) { - Utils.log("存在记录=================" + (runTimeCount + runTimeDao.getRunTimeCount(packageName))); + Utils.log("存在记录=================" + (runTimeCount + runTimeDao.getRunTimeCount(packageName)) + "==" + "本次增加：" + runTimeCount); runTimeDao.update(new AppRunTimeInfo(packageName, (runTimeCount + runTimeDao.getRunTimeCount(packageName)))); } else { Utils.log("不存在记录=================" + runTimeCount); diff --git a/app/src/main/java/com/gh/gamecenter/statistics/TrafficUtils.java b/app/src/main/java/com/gh/gamecenter/statistics/TrafficUtils.java index c15fd267d0..347142fa1d 100644 --- a/app/src/main/java/com/gh/gamecenter/statistics/TrafficUtils.java +++ b/app/src/main/java/com/gh/gamecenter/statistics/TrafficUtils.java @@ -1,19 +1,30 @@ package com.gh.gamecenter.statistics; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.net.TrafficStats; + +import com.gh.common.util.Utils; + +import java.util.List; + /** * Created by khy on 2017/1/3. */ public class TrafficUtils { -// -// PackageManager pm = getPackageManager(); -// List installedPackages = (List) pm.getInstalledPackages(0); -// TrafficStats trafficStats = new TrafficStats(); -// -// for (PackageInfo installedPackage : installedPackages) { -// int uid = installedPackage.applicationInfo.uid; -// long uidRxBytes = trafficStats.getUidRxBytes(uid); -// long KB = uidRxBytes / 1024; -// Utils.log(installedPackage.applicationInfo.loadLabel(pm).toString() + "===========" + KB); -// } - + public static void getAppTraffic(Context context) { + PackageManager pm = context.getPackageManager(); + List installedPackages = pm.getInstalledPackages(0); + TrafficStats trafficStats = new TrafficStats(); + for (PackageInfo installedPackage : installedPackages) { + if ((installedPackage.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) { + int uid = installedPackage.applicationInfo.uid; + long uidRxBytes = trafficStats.getUidRxBytes(uid); + long KB = uidRxBytes / 1024; + Utils.log(installedPackage.applicationInfo.loadLabel(pm).toString() + "=====" + uid + "===========" + KB); + } + } + } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5343f767ad..bbfd5e75f4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:text="资讯" android:layout_marginTop="3dp" - android:textColor="@color/title" + android:textColor="#a7a8b2" android:textSize="10sp" /> @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:text="我的光环" android:layout_marginTop="3dp" - android:textColor="@color/title" + android:textColor="#a7a8b2" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/game_normal_item.xml b/app/src/main/res/layout/game_normal_item.xml index 32897b0091..c090d03713 100644 --- a/app/src/main/res/layout/game_normal_item.xml +++ b/app/src/main/res/layout/game_normal_item.xml @@ -7,7 +7,7 @@ android:paddingTop="6dp" android:paddingBottom="6dp" android:paddingRight="10dp" - android:paddingLeft="5dp" + android:paddingLeft="6dp" android:gravity="center_vertical" android:orientation="horizontal" android:background="@drawable/reuse_listview_item_style" @@ -24,19 +24,20 @@ android:textColor="@color/title" android:maxLength="3" android:textSize="14sp" + android:layout_marginRight="-2dp" android:visibility="gone"/> + android:layout_width="68dp" + android:layout_height="74dp"> + android:layout_width="68dp" + android:layout_height="74dp"> @@ -52,7 +54,7 @@ android:layout_weight="1" android:layout_height="wrap_content" android:orientation="vertical" - android:layout_marginLeft="8dp" + android:layout_marginLeft="10dp" android:layout_marginRight="8dp"> From 2ddaf3ee6610520a9454158c5e536654b087fdb6 Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Thu, 19 Jan 2017 15:18:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=96=87=E6=A1=88=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=92=8C=E6=B8=B8=E6=88=8F=E6=A3=80=E6=9F=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=8B=BC=E5=87=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/MainActivity.java | 28 +++++++++---------- .../gh/gamecenter/retrofit/ApiService.java | 2 +- .../main/res/layout/common_alertdialog.xml | 4 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 4e3773b964..16842fc032 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -559,17 +559,17 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene // 获取已安装游戏 private void getInstalledListFromServer() { ArrayList list = PackageUtils.getAllPackageName(getApplicationContext()); - if (list.isEmpty()) { - if (isNewFirstLaunch) { // 延迟0.3s,防止页面未注册eventbus，接收消息失败 - handler.postDelayed(new Runnable() { - @Override - public void run() { - EventBus.getDefault().post(new EBUISwitch("NewsFragment", -1)); //通知更新推荐关注小版块 - } - }, 300); - } - return; - } +// if (list.isEmpty()) { +// if (isNewFirstLaunch) { // 延迟0.3s,防止页面未注册eventbus，接收消息失败 +// handler.postDelayed(new Runnable() { +// @Override +// public void run() { +// EventBus.getDefault().post(new EBUISwitch("NewsFragment", -1)); //通知更新推荐关注小版块 +// } +// }, 300); +// } +// return; +// } PackageManager.init(list); @@ -653,9 +653,9 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene * 更新关注列表数据 */ private void update() { - if (isNewFirstLaunch) { - EventBus.getDefault().post(new EBUISwitch("NewsFragment", -1)); //通知更新推荐关注小版块 - } +// if (isNewFirstLaunch) { +// EventBus.getDefault().post(new EBUISwitch("NewsFragment", -1)); //通知更新推荐关注小版块 +// } new Thread(){ @Override public void run() { diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java index 2bb2116087..86a023938b 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java @@ -72,7 +72,7 @@ public interface ApiService { @GET("update/package/{package_name}") Observable getGameUpdate(@Path("package_name") String package_name);// 获取游戏更新 - @GET("update/game/{gh_id}/package{package_name}") + @GET("update/game/{gh_id}/package/{package_name}") Observable getGameUpdate(@Path("gh_id") String gh_id, @Path("package_name") String package_name);// 获取游戏更新 diff --git a/app/src/main/res/layout/common_alertdialog.xml b/app/src/main/res/layout/common_alertdialog.xml index 32e1221422..d3dc9abf85 100644 --- a/app/src/main/res/layout/common_alertdialog.xml +++ b/app/src/main/res/layout/common_alertdialog.xml @@ -1,6 +1,6 @@ @@ -23,7 +23,7 @@ Date: Fri, 20 Jan 2017 16:41:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=B9=B3=E5=8F=B0=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=88=91=E7=9A=84=E5=85=89=E7=8E=AF?= =?UTF-8?q?=E5=B7=B2=E5=AE=89=E8=A3=85=E5=88=97=E8=A1=A8=E6=96=87=E6=A1=88?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 4 +++- .../download/GameUpdateFragmentAdapter.java | 7 ++++++- .../personal/InstallFragmentAdapter.java | 2 +- .../main/res/drawable-hdpi/checkbox_select.png | Bin 681 -> 1618 bytes .../res/drawable-hdpi/checkbox_unselect.png | Bin 131 -> 1100 bytes .../main/res/layout/dialog_install_hint.xml | 1 + .../res/layout/home_subject_entrance_item.xml | 4 ++-- 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index fc473cd31f..59b7412294 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -11,6 +11,7 @@ import android.text.Spanned; import android.view.View; import android.view.Window; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import com.gh.gamecenter.R; @@ -115,8 +116,9 @@ public class DialogUtils { final ImageView installhint_select = (ImageView) view.findViewById(R.id.installhint_select); TextView installhint_cancel = (TextView) view.findViewById(R.id.installhint_cancel); + LinearLayout installhint_unselect_ll = (LinearLayout) view.findViewById(R.id.installhint_unselect_ll); - installhint_cancel.setOnClickListener(new View.OnClickListener() { + installhint_unselect_ll.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (installhint_unselect.getVisibility() == View.GONE) { 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 52d8bf7c26..a9d049537a 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -51,7 +51,7 @@ import rx.schedulers.Schedulers; * Created by LGT on 2016/8/16. * */ -public class GameUpdateFragmentAdapter extends RecyclerView.Adapter { +public class GameUpdateFragmentAdapter extends RecyclerView.Adapter { private Context context; @@ -542,6 +542,11 @@ public class GameUpdateFragmentAdapter extends RecyclerView.AdaptereNYr-9KHY*#8W3o2?>_HWH8;^-TU5^Q@O7=^N`>a#`0r7Uf`6wUH2C5K(qiY zxtJIf^8*yo33O7l%t=S{Gsnr&Ofwyo5y%op2B=BN(X>6_%s(7=X7_#f-QV;4p5ND2 zXJx)EA00nhCX>nS8J28mO%C3XBc*5V?Ngkzye?Yv#2hYP^icwkrL!CjAiJ9?0NH?I zOP7BS(qyvm)h=hAnCF;7GMrmU1#OgmH!q=Ovb33go??~(5u!nX%VUK5jvR*}7i)xb zwGPa|n?a!~qf7ufWtmQg5e}akQfdPU$Ep&VDrgr zi*4AK^k#$$MUf{_)aUaleQG5q6reak5GbZXRVqZXK)j_Mk@6!RuOh@?0bWLM@uG|K zKtV=|=88olEGZod!Oc4y&xk$V;Y3L(L;Vzw;z|s4yMu8JT6@K8@V|@~T6>+PJV3L7 zmn#++sUG=?5Ln9H%N+#`B{k$+!6g-iDzb1)u^V_qyTu4gUzDtiB@Gm=(XdQDqSIq6 zqNX)8La7-IqS5ONIz6SP)hZ^$^CEn@1=CseHiJbiWgoZd(s7%~YE{|HT8qVI(h?!8 z-QyK04+BEJU6Su%tp24~(kuW<~r}W z>Qm`Nih~cyA!(Y{saT1KVOSi&aiBwJiXadMQxj^HT8*(P4U9?>(O~O5*Gi!ysXv3; zXM-WVJR2?Gk>*K|1}9-4=d?@~#@a3EPXG0ujf*p4(-Y3#5gq2qnD$=(yWPpB7S%wh z8cP|vq93ZyiHt~&8WUTY7;!flPR(uJ|1})`=b7%N)V13qP50Mz?!5j<@)P6qvweMy zYnJyu@DzNzaAkLNQvMzNiUYSA{ypC$=Pzt-3tQPUtE)LL>2T`RUE5BMO~)<<=qRvo z&#Fkp@~E0u%)hL7oLC*!KVLQLTwqevWzFGw2!-&}#lzU2J@R*-afa71PK=0N`a z6tpRh=Sb6>0 zyQu>YV~=`OwF9mxe5E{o;@+jo?y9;(KFyk#1#eqNt2^2*pJAKEOaKqdt0u=?vd2w1 zaQEYuu6etUnI45*6F}FSi@_Up<3wVIW^3yQqZHrN`w!;TvsbEakv}YL{L4SBZeNvd z{Dy|__RkC_I>z`vFDj`$xxM%LwygGslu=s`?TLtr1bTZ3-K>S%ld~D8$&Q zqnhelqPuqGSO5Ckg7NkvQPk~mf%q>+_FTJJGU>-7?MpYC71KMCmHU34Gk;4`MRQfp zz=Fy;uIqmJYt8n$6K&woY3YrgI$><<4BwWPV^Mo|9(N5y tpu(y3KbiDR6^j}_dfH%6rId__ll9JPM0D?Lni%}c+pU?FHq(;I{{ZH(Q&<21 literal 681 zcmV;a0#^NrP)0007TNklK zwpDZ?ZUzc1q|k=81cbB{OWVzWCI|*eA{v|L;!VQMi!*tXO!C{EbI&>7d+yvbb0>=9 zSQbU~wM=oX6c_WN`dVLH%&$OhPt`h5R9~CKLR4QHh3J4feho9|ZQ9j?==gDb8$cl+ zRVtNiE$>1xzUV)0{?K!w`!-(L*N*FlUr0k&F&r23D`ERlyCUU6sZ;LjIq{X0@9nsl zzs3ID>V8~U-`dM`T+G)tjQs%T@D0KQAf6E^3# zTqs5O6w{SPZQEzkM#q}qP~*7UE-CEzT}VI-~adjx;;5@ zesJK#fFwzSjSGHDtS5{2@K@qH{qJ8)EXVoy44+~h-bE>us)Pj;G$J%hTNII%Yk$*G zN&50e*q-4t&5IspQ3(|`r94UmT9QV`@&w@p%0WP9!?+@EK6xsGkW}PptEn}UI-LtI ztfq8ob)t<|7qCm@v2Va=?g@g3as={dG0wcaB5(0}VqaXVGT1WV3l(`=)J$^{)LBY_ zRk9Tf4F{Cn60}@LH@^nD25nVyRcI<2^fcGgAm}}^@RpK}*YeNxe2G&#V(!P_;!fwv=K~kIrx(EONKMqryoV}f;Gc6bi>eyZpx~V zs1~iWtCjj!qCbo6&R~ec&S=qC%u^}`Cw)2pn;5z)4ZqsXUwwFSW(6KC z_j_Rd*3Gf}`#T%QS`XiTe6t+n0L-`6u6F*p?_YlRxncgY@uInT_mAhnx^&=+gNKK} u*&m$m`27cKBahcE)jkdV^#0dF$D~s~A3gf|+v`6T^W7Mq@E_H#uKx!&TwXf> literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIUY;(FAs(G?uNiVN7;rEji1-y! zpZYH=e0q?;D-m_ak0+M7x;!dgd!K>f&86t)4ZGvhRfHwHlw3Ll6rEZ)B;8*rU##l& euq$_)Bvba8^QN!P^+`Ze89ZJ6T-G@yGywq2A1gKh diff --git a/app/src/main/res/layout/dialog_install_hint.xml b/app/src/main/res/layout/dialog_install_hint.xml index e4cbdfd8db..c9a9d1e57f 100644 --- a/app/src/main/res/layout/dialog_install_hint.xml +++ b/app/src/main/res/layout/dialog_install_hint.xml @@ -49,6 +49,7 @@ android:orientation="horizontal"> + android:layout_width="60dp" + android:layout_height="55dp">