diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 3d6adbfe50..c77043bf7f 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -137,7 +137,7 @@ public class DataUtils { @Override public void onFailure(String s) { - MtaHelper.onEvent("开发辅助", "GID 获取异常", s); + Utils.log(s); } }); } diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 47c634e6a0..62f870f086 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -961,6 +961,7 @@ public class DialogUtils { @Override public void onClick(@NonNull View widget) { + MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击隐私政策"); Intent intent = WebActivity.getPrivacyPolicyIntent(activityContext); activityContext.startActivity(intent); } @@ -973,7 +974,12 @@ public class DialogUtils { titleTv.setText("隐私政策指引概要"); positiveTv.setText("我知道了"); - positiveTv.setOnClickListener(view -> dialog.dismiss()); + positiveTv.setOnClickListener(view -> { + dialog.dismiss(); + MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击我知道了"); + }); + + MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "出现弹窗"); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.setContentView(contentView); @@ -982,7 +988,6 @@ public class DialogUtils { /** * @param context may be is application context - * * @return activity context */ public static Context checkDialogContext(Context context) { diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 41637b2ece..a72d2dc74e 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -38,6 +38,7 @@ import com.gh.common.util.DetailDownloadUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.GdtHelper; +import com.gh.common.util.MtaHelper; import com.gh.common.util.ShareUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.download.DownloadManager; @@ -174,7 +175,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, * 启动新闻详情页面 */ public static void startNewsDetailActivity(Context context, NewsEntity newsEntity, String entrance) { - DataUtils.onMtaEvent(context, "详情页面", "文章详情", newsEntity != null ? newsEntity.getTitle() : ""); + MtaHelper.onEvent("详情页面", "文章详情", newsEntity != null ? newsEntity.getTitle() : ""); if (!TextUtils.isEmpty(newsEntity.getLink())) { context.startActivity(WebActivity.getIntentByNews(context, newsEntity, entrance)); } else { @@ -192,7 +193,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, * 在收藏启动新闻详情页面 */ public static void startNewsDetailByCollection(Context context, NewsEntity newsEntity, String entrance) { - DataUtils.onMtaEvent(context, "详情页面", "文章详情", newsEntity != null ? newsEntity.getTitle() : ""); + MtaHelper.onEvent("详情页面", "文章详情", newsEntity != null ? newsEntity.getTitle() : ""); if (!TextUtils.isEmpty(newsEntity.getLink())) { Intent intent = WebActivity.getIntentByNews(context, newsEntity, entrance); context.startActivity(intent); @@ -505,7 +506,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, HistoryHelper.insertNewsEntity(mNewsEntity); - DataUtils.onMtaEvent(NewsDetailActivity.this, "详情页面", "文章详情", response.getTitle()); + MtaHelper.onEvent("详情页面", "文章详情", response.getTitle()); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index 1c5407c257..54f77e976d 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -214,7 +214,6 @@ public class SearchActivity extends BaseActivity { searchInput.setSelection(searchInput.getText().length()); setResultPresentModel(2); isSearchDetail = false; - MtaHelper.onEvent("游戏搜索", "热门搜索", key); break; case "history": //历史搜索 @@ -244,7 +243,7 @@ public class SearchActivity extends BaseActivity { toast("请输入搜索内容"); } } - MtaHelper.onEvent("游戏搜索", "主动搜索", key); + MtaHelper.onEvent("游戏搜索", "主动搜索", newSearchKey); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 57608d7380..b0a0a2f963 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -27,6 +27,7 @@ import com.gh.common.util.DeviceUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.GameRepositoryHelper; import com.gh.common.util.GdtHelper; +import com.gh.common.util.MtaHelper; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.TagUtils; @@ -46,13 +47,11 @@ import org.jetbrains.annotations.NotNull; import org.json.JSONObject; import java.io.File; -import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Locale; -import io.reactivex.Scheduler; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import okhttp3.ResponseBody; @@ -72,7 +71,9 @@ public class SplashScreenActivity extends BaseActivity { private boolean isNewFirstLaunch; private final static int REQUEST_PERMISSION_TAG = 30001; - private String[] mPermissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE, + private String[] mPermissions = { + Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE}; public static Intent getSplashScreenIntent(Context context, Bundle bundle) { @@ -140,7 +141,7 @@ public class SplashScreenActivity extends BaseActivity { public void onSuccess(ResponseBody data) { try { String content = new JSONObject(data.string()).getString("content"); - DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this,content); + DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this, content); } catch (Exception e) { e.printStackTrace(); } @@ -148,7 +149,7 @@ public class SplashScreenActivity extends BaseActivity { @Override public void onFailure(@NotNull Exception exception) { - DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this,null); + DialogUtils.showPrivacyPolicyDialog(SplashScreenActivity.this, null); } }); } @@ -252,6 +253,7 @@ public class SplashScreenActivity extends BaseActivity { private void checkAndRequestPermission() { if (EasyPermissions.hasPermissions(this, mPermissions)) { launch(); + MtaHelper.onEvent("授权情况", "启动授权", "都授权"); // 检查是否有旧版本光环，有就删掉 HaloApp.getInstance().getMainExecutor().execute(this::checkOldGhFile); } else { @@ -268,11 +270,30 @@ public class SplashScreenActivity extends BaseActivity { Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); intent.setData(Uri.parse("package:" + getPackageName())); startActivity(intent); - }, this::launch); + }, () -> { + launch(); + logGrantedPermission(perms); + }); } else { DialogUtils.showPermissionDialog(this, "权限申请", "在设置-应用-光环助手-权限中开启存储和手机信息权限，以保证能正常使用相关功能", "重试", "放弃", - this::checkAndRequestPermission, this::launch); + this::checkAndRequestPermission, + () -> { + launch(); + logGrantedPermission(perms); + }); + } + } + + private void logGrantedPermission(List perms) { + if (perms.size() == 1) { + MtaHelper.onEvent("授权情况", "启动授权", "只授权存储"); + } else { + if (perms.contains(Manifest.permission.READ_PHONE_STATE)) { + MtaHelper.onEvent("授权情况", "启动授权", "都不授权"); + } else { + MtaHelper.onEvent("授权情况", "启动授权", "只授权IMEI"); + } } } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt index df9c68d200..82281c9afd 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt @@ -70,6 +70,7 @@ class SearchDefaultFragment : BaseFragment() { layoutManager = GridLayoutManager(context, 2) adapter = SearchDefaultHotAdapter(context, mHotSearchList, callBack = { GameDetailActivity.startGameDetailActivity(context, it.id, "(搜索-热门搜索)") + MtaHelper.onEvent("游戏搜索", "热门搜索", it.name) Util_System_Keyboard.hideSoftKeyboardByIBinder(context, windowToken) }) } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index f4908526ea..e4cb58df72 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -208,7 +208,7 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter im mDao.add(gameEntity.getNameWithoutSuffix()); if (SearchActivity.convertSearchType(type).equals(SearchActivity.SEARCH_AUTO)) { - MtaHelper.onEvent("游戏搜索", "主动搜索", key); + MtaHelper.onEvent("游戏搜索", "自动搜索", key); } }); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 77f4791848..26e9123998 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -183,7 +183,6 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter impl DisplayUtils.dip2px(20F), DisplayUtils.dip2px(4F)); } - final GameItemViewHolder viewHolder = (GameItemViewHolder) holder; GameItemBinding binding = viewHolder.getBinding(); binding.setGame(gameEntity); @@ -200,7 +199,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter impl } if (SearchActivity.convertSearchType(type).equals(SearchActivity.SEARCH_AUTO)) { - MtaHelper.onEvent("游戏搜索", "主动搜索", key); + MtaHelper.onEvent("游戏搜索", "自动搜索", key); } GameDetailActivity.startGameDetailActivity(mContext, gameEntity, @@ -228,7 +227,7 @@ class SearchGameListFragmentAdapter extends BaseRecyclerAdapter impl } if (SearchActivity.convertSearchType(type).equals(SearchActivity.SEARCH_AUTO)) { - MtaHelper.onEvent("游戏搜索", "主动搜索", key); + MtaHelper.onEvent("游戏搜索", "自动搜索", key); } } );