Merge remote-tracking branch 'origin/dev-5.6.0' into dev

# Conflicts:
#	app/src/main/java/com/gh/common/util/DownloadObserver.kt
#	app/src/main/java/com/gh/common/util/EnvHelper.kt
#	app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
#	app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt
#	app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt
#	app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt
#	app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
#	app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt
#	app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java
#	app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
#	app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	dependencies.gradle
This commit is contained in:
juntao
2022-01-13 16:59:12 +08:00
646 changed files with 6123 additions and 33803 deletions

View File

@ -255,7 +255,7 @@ public class MainActivity extends BaseActivity {
// checkTinkerPath(); // 看情况是否需要显示补丁弹窗
// 必须放在这里,否则会导致获取 baseActivity 不是本应用包名
DownloadManager.getInstance(this).initDownloadService();
DownloadManager.getInstance().initDownloadService();
ReservationRepository.refreshReservations();
@ -293,7 +293,7 @@ public class MainActivity extends BaseActivity {
// 耗时操作
AppExecutor.getIoExecutor().execute(() -> {
// 上传数据
DataCollectionManager.getInstance(getApplicationContext()).upload();
DataCollectionManager.getInstance().upload();
// 获取默认配置
if (Config.getSettings() == null) {
@ -332,7 +332,7 @@ public class MainActivity extends BaseActivity {
@SuppressLint("CheckResult")
private void getTeenagerMode() {
RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
RetrofitManager.getInstance()
.getApi().getTeenagerMode(HaloApp.getInstance().getGid())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@ -367,7 +367,7 @@ public class MainActivity extends BaseActivity {
.flatMap((Function<List<String>, SingleSource<ResponseBody>>) strings -> {
requestMap.put("cache_video_ids", strings);
RequestBody body = ExtensionsKt.toRequestBody(requestMap);
return RetrofitManager.getInstance(HaloApp.getInstance())
return RetrofitManager.getInstance()
.getApi()
.postAttentionVideoRecord(UserManager.getInstance().getUserId(), body);
})
@ -385,7 +385,7 @@ public class MainActivity extends BaseActivity {
//查询到模拟器游戏表中逻辑删除的数据后,删除服务器中的记录
@SuppressLint("CheckResult")
private void deleteSimulatorGame() {
SimulatorGameDao dao = AppDatabase.getInstance(HaloApp.getInstance()).simulatorGameDao();
SimulatorGameDao dao = AppDatabase.getInstance().simulatorGameDao();
dao.getSimulatorGameByDeleted()
.subscribeOn(Schedulers.io())
.subscribe(new BiResponse<List<String>>() {
@ -636,7 +636,7 @@ public class MainActivity extends BaseActivity {
*/
private void redirectGameDetail(String packageName) {
String filterQuery = UrlFilterUtils.getFilterQuery("package", packageName, "type", "package_redirect");
RetrofitManager.getInstance(this).getApi().loadGameDataByPackageName(filterQuery)
RetrofitManager.getInstance().getApi().loadGameDataByPackageName(filterQuery)
.compose(observableToMain())
.subscribe(new Response<List<GameEntity>>() {
@Override
@ -647,7 +647,7 @@ public class MainActivity extends BaseActivity {
startActivity(PackageSkipActivity.getIntent(MainActivity.this, response));
LogUtils.uploadPackageSkip("external_jump", "进入展示页", "", "");
} else {
GameDetailActivity.startGameDetailActivity(MainActivity.this, response.get(0), "应用跳转");
GameDetailActivity.startGameDetailActivity(MainActivity.this, response.get(0), "应用跳转", null);
LogUtils.uploadPackageSkip("external_jump", "进入游戏详情", response.get(0).getId(), response.get(0).getName());
}
}
@ -692,7 +692,7 @@ public class MainActivity extends BaseActivity {
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0 && !mMainWrapperFragment.onHandleBackPressed()) {
DownloadEntity downloadEntity = null;
for (DownloadEntity entity : DownloadManager.getInstance(getApplicationContext()).getAllDownloadEntityExcludeSilentUpdate()) {
for (DownloadEntity entity : DownloadManager.getInstance().getAllDownloadEntityExcludeSilentUpdate()) {
if (entity.getStatus().equals(DownloadStatus.done)) {
if (PackageUtils.isInstalled(getApplicationContext(), entity.getPackageName())
&& (!entity.isPlugin()
@ -751,7 +751,7 @@ public class MainActivity extends BaseActivity {
@Override
public void finish() {
// 上传数据
DataCollectionManager.getInstance(getApplicationContext()).statClickData();
DataCollectionManager.getInstance().statClickData();
super.finish();
}
@ -872,7 +872,7 @@ public class MainActivity extends BaseActivity {
private void checkDevice() {
String content = DeviceUtils.getUserDevice(MainActivity.this).toString();
RequestBody body = RequestBody.create(MediaType.parse("application/json"), content);
RetrofitManager.getInstance(this).getApi().checkDevice(body)
RetrofitManager.getInstance().getApi().checkDevice(body)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response<ResponseBody>() {