Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-issues1107' into dev-4.8.0

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/MainActivity.java
This commit is contained in:
张玉久
2021-03-05 16:54:39 +08:00
parent 1a5a4ba149 a9275c83d2
commit de1e3ba7a7
20 changed files with 491 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -32,6 +32,8 @@ import com.gh.common.avoidcallback.AvoidOnResultManager;
import com.gh.common.constant.Config;
import com.gh.common.constant.Constants;
import com.gh.common.exposure.meta.MetaUtil;
import com.gh.common.history.HistoryDatabase;
import com.gh.common.history.HistoryHelper;
import com.gh.common.repository.ReservationRepository;
import com.gh.common.simulator.SimulatorGameManager;
import com.gh.common.util.ActivationHelper;
@ -77,6 +79,7 @@ import com.gh.gamecenter.manager.UserManager;
import com.gh.gamecenter.normal.NormalFragment;
import com.gh.gamecenter.packagehelper.PackageViewModel;
import com.gh.gamecenter.qa.CommunityFragment;
import com.gh.gamecenter.retrofit.BiResponse;
import com.gh.gamecenter.retrofit.Response;
import com.gh.gamecenter.retrofit.RetrofitManager;
import com.gh.gamecenter.suggest.SuggestSelectFragment;
@ -94,6 +97,7 @@ import com.lightgame.utils.Utils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.jetbrains.annotations.NotNull;
import org.json.JSONObject;
import java.io.BufferedReader;
@ -102,14 +106,19 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import io.reactivex.SingleSource;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers;
import kotlin.jvm.functions.Function1;
import okhttp3.MediaType;
@ -260,10 +269,11 @@ public class MainActivity extends BaseActivity {
// 上传数据
DataCollectionManager.getInstance(getApplicationContext()).upload();
// 获取默认配置
if (Config.getSettings() == null) {
Config.getGhzsSettings();
}
// 初始化PlatformUtils
PlatformUtils.getInstance(getApplicationContext());
// // 友盟记录启动
@ -288,6 +298,33 @@ public class MainActivity extends BaseActivity {
SPUtils.setBoolean(Constants.SP_NON_WIFI_TIPS, true);
//重置首页视频播放进度
SPUtils.setString(Constants.SP_HOME_VIDEO_PLAY_RECORD, "");
postAttentionVideoRecord();
}
//上传关注视频浏览记录
@SuppressLint("CheckResult")
private void postAttentionVideoRecord() {
if (UserManager.getInstance().isLoggedIn()) {
Map<String, Object> requestMap = new HashMap<>();
HistoryDatabase.Companion.getInstance().videoHistoryDao()
.getAttentionVideoRecord()
.flatMap((Function<List<String>, SingleSource<ResponseBody>>) strings -> {
requestMap.put("cache_video_ids", strings);
RequestBody body = ExtensionsKt.toRequestBody(requestMap);
return RetrofitManager.getInstance(HaloApp.getInstance())
.getApi()
.postAttentionVideoRecord(UserManager.getInstance().getUserId(), body);
})
.subscribeOn(Schedulers.io())
.subscribe(new BiResponse<ResponseBody>() {
@Override
public void onSuccess(ResponseBody data) {
HistoryHelper.deleteAttentionVideoRecord();
}
});
}
}
@Override
@ -375,11 +412,11 @@ public class MainActivity extends BaseActivity {
getIntent().putExtra(SHOW_AD, false);
findViewById(R.id.maskContainer).setVisibility(View.GONE);
mMainWrapperFragment.getWelcomeDialog();
checkDialog();
}
}
private void checkDialog() {
// 检查通知权限
checkNotificationPermission();