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

Merge branch 'feature-sdk-free' into dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt
#	app/src/main/java/com/gh/common/im/ImManager.kt
#	app/src/main/java/com/gh/common/im/ImReceiver.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
#	app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundViewModel.kt
#	app/src/main/java/com/gh/gamecenter/user/UserRepository.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	dependencies.gradle
This commit is contained in:
chenjuntao
2020-11-02 10:03:28 +08:00
parent 261e0cc45a ebb279c42f
commit 883a948b7b
79 changed files with 3139 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/download/DownloadManager.java
View File

@ -24,7 +24,6 @@ import com.gh.common.util.DataCollectionUtils;
import com.gh.common.util.DeviceUtils;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.ExtensionsKt;
import com.gh.common.util.GdtHelper;
import com.gh.common.util.HomePluggableHelper;
import com.gh.common.util.NetworkUtils;
import com.gh.common.util.PackageInstaller;
@ -56,7 +55,6 @@ import com.lightgame.download.DownloadStatusManager;
import com.lightgame.download.FileUtils;
import com.lightgame.download.HttpDnsManager;
import com.lightgame.utils.Utils;
import com.qq.gdt.action.ActionType;
import org.greenrobot.eventbus.EventBus;
@ -321,9 +319,9 @@ public class DownloadManager implements DownloadStatusListener {
DownloadManager.getInstance(context).markDownloadingTaskAsUnread();
// 收集下载数据
DataCollectionUtils.uploadDownload(context, downloadEntity, "开始");
GdtHelper.INSTANCE.logAction(ActionType.DOWNLOAD_APP,
GdtHelper.GAME_ID, downloadEntity.getGameId(),
GdtHelper.PLATFORM, downloadEntity.getPlatform());
// GdtHelper.INSTANCE.logAction(ActionType.DOWNLOAD_APP,
// GdtHelper.GAME_ID, downloadEntity.getGameId(),
// GdtHelper.PLATFORM, downloadEntity.getPlatform());
}
public void removeAllTaskThatFileDoesNotExist() {