diff --git a/app/build.gradle b/app/build.gradle index c3ee2d6d09..82ca6b103f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -135,7 +135,7 @@ android { variantFilter { variant -> def names = variant.flavors*.name def isDebugType = variant.buildType.name == "debug" - if ((names.contains("tea") || name.contains("gdt")) && isDebugType) { + if ((names.contains("tea")) && isDebugType) { setIgnore(true) } } @@ -152,9 +152,6 @@ android { tea { java.srcDirs = ['src/main/java', 'src/tea/java'] } - gdt { - java.srcDirs = ['src/main/java', 'src/gdt/java'] - } } productFlavors { @@ -183,13 +180,6 @@ android { manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase()) } - - gdt { - dimension "env" - - buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\"" - buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\"" - } } lintOptions { @@ -207,7 +197,6 @@ repositories { dependencies { implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') - gdtImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/gdt/libs') testImplementation 'junit:junit:4.12' diff --git a/app/proguard-rules-legacy.txt b/app/proguard-rules-legacy.txt index 21959c04d0..3d45652e0a 100644 --- a/app/proguard-rules-legacy.txt +++ b/app/proguard-rules-legacy.txt @@ -220,10 +220,6 @@ -keepattributes Signature -keepattributes Annotation -### 广点通 --dontwarn com.qq.gdt.action.** --keep class com.qq.gdt.action.** {*;} - ### AndroidX -keep class androidx.core.app.CoreComponentFactory { *; } @@ -267,5 +263,4 @@ -keep class com.ut.**{*;} -keep class com.ta.**{*;} --keep class com.gh.gamecenter.GdtHelper { *; } -keep class com.gh.gamecenter.TeaHelper { *; } \ No newline at end of file diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index 1e0327f48a..7b697e4cb6 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -94,10 +94,6 @@ @androidx.annotation.Keep *; } -### 广点通 --dontwarn com.qq.gdt.action.** --keep class com.qq.gdt.action.* {*;} - ### 阿里云上传 -keep class com.alibaba.sdk.android.oss.* { *; } -dontwarn okio.** @@ -124,8 +120,7 @@ -keep class com.ut.*{*;} -keep class com.ta.*{*;} -### GDT & TEA --keep class com.gh.gamecenter.GdtHelper { *; } +### TEA -keep class com.gh.gamecenter.TeaHelper { *; } ### 阿里云日志 diff --git a/app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt b/app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt deleted file mode 100644 index 4e56e67489..0000000000 --- a/app/src/gdt/java/com/gh/gamecenter/GdtHelper.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.gh.gamecenter - -import android.app.Application -import android.text.TextUtils -import android.util.Log -import com.gh.common.util.ToastUtils -import com.lightgame.utils.Utils -import com.qq.gdt.action.GDTAction -import org.json.JSONObject - -/** - * 广点通辅助类 [https://gitlab.ghzhushou.com/pm/halo-app-issues/issues/403] - * - * 更换帐号 [https://gitlab.ghzs.com/pm/yunying/issues/893] - */ -object GdtHelper { - - const val NETWORK_TYPE = "NETWORK_TYPE" - const val PAGE_TYPE = "PAGE_TYPE" - const val CONTENT_TYPE = "CONTENT_TYPE" - const val CONTENT_ID = "CONTENT_ID" - const val KEYWORD = "KEYWORD" - const val GAME_ID = "GAME_ID" - const val SCORE = "SCORE" - const val PLATFORM = "PLATFORM" - - @JvmStatic - fun init(application: Application, channel: String) { - if (shouldUseGdtHelper()) { - if (channel == "GH_728") { - GDTAction.init(application, "1111012969", "9d3d9da5b0948a317c03d08f14d445dc") - } else if (channel == "GH_729") { - GDTAction.init(application, "1111013063", "f53dabf458a356b101d99fc4069eb7f1") - } else if (channel == "GH_765") { - GDTAction.init(application, "1111327925", "588d503f0990f98f9b2394fbb795c570") - } else { - GDTAction.init(application, "1110680399", "f5ddaafbf520d7d7385499232a408d0a") - } - } - Utils.log("init GdtHelper") - } - -// fun logAction(type: String) { -// if (shouldUseGdtHelper()) { -// GDTAction.logAction(type) -// Utils.log("GDT", type) -// } -// } - @JvmStatic - fun logAction(type: String, vararg kv: String?) { - try { - val actionParam = JSONObject() - for (i in kv.indices) { - if (i % 2 != 0) { - val key = kv[i - 1] - val value = kv[i] - if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) { - actionParam.put(key, value) - } - } - } - Utils.log("GDT", "$type + [${kv.joinToString(" , ")}]") - GDTAction.logAction(type, actionParam) - } catch (e: Exception) { - e.printStackTrace() - } - } - - // TODO 确认开启的渠道条件 - private fun shouldUseGdtHelper(): Boolean { - return true -// -// val channel = HaloApp.getInstance().channel -// return !(TextUtils.isEmpty(channel) || channel.contains("GDT".toLowerCase(Locale.CHINA))) - } - -} \ No newline at end of file diff --git a/app/src/gdt/libs/GDTActionSDK.min.1.6.10.aar b/app/src/gdt/libs/GDTActionSDK.min.1.6.10.aar deleted file mode 100644 index 17ddcbc8e3..0000000000 Binary files a/app/src/gdt/libs/GDTActionSDK.min.1.6.10.aar and /dev/null differ diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 36055dbbbe..01d5cfb45b 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -356,10 +356,6 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen new CollectionUtils.OnCollectionListener() { @Override public void onSuccess() { -// GdtHelper.INSTANCE.logAction(ActionType.ADD_TO_WISHLIST, -// GdtHelper.CONTENT_TYPE, "ARTICLE", -// GdtHelper.CONTENT_ID, newsDetailEntity.getId()); - newsDetailEntity.getMe().setArticleFavorite(false); mNewsCollection.setEnabled(true); mNewsCollection.setIcon(R.drawable.community_content_detail_collect_unselect); @@ -667,10 +663,6 @@ public class NewsDetailActivity extends ToolBarActivity implements OnClickListen } else { mDetailBottomLl.setVisibility(View.GONE); } - -// GdtHelper.INSTANCE.logAction(ActionType.PAGE_VIEW, -// GdtHelper.CONTENT_TYPE, "ARTICLE", -// GdtHelper.CONTENT_ID, response.getId()); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 6f61e22b12..6b895f7ba1 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -29,7 +29,6 @@ import com.gh.common.dialog.PrivacyPolicyDialogFragment; import com.gh.common.tracker.TrackerLogger; import com.gh.common.util.AdHelper; import com.gh.common.util.DeviceTokenUtils; -import com.gh.common.util.DeviceUtils; import com.gh.common.util.DialogHelper; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; @@ -60,7 +59,6 @@ import org.jetbrains.annotations.NotNull; import org.json.JSONObject; import java.io.File; -import java.lang.reflect.Field; import java.lang.reflect.Method; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -386,8 +384,6 @@ public class SplashScreenActivity extends BaseActivity { getAd(); prefetchData(); - uploadTeaAndGdtData(); - Bundle bundle = getIntent().getExtras(); Intent intent = new Intent(SplashScreenActivity.this, MainActivity.class); if (bundle != null) { @@ -397,7 +393,7 @@ public class SplashScreenActivity extends BaseActivity { overridePendingTransition(0, 0); startActivity(intent); - uploadTeaAndGdtData(); + uploadTeaData(); finish(); } @@ -407,7 +403,7 @@ public class SplashScreenActivity extends BaseActivity { AdHelper.getStartUpAd(); } - private void uploadTeaAndGdtData() { + private void uploadTeaData() { if ("tea".equals(BuildConfig.FLAVOR)) { // 在可能获取了相关权限后才初始化SDK/发送激活数据 // TeaHelper.init(getApplication(), HaloApp.getInstance().getChannel()); @@ -419,23 +415,6 @@ public class SplashScreenActivity extends BaseActivity { e.printStackTrace(); } } -// GdtHelper.INSTANCE.logAction(ActionType.START_APP, GdtHelper.NETWORK_TYPE, DeviceUtils.getNetwork(this)); - if ("gdt".equals(BuildConfig.FLAVOR)) { - try { - Class clazz = Class.forName("com.gh.gamecenter.GdtHelper"); - Field field = clazz.getDeclaredField("NETWORK_TYPE"); - String type = (String) field.get(null); - Method method = clazz.getMethod("logAction", String.class, String[].class); - - Class actionTypeClazz = Class.forName("com.qq.gdt.action.ActionType"); - Field typeField = actionTypeClazz.getDeclaredField("START_APP"); - String actionType = (String) typeField.get(null); - - method.invoke(null, actionType, new String[]{type, DeviceUtils.getNetwork(this)}); - } catch (Exception e) { - e.printStackTrace(); - } - } } private void prefetchData() { diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index a3d36c179f..5206f3a013 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -563,9 +563,6 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen // 收集下载数据 DataCollectionUtils.uploadDownload(mContext, downloadEntity, "开始"); -// GdtHelper.INSTANCE.logAction(ActionType.DOWNLOAD_APP, -// GdtHelper.GAME_ID, downloadEntity.getGameId(), -// GdtHelper.PLATFORM, downloadEntity.getPlatform()); notifyItemChanged(0); EventBus.getDefault().post(new EBSkip(DownloadManagerActivity.TAG, DownloadManagerActivity.INDEX_DOWNLOAD)); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 85789a1478..9463cedd81 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -435,10 +435,6 @@ class GameDetailFragment : NormalFragment() { DataLogUtils.uploadGameLog(context, mGameEntity!!.id, mGameEntity!!.name, mEntrance) -// GdtHelper.logAction(ActionType.PAGE_VIEW, -// GdtHelper.CONTENT_TYPE, "GAME", -// GdtHelper.CONTENT_ID, mGameEntity!!.id) - mNewGameDetailEntity = data showAlertDialogIfNeeded(data) @@ -495,7 +491,6 @@ class GameDetailFragment : NormalFragment() { mGameEntity!!.id, "关注" ) -// GdtHelper.logAction(ActionType.ADD_TO_WISHLIST, GdtHelper.CONTENT_TYPE, "GAME", GdtHelper.CONTENT_ID, mGameEntity!!.id) updateConcernMenuIcon(isConcerned = true) toast(R.string.concern_success) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt index 4d09ab87bd..c7ccdcf6f6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt @@ -235,9 +235,6 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { MtaHelper.onEvent("发表评论", "提交", mGame?.name) setResult(Activity.RESULT_OK) toast("提交成功") -// GdtHelper.logAction(ActionType.RATE, -// GdtHelper.GAME_ID, mGame.id, -// GdtHelper.PLATFORM, mBinding.ratingScore.rating.toString()) if (mFromAmway) { if (mIsSkipSuccessPage) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index fa67c9074a..cc64d78724 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -254,8 +254,6 @@ open class AnswerDetailFragment : NormalFragment() { mSkeletonScreen?.hide() } }, if (fragmentIsVisible()) 0 else 1000L) - -// GdtHelper.logAction(ActionType.PAGE_VIEW, GdtHelper.CONTENT_TYPE, "ANSWER", GdtHelper.CONTENT_ID, mAnswerId) } else if (apiResponse.httpException != null) { val e = apiResponse.httpException mSkeletonScreen?.hide() @@ -896,10 +894,6 @@ open class AnswerDetailFragment : NormalFragment() { } private fun shareAnswer() { -// GdtHelper.logAction(ActionType.SHARE, -// GdtHelper.CONTENT_TYPE, "ANSWER", -// GdtHelper.CONTENT_ID, mAnswerId) - val shareIcon: String = if (mAnswersImages!!.size > 0) { mAnswersImages[0] } else { diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt index 410b9655b4..0ae2c1713a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.kt @@ -27,7 +27,6 @@ import okhttp3.ResponseBody import org.greenrobot.eventbus.EventBus import org.json.JSONObject import retrofit2.HttpException -import java.util.* class AnswerDetailViewModel(application: Application) : AndroidViewModel(application) { @@ -187,10 +186,6 @@ class AnswerDetailViewModel(application: Application) : AndroidViewModel(applica override fun onSuccess() { collect.postValue(true) answerDetail?.me?.isAnswerFavorite = true - -// GdtHelper.logAction(ActionType.ADD_TO_WISHLIST, -// GdtHelper.CONTENT_TYPE, "ANSWER", -// GdtHelper.CONTENT_ID, answerId) } override fun onError() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index 3547a8b9d0..682f91fb70 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -308,9 +308,6 @@ class ArticleDetailFragment : BaseCommentFragment { if (it == BaseCommentViewModel.LoadResult.DELETED) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt index d3925de9f1..267ffb7bdc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt @@ -14,11 +14,11 @@ import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.databinding.FragmentArticleDetailCommentBinding import com.gh.gamecenter.entity.CommentEntity import com.gh.gamecenter.manager.UserManager +import com.gh.gamecenter.qa.article.detail.CommentItemData +import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter import com.gh.gamecenter.qa.comment.base.BaseCommentFragment import com.gh.gamecenter.qa.comment.base.BaseCommentViewModel -import com.gh.gamecenter.qa.article.detail.CommentItemData -import com.gh.gamecenter.qa.comment.CommentActivity import com.halo.assistant.HaloApp @Deprecated("v5.0.0废弃") @@ -114,11 +114,6 @@ class ArticleDetailCommentFragment : BaseCommentFragment { mReuseNoConn?.visibility = View.GONE mListLoading?.visibility = View.GONE - -// GdtHelper.logAction(ActionType.PAGE_VIEW, -// GdtHelper.CONTENT_TYPE, "QA_ARTICLE", -// GdtHelper.CONTENT_ID, mViewModel.articleId) - val showKeyboard = arguments?.getBoolean(EntranceUtils.KEY_SHOW_KEYBOARD_IF_NEEDED) ?: false if (showKeyboard) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt index 5637f9c092..ffb8e1673d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt @@ -190,7 +190,6 @@ // mAdapter?.setQuestionsEntity(it) // // updateFab() -//// GdtHelper.logAction(ActionType.PAGE_VIEW, GdtHelper.CONTENT_TYPE, "QUESTION", GdtHelper.CONTENT_ID, mQuestionsId) // // setNavigationTitle(mQuestionsDetailEntity!!.community.name + " - 问题详情") // MtaHelper.onEvent("详情页面", "问题详情", it.title) @@ -348,10 +347,6 @@ // mQuestionsDetailEntity!!.setFollowCount(mQuestionsDetailEntity!!.getFollowCount() + 1) // mAdapter!!.notifyItemChanged(0) // -//// GdtHelper.logAction(ActionType.ADD_TO_WISHLIST, -//// GdtHelper.CONTENT_TYPE, "QUESTION", -//// GdtHelper.CONTENT_ID, mQuestionsId) -// // toast("已关注 ") // } // diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 4418bf354c..fbd8efe327 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -289,19 +289,6 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid private void initThirdPartySdk() { DataUtils.init(this, mChannel); - initGdt(); - } - - private void initGdt() { - try { - if ("gdt".equals(BuildConfig.FLAVOR)) { - Class clazz = Class.forName("com.gh.gamecenter.GdtHelper"); - Method method = clazz.getMethod("init", Application.class, String.class); - method.invoke(null, getApplication(), HaloApp.getInstance().getChannel()); - } - } catch (Exception e) { - e.printStackTrace(); - } } private void initDataHelper() {