From 5f2b84d88c8dc541c238fd1f9cf4ad71773bb9a9 Mon Sep 17 00:00:00 2001 From: huangzhuanghua <401742778@qq.com> Date: Wed, 28 Sep 2016 17:55:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=A3=80=E6=9F=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E5=92=8C=E6=8E=A7=E5=88=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/volley/toolbox/BasicNetwork.java | 2 +- .../java/com/gh/gamecenter/MainActivity.java | 15 +++---- .../com/gh/gamecenter/SettingActivity.java | 11 +++-- .../gh/gamecenter/SplashScreenActivity.java | 22 ++++++---- .../com/gh/gamecenter/entity/AppEntity.java | 42 +++++-------------- 5 files changed, 37 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java b/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java index 4a719f1f7e..b1986449ed 100644 --- a/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java +++ b/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java @@ -106,7 +106,7 @@ public class BasicNetwork implements Network { responseHeaders = convertHeaders(httpResponse.getAllHeaders()); // Handle cache validation. if (statusCode == HttpStatus.SC_NOT_MODIFIED) { - if (request.getUrl().startsWith(Config.HOST + "v2/version")) { + if (request.getUrl().startsWith(Config.HOST + "v2d0/support/upgrade")) { if (request.getCacheEntry() != null) { return new NetworkResponse(HttpStatus.SC_NOT_MODIFIED, request.getCacheEntry().data, responseHeaders, true); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index ffa5e49d6f..9663aa55ee 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -162,7 +162,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene if (downloadEntity.getName().contains("光环助手")) { DataUtils.onEvent(MainActivity.this, "软件更新", "下载完成"); startActivity(PackageUtils.getInstallIntent(downloadEntity.getPath())); - if (appEntity != null && appEntity.isIs_force()) { + if (appEntity != null && appEntity.isForce()) { finish(); } } else { @@ -316,6 +316,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene getPackageName(), "TD_CHANNEL_ID"); map.put("version", version); map.put("user", user); + map.put("device_id", TokenUtils.getDeviceId(this)); map.put("channel", channel); String url = "http://data.ghzhushou.com/api/v1d0/log"; Map params = new HashMap<>(); @@ -1029,7 +1030,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene private void checkUpdate() { String TD_CHANNEL_ID = (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID"); - String url = Config.HOST + "v2/version?version_name=" + PackageUtils.getVersion(getApplicationContext()) + String url = Config.HOST + "v2d0/support/upgrade?version=" + PackageUtils.getVersion(getApplicationContext()) + "&channel=" + TD_CHANNEL_ID; JsonObjectExtendedRequest request = new JsonObjectExtendedRequest(url, new Response.Listener() { @@ -1053,12 +1054,12 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene PackageManager.addUpdate(0, game); String updateMD5 = MD5Utils.getUpdateMD5(appEntity.getUrl(), appEntity.getContent()); - if (appEntity.isIs_force()) { + if (appEntity.isForce()) { // 强制更新 showUpdateDialog(updateMD5); } else { // 非强制更新 - if ("EVERY_TIME_OPEN".equals(appEntity.getAlet_type())) { + if ("EVERY_TIME_OPEN".equals(appEntity.getAlert())) { // 每次都提示 showUpdateDialog(updateMD5); } else { @@ -1097,7 +1098,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene new OnClickListener() { @Override public void onClick(View v) { - if (appEntity.isIs_force()) { + if (appEntity.isForce()) { finish(); } else { updateDialog.dismiss(); @@ -1122,7 +1123,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } }); - if (appEntity.isIs_force()) { + if (appEntity.isForce()) { updateDialog.setCanceledOnTouchOutside(false); updateDialog.setCancelable(false); } @@ -1151,7 +1152,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene @Override public void onClick(View v) { DownloadManager.getInstance(getApplicationContext()).cancel(appEntity.getUrl()); - if (appEntity.isIs_force()) { + if (appEntity.isForce()) { finish(); } else { dialog.dismiss(); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index fe90f5a536..0c540952dc 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -93,7 +93,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { if (DownloadStatus.done.equals(downloadEntity.getStatus())) { DownloadManager.getInstance(getApplicationContext()) .cancel(downloadEntity.getUrl(), false); - if (appEntity != null && appEntity.isIs_force()) { + if (appEntity != null && appEntity.isForce()) { AppController.getInstance().finishActivity(); } else { if (dialog != null) { @@ -362,8 +362,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { private void checkUpdate() { String TD_CHANNEL_ID = (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID"); - String url = Config.HOST + "v2/version?version_name=" - + PackageUtils.getVersion(getApplicationContext()) + String url = Config.HOST + "v2d0/support/upgrade?version=" + PackageUtils.getVersion(getApplicationContext()) + "&channel=" + TD_CHANNEL_ID; JsonObjectExtendedRequest request = new JsonObjectExtendedRequest(url, new Response.Listener() { @@ -440,7 +439,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { size.setText("大小："+appEntity.getSize()); content.setText(appEntity.getContent()+""); - if (appEntity.isIs_force()) { + if (appEntity.isForce()) { dialog.setCanceledOnTouchOutside(false); dialog.setCancelable(false); } @@ -448,7 +447,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { new OnClickListener() { @Override public void onClick(View v) { - if (appEntity.isIs_force()) { + if (appEntity.isForce()) { Intent data = new Intent(); data.putExtra("isForce", true); setResult(RESULT_OK, data); @@ -502,7 +501,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { public void onClick(View v) { DownloadManager.getInstance(getApplicationContext()).cancel( appEntity.getUrl()); - if (appEntity.isIs_force()) { + if (appEntity.isForce()) { Intent data = new Intent(); data.putExtra("isForce", true); setResult(RESULT_OK, data); diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index ed0f5d12ab..46d12107b4 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -25,7 +25,6 @@ import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; import com.gh.common.util.FileUtils; -import com.gh.common.util.ImageUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.TimestampUtils; import com.gh.common.util.Utils; @@ -143,9 +142,11 @@ public class SplashScreenActivity extends BaseActivity { return view; } else { ImageView imageView = new ImageView(SplashScreenActivity.this); - ImageUtils.getInstance(SplashScreenActivity.this). - display("drawable://" + pics[position], imageView, -1); - container.addView(imageView); + imageView.setScaleType(ImageView.ScaleType.FIT_XY); + imageView.setImageResource(pics[position]); + ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); + container.addView(imageView, params); return imageView; } } @@ -305,15 +306,18 @@ public class SplashScreenActivity extends BaseActivity { String TD_CHANNEL_ID = (String) PackageUtils.getMetaData(this, getPackageName(), "TD_CHANNEL_ID"); JsonObjectExtendedRequest request = new JsonObjectExtendedRequest( - Config.HOST + "v1d45/support/setting/download/" + TD_CHANNEL_ID - + "/switch2?version=" - + PackageUtils.getVersion(getApplicationContext()), + Config.HOST + "v2d0/support/download_status?version=" + PackageUtils.getVersion(getApplicationContext()) + + "&channel=" + TD_CHANNEL_ID, new Response.Listener() { @Override public void onResponse(JSONObject response) { try { - boolean isShow = response.getBoolean("status"); - sp.edit().putBoolean("isShow", isShow).apply(); + String status = response.getString("status"); + if ("on".equals(status)) { + sp.edit().putBoolean("isShow", true).apply(); + } else { + sp.edit().putBoolean("isShow", false).apply(); + } EventBus.getDefault().post(new EBReuse("Refresh")); } catch (JSONException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/gh/gamecenter/entity/AppEntity.java b/app/src/main/java/com/gh/gamecenter/entity/AppEntity.java index 8d5f798e07..b7e623cd46 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/AppEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/AppEntity.java @@ -6,22 +6,8 @@ public class AppEntity { private String url; private String size; private String content; - private boolean is_force; - private String alet_type; - - public AppEntity() { - - } - - public AppEntity(String version, String url, String size, String content, - boolean is_force, String alet_type) { - this.version = version; - this.url = url; - this.size = size; - this.content = content; - this.is_force = is_force; - this.alet_type = alet_type; - } + private boolean force; + private String alert; public String getVersion() { return version; @@ -55,27 +41,19 @@ public class AppEntity { this.content = content; } - public boolean isIs_force() { - return is_force; + public boolean isForce() { + return force; } - public void setIs_force(boolean is_force) { - this.is_force = is_force; + public void setForce(boolean force) { + this.force = force; } - public String getAlet_type() { - return alet_type; + public String getAlert() { + return alert; } - public void setAlet_type(String alet_type) { - this.alet_type = alet_type; + public void setAlert(String alert) { + this.alert = alert; } - - @Override - public String toString() { - return "AppEntity [version=" + version + ", url=" + url + ", size=" - + size + ", content=" + content + ", is_force=" + is_force - + ", alet_type=" + alet_type + "]"; - } - }