()
// 标记需要替换的已安装游戏
diff --git a/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt b/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt
index ae79b3cd68..8671deaea9 100644
--- a/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt
+++ b/app/src/main/java/com/gh/common/util/GhMatisseVideoApplyFilter.kt
@@ -14,9 +14,10 @@ class GhMatisseVideoApplyFilter : ApplyFilter() {
Utils.toast(context, "网络异常，请检查手机网络状态")
} else if (!NetworkUtils.isWifiConnected(context)) {
DialogHelper.showDialog(context, "提示",
- "您当前正在使用移动网络上传视频，确定继续上传吗？",
- "继续上传", "暂时不了",
- { callBack.onApply() }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
+ "您当前正在使用移动网络上传视频，确定继续上传吗？",
+ "继续上传", "暂时不了",
+ { callBack.onApply() }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+ )
} else {
callBack.onApply()
}
diff --git a/app/src/main/java/com/gh/common/util/HaloWheelViewAdapter.java b/app/src/main/java/com/gh/common/util/HaloWheelViewAdapter.java
index 64c21cd642..c8db887488 100644
--- a/app/src/main/java/com/gh/common/util/HaloWheelViewAdapter.java
+++ b/app/src/main/java/com/gh/common/util/HaloWheelViewAdapter.java
@@ -4,7 +4,7 @@ import com.contrarywind.adapter.WheelAdapter;
/**
* 注意：选择后的数据其实是dates的position，需要在回调时对返回的date数据进行转换
- *
+ *
* 例子请见：
* {@link com.gh.gamecenter.servers.add.AddKaiFuActivity}
*/
diff --git a/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt b/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt
index 4026ace723..597e180f6d 100644
--- a/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt
+++ b/app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt
@@ -21,17 +21,19 @@ object HomeBottomBarHelper {
}
val animationCode = HaloApp.getInstance().application.assets
- .open("lottie/tab_game.json")
- .bufferedReader().use { it.readText() }
- return SubjectRecommendEntity(link = "5de21b5d75e6fa054f784882",
- type = "block",
- text = "游戏库",
- name = "游戏库",
- iconSelect = "https://resource.ghzs.com/image/game/library/entrance/5e183202913fbd002c75f247.png",
- iconUnselect = "https://resource.ghzs.com/image/game/library/entrance/5e1831fd913fbd003024641e.png",
- animationCode = animationCode,
- default = false,
- display = Display())
+ .open("lottie/tab_game.json")
+ .bufferedReader().use { it.readText() }
+ return SubjectRecommendEntity(
+ link = "5de21b5d75e6fa054f784882",
+ type = "block",
+ text = "游戏库",
+ name = "游戏库",
+ iconSelect = "https://resource.ghzs.com/image/game/library/entrance/5e183202913fbd002c75f247.png",
+ iconUnselect = "https://resource.ghzs.com/image/game/library/entrance/5e1831fd913fbd003024641e.png",
+ animationCode = animationCode,
+ default = false,
+ display = Display()
+ )
}
@JvmStatic
diff --git a/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt b/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt
index b0776a84ff..78ec92fa5c 100644
--- a/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt
+++ b/app/src/main/java/com/gh/common/util/HomePluggableHelper.kt
@@ -19,7 +19,15 @@ object HomePluggableHelper {
if (apkList.isNotEmpty()) {
val apk = apkList.first()
val tag = if (isNever) "never" else apk.version ?: ""
- tryCatchInRelease { mHomePluggableFilterDao.addData(HomePluggableFilterEntity(pkgName = apk.packageName, tag = tag, active = isNever)) }
+ tryCatchInRelease {
+ mHomePluggableFilterDao.addData(
+ HomePluggableFilterEntity(
+ pkgName = apk.packageName,
+ tag = tag,
+ active = isNever
+ )
+ )
+ }
}
}
diff --git a/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt b/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt
index 352401c30f..04b441928d 100644
--- a/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt
+++ b/app/src/main/java/com/gh/common/util/IntegralLogHelper.kt
@@ -54,7 +54,13 @@ object IntegralLogHelper {
log(json, "score", false)
}
- fun logCommodityCategory(event: String, location: String, entrance: String, categoryId: String, categoryName: String) {
+ fun logCommodityCategory(
+ event: String,
+ location: String,
+ entrance: String,
+ categoryId: String,
+ categoryName: String
+ ) {
val json = JSONObject().apply {
tryWithDefaultCatch {
put("meta", LogUtils.getMetaObject())
diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java
index 14f11356c4..d060e47057 100644
--- a/app/src/main/java/com/gh/common/util/LibaoUtils.java
+++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java
@@ -356,7 +356,9 @@ public class LibaoUtils {
break;
case "查看":
if (!TextUtils.isEmpty(libaoEntity.getDes())) {
- DialogHelper.showCenterDialog(v.getContext(), "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {}, () -> {});
+ DialogHelper.showCenterDialog(v.getContext(), "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {
+ }, () -> {
+ });
}
break;
case "再领":
@@ -424,7 +426,9 @@ public class LibaoUtils {
break;
case "check":
if (!TextUtils.isEmpty(libaoEntity.getDes())) {
- DialogHelper.showDialog(context, "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {}, () -> {}, false, "", "");
+ DialogHelper.showDialog(context, "使用说明", Html.fromHtml(libaoEntity.getDes()), "关闭", "", () -> {
+ }, () -> {
+ }, false, "", "");
}
break;
case "repeatLing":
diff --git a/app/src/main/java/com/gh/common/util/PackageHelper.kt b/app/src/main/java/com/gh/common/util/PackageHelper.kt
index 9cbda1952d..919b070892 100644
--- a/app/src/main/java/com/gh/common/util/PackageHelper.kt
+++ b/app/src/main/java/com/gh/common/util/PackageHelper.kt
@@ -54,7 +54,8 @@ object PackageHelper {
}
private fun updateValidPackageNameList() {
- validLocalPackageNameSet = localPackageNameSet.filterNot { p -> downloadPackageNameBlackList.contains(p) }.toHashSet()
+ validLocalPackageNameSet =
+ localPackageNameSet.filterNot { p -> downloadPackageNameBlackList.contains(p) }.toHashSet()
}
/*
diff --git a/app/src/main/java/com/gh/common/util/PackageInstaller.kt b/app/src/main/java/com/gh/common/util/PackageInstaller.kt
index 42b3fb113c..9484cfda20 100644
--- a/app/src/main/java/com/gh/common/util/PackageInstaller.kt
+++ b/app/src/main/java/com/gh/common/util/PackageInstaller.kt
@@ -123,8 +123,8 @@ object PackageInstaller {
// if (downloadEntity != null) {
// showCertificateDialogIfNeededBeforeInstall(app, downloadEntity, pkgPath)
// } else {
- val installIntent = getInstallIntent(context, pkgPath)
- context.startActivity(installIntent)
+ val installIntent = getInstallIntent(context, pkgPath)
+ context.startActivity(installIntent)
// }
} else {
if (isPluggin) {
diff --git a/app/src/main/java/com/gh/common/util/PlatformUtils.java b/app/src/main/java/com/gh/common/util/PlatformUtils.java
index 41f1a49f64..eceb286682 100644
--- a/app/src/main/java/com/gh/common/util/PlatformUtils.java
+++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java
@@ -32,27 +32,28 @@ import java.util.Set;
import androidx.collection.ArrayMap;
import androidx.core.content.ContextCompat;
+
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import retrofit2.HttpException;
public class PlatformUtils {
-
+
private static PlatformUtils mInstance;
-
+
private Context context;
-
+
private ArrayMap platformMap;
private ArrayMap platformPicUrlMap;
private ArrayMap platformColorMap;
private boolean isCheck = false;
private boolean isUpdate = false;
-
+
private PlatformUtils(Context con) {
this.context = con.getApplicationContext();
initMap();
}
-
+
private void initMap() {
ArrayMap platformColorMap = new ArrayMap<>();
platformColorMap.put("360", "#218FA4");
@@ -72,10 +73,10 @@ public class PlatformUtils {
platformColorMap.put("pps", "#FF8C27");
platformColorMap.put("vivo", "#3FA5E3");
platformColorMap.put("wdj", "#5ABA3F");
-
+
ArrayMap platformMap = new ArrayMap<>();
ArrayMap platformPicUrlMap = new ArrayMap<>();
-
+
SharedPreferences sharedPreferences = context.getSharedPreferences("gh_platform", Context.MODE_PRIVATE);
Set set = sharedPreferences.getStringSet("platform", null);
if (set == null) {
@@ -110,10 +111,10 @@ public class PlatformUtils {
// checkPlatformPic(urls);
}
}
-
+
updatePlatform(platformMap, platformPicUrlMap, platformColorMap);
}
-
+
private void checkPlatformPic(final ArrayList urls) {
isCheck = true;
File file = new File(FileUtils.getPlatformPicDir(context));
@@ -135,7 +136,7 @@ public class PlatformUtils {
for (int i = 0; i < urls.size(); i++) {
String url = urls.get(i);
String savePath = FileUtils.getPlatformPicDir(context) + File.separator + url
- .substring(url.lastIndexOf("/") + 1);
+ .substring(url.lastIndexOf("/") + 1);
int code = FileUtils.downloadFile(url, savePath);
if (code == HttpURLConnection.HTTP_OK) {
success++;
@@ -151,20 +152,20 @@ public class PlatformUtils {
isCheck = false;
}
}
-
+
private void updatePlatform(ArrayMap pMap, ArrayMap pUMap, ArrayMap pCMap) {
platformMap = pMap;
platformPicUrlMap = pUMap;
platformColorMap = pCMap;
}
-
+
public static PlatformUtils getInstance(Context context) {
if (mInstance == null) {
mInstance = new PlatformUtils(context);
}
return mInstance;
}
-
+
public String getPlatformColor(String platform) {
if ("".equals(platform) || "官方版".equals(platform)) {
return "#BB3D42";
@@ -173,16 +174,16 @@ public class PlatformUtils {
if (color != null) {
return color;
}
-
+
int themeColor = ContextCompat.getColor(HaloApp.getInstance()
- .getApplication(), R.color.theme);
+ .getApplication(), R.color.theme);
return String.format("#%06X", 0xFFFFFF & themeColor);
}
-
+
public String getPlatformPicUrl(String platform) {
return platformPicUrlMap.get(platform);
}
-
+
public String getPlatformName(String platform) {
if ("".equals(platform) || "官方版".equals(platform)) {
return "官方版";
@@ -201,40 +202,40 @@ public class PlatformUtils {
}
return platform;
}
-
+
public void getPlatform() {
if (isUpdate) {
return;
}
isUpdate = true;
RetrofitManager.getInstance()
- .getApi()
- .getGamePlatform()
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Response>() {
- @Override
- public void onResponse(List response) {
- Set platformSet = new HashSet<>();
- for (PlatformEntity platformEntity : response) {
- platformSet.add(platformEntity.toString());
+ .getApi()
+ .getGamePlatform()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Response>() {
+ @Override
+ public void onResponse(List response) {
+ Set platformSet = new HashSet<>();
+ for (PlatformEntity platformEntity : response) {
+ platformSet.add(platformEntity.toString());
+ }
+ SharedPreferences sp = context.getSharedPreferences("gh_platform", Context.MODE_PRIVATE);
+ sp.edit().putStringSet("platform", platformSet).apply();
+ initMap();
+ EventBus.getDefault().post(new EBReuse("PlatformChanged"));
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+ String today = format.format(new Date());
+ sp.edit().putString("refresh_time", today).apply();
+ isUpdate = false;
}
- SharedPreferences sp = context.getSharedPreferences("gh_platform", Context.MODE_PRIVATE);
- sp.edit().putStringSet("platform", platformSet).apply();
- initMap();
- EventBus.getDefault().post(new EBReuse("PlatformChanged"));
-
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
- String today = format.format(new Date());
- sp.edit().putString("refresh_time", today).apply();
- isUpdate = false;
- }
-
- @Override
- public void onFailure(HttpException e) {
- isUpdate = false;
- }
- });
+
+ @Override
+ public void onFailure(HttpException e) {
+ isUpdate = false;
+ }
+ });
}
-
+
}
diff --git a/app/src/main/java/com/gh/common/util/RealNameHelper.kt b/app/src/main/java/com/gh/common/util/RealNameHelper.kt
index 05720cc4aa..36da379042 100644
--- a/app/src/main/java/com/gh/common/util/RealNameHelper.kt
+++ b/app/src/main/java/com/gh/common/util/RealNameHelper.kt
@@ -63,7 +63,8 @@ object RealNameHelper {
val currentActivity = CurrentActivityHolder.getCurrentActivity()
if (currentActivity == null
- || currentActivity.isFinishing) {
+ || currentActivity.isFinishing
+ ) {
ToastUtils.toast("为保护未成年身心健康成长，根据相关政策要求，该游戏不对未成年人开放")
} else {
NewLogUtils.logCertificationHintDialogAppearance()
diff --git a/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt b/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt
index c4c8fe7979..e755d2bc9a 100644
--- a/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt
+++ b/app/src/main/java/com/gh/common/util/RecommendPopupHelper.kt
@@ -94,7 +94,7 @@ object RecommendPopupHelper {
}
}
- fun checkFrequencyIsMatch(entity: RecommendPopupEntity): Boolean {
+ fun checkFrequencyIsMatch(entity: RecommendPopupEntity): Boolean {
//判断是否符合通知频率 一次once, 累计次数count, 每周一次weekly, 每天一次daily, 每次always
val plan = entity.notice.plan
val times = entity.notice.times
@@ -102,7 +102,7 @@ object RecommendPopupHelper {
val recordStr = SPUtils.getString(Constants.SP_RECOMMEND_POPUP)
val type = object : TypeToken>() {}.type
val records = GsonUtils.gson.fromJson>(recordStr, type)
- ?: arrayListOf()
+ ?: arrayListOf()
val recommendRecord = records.find { it.popupId == entity.id }
val showTime = recommendRecord?.showTime ?: 0L
val count = recommendRecord?.count ?: 0
@@ -131,7 +131,7 @@ object RecommendPopupHelper {
val recordStr = SPUtils.getString(Constants.SP_RECOMMEND_POPUP)
val type = object : TypeToken>() {}.type
val records = GsonUtils.gson.fromJson>(recordStr, type)
- ?: arrayListOf()
+ ?: arrayListOf()
val recommendRecord = records.find { it.popupId == popup.id }
if (recommendRecord == null) {
records.add(RecommendRecord(popup.id, System.currentTimeMillis(), 1))
diff --git a/app/src/main/java/com/gh/common/util/ReservationHelper.kt b/app/src/main/java/com/gh/common/util/ReservationHelper.kt
index 8229c81848..e3d9e4fb9b 100644
--- a/app/src/main/java/com/gh/common/util/ReservationHelper.kt
+++ b/app/src/main/java/com/gh/common/util/ReservationHelper.kt
@@ -33,7 +33,11 @@ object ReservationHelper {
}
@SuppressLint("CheckResult")
- private fun deleteOrCancelReservation(game: GameEntity, deleteReservation: Boolean, refreshCallback: EmptyCallback) {
+ private fun deleteOrCancelReservation(
+ game: GameEntity,
+ deleteReservation: Boolean,
+ refreshCallback: EmptyCallback
+ ) {
val retrofit = RetrofitManager.getInstance()
val requestMap = hashMapOf()
requestMap["game_id"] = game.id
diff --git a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt
index a1c5cd0ab9..92e18c38f9 100644
--- a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt
+++ b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt
@@ -22,17 +22,17 @@ object SimpleRequestHelper {
val map = HashMap()
map["reason"] = type
mApi.reportGameComment(gameId, commentId, map.createRequestBody())
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(object : Response() {
- override fun onResponse(response: ResponseBody?) {
- Utils.toast(HaloApp.getInstance().application, "举报成功")
- }
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(object : Response() {
+ override fun onResponse(response: ResponseBody?) {
+ Utils.toast(HaloApp.getInstance().application, "举报成功")
+ }
- override fun onFailure(e: HttpException?) {
- ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
- }
- })
+ override fun onFailure(e: HttpException?) {
+ ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
+ }
+ })
}
@@ -40,17 +40,17 @@ object SimpleRequestHelper {
val map = HashMap()
map["reason"] = type
mApi.reportGameCommentReply(gameId, commentId, replyId, map.createRequestBody())
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(object : Response() {
- override fun onResponse(response: ResponseBody?) {
- Utils.toast(HaloApp.getInstance().application, "举报成功")
- }
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(object : Response() {
+ override fun onResponse(response: ResponseBody?) {
+ Utils.toast(HaloApp.getInstance().application, "举报成功")
+ }
- override fun onFailure(e: HttpException?) {
- ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
- }
- })
+ override fun onFailure(e: HttpException?) {
+ ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
+ }
+ })
}
@@ -63,7 +63,7 @@ object SimpleRequestHelper {
}
override fun onFailure(e: HttpException?) {
- ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
+ ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
}
})
}
@@ -77,7 +77,7 @@ object SimpleRequestHelper {
}
override fun onFailure(e: HttpException?) {
- ErrorHelper.handleError(HaloApp.getInstance().application,e?.response()?.errorBody()?.string())
+ ErrorHelper.handleError(HaloApp.getInstance().application, e?.response()?.errorBody()?.string())
}
})
}
diff --git a/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt b/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt
index 1fdf994cf4..14f32fa8f2 100644
--- a/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt
+++ b/app/src/main/java/com/gh/common/util/SyncDataBetweenPageHelper.kt
@@ -45,7 +45,11 @@ object SyncDataBetweenPageHelper {
fragment.startActivityForResult(intent, requestCode)
}
- fun setResultAndFinish(context: Context, syncData: T?, resultCode: Int = Activity.RESULT_OK): Boolean {
+ fun setResultAndFinish(
+ context: Context,
+ syncData: T?,
+ resultCode: Int = Activity.RESULT_OK
+ ): Boolean {
if (context is Activity) {
val requestCode = context.intent.getIntExtra(REQUEST_CODE_TAG, DEFAULT_NUMBER)
val dataPosition = context.intent.getIntExtra(DATA_POSITION_TAG, DEFAULT_NUMBER)
diff --git a/app/src/main/java/com/gh/common/util/TagUtils.java b/app/src/main/java/com/gh/common/util/TagUtils.java
index d20aeeefcd..8327ada682 100644
--- a/app/src/main/java/com/gh/common/util/TagUtils.java
+++ b/app/src/main/java/com/gh/common/util/TagUtils.java
@@ -3,6 +3,7 @@ package com.gh.common.util;
import android.content.Context;
import android.content.SharedPreferences;
+
import androidx.collection.ArrayMap;
import com.gh.gamecenter.entity.TagEntity;
diff --git a/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt b/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt
index 57fc86e676..d1781f69cb 100644
--- a/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt
+++ b/app/src/main/java/com/gh/common/util/UsageStatsHelper.kt
@@ -61,12 +61,13 @@ object UsageStatsHelper {
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
private fun getDataByUsageStats(lastPostTime: Long): JSONArray? {
val usageStatsManager = HaloApp
- .getInstance().application
- .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+ .getInstance().application
+ .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
val usageStatsMap = usageStatsManager.queryAndAggregateUsageStats(
- lastPostTime,
- System.currentTimeMillis()) ?: return null
+ lastPostTime,
+ System.currentTimeMillis()
+ ) ?: return null
val postBody = JSONArray()
for (entry in usageStatsMap) {
@@ -93,9 +94,9 @@ object UsageStatsHelper {
private fun getDataByUsageEvents(startTime: Long): JSONArray? {
val mUsageStatsManager = HaloApp
- .getInstance()
- .application
- .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
+ .getInstance()
+ .application
+ .getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
val usageEvents = mUsageStatsManager.queryEvents(startTime, System.currentTimeMillis())
val allEvents = ArrayList()
@@ -107,7 +108,8 @@ object UsageStatsHelper {
currentEvent = UsageEvents.Event()
usageEvents.getNextEvent(currentEvent)
if (currentEvent.eventType == UsageEvents.Event.MOVE_TO_FOREGROUND
- || currentEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND) {
+ || currentEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND
+ ) {
allEvents.add(currentEvent)
}
}
@@ -118,8 +120,9 @@ object UsageStatsHelper {
val nextEvent = allEvents[i + 1]
if (curEvent.eventType == UsageEvents.Event.MOVE_TO_FOREGROUND
- && nextEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND
- && curEvent.className == nextEvent.className) {
+ && nextEvent.eventType == UsageEvents.Event.MOVE_TO_BACKGROUND
+ && curEvent.className == nextEvent.className
+ ) {
val diff = nextEvent.timeStamp - curEvent.timeStamp
if (pakAndTime[curEvent.packageName] == null) {
@@ -174,25 +177,26 @@ object UsageStatsHelper {
val body = RequestBody.create(MediaType.parse("application/json"), postBody.toString())
mApi.postUsageStatus(body, UserManager.getInstance().userId)
- .subscribe(object : BiResponse() {
- override fun onSuccess(data: ResponseBody) {
- debugOnly {
- Utils.log("UsageStats: 数据上传成功")
- }
+ .subscribe(object : BiResponse() {
+ override fun onSuccess(data: ResponseBody) {
+ debugOnly {
+ Utils.log("UsageStats: 数据上传成功")
}
- })
+ }
+ })
}
@JvmStatic
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
fun checkForPermission(): Boolean {
val appOps = HaloApp
- .getInstance().application
- .getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
+ .getInstance().application
+ .getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
val mode = appOps.checkOpNoThrow(
- OPSTR_GET_USAGE_STATS,
- Process.myUid(),
- HaloApp.getInstance().application.packageName)
+ OPSTR_GET_USAGE_STATS,
+ Process.myUid(),
+ HaloApp.getInstance().application.packageName
+ )
return mode == MODE_ALLOWED
}
@@ -220,19 +224,19 @@ object UsageStatsHelper {
}
mApi.getUsageStatusUpdateTime(HaloApp.getInstance().gid)
- .subscribe(object : BiResponse() {
- override fun onSuccess(data: ResponseBody) {
- val body = JSONObject(data.string())
- val lastPostTime = body.getLong("update_time") * 1000
+ .subscribe(object : BiResponse() {
+ override fun onSuccess(data: ResponseBody) {
+ val body = JSONObject(data.string())
+ val lastPostTime = body.getLong("update_time") * 1000
- val beginTime = if (lastPostTime == 0L) {
- getDefaultBeginTime()
- } else {
- lastPostTime
- }
- postUsageStats(beginTime)
+ val beginTime = if (lastPostTime == 0L) {
+ getDefaultBeginTime()
+ } else {
+ lastPostTime
}
- })
+ postUsageStats(beginTime)
+ }
+ })
}
private fun isSameDay(timeA: Long, timeB: Long): Boolean {
diff --git a/app/src/main/java/com/gh/common/util/WechatBindHelper.kt b/app/src/main/java/com/gh/common/util/WechatBindHelper.kt
index faa02f1d40..c1478a1aaa 100644
--- a/app/src/main/java/com/gh/common/util/WechatBindHelper.kt
+++ b/app/src/main/java/com/gh/common/util/WechatBindHelper.kt
@@ -48,7 +48,10 @@ object WechatBindHelper {
override fun onFailure(exception: Exception) {
callback.onSecond(true)
if (exception is HttpException) {
- ErrorHelper.handleError(HaloApp.getInstance().application, exception.response().errorBody()?.string())
+ ErrorHelper.handleError(
+ HaloApp.getInstance().application,
+ exception.response().errorBody()?.string()
+ )
}
}
})
diff --git a/app/src/main/java/com/gh/common/videolog/VideoRecordEntity.kt b/app/src/main/java/com/gh/common/videolog/VideoRecordEntity.kt
index 0328455cdf..c7b5d302c6 100644
--- a/app/src/main/java/com/gh/common/videolog/VideoRecordEntity.kt
+++ b/app/src/main/java/com/gh/common/videolog/VideoRecordEntity.kt
@@ -11,8 +11,8 @@ import java.util.*
@Parcelize
@Entity(tableName = "VideoRecord")
data class VideoRecordEntity(
- @PrimaryKey
- var id: String = UUID.randomUUID().toString(),
- var videoId: String = "",
- var time: Long = 0
+ @PrimaryKey
+ var id: String = UUID.randomUUID().toString(),
+ var videoId: String = "",
+ var time: Long = 0
) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt b/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt
index 0e91ae5f2d..c104e9712d 100644
--- a/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt
+++ b/app/src/main/java/com/gh/common/videolog/VideoRecordUtils.kt
@@ -25,7 +25,7 @@ object VideoRecordUtils {
private val videoRecordDao by lazy { AppDatabase.getInstance().videoRecordDao() }
@JvmStatic
- fun init(application: Application, executor : ExecutorService) {
+ fun init(application: Application, executor: ExecutorService) {
mApplication = application
videoRecordExecutor = executor
@@ -78,12 +78,12 @@ object VideoRecordUtils {
requestMap["time"] = time
requestMap["video_id"] = videoIds
RetrofitManager.getInstance().api
- .uploadVideoLog(requestMap.toRequestBody())
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(object : BiResponse() {
- override fun onSuccess(data: ResponseBody) {
- }
- })
+ .uploadVideoLog(requestMap.toRequestBody())
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(object : BiResponse() {
+ override fun onSuccess(data: ResponseBody) {
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/common/view/AdBannerView.kt b/app/src/main/java/com/gh/common/view/AdBannerView.kt
index 0aac78de52..f25fe1b8ca 100644
--- a/app/src/main/java/com/gh/common/view/AdBannerView.kt
+++ b/app/src/main/java/com/gh/common/view/AdBannerView.kt
@@ -181,7 +181,8 @@ class AdBannerView : LinearLayout {
private inner class AdBannerAdapter : RecyclerView.Adapter() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
- return object : RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_ad_banner, parent, false)) {}
+ return object :
+ RecyclerView.ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_ad_banner, parent, false)) {}
}
override fun getItemCount(): Int = if (mDatas.size == 1) mDatas.size else Int.MAX_VALUE
@@ -189,7 +190,7 @@ class AdBannerView : LinearLayout {
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
val ad = mDatas[position % mDatas.size]
val view = holder.itemView as SimpleDraweeView
- ImageUtils.display(view,ad.image)
+ ImageUtils.display(view, ad.image)
holder.itemView.setOnClickListener {
onItemClick?.invoke(position % mDatas.size)
}
diff --git a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt
index 7b4a6c17fa..94f39dd430 100644
--- a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt
+++ b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt
@@ -19,7 +19,11 @@ import com.gh.gamecenter.entity.CatalogEntity
import com.gh.gamecenter.entity.SubjectSettingEntity
import com.google.android.flexbox.FlexboxLayout
-class CatalogFilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : LinearLayout(context, attrs, defStyleAttr) {
+class CatalogFilterView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
private var mTypeTv: TextView
private var mCatalogTv: TextView
diff --git a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt
index 5a90454bb2..cce34d9357 100644
--- a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt
+++ b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt
@@ -17,7 +17,11 @@ import com.gh.gamecenter.R
import com.gh.gamecenter.entity.SubjectSettingEntity
import com.google.android.flexbox.FlexboxLayout
-class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : LinearLayout(context, attrs, defStyleAttr) {
+class CategoryFilterView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
private var mTypeTv: TextView
private var mCatalogTv: TextView
diff --git a/app/src/main/java/com/gh/common/view/DownloadButton.kt b/app/src/main/java/com/gh/common/view/DownloadButton.kt
index 3074da2143..7c5a39586c 100644
--- a/app/src/main/java/com/gh/common/view/DownloadButton.kt
+++ b/app/src/main/java/com/gh/common/view/DownloadButton.kt
@@ -19,10 +19,11 @@ class DownloadButton @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
-): ProgressBar(context, attrs, defStyleAttr) {
+) : ProgressBar(context, attrs, defStyleAttr) {
private val mDuffXFerMode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN)
private val mPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+
// 仅用于测量文字是否超出范围，不用于画文字
private val mFakeTextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
private var mDownloadStyle = 0
@@ -68,8 +69,12 @@ class DownloadButton @JvmOverloads constructor(
val ta = context.obtainStyledAttributes(attrs, R.styleable.DownloadButton)
showProgress = ta.getBoolean(R.styleable.DownloadButton_download_button_show_progress, false)
mShowPercent = ta.getBoolean(R.styleable.DownloadButton_download_button_show_percent, false)
- mDownloadStyle = ta.getInteger(R.styleable.DownloadButton_download_button_download_style, DOWNLOAD_NORMAL_STYLE)
- mTextSize = ta.getDimensionPixelSize(R.styleable.DownloadButton_download_button_text_size, DisplayUtils.sp2px(context, 12F))
+ mDownloadStyle =
+ ta.getInteger(R.styleable.DownloadButton_download_button_download_style, DOWNLOAD_NORMAL_STYLE)
+ mTextSize = ta.getDimensionPixelSize(
+ R.styleable.DownloadButton_download_button_text_size,
+ DisplayUtils.sp2px(context, 12F)
+ )
ta.recycle()
}
max = MAX_LENGTH
@@ -156,13 +161,22 @@ class DownloadButton @JvmOverloads constructor(
ButtonStyle.SPECIAL_DOWNLOAD,
ButtonStyle.TEENAGER_MODE -> {
progressDrawable = null
- background = if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.drawable.text_white_background.toDrawable(context) else R.drawable.download_button_normal_style.toDrawable(context)
+ background =
+ if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.drawable.text_white_background.toDrawable(context) else R.drawable.download_button_normal_style.toDrawable(
+ context
+ )
progress = 0
- mDefaultColor = if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.color.black.toColor(context) else R.color.white.toColor(context)
+ mDefaultColor =
+ if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.color.black.toColor(context) else R.color.white.toColor(
+ context
+ )
}
ButtonStyle.LAUNCH_OR_OPEN -> {
progressDrawable = null
- background = if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.drawable.detail_download_open_image_style.toDrawable(context) else R.drawable.download_button_normal_style.toDrawable(context)
+ background =
+ if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.drawable.detail_download_open_image_style.toDrawable(
+ context
+ ) else R.drawable.download_button_normal_style.toDrawable(context)
progress = 0
mDefaultColor = R.color.white.toColor(context)
}
@@ -189,8 +203,14 @@ class DownloadButton @JvmOverloads constructor(
}
ButtonStyle.DOWNLOADING_NORMAL -> {
if (showProgress) {
- progressDrawable = if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.drawable.detail_downloading_normal_image_style.toDrawable(context) else R.drawable.detail_downloading_normal_style.toDrawable(context)
- mDefaultColor = if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.color.white.toColor(context) else R.color.theme_font.toColor(context)
+ progressDrawable =
+ if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.drawable.detail_downloading_normal_image_style.toDrawable(
+ context
+ ) else R.drawable.detail_downloading_normal_style.toDrawable(context)
+ mDefaultColor =
+ if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.color.white.toColor(context) else R.color.theme_font.toColor(
+ context
+ )
} else {
background = R.drawable.game_item_btn_downloading_style.toDrawable(context)
mDefaultColor = R.color.theme_font.toColor(context)
diff --git a/app/src/main/java/com/gh/common/view/FilterView.kt b/app/src/main/java/com/gh/common/view/FilterView.kt
index f7ea8c0d97..3504b7478f 100644
--- a/app/src/main/java/com/gh/common/view/FilterView.kt
+++ b/app/src/main/java/com/gh/common/view/FilterView.kt
@@ -23,8 +23,8 @@ import com.gh.gamecenter.databinding.LayoutFilterBinding
import com.google.android.flexbox.FlexboxLayout
// TODO 把 ConfigFilterView 的上层实现切换到继承这个类实现
-class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
- : ConstraintLayout(context, attrs, defStyleAttr) {
+class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
+ ConstraintLayout(context, attrs, defStyleAttr) {
private var mBinding: LayoutFilterBinding? = null
@@ -43,13 +43,15 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
mBinding = LayoutFilterBinding.inflate(LayoutInflater.from(context), this, true)
}
- fun setupFilter(mainFilterList: ArrayList,
- defaultSelectedMainFilter: String? = null,
- subFilterList: ArrayList,
- subFilterText: String,
- mainFilterSelectedCallback: ((String) -> Unit),
- subFilterSelectedCallback: ((String) -> Unit),
- highlightSubFilterIfNotDefault: Boolean = false) {
+ fun setupFilter(
+ mainFilterList: ArrayList,
+ defaultSelectedMainFilter: String? = null,
+ subFilterList: ArrayList,
+ subFilterText: String,
+ mainFilterSelectedCallback: ((String) -> Unit),
+ subFilterSelectedCallback: ((String) -> Unit),
+ highlightSubFilterIfNotDefault: Boolean = false
+ ) {
mMainFilterList = mainFilterList
mSubFilterList = subFilterList
mSubFilterSelectedCallback = subFilterSelectedCallback
@@ -65,9 +67,10 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
mBinding?.filterRecyclerView?.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
mBinding?.filterRecyclerView?.adapter = FilterAdapter(
- context,
- mMainFilterList,
- defaultSelectedMainFilter ?: mainFilterList.first()) {
+ context,
+ mMainFilterList,
+ defaultSelectedMainFilter ?: mainFilterList.first()
+ ) {
mainFilterSelectedCallback.invoke(it)
}
}
@@ -98,10 +101,12 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
}
}
- private fun showSelectionPopupWindow(containerView: View,
- subFilterTv: TextView,
- subFilterText: String,
- selectedCallback: ((String) -> Unit)) {
+ private fun showSelectionPopupWindow(
+ containerView: View,
+ subFilterTv: TextView,
+ subFilterText: String,
+ selectedCallback: ((String) -> Unit)
+ ) {
val drawableUp = ContextCompat.getDrawable(subFilterTv.context, R.drawable.ic_filter_arrow_up)
val drawableDown = ContextCompat.getDrawable(subFilterTv.context, R.drawable.ic_filter_arrow_down)
drawableUp?.setBounds(0, 0, drawableUp.minimumWidth, drawableUp.minimumHeight)
@@ -190,11 +195,12 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
}
}
- class FilterAdapter(val context: Context,
- private val mFilterList: ArrayList,
- private val mDefaultSelectedFilter: String,
- private val mClickCallback: (String) -> Unit)
- : RecyclerView.Adapter() {
+ class FilterAdapter(
+ val context: Context,
+ private val mFilterList: ArrayList,
+ private val mDefaultSelectedFilter: String,
+ private val mClickCallback: (String) -> Unit
+ ) : RecyclerView.Adapter() {
private var mSelectedFilter = mDefaultSelectedFilter
diff --git a/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt b/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt
index afde654fe6..2f5a7e7110 100644
--- a/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt
+++ b/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt
@@ -23,7 +23,8 @@ import kotlin.math.ceil
/**
* 标签最多显示一行，显示的个数由行宽决定
*/
-class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
+class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+ LinearLayout(context, attrs) {
private var mTotalCount = 0
private var mTags = ArrayList()
diff --git a/app/src/main/java/com/gh/common/view/GameIconView.kt b/app/src/main/java/com/gh/common/view/GameIconView.kt
index ed97d49e34..9820760fab 100644
--- a/app/src/main/java/com/gh/common/view/GameIconView.kt
+++ b/app/src/main/java/com/gh/common/view/GameIconView.kt
@@ -96,7 +96,7 @@ class GameIconView : CardView {
mGameIconIv?.display(icon)
mGameIconDecorationIv?.display(iconSubscript, true)
if (goneIfEmpty) {
- visibility = if(TextUtils.isEmpty(icon)) View.GONE else View.VISIBLE
+ visibility = if (TextUtils.isEmpty(icon)) View.GONE else View.VISIBLE
}
}
diff --git a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt
index aed601cdd2..c02be1be9f 100644
--- a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt
+++ b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt
@@ -18,7 +18,8 @@ import kotlin.math.ceil
/**
* 首页游戏标签，最多显示三个，实际显示个数由控件宽度决定
*/
-class GameTagFlexLinearLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
+class GameTagFlexLinearLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+ LinearLayout(context, attrs) {
private var mTotalCount = 0
private var mTags = ArrayList()
private var mItemHeight = DisplayUtils.dip2px(13F)
diff --git a/app/src/main/java/com/gh/common/view/ImageContainerView.kt b/app/src/main/java/com/gh/common/view/ImageContainerView.kt
index 9017c2c0ba..14eec31bf6 100644
--- a/app/src/main/java/com/gh/common/view/ImageContainerView.kt
+++ b/app/src/main/java/com/gh/common/view/ImageContainerView.kt
@@ -194,7 +194,9 @@ class ImageContainerView : LinearLayout {
val position = if (mAnswerEntity?.type == "community_article") {
binding.root.tag as Int
} else {
- if (mAnswerEntity!!.getPassVideos().isNullOrEmpty()) binding.root.tag as Int else (binding.root.tag as Int) - 1
+ if (mAnswerEntity!!.getPassVideos()
+ .isNullOrEmpty()
+ ) binding.root.tag as Int else (binding.root.tag as Int) - 1
}
if (mAnswerEntity?.communityId.isNullOrEmpty()) {
mAnswerEntity?.communityId = mAnswerEntity?.bbs?.id
diff --git a/app/src/main/java/com/gh/common/view/NestedScrollRichEditor.java b/app/src/main/java/com/gh/common/view/NestedScrollRichEditor.java
index 7cf190b6bf..0c05557515 100644
--- a/app/src/main/java/com/gh/common/view/NestedScrollRichEditor.java
+++ b/app/src/main/java/com/gh/common/view/NestedScrollRichEditor.java
@@ -1,4 +1,5 @@
package com.gh.common.view;
+
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -83,17 +84,17 @@ public class NestedScrollRichEditor extends RichEditor implements NestedScrollin
trackedEvent.offsetLocation(0, mScrollOffset[1]);
mNestedYOffset += mScrollOffset[1];
}
- if(mScrollConsumed[1]==0 && mScrollOffset[1]==0) {
- if(mChange){
- mChange =false;
+ if (mScrollConsumed[1] == 0 && mScrollOffset[1] == 0) {
+ if (mChange) {
+ mChange = false;
trackedEvent.setAction(MotionEvent.ACTION_DOWN);
super.onTouchEvent(trackedEvent);
- }else {
+ } else {
result = super.onTouchEvent(trackedEvent);
}
trackedEvent.recycle();
- }else{
- if(Math.abs(mLastMotionY - y) >= 10) {
+ } else {
+ if (Math.abs(mLastMotionY - y) >= 10) {
if (!mChange) {
mChange = true;
super.onTouchEvent(MotionEvent.obtain(0, 0, MotionEvent.ACTION_CANCEL, 0, 0, 0));
diff --git a/app/src/main/java/com/gh/common/view/SimpleToggleView.kt b/app/src/main/java/com/gh/common/view/SimpleToggleView.kt
index 68474e6ec3..ccda7258bb 100644
--- a/app/src/main/java/com/gh/common/view/SimpleToggleView.kt
+++ b/app/src/main/java/com/gh/common/view/SimpleToggleView.kt
@@ -17,7 +17,7 @@ class SimpleToggleView @JvmOverloads constructor(
val switchIv by lazy { findViewById(R.id.switchIv) }
val hintTv by lazy { findViewById(R.id.hintTv) }
- val lottieView by lazy { findViewById(R.id.lottieView)}
+ val lottieView by lazy { findViewById(R.id.lottieView) }
init {
View.inflate(context, R.layout.view_simple_toggle, this)
diff --git a/app/src/main/java/com/gh/common/view/SubCategoryView.kt b/app/src/main/java/com/gh/common/view/SubCategoryView.kt
index 482847c89a..997f7bac5e 100644
--- a/app/src/main/java/com/gh/common/view/SubCategoryView.kt
+++ b/app/src/main/java/com/gh/common/view/SubCategoryView.kt
@@ -9,7 +9,8 @@ import com.gh.gamecenter.R
import com.gh.gamecenter.category.CategoryListActivity
import com.gh.gamecenter.entity.CategoryEntity
-class SubCategoryView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : LinearLayout(context, attrs, defStyleAttr) {
+class SubCategoryView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
+ LinearLayout(context, attrs, defStyleAttr) {
var leftTv: TextView
var centerTv: TextView
@@ -49,7 +50,14 @@ class SubCategoryView @JvmOverloads constructor(context: Context, attrs: Attribu
private fun setCategory(tv: TextView, category: CategoryEntity) {
tv.text = category.name
tv.setOnClickListener {
- tv.context.startActivity(CategoryListActivity.getIntent(tv.context, categoryTitle!!, primeCategory!!, category.name!!))
+ tv.context.startActivity(
+ CategoryListActivity.getIntent(
+ tv.context,
+ categoryTitle!!,
+ primeCategory!!,
+ category.name!!
+ )
+ )
}
}
diff --git a/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt b/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt
index 4eca5009d5..410c227662 100644
--- a/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt
+++ b/app/src/main/java/com/gh/common/xapk/XapkUnzipThread.kt
@@ -16,8 +16,10 @@ import java.io.File
import java.util.zip.ZipFile
-class XapkUnzipThread(private var mDownloadEntity: DownloadEntity,
- private var mUnzipListener: IXapkUnzipListener) : Thread() {
+class XapkUnzipThread(
+ private var mDownloadEntity: DownloadEntity,
+ private var mUnzipListener: IXapkUnzipListener
+) : Thread() {
private val mDefaultBufferSize = 1024 * 1024
@@ -95,7 +97,12 @@ class XapkUnzipThread(private var mDownloadEntity: DownloadEntity,
} else {
// 防止多次短时间内多次触发onProgress方法导致阻塞主线程（低端机会出现十分明显的卡顿）
debounceActionWithInterval(-1, 500) {
- mUnzipListener.onProgress(mDownloadEntity, outputFile.path, unzipSize, unzipProgress)
+ mUnzipListener.onProgress(
+ mDownloadEntity,
+ outputFile.path,
+ unzipSize,
+ unzipProgress
+ )
}
}
}
diff --git a/app/src/main/java/com/gh/download/DownloadDataHelper.kt b/app/src/main/java/com/gh/download/DownloadDataHelper.kt
index 5624883246..8c86deede1 100644
--- a/app/src/main/java/com/gh/download/DownloadDataHelper.kt
+++ b/app/src/main/java/com/gh/download/DownloadDataHelper.kt
@@ -88,7 +88,7 @@ object DownloadDataHelper {
"未成年"
} else if (status == DownloadStatus.unavailable) {
"未接入防沉迷系统，暂不支持下载"
- }else if (status == DownloadStatus.banned) {
+ } else if (status == DownloadStatus.banned) {
"网络异常"
} else if (status == DownloadStatus.redirected) {
"重定向至最终地址"
@@ -316,8 +316,14 @@ object DownloadDataHelper {
mDownloadHeartbeatSheet[downloadEntity.url] = sheet
} else {
val progressSize = sheet.getLong("current_progress_size")
- sheet.put("host", downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown") // 初始化记录的 host 为空
- sheet.put("path", downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown") // 初始化记录的 path 为空
+ sheet.put(
+ "host",
+ downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown"
+ ) // 初始化记录的 host 为空
+ sheet.put(
+ "path",
+ downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown"
+ ) // 初始化记录的 path 为空
sheet.put("total_size", downloadEntity.size / 1024 / 1024) // 初始化记录的 total_size 有可能为0
sheet.put("progress_size", downloadEntity.progress / 1024 - progressSize)
sheet.put("current_progress_size", downloadEntity.progress / 1024)
diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java
index 602f48bc44..7ecc39609a 100644
--- a/app/src/main/java/com/gh/download/DownloadManager.java
+++ b/app/src/main/java/com/gh/download/DownloadManager.java
@@ -565,12 +565,12 @@ public class DownloadManager implements DownloadStatusListener {
/**
* 获取快照
- *
+ *
* 畅玩游戏优先根据游戏 ID 获取，非畅玩游戏根据 url 获取
*
- * @param url 下载链接
+ * @param url 下载链接
* @param isVGame 是不是畅玩游戏
- * @param gameId 游戏 ID
+ * @param gameId 游戏 ID
* @return null表示下载列表中不存在该任务，否则返回下载任务
*/
@Nullable
@@ -713,8 +713,8 @@ public class DownloadManager implements DownloadStatusListener {
for (DownloadEntity downloadEntity : downloadEntityList) {
if (!ExtensionsKt.isSimulatorGame(downloadEntity)) {
if (!Constants.SILENT_UPDATE.equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.EXTRA_DOWNLOAD_TYPE))
- && !Constants.SIMULATOR_DOWNLOAD.equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.EXTRA_DOWNLOAD_TYPE))
- && !Constants.SMOOTH_GAME.equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.EXTRA_DOWNLOAD_TYPE))
+ && !Constants.SIMULATOR_DOWNLOAD.equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.EXTRA_DOWNLOAD_TYPE))
+ && !Constants.SMOOTH_GAME.equals(ExtensionsKt.getMetaExtra(downloadEntity, Constants.EXTRA_DOWNLOAD_TYPE))
) {
filteredDownloadEntityList.add(downloadEntity);
}
@@ -881,7 +881,6 @@ public class DownloadManager implements DownloadStatusListener {
/**
* 立马通知 dataWatcher 更新已下载完的任务状态，这里的下载完成是持久状态，不是瞬时状态
- *
*/
private void notifyDownloadedStatusASAP(DataWatcher dataWatcher) {
for (DownloadEntity downloadEntity : getAllDownloadEntitySnapshots()) {
@@ -1191,6 +1190,7 @@ public class DownloadManager implements DownloadStatusListener {
/**
* 添加不可见的 pending 下载任务
+ *
* @param downloadEntity 任务信息实体
*/
public void addInvisiblePendingTask(DownloadEntity downloadEntity) {
diff --git a/app/src/main/java/com/gh/download/PackageObserver.kt b/app/src/main/java/com/gh/download/PackageObserver.kt
index eaa359e63a..dc76fe4746 100644
--- a/app/src/main/java/com/gh/download/PackageObserver.kt
+++ b/app/src/main/java/com/gh/download/PackageObserver.kt
@@ -64,7 +64,8 @@ object PackageObserver {
for (downloadEntity in DownloadManager.getInstance().allDownloadEntity) {
if (packageName == downloadEntity.packageName
- && (preciseGameId == null || preciseGameId == downloadEntity.gameId)) {
+ && (preciseGameId == null || preciseGameId == downloadEntity.gameId)
+ ) {
mDownloadEntity = downloadEntity
gameId = mDownloadEntity.gameId
if (TextUtils.isEmpty(busFour.versionName)) {
@@ -120,7 +121,12 @@ object PackageObserver {
for (gameDigestEntity in response!!) {
if (!TextUtils.isEmpty(gameDigestEntity?.id)) { // 关注游戏
if (gameDigestEntity?.id == finalDownloadEntity.gameId) {
- ConcernUtils.postConcernGameId(application, gameDigestEntity?.id ?: "", null, false)
+ ConcernUtils.postConcernGameId(
+ application,
+ gameDigestEntity?.id ?: "",
+ null,
+ false
+ )
}
}
}
@@ -180,10 +186,10 @@ object PackageObserver {
jsonObject.put("package", packageName)
val rBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
RetrofitManager.getInstance().api
- .postPlayedGame(UserManager.getInstance().userId, rBody)
- .subscribeOn(Schedulers.io())
- .observeOn(Schedulers.io())
- .subscribe(EmptyResponse())
+ .postPlayedGame(UserManager.getInstance().userId, rBody)
+ .subscribeOn(Schedulers.io())
+ .observeOn(Schedulers.io())
+ .subscribe(EmptyResponse())
} catch (e: JSONException) {
e.printStackTrace()
}
@@ -213,6 +219,6 @@ object PackageObserver {
}
fun interface PackageChangeListener {
- fun onChanged(data:EBPackage)
+ fun onChanged(data: EBPackage)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt b/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt
index 9096504294..1e7d689d3e 100644
--- a/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt
+++ b/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt
@@ -53,16 +53,16 @@ object ExoCacheManager {
val cacheLength = if (contentLength >= preLength) preLength else contentLength
val simpleCache = ExoSourceManager.getCacheSingleInstance(HaloApp.getInstance().application, null)
val specBuilder = DataSpec.Builder()
- .setUri(Uri.parse(videoUri))
- .setLength(cacheLength)
- .build()
+ .setUri(Uri.parse(videoUri))
+ .setLength(cacheLength)
+ .build()
val dataSource: DataSource = DefaultDataSourceFactory(HaloApp.getInstance()).createDataSource()
val cacheDataSource = CacheDataSource(simpleCache, dataSource)
val cacheWriter = CacheWriter(
- cacheDataSource,
- specBuilder,
- true,
- null
+ cacheDataSource,
+ specBuilder,
+ true,
+ null
) { requestLength, bytesCached, newBytesCached ->
// debugOnly {
// Utils.log("$requestLength-$bytesCached-$newBytesCached")
@@ -94,8 +94,8 @@ object ExoCacheManager {
fun getContentLength(downloadUrl: String): Long {
var contentLength = -1L
val request = Request.Builder()
- .url(downloadUrl)
- .build()
+ .url(downloadUrl)
+ .build()
var response: Response? = null
try {
response = OkHttpClient.Builder().build().newCall(request).execute()
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt
index 0e1ac9e5de..afdbe7d450 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialog.kt
@@ -102,7 +102,8 @@ class DownloadDialog : BaseDraggableDialogFragment() {
mViewModel.getAllPackageName()
}
mViewModel.listLiveData.observeNonNull(this, callback = { itemList ->
- mAdapter = DownloadDialogAdapter(requireContext(), mViewModel, itemList, false, mTraceEvent, mEntrance, mLocation)
+ mAdapter =
+ DownloadDialogAdapter(requireContext(), mViewModel, itemList, false, mTraceEvent, mEntrance, mLocation)
mBinding.contentList.layoutManager = createLayoutManager(itemList)
mBinding.contentList.adapter = mAdapter
})
@@ -133,7 +134,15 @@ class DownloadDialog : BaseDraggableDialogFragment() {
itemList.add(DownloadDialogItemData(instruction = collection.downloadInstruction))
}
- mCollectionAdapter = DownloadDialogAdapter(requireContext(), mViewModel, itemList, true, mTraceEvent, mEntrance, mLocation)
+ mCollectionAdapter = DownloadDialogAdapter(
+ requireContext(),
+ mViewModel,
+ itemList,
+ true,
+ mTraceEvent,
+ mEntrance,
+ mLocation
+ )
mBinding.collectionList.layoutManager = createLayoutManager(itemList)
mBinding.collectionList.adapter = mCollectionAdapter
@@ -229,7 +238,8 @@ class DownloadDialog : BaseDraggableDialogFragment() {
})
mBinding.contentListContainer.startAnimation(contentAnimation)
- val collectionAnimation = AnimationUtils.loadAnimation(requireContext(), R.anim.download_dialog_collection_content_enter)
+ val collectionAnimation =
+ AnimationUtils.loadAnimation(requireContext(), R.anim.download_dialog_collection_content_enter)
mBinding.collectionList.startAnimation(collectionAnimation)
mBinding.collectionList.visibility = View.VISIBLE
}
@@ -243,7 +253,8 @@ class DownloadDialog : BaseDraggableDialogFragment() {
mBinding.contentListContainer.startAnimation(contentAnimation)
mBinding.contentListContainer.visibility = View.VISIBLE
- val collectionAnimation = AnimationUtils.loadAnimation(requireContext(), R.anim.download_dialog_collection_content_exit)
+ val collectionAnimation =
+ AnimationUtils.loadAnimation(requireContext(), R.anim.download_dialog_collection_content_exit)
collectionAnimation.setAnimationListener(object : Animation.AnimationListener {
override fun onAnimationRepeat(animation: Animation?) {
}
@@ -338,7 +349,13 @@ class DownloadDialog : BaseDraggableDialogFragment() {
companion object {
@JvmStatic
- fun showDownloadDialog(context: Context?, gameEntity: GameEntity, traceEvent: ExposureEvent?, entrance: String?, location: String?) {
+ fun showDownloadDialog(
+ context: Context?,
+ gameEntity: GameEntity,
+ traceEvent: ExposureEvent?,
+ entrance: String?,
+ location: String?
+ ) {
val fragmentActivity: FragmentActivity = if (context is FragmentActivity) {
context
} else if (BuildConfig.DEBUG) {
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt
index cf2ec826d9..22a441e4e0 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt
@@ -120,7 +120,7 @@ class DownloadDialogAdapter(
}
}
leftLink.visibleIf(!links.isNullOrEmpty())
- rightLink.visibleIf(links?.size ?:0 > 1)
+ rightLink.visibleIf(links?.size ?: 0 > 1)
leftLink.text = if (links.isNullOrEmpty()) "" else links[0].title
rightLink.text = if (links?.size ?: 0 > 1) links?.get(1)?.title else ""
leftLink.background = GradientDrawable().apply {
@@ -140,11 +140,27 @@ class DownloadDialogAdapter(
holder.bindItem(viewModel.gameEntity)
}
is DownloadDialogInstalledItemViewHolder -> {
- holder.bindInstalledItem(listData[position].installed!!, viewModel, mTraceEvent, mEntrance, mPath, mLocation)
+ holder.bindInstalledItem(
+ listData[position].installed!!,
+ viewModel,
+ mTraceEvent,
+ mEntrance,
+ mPath,
+ mLocation
+ )
throwExceptionInDebug("合集页面不应该存在该条数据", isCollectionPage)
}
is DownloadDialogItemViewHolder -> {
- holder.bindItem(listData, position, viewModel, isCollectionPage, mTraceEvent, mEntrance, mPath, mLocation)
+ holder.bindItem(
+ listData,
+ position,
+ viewModel,
+ isCollectionPage,
+ mTraceEvent,
+ mEntrance,
+ mPath,
+ mLocation
+ )
}
}
}
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt
index 14cb4bd6dd..069b63157c 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt
@@ -15,7 +15,8 @@ import com.gh.gamecenter.databinding.DownloadDialogInstalledItemBinding
import com.gh.gamecenter.entity.ApkEntity
import com.lightgame.download.DownloadStatus
-class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalledItemBinding) : BaseRecyclerViewHolder(binding.root) {
+class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalledItemBinding) :
+ BaseRecyclerViewHolder(binding.root) {
fun bindInstalledItem(
apkEntity: ApkEntity,
@@ -30,7 +31,11 @@ class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalled
val apkCollection = apkEntity.apkCollection
val pluginDesc = gameEntity.pluginDesc
val apk = if (apkCollection != null) {
- ApkEntity(platformIcon = apkCollection.newIcon, platformName = apkCollection.name, remark = apkCollection.remark)
+ ApkEntity(
+ platformIcon = apkCollection.newIcon,
+ platformName = apkCollection.name,
+ remark = apkCollection.remark
+ )
} else apkEntity
ImageUtils.display(binding.icon, apk.getPlatformIcon())
binding.name.text = apk.getPlatformName()
@@ -145,6 +150,14 @@ class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalled
}
}
- DownloadDialogItemViewHolder.setDownloadClickListener(itemView, apkEntity, viewModel, traceEvent, entrance, path, location)
+ DownloadDialogItemViewHolder.setDownloadClickListener(
+ itemView,
+ apkEntity,
+ viewModel,
+ traceEvent,
+ entrance,
+ path,
+ location
+ )
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt
index 0b363a7086..49e3aa6a6a 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstructionItemViewHolder.kt
@@ -9,15 +9,17 @@ import com.gh.common.DefaultUrlHandler
import com.gh.gamecenter.common.utils.dip2px
import com.gh.gamecenter.databinding.DownloadDialogInstructionItemBinding
-class DownloadDialogInstructionItemViewHolder(val binding: DownloadDialogInstructionItemBinding) : BaseRecyclerViewHolder(binding.root) {
+class DownloadDialogInstructionItemViewHolder(val binding: DownloadDialogInstructionItemBinding) :
+ BaseRecyclerViewHolder(binding.root) {
fun bindItem(listData: List, position: Int, entrance: String) {
val instruction = listData[position].instruction
binding.webView.loadDataWithBaseURL(
- null,
- "$instruction",
- "text/html",
- "utf-8", null)
+ null,
+ "$instruction",
+ "text/html",
+ "utf-8", null
+ )
binding.webView.settings
binding.webView.setBackgroundColor(Color.TRANSPARENT)
binding.webView.webViewClient = object : WebViewClient() {
@@ -26,7 +28,8 @@ class DownloadDialogInstructionItemViewHolder(val binding: DownloadDialogInstruc
}
}
- val topOffset = if (position - 1 >= 0 && (listData[position - 1].normal?.url.isNullOrEmpty() || listData[position - 1].normal?.recommend != null)) 0 else 12f.dip2px()
+ val topOffset =
+ if (position - 1 >= 0 && (listData[position - 1].normal?.url.isNullOrEmpty() || listData[position - 1].normal?.recommend != null)) 0 else 12f.dip2px()
(binding.root.layoutParams as RecyclerView.LayoutParams).apply {
topMargin = topOffset
binding.root.layoutParams = this
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemData.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemData.kt
index e71c2f8596..dc43efe720 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemData.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemData.kt
@@ -3,12 +3,14 @@ package com.gh.download.dialog
import com.gh.gamecenter.entity.ApkEntity
import com.gh.gamecenter.entity.GameEntity
-data class DownloadDialogItemData(var links: List? = null,
- var section: DownloadDialogSectionType? = null,
- var installed: ApkEntity? = null,
- var normal: ApkEntity? = null,
- var instruction: String? = null,
- var platformRequest: Any? = null)
+data class DownloadDialogItemData(
+ var links: List? = null,
+ var section: DownloadDialogSectionType? = null,
+ var installed: ApkEntity? = null,
+ var normal: ApkEntity? = null,
+ var instruction: String? = null,
+ var platformRequest: Any? = null
+)
enum class DownloadDialogSectionType {
INSTALLED,
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt
index 579373ff45..4f821e2525 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt
@@ -152,13 +152,18 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
binding.status.setCompoundDrawablesWithIntrinsicBounds(
null,
null,
- ContextCompat.getDrawable(binding.status.context, R.drawable.download_dialog_collection_status_update),
+ ContextCompat.getDrawable(
+ binding.status.context,
+ R.drawable.download_dialog_collection_status_update
+ ),
null
)
binding.downloadStatusIcon.visibility = View.GONE
itemView.setTag(DownloadDialogAdapter.ITEM_TAG_KEY, DownloadDialogItemStatus.UPDATE)
} else if (PackageUtils.getGhId(apkEntity.packageName) == gameEntity.id ||
- PackagesManager.isInstalled(apkEntity.packageName) && Config.getSettings()?.gameDownloadBlackList?.contains(apkEntity.packageName) == true
+ PackagesManager.isInstalled(apkEntity.packageName) && Config.getSettings()?.gameDownloadBlackList?.contains(
+ apkEntity.packageName
+ ) == true
) {
binding.downloadStatusIcon.visibility = View.GONE
binding.status.visibility = View.VISIBLE
@@ -182,7 +187,10 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
binding.status.setCompoundDrawablesWithIntrinsicBounds(
null,
null,
- ContextCompat.getDrawable(binding.status.context, R.drawable.download_dialog_collection_status_launch),
+ ContextCompat.getDrawable(
+ binding.status.context,
+ R.drawable.download_dialog_collection_status_launch
+ ),
null
)
}
@@ -220,9 +228,11 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
}
val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(apkEntity.url)
if (apkEntity.recommend != null && downloadEntity == null) {
- binding.containerView.background = ContextCompat.getDrawable(binding.root.context, R.drawable.bg_download_dialog_item_recommend)
+ binding.containerView.background =
+ ContextCompat.getDrawable(binding.root.context, R.drawable.bg_download_dialog_item_recommend)
} else {
- binding.containerView.background = ContextCompat.getDrawable(binding.root.context, R.drawable.download_dialog_item_background)
+ binding.containerView.background =
+ ContextCompat.getDrawable(binding.root.context, R.drawable.download_dialog_item_background)
}
}
@@ -361,35 +371,54 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas
// todo 有时间存储判断统一处理
val msg = FileUtils.isCanDownload(context, apkEntity.size)
if (msg.isNullOrEmpty()) {
- BrowserInstallHelper.showBrowserInstallHintDialog(context, gameEntity.isVGame(), object : EmptyCallback {
- override fun onCallback() {
- DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apkEntity, object : EmptyCallback {
- override fun onCallback() {
- PackageCheckDialogFragment.show(context as AppCompatActivity, gameEntity, object : ConfirmListener {
- override fun onConfirm() {
- CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
- override fun onConfirm() {
- DialogUtils.checkDownload(context, apkEntity.size) { isSubscribe ->
- DownloadManager.createDownload(
+ BrowserInstallHelper.showBrowserInstallHintDialog(
+ context,
+ gameEntity.isVGame(),
+ object : EmptyCallback {
+ override fun onCallback() {
+ DownloadDialogHelper.findAvailableDialogAndShow(
+ context,
+ gameEntity,
+ apkEntity,
+ object : EmptyCallback {
+ override fun onCallback() {
+ PackageCheckDialogFragment.show(
+ context as AppCompatActivity,
+ gameEntity,
+ object : ConfirmListener {
+ override fun onConfirm() {
+ CertificationDialog.showCertificationDialog(
context,
- apkEntity,
gameEntity,
- downloadMethod,
- entrance,
- location,
- isSubscribe, traceEvent
- )
+ object : ConfirmListener {
+ override fun onConfirm() {
+ DialogUtils.checkDownload(
+ context,
+ apkEntity.size
+ ) { isSubscribe ->
+ DownloadManager.createDownload(
+ context,
+ apkEntity,
+ gameEntity,
+ downloadMethod,
+ entrance,
+ location,
+ isSubscribe, traceEvent
+ )
- DeviceRemindDialog.showDeviceRemindDialog(context, gameEntity)
+ DeviceRemindDialog.showDeviceRemindDialog(
+ context,
+ gameEntity
+ )
+ }
+ }
+ })
}
- }
- })
+ })
}
})
- }
- })
- }
- })
+ }
+ })
} else {
Utils.toast(context, msg)
}
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt
index cf454507e8..fe06f96dc1 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogLinkItemViewHolder.kt
@@ -3,6 +3,7 @@ package com.gh.download.dialog
import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
import com.gh.gamecenter.databinding.DownloadDialogLinkItemBinding
-class DownloadDialogLinkItemViewHolder(val binding: DownloadDialogLinkItemBinding) : BaseRecyclerViewHolder(binding.root) {
+class DownloadDialogLinkItemViewHolder(val binding: DownloadDialogLinkItemBinding) :
+ BaseRecyclerViewHolder(binding.root) {
}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt
index b61775c90b..b4e927af29 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogPlatformRequestItemViewHolder.kt
@@ -5,8 +5,8 @@ import com.gh.gamecenter.VoteActivity
import com.gh.gamecenter.databinding.DownloadDialogPlatformRequestItemBinding
import com.gh.gamecenter.entity.GameEntity
-class DownloadDialogPlatformRequestItemViewHolder(val binding: DownloadDialogPlatformRequestItemBinding)
- : BaseRecyclerViewHolder(binding.root) {
+class DownloadDialogPlatformRequestItemViewHolder(val binding: DownloadDialogPlatformRequestItemBinding) :
+ BaseRecyclerViewHolder(binding.root) {
fun bindItem(gameEntity: GameEntity) {
binding.content.setOnClickListener {
diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt
index 13ee777928..a42fa14483 100644
--- a/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt
+++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogSectionItemViewHolder.kt
@@ -3,6 +3,7 @@ package com.gh.download.dialog
import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
import com.gh.gamecenter.databinding.DownloadDialogSectionItemBinding
-class DownloadDialogSectionItemViewHolder(val binding: DownloadDialogSectionItemBinding) : BaseRecyclerViewHolder(binding.root) {
+class DownloadDialogSectionItemViewHolder(val binding: DownloadDialogSectionItemBinding) :
+ BaseRecyclerViewHolder(binding.root) {
}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt
index 9365af500a..bf75f656a3 100644
--- a/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt
+++ b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt
@@ -68,12 +68,17 @@ object BrowserInstallHelper {
if (!mServer.isBuggyDevice) {
fileName = fileName.removeSuffix(DownloadServer.APK_SUFFIX)
}
- val downloadUrl = if (mUseReservePort) "http://127.0.0.1:$RESERVE_PORT/$fileName" else "http://127.0.0.1:$PORT/$fileName"
+ val downloadUrl =
+ if (mUseReservePort) "http://127.0.0.1:$RESERVE_PORT/$fileName" else "http://127.0.0.1:$PORT/$fileName"
mFileNameSet.add(fileName)
if (mServer.isBuggyDevice) {
- val encodedString = Base64.encodeToString(URLEncoder.encode(downloadUrl).trim().toByteArray(), Base64.NO_WRAP)
- DirectUtils.directToExternalBrowser(mContext, "https://down-and.ghzs.com/redirect?location=base64($encodedString)")
+ val encodedString =
+ Base64.encodeToString(URLEncoder.encode(downloadUrl).trim().toByteArray(), Base64.NO_WRAP)
+ DirectUtils.directToExternalBrowser(
+ mContext,
+ "https://down-and.ghzs.com/redirect?location=base64($encodedString)"
+ )
} else {
DirectUtils.directToExternalBrowser(mContext, downloadUrl)
}
@@ -123,7 +128,11 @@ object BrowserInstallHelper {
}
@JvmStatic
- fun showBrowserInstallHintDialog(context: Context, skipBrowserInstallDialog: Boolean = false, callback: EmptyCallback) {
+ fun showBrowserInstallHintDialog(
+ context: Context,
+ skipBrowserInstallDialog: Boolean = false,
+ callback: EmptyCallback
+ ) {
if (skipBrowserInstallDialog || !shouldShowUseBrowserToInstallHint()) {
callback.onCallback()
return
@@ -139,21 +148,21 @@ object BrowserInstallHelper {
}
DialogHelper.showDialog(
- context,
- title = "温馨提示",
- content = contentText,
- confirmText = "切换安装方式",
- cancelText = "继续下载",
- confirmClickCallback = {
- val intent = ShellActivity.getIntent(context, ShellActivity.Type.SWITCH_INSTALL_METHOD, null)
- context.startActivity(intent)
- logOrdinaryBrowserEvent(Type.SWITCH_INSTALL_DIALOG_ACCESS)
- },
- cancelClickCallback = {
- callback.onCallback()
- logOrdinaryBrowserEvent(Type.SWITCH_INSTALL_DIALOG_QUIT)
- },
- extraConfig = DialogHelper.Config(hint = "修改路径：我的光环-设置-切换安装方式")
+ context,
+ title = "温馨提示",
+ content = contentText,
+ confirmText = "切换安装方式",
+ cancelText = "继续下载",
+ confirmClickCallback = {
+ val intent = ShellActivity.getIntent(context, ShellActivity.Type.SWITCH_INSTALL_METHOD, null)
+ context.startActivity(intent)
+ logOrdinaryBrowserEvent(Type.SWITCH_INSTALL_DIALOG_ACCESS)
+ },
+ cancelClickCallback = {
+ callback.onCallback()
+ logOrdinaryBrowserEvent(Type.SWITCH_INSTALL_DIALOG_QUIT)
+ },
+ extraConfig = DialogHelper.Config(hint = "修改路径：我的光环-设置-切换安装方式")
)
}
diff --git a/app/src/main/java/com/gh/download/server/DownloadServer.kt b/app/src/main/java/com/gh/download/server/DownloadServer.kt
index 686e1f3cf0..dcf242c440 100644
--- a/app/src/main/java/com/gh/download/server/DownloadServer.kt
+++ b/app/src/main/java/com/gh/download/server/DownloadServer.kt
@@ -26,12 +26,12 @@ class DownloadServer(port: Int) : NanoHTTPD(port) {
init {
// 某些浏览器会开启多线程下载，如果不 throttle 的话会出现多次调用
val disposable = mPublishSubject
- .distinctUntilChanged()
- .throttleWithTimeout(500, TimeUnit.MILLISECONDS)
- .subscribeOn(Schedulers.io())
- .subscribe({
- logBrowserDownload(it, false)
- }, {})
+ .distinctUntilChanged()
+ .throttleWithTimeout(500, TimeUnit.MILLISECONDS)
+ .subscribeOn(Schedulers.io())
+ .subscribe({
+ logBrowserDownload(it, false)
+ }, {})
mCompositeDisposable.add(disposable)
}
@@ -39,11 +39,13 @@ class DownloadServer(port: Int) : NanoHTTPD(port) {
/**
* 默认截掉 .apk 后缀的原因是部分系统判断到 url 后缀为 .apk 就会调用系统下载器而不是浏览器下载 apk (下载完成不会自动触发安装)
*/
- override fun serve(fileName: String?,
- method: Method?,
- headers: MutableMap?,
- parms: MutableMap?,
- files: MutableMap?): Response {
+ override fun serve(
+ fileName: String?,
+ method: Method?,
+ headers: MutableMap?,
+ parms: MutableMap?,
+ files: MutableMap?
+ ): Response {
var filePath = FileUtils.getDownloadDir(HaloApp.getInstance()) + fileName
if (!filePath.contains(APK_SUFFIX)) {
filePath += APK_SUFFIX
@@ -66,7 +68,7 @@ class DownloadServer(port: Int) : NanoHTTPD(port) {
return if (file.exists()) {
val fileType = FileUtils.getFileMimeType(HaloApp.getInstance().applicationContext, filePath)
- ?: "application/vnd.android.package-archive"
+ ?: "application/vnd.android.package-archive"
// TODO 山寨机给了文件长度会下载失败，有空再看看为什么
if (isBuggyDevice) {
@@ -88,7 +90,11 @@ class DownloadServer(port: Int) : NanoHTTPD(port) {
for (download in DownloadManager.getInstance().allDownloadEntity) {
if (download.path == path) {
download.exposureTrace?.toObject()?.let {
- BrowserInstallHelper.logWebDownloadStarted(it, download.getMetaExtra(Constants.DOWNLOAD_ID), isDownloadComplete)
+ BrowserInstallHelper.logWebDownloadStarted(
+ it,
+ download.getMetaExtra(Constants.DOWNLOAD_ID),
+ isDownloadComplete
+ )
}
break
}
diff --git a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt
index 6859e6b744..39efca0e02 100644
--- a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt
@@ -39,7 +39,10 @@ class BlockActivity : DownloadToolbarActivity() {
}
override fun getBusinessId(): Pair {
- return Pair(targetFragment?.arguments?.getParcelable(EntranceConsts.KEY_BLOCK_DATA)?.link ?: "", "")
+ return Pair(
+ targetFragment?.arguments?.getParcelable(EntranceConsts.KEY_BLOCK_DATA)?.link ?: "",
+ ""
+ )
}
override fun onDarkModeChanged() {
diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java
index 0a17392351..8548ce5a4e 100644
--- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java
@@ -3,7 +3,9 @@ package com.gh.gamecenter;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+
import androidx.annotation.NonNull;
+
import com.gh.gamecenter.collection.CollectionWrapperFragment;
import com.gh.gamecenter.common.base.activity.ToolBarActivity;
import com.gh.gamecenter.common.constant.EntranceConsts;
diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
index f94bb2775b..65f858d37e 100644
--- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
@@ -3,7 +3,9 @@ package com.gh.gamecenter;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+
import androidx.annotation.NonNull;
+
import com.gh.gamecenter.common.base.activity.ToolBarActivity;
import com.gh.gamecenter.common.constant.EntranceConsts;
import com.gh.gamecenter.common.utils.ExtensionsKt;
diff --git a/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt b/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt
index 669dd1432a..3a7adcb46c 100644
--- a/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/FullScreenWebActivity.kt
@@ -19,8 +19,10 @@ class FullScreenWebActivity : BaseActivity() {
DisplayUtils.transparentStatusBar(this)
- mWebFragment = supportFragmentManager.findFragmentByTag("webFragment") as? WebFragment ?: WebFragment().apply { with(intent.extras) }
- supportFragmentManager.beginTransaction().replace(R.id.placeholder, mWebFragment!!,"webFragment").commitAllowingStateLoss()
+ mWebFragment = supportFragmentManager.findFragmentByTag("webFragment") as? WebFragment
+ ?: WebFragment().apply { with(intent.extras) }
+ supportFragmentManager.beginTransaction().replace(R.id.placeholder, mWebFragment!!, "webFragment")
+ .commitAllowingStateLoss()
}
override fun handleBackPressed(): Boolean {
@@ -28,7 +30,12 @@ class FullScreenWebActivity : BaseActivity() {
}
companion object {
- fun getIntent(context: Context, url: String, webViewHandleBackPressed: Boolean = false, entrance: String? = null): Intent {
+ fun getIntent(
+ context: Context,
+ url: String,
+ webViewHandleBackPressed: Boolean = false,
+ entrance: String? = null
+ ): Intent {
val intent = Intent(context, FullScreenWebActivity::class.java)
if (entrance != null) intent.putExtra(EntranceConsts.KEY_ENTRANCE, entrance)
intent.putExtra(EntranceConsts.KEY_URL, url)
diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt
index 2f1efac086..a49edc7154 100644
--- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt
@@ -80,13 +80,21 @@ class GameDetailActivity : DownloadToolbarActivity() {
override fun isAutoResetViewBackgroundEnabled(): Boolean = true
override fun updateStaticViewBackground(view: View?) {
- updateStaticView(view, listOf(R.id.menu_download_iv, R.id.gameBigEvent, R.id.cardContainer, R.id.iv_reserve, R.id.iv_concern))
+ updateStaticView(
+ view,
+ listOf(R.id.menu_download_iv, R.id.gameBigEvent, R.id.cardContainer, R.id.iv_reserve, R.id.iv_concern)
+ )
}
companion object {
@JvmStatic
- fun startGameDetailActivity(context: Context, gameEntity: GameEntity?, entrance: String, traceEvent: ExposureEvent?) {
+ fun startGameDetailActivity(
+ context: Context,
+ gameEntity: GameEntity?,
+ entrance: String,
+ traceEvent: ExposureEvent?
+ ) {
startGameDetailActivity(context, gameEntity, entrance, -1, traceEvent = traceEvent)
}
@@ -143,7 +151,14 @@ class GameDetailActivity : DownloadToolbarActivity() {
bundle.putString(EntranceConsts.KEY_GAMEID, gameEntity?.id)
bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
bundle.putParcelable(GameEntity.TAG, gameEntity)
- context.startActivity(getTargetIntent(context, GameDetailActivity::class.java, GameDetailFragment::class.java, bundle))
+ context.startActivity(
+ getTargetIntent(
+ context,
+ GameDetailActivity::class.java,
+ GameDetailFragment::class.java,
+ bundle
+ )
+ )
}
@JvmStatic
@@ -216,7 +231,14 @@ class GameDetailActivity : DownloadToolbarActivity() {
}
bundle.putString(EntranceConsts.KEY_GAMEID, gameId)
bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
- context.startActivity(getTargetIntent(context, GameDetailActivity::class.java, GameDetailFragment::class.java, bundle))
+ context.startActivity(
+ getTargetIntent(
+ context,
+ GameDetailActivity::class.java,
+ GameDetailFragment::class.java,
+ bundle
+ )
+ )
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt
index 28e14fe82e..1eef408890 100644
--- a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt
@@ -19,7 +19,8 @@ class HelpAndFeedbackActivity : BaseActivity_TabLayout() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == SuggestSelectFragment.SUGGEST_TYPE_REQUEST
- && resultCode == SuggestSelectFragment.SUGGEST_TYPE_REQUEST) {
+ && resultCode == SuggestSelectFragment.SUGGEST_TYPE_REQUEST
+ ) {
finish()
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt
index fcf9f7504a..b674b141b3 100644
--- a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt
@@ -225,7 +225,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
val intent = ArticleDetailActivity.getIntent(
this,
CommunityEntity(
- if (!mAnswerEntity?.communityId.isNullOrEmpty()) mAnswerEntity?.communityId ?: "" else mAnswerEntity?.articleCommunityId ?: "",
+ if (!mAnswerEntity?.communityId.isNullOrEmpty()) mAnswerEntity?.communityId
+ ?: "" else mAnswerEntity?.articleCommunityId ?: "",
mAnswerEntity?.communityName ?: ""
),
mAnswerEntity?.id
@@ -462,7 +463,13 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
if (mUseEnterAndExitAnimation && !fadeOnly) {
if (mFinalUrl.contains(".gif") || mUrlList!![mViewPager.currentItem].contains(".gif")) {
animatorSet.apply {
- playTogether(translateXAnimator, translateYAnimator, scaleXAnimator, scaleYAnimator, backgroundAlphaAnimation)
+ playTogether(
+ translateXAnimator,
+ translateYAnimator,
+ scaleXAnimator,
+ scaleYAnimator,
+ backgroundAlphaAnimation
+ )
duration = ANIMATION_DURATION
doOnStart { mIndicatorMask.visibility = View.GONE }
doOnEnd {
@@ -490,7 +497,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
private fun shouldResize() = abs(mImageRatio - mViewRatio) > RATIO_DIFF
- private fun justChangeBoundsAndTransform() = mImageRatio < mViewRatio && mIsFromImageContainerView && adapter?.count == 1
+ private fun justChangeBoundsAndTransform() =
+ mImageRatio < mViewRatio && mIsFromImageContainerView && adapter?.count == 1
private fun startEndTransition() {
if (mAnimating) return
@@ -618,7 +626,13 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
animatorSet.apply {
if (mUseEnterAndExitAnimation) {
- playTogether(translateXAnimator, translateYAnimator, scaleXAnimator, scaleYAnimator, backgroundAlphaAnimator)
+ playTogether(
+ translateXAnimator,
+ translateYAnimator,
+ scaleXAnimator,
+ scaleYAnimator,
+ backgroundAlphaAnimator
+ )
} else {
playTogether(backgroundAlphaAnimator)
}
@@ -635,7 +649,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
private fun performExitAnimation(view: DraggableBigImageView, scale: Float, fadeOnly: Boolean) {
val finalScale = mOriginWidth / mTargetWidth
val finalTranslationX = mOriginLeft - (1 - finalScale) * mTargetWidth / 2
- val finalTranslationY = mOriginTop - ((1 - finalScale) * mTargetHeight + (mTargetHeight * finalScale - mOriginHeight)) / 2
+ val finalTranslationY =
+ mOriginTop - ((1 - finalScale) * mTargetHeight + (mTargetHeight * finalScale - mOriginHeight)) / 2
val animatorSet = AnimatorSet()
@@ -898,7 +913,8 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
}
}
- private fun isFadeOnly() = mViewPager.currentItem >= mOriginLeftList?.size ?: 0 || mOriginLeft == 0 || mOriginTop == 0
+ private fun isFadeOnly() =
+ mViewPager.currentItem >= mOriginLeftList?.size ?: 0 || mOriginLeft == 0 || mOriginTop == 0
override fun onBackPressed() {
updateOriginPosition(mViewPager.currentItem)
@@ -941,7 +957,13 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener {
}
@JvmStatic
- fun getIntent(context: Context, list: ArrayList, position: Int = 0, originalViewList: List? = null, entrance: String?): Intent {
+ fun getIntent(
+ context: Context,
+ list: ArrayList,
+ position: Int = 0,
+ originalViewList: List? = null,
+ entrance: String?
+ ): Intent {
return getIntent(context, list, position, originalViewList, entrance, false, null)
}
diff --git a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt
index 28944a9825..917172306e 100644
--- a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt
@@ -112,7 +112,13 @@ class NetworkDiagnosisActivity : ToolBarActivity() {
builder.append("-----------------------------------------------------------------------\n")
// 2.ping域名
- val domains = arrayOf("api.ghzs.com", "download.ghzs.com", "apk.ghzs666.com", "image.ghzs666.com", "image.ghzhushou.com")
+ val domains = arrayOf(
+ "api.ghzs.com",
+ "download.ghzs.com",
+ "apk.ghzs666.com",
+ "image.ghzs666.com",
+ "image.ghzhushou.com"
+ )
for (domain in domains) {
builder.append(DeviceUtils.ping(domain))
builder.append("-----------------------------------------------------------------------\n")
@@ -121,7 +127,13 @@ class NetworkDiagnosisActivity : ToolBarActivity() {
}
// 3.okhttp访问链接
- val urls = arrayOf("https://api.ghzs.com/v3d3/index/columns", "https://download.ghzs.com/game?id=55097638fc1a6fa45f8b4568&platform=9u", "https://apk.ghzs666.com/packed/5af00abc02b30f7c038b456c.apk", "http://image.ghzs666.com/pic/5b29b3c92924bcaf5d438d38.jpg", "http://image.ghzhushou.com/pic/586cad378ab49e0f1b91b3e8.png")
+ val urls = arrayOf(
+ "https://api.ghzs.com/v3d3/index/columns",
+ "https://download.ghzs.com/game?id=55097638fc1a6fa45f8b4568&platform=9u",
+ "https://apk.ghzs666.com/packed/5af00abc02b30f7c038b456c.apk",
+ "http://image.ghzs666.com/pic/5b29b3c92924bcaf5d438d38.jpg",
+ "http://image.ghzhushou.com/pic/586cad378ab49e0f1b91b3e8.png"
+ )
for (url in urls) {
builder.append("Url:")
builder.append(url)
@@ -129,9 +141,9 @@ class NetworkDiagnosisActivity : ToolBarActivity() {
val client = OkHttpClient()
val request = Request.Builder()
- .head()
- .url(url)
- .build()
+ .head()
+ .url(url)
+ .build()
try {
val response = client.newCall(request).execute()
builder.append("Success:\n")
@@ -152,17 +164,17 @@ class NetworkDiagnosisActivity : ToolBarActivity() {
it.onComplete()
}).subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(object : Response() {
- override fun onNext(response: ProgressAndDetail) {
- mResult.text = response.detail
- setResultProgress(response.progress ?: 0)
- }
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(object : Response() {
+ override fun onNext(response: ProgressAndDetail) {
+ mResult.text = response.detail
+ setResultProgress(response.progress ?: 0)
+ }
- override fun onComplete() {
- initWebView()
- }
- })
+ override fun onComplete() {
+ initWebView()
+ }
+ })
}
@@ -191,13 +203,20 @@ class NetworkDiagnosisActivity : ToolBarActivity() {
view.postDelayed({
// WebView生成长图，也就是超过一屏的图片，代码中的bitmap就是最后生成的长图
tryCatchInRelease {
- mWebView.measure(View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED),
- View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
+ mWebView.measure(
+ View.MeasureSpec.makeMeasureSpec(
+ View.MeasureSpec.UNSPECIFIED,
+ View.MeasureSpec.UNSPECIFIED
+ ),
+ View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)
+ )
mWebView.layout(0, 0, mWebView.measuredWidth, mWebView.measuredHeight)
mWebView.isDrawingCacheEnabled = true
mWebView.buildDrawingCache()
- val bitmap = Bitmap.createBitmap(mWebView.measuredWidth,
- mWebView.measuredHeight, Bitmap.Config.ARGB_8888)
+ val bitmap = Bitmap.createBitmap(
+ mWebView.measuredWidth,
+ mWebView.measuredHeight, Bitmap.Config.ARGB_8888
+ )
// 画布的宽高和WebView的网页保持一致
val canvas = Canvas(bitmap)
@@ -246,9 +265,10 @@ class NetworkDiagnosisActivity : ToolBarActivity() {
fun bitmap2File(bitmap: Bitmap): String {
try {
- val file = File(Environment.getExternalStorageDirectory().absolutePath + "/Pictures/ghzhushou/"
- + (UUID.randomUUID().toString().replace("-".toRegex(), ""))
- + ".jpg"
+ val file = File(
+ Environment.getExternalStorageDirectory().absolutePath + "/Pictures/ghzhushou/"
+ + (UUID.randomUUID().toString().replace("-".toRegex(), ""))
+ + ".jpg"
)
if (!file.exists()) {
file.parentFile.mkdirs()
@@ -267,8 +287,7 @@ class NetworkDiagnosisActivity : ToolBarActivity() {
override fun handleBackPressed(): Boolean {
return if (mProgressData < 100) {
- DialogHelper.showDialog(this, "确认退出", "网络诊断还未完成，退出会终止所有诊断进程，确定退出吗？"
- , "确定", "取消", {
+ DialogHelper.showDialog(this, "确认退出", "网络诊断还未完成，退出会终止所有诊断进程，确定退出吗？", "确定", "取消", {
finish()
}, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
true
diff --git a/app/src/main/java/com/gh/gamecenter/QaActivity.kt b/app/src/main/java/com/gh/gamecenter/QaActivity.kt
index 2e155faa39..11ed008d6a 100644
--- a/app/src/main/java/com/gh/gamecenter/QaActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/QaActivity.kt
@@ -16,7 +16,12 @@ class QaActivity : ToolBarActivity() {
* qaCollectionId 存在则是QA合集页面
* 两个都存在则默认时QA合集页面
*/
- fun getIntent(context: Context, navigationTitle: String, qaId: String? = null, qaCollectionId: String? = null): Intent {
+ fun getIntent(
+ context: Context,
+ navigationTitle: String,
+ qaId: String? = null,
+ qaCollectionId: String? = null
+ ): Intent {
val args = Bundle()
args.putString(EntranceConsts.KEY_QA_ID, qaId)
args.putString(EntranceConsts.KEY_QA_COLLECTION_ID, qaCollectionId)
diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
index 832dbc248e..8ca55b5403 100644
--- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
@@ -15,7 +15,7 @@ public class SelectUserIconActivity extends ToolBarActivity {
@NonNull
public static Intent getIntent(Context context) {
- return getTargetIntent(context,SelectUserIconActivity.class, SelectPortraitFragment.class);
+ return getTargetIntent(context, SelectUserIconActivity.class, SelectPortraitFragment.class);
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
index 4de238d172..1360bb8457 100644
--- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
@@ -190,7 +190,7 @@ public class ShareCardPicActivity extends ToolBarActivity {
mActionbar = findViewById(R.id.normal_toolbar_container);
mShareChangImageRl = findViewById(R.id.sharecard_chang_img);
mShareShareRl = findViewById(R.id.sharecard_share_btn);
- mShareChangImageIcon = findViewById(R.id.sharecard_chang_img_icon);
+ mShareChangImageIcon = findViewById(R.id.sharecard_chang_img_icon);
mShareChangImageTv = findViewById(R.id.sharecard_chang_img_tv);
mShareShareRl.setOnClickListener(v -> {
diff --git a/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt b/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt
index 41f4e53d7c..6625cdb1c3 100644
--- a/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SingletonWebActivity.kt
@@ -10,13 +10,16 @@ class SingletonWebActivity : WebActivity() {
super.onNewIntent(intent)
if (intent?.extras?.getString(EntranceConsts.KEY_URL)
- == targetFragment.arguments?.getString(EntranceConsts.KEY_URL)) {
+ == targetFragment.arguments?.getString(EntranceConsts.KEY_URL)
+ ) {
// 同样的地址，不理会
} else {
if (targetFragment is WebFragment) {
targetFragment.arguments?.putString(
EntranceConsts.KEY_URL, intent?.extras?.getString(
- EntranceConsts.KEY_URL))
+ EntranceConsts.KEY_URL
+ )
+ )
(targetFragment as WebFragment).reload()
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
index 83ea975bc2..971b5d4320 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
@@ -66,7 +66,8 @@ class SplashScreenActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
mViewModel = viewModelProvider()
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
- mIsNewForThisVersion = mSharedPreferences!!.getBoolean("isNewFirstLaunchV" + PackageUtils.getGhVersionName(), true)
+ mIsNewForThisVersion =
+ mSharedPreferences!!.getBoolean("isNewFirstLaunchV" + PackageUtils.getGhVersionName(), true)
HaloApp.getInstance().isNewForThisVersion = mIsNewForThisVersion
// 用户不是新版本，但应用最后更新时间不是上次的时间代表用户重新安装了当前版本
@@ -186,11 +187,14 @@ class SplashScreenActivity : BaseActivity() {
// })
} else {
- DialogUtils.showPrivacyPolicyDisallowDialog(this, PrivacyPolicyEntity.createDefaultData(), object : EmptyCallback {
- override fun onCallback() {
- showPrivacyDialog(guideLayout)
- }
- })
+ DialogUtils.showPrivacyPolicyDisallowDialog(
+ this,
+ PrivacyPolicyEntity.createDefaultData(),
+ object : EmptyCallback {
+ override fun onCallback() {
+ showPrivacyDialog(guideLayout)
+ }
+ })
}
}
}
diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt
index 4b1b06cb50..a3a57b737c 100644
--- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt
@@ -17,7 +17,7 @@ class UserInfoActivity : ToolBarActivity() {
}
}
- override fun isAutoResetViewBackgroundEnabled(): Boolean=true
+ override fun isAutoResetViewBackgroundEnabled(): Boolean = true
override fun onDarkModeChanged() {
super.onDarkModeChanged()
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java
index 725861cffd..2b4552d0cd 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java
@@ -79,11 +79,11 @@ public class CleanApkAdapter extends BaseRecyclerAdapter
private void init() {
Observable.create(emitter -> {
- // 扫描和获取apk数据 分步操作 尽量避免 StackoverflowError
- FindAllAPKPath(Environment.getExternalStorageDirectory());
- LoadApkData();
- emitter.onComplete();
- })
+ // 扫描和获取apk数据 分步操作 尽量避免 StackoverflowError
+ FindAllAPKPath(Environment.getExternalStorageDirectory());
+ LoadApkData();
+ emitter.onComplete();
+ })
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response