diff --git a/app/src/debug/java/com/gh/gamecenter/DataUtils.java b/app/src/debug/java/com/gh/gamecenter/DataUtils.java deleted file mode 100644 index c5cc9f159c..0000000000 --- a/app/src/debug/java/com/gh/gamecenter/DataUtils.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.gh.gamecenter; - -import android.app.Activity; -import android.app.Application; -import android.content.Context; - -import com.gh.common.constant.Config; -import com.gh.common.util.PackageUtils; -import com.tencent.bugly.crashreport.CrashReport; -import com.tencent.stat.MtaSDkException; -import com.tencent.stat.StatConfig; -import com.tencent.stat.StatCrashReporter; -import com.tencent.stat.StatReportStrategy; -import com.tencent.stat.StatService; -import com.tendcloud.tenddata.TCAgent; - -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -/** - * Created by LGT on 2016/6/15. - * 数据收集 工具类 （TalkingData、MTA） - */ -public class DataUtils { - - public static final boolean DEBUG = true; - - /** - * 初始化各种统计工具，仅在release build（非debug）模式启用统计 - * - * @param context - * @param channel - */ - public static void init(final Application context, String channel) { - -// // 神烦这些SDK上报，debug就不开了 -// if (DEBUG) return; - - //TalkingData - try { - TCAgent.LOG_ON = false; - TCAgent.init(context, Config.TALKINGDATA_APPID, channel); - /** - * - * 不要启用！！！！不要启用，全部由{@link com.gh.base.AppUncaughtHandler}处理 - */ - TCAgent.setReportUncaughtExceptions(false); - } catch (Exception e) { - e.printStackTrace(); - } - - //MTA - try { - /** - * - * 不要启用！！！！全部由{@link com.gh.base.AppUncaughtHandler}处理 - */ - StatConfig.setAutoExceptionCaught(false); - - StatCrashReporter crashReporter = StatCrashReporter.getStatCrashReporter(context); - crashReporter.setJavaCrashHandlerStatus(false); -// crashReporter.setEnableInstantReporting(true); - - StatConfig.setDebugEnable(DEBUG); - - // 设置数据上报策略 - if (DEBUG) { - StatConfig.setStatSendStrategy(StatReportStrategy.INSTANT); - } else { - StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD); - StatConfig.setSendPeriodMinutes(5); - } - - // 设置启用Tlink - StatConfig.setTLinkStatus(true); - - StatConfig.init(context); - StatConfig.setInstallChannel(channel); - StatConfig.setAntoActivityLifecycleStat(true); - StatConfig.setAppVersion(PackageUtils.getPatchVersionName()); - - // 开启收集服务 - StatService.startStatService(context, Config.MTA_APPKEY, com.tencent.stat.common.StatConstants.VERSION); - StatService.registerActivityLifecycleCallbacks(context); - - } catch (MtaSDkException e) { - e.printStackTrace(); - } - - // init bugly - try { - - CrashReport.setIsDevelopmentDevice(context, "GH_TEST".equals(channel)); - - CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context); - strategy.setEnableANRCrashMonitor(false); - strategy.setEnableNativeCrashMonitor(false); - strategy.setAppChannel(channel); - strategy.setAppVersion(PackageUtils.getPatchVersionName()); - - CrashReport.initCrashReport(context, Config.BUGLY_APPID, DEBUG, strategy); - - } catch (Exception e) { - e.printStackTrace(); - } - -// Logger.setLogger(context, new LoggerInterface() { -// -// @Override -// public void setTag(String tag) { -// CommonDebug.logMethodWithParams(this, tag); -// } -// -// @Override -// public void log(String content) { -// CommonDebug.logMethodWithParams(this, content); -// } -// -// @Override -// public void log(String content, Throwable t) { -// CommonDebug.logMethodWithParams(this, content, t); -// } -// }); - - } - - public static void onEvent(Context var0, String var1, String var2) { - TCAgent.onEvent(var0, var1, var2); - StatService.trackCustomEvent(var0, var1, var2); - } - - public static void onPause(Activity var0) { - TCAgent.onPageEnd(var0, var0.getClass().getSimpleName()); - StatService.onPause(var0); - } - - public static void onResume(Activity var0) { - TCAgent.onPageStart(var0, var0.getClass().getSimpleName()); - StatService.onResume(var0); - } - - // 游戏启动 - public static void onGameLaunchEvent(Context context, String gameName, String platform, String page) { - Map kv = new HashMap<>(); - kv.put("版本", platform); - kv.put("页面", page); - onEvent(context, "游戏启动", gameName, kv); - } - - public static void onEvent(Context var0, String var1, String var2, Map var3) { - TCAgent.onEvent(var0, var1, var2, var3); - Properties prop = new Properties(); - prop.setProperty("label", var2); - for (String key : var3.keySet()) { - prop.setProperty(key, var3.get(key) + ""); - } - StatService.trackCustomKVEvent(var0, var1, prop); - } - - // 游戏下载 - public static void onGameDownloadEvent(Context context, String gameName, String platform, String entrance, String status) { - Map kv = new HashMap<>(); - kv.put("版本", platform); - kv.put("状态", status); - onEvent(context, "游戏下载", gameName, kv); - - Map kv2 = new HashMap<>(); - kv2.put("版本", platform); - kv2.put("状态", status); - kv2.put("位置", entrance); - onEvent(context, "游戏下载位置", gameName, kv2); - - Map kv3 = new HashMap<>(); - kv3.put(entrance, "下载数"); - kv3.put(entrance, status); - onEvent(context, "应用数据", gameName, kv3); - } - - // 游戏更新 - public static void onGameUpdateEvent(Context context, String gameName, String paltform, String status) { - Map kv = new HashMap<>(); - kv.put("版本", paltform); - kv.put("状态", status); - onEvent(context, "游戏更新", gameName, kv); - } - - public static void onError(Context context, Throwable throwable) { - // MTA主动上传错误 - try { - StatService.reportException(context, throwable); - } catch (Exception e) { - } - -// //bugly 作为默认处理异常的类库，已经上报了，此处不重复上报 -// try { -// CrashReport.postCatchedException(throwable); -// } catch (Exception e) { -// } - - //talkingdata - try { - TCAgent.onError(context, throwable); - } catch (Exception e) { - } - } - -} diff --git a/app/src/main/java/com/gh/base/AppUncaughtHandler.java b/app/src/main/java/com/gh/base/AppUncaughtHandler.java index a6fad22179..a62befe03d 100644 --- a/app/src/main/java/com/gh/base/AppUncaughtHandler.java +++ b/app/src/main/java/com/gh/base/AppUncaughtHandler.java @@ -11,7 +11,7 @@ import android.util.Log; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.gamecenter.SplashScreenActivity; import com.lightgame.config.CommonDebug; import com.lightgame.download.FileUtils; diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 83d9b7f89f..033fca4849 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -7,12 +7,12 @@ import android.os.Handler; import android.os.Message; import android.support.annotation.NonNull; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.RunningUtils; import com.gh.common.util.ShareUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; diff --git a/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java b/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java index 0c8f4a2ae8..d1784f1ebb 100644 --- a/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java +++ b/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java @@ -4,14 +4,10 @@ import android.app.Activity; import android.app.Application.ActivityLifecycleCallbacks; import android.os.Bundle; +import com.gh.common.util.DataUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; -import com.lightgame.config.CommonDebug; import com.lightgame.utils.AppManager; -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; - /** * 1、写点针对生命周期的统计代码 * 2、写点通用的逻辑 diff --git a/app/src/release/java/com/gh/gamecenter/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java similarity index 97% rename from app/src/release/java/com/gh/gamecenter/DataUtils.java rename to app/src/main/java/com/gh/common/util/DataUtils.java index bc502668b2..d40c41e540 100644 --- a/app/src/release/java/com/gh/gamecenter/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -1,11 +1,11 @@ -package com.gh.gamecenter; +package com.gh.common.util; import android.app.Activity; import android.app.Application; import android.content.Context; import com.gh.common.constant.Config; -import com.gh.common.util.PackageUtils; +import com.lightgame.config.CommonDebug; import com.tencent.bugly.crashreport.CrashReport; import com.tencent.stat.MtaSDkException; import com.tencent.stat.StatConfig; @@ -32,6 +32,9 @@ public class DataUtils { */ public static void init(final Application context, String channel) { + if (CommonDebug.IS_DEBUG) { + return; + } //TalkingData try { TCAgent.LOG_ON = false; diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index d2e611173a..f3a34398d9 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -13,7 +13,6 @@ import android.widget.TextView; import com.gh.common.constant.Config; import com.gh.common.view.DownloadDialog; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index c1af17a071..58e2ba04a0 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -32,6 +32,7 @@ import com.gh.common.util.ClassUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataLogUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 828c69a058..8575ce9165 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -28,6 +28,7 @@ import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DetailDownloadUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index 9bc8719a44..ac3653bee7 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -13,11 +13,11 @@ import android.widget.LinearLayout; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.UrlFilterUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.NewsSearchActivity; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java index 38a19ab6ee..11fa9e3423 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -12,10 +12,10 @@ import android.view.ViewGroup; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.common.util.DataLogUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index e67b843fb8..13822d745c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -17,6 +17,7 @@ import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.BitmapUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; @@ -26,7 +27,6 @@ import com.gh.common.util.PlatformUtils; import com.gh.common.util.TrafficUtils; import com.gh.common.view.SwipeLayout; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.InstallActivity; import com.gh.gamecenter.KcSelectGameActivity; @@ -44,7 +44,6 @@ import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.adapter.BaseRecyclerAdapter; -import com.lightgame.utils.Utils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index f92d397ad7..9c13fe4b01 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -14,13 +14,13 @@ import com.gh.common.constant.Config; import com.gh.common.util.CommentUtils; import com.gh.common.util.ConcernContentUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.TimestampUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ShareCardPicActivity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 70eef830ce..c4005bf8f0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -18,6 +18,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.ImageUtils; @@ -25,7 +26,6 @@ import com.gh.common.util.NetworkUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.VoteActivity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java index 72d49c88b2..d0890603aa 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -6,7 +6,7 @@ import android.view.ViewGroup; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.DataCollectionUtils; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java index fe319db44a..c12cb662fb 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.text.TextUtils; import android.view.View; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.NetworkUtils; import com.gh.common.util.PackageUtils; @@ -12,7 +13,6 @@ import com.gh.common.util.StringUtils; import com.gh.common.view.DownloadDialog; import com.gh.common.view.DownloadProgressBar; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.ApkEntity; diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java index 33804b3731..e0180d7b60 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -4,7 +4,7 @@ import android.view.View; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.ListFragment; diff --git a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java index cdeef2f260..bd48127c6b 100644 --- a/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java +++ b/app/src/main/java/com/gh/gamecenter/discover/DiscoverFragment.java @@ -12,10 +12,10 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; import com.gh.gamecenter.CleanApkActivity; import com.gh.gamecenter.ConcernInfoActivity; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.InfoActivity; import com.gh.gamecenter.LibaoActivity; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 10679177dd..a2e7e7b1bc 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -17,6 +17,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.gh.common.util.BitmapUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.NetworkUtils; @@ -24,7 +25,6 @@ import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.SpeedUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; import com.gh.gamecenter.adapter.viewholder.GameDownloadViewHolder; 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 d2c636132e..6622914ac7 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -13,6 +13,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MD5Utils; @@ -22,7 +23,6 @@ import com.gh.common.util.PlatformUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index 98acacdb54..5fc77c1d71 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -17,10 +17,10 @@ import com.gh.base.SearchBarHint; import com.gh.base.fragment.BaseFragment; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.ConcernActivity; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SearchActivity; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java index f345cf8e3c..869bbbe09b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java @@ -9,7 +9,7 @@ import android.view.View; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DataCollectionUtils; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.QQUtils; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java index 0f20a9def7..645de565e3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java @@ -19,6 +19,7 @@ import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DetailDownloadUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; @@ -26,7 +27,6 @@ import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.ShareUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; import com.gh.gamecenter.entity.ApkEntity; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java index fbe19dc13f..c8b3ede32d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java @@ -6,7 +6,7 @@ import android.view.View; import android.view.ViewGroup; import com.gh.common.util.DataCollectionUtils; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.ViewImageActivity; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java index 3b1e88c341..73e4a564ba 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiAdapter.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -19,7 +20,6 @@ import com.gh.common.util.StringUtils; import com.gh.common.view.HorizontalItemDecoration; import com.gh.common.view.MarqueeView; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index b7651af34b..a8e3cf1c9b 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -22,12 +22,12 @@ import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.StringUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.ConcernActivity; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.NewsDetailActivity; diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java b/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java index e65db39079..6e4a6cd321 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoFragment.java @@ -3,8 +3,8 @@ package com.gh.gamecenter.info; import android.view.View; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java b/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java index 236e540580..89adf3ba73 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalFragment.java @@ -3,8 +3,8 @@ package com.gh.gamecenter.info; import android.view.View; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.baselist.ListAdapter; diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java index 8ed5815973..8254bf1a0a 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.StringUtils; diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index 3bbf09bc6e..738502ec78 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -14,12 +14,12 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.gh.common.util.DataLogUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.MD5Utils; import com.gh.common.util.PackageUtils; import com.gh.common.util.SpeedUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.AppEntity; import com.gh.gamecenter.entity.GameUpdateEntity; diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 46727c249c..feea1289d0 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -26,6 +26,7 @@ import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CommentUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; @@ -34,7 +35,6 @@ import com.gh.common.util.NewsUtils; import com.gh.common.util.QQUtils; import com.gh.common.util.RandomUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.MessageDetailActivity; diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index d91777996f..d6d16f7319 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -18,11 +18,11 @@ import com.gh.base.fragment.BaseFragment; import com.gh.base.fragment.WaitingDialogFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.GetLoginDataUtils; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.CollectionActivity; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.InstallActivity; import com.gh.gamecenter.LoginActivity; diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java index 5c85a1db27..47bff9b4fd 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java @@ -4,10 +4,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.InstallUtils; -import com.lightgame.utils.Utils; import com.gh.gamecenter.eventbus.EBPackage; +import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index fa0f7ca07b..0dd643bdd1 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -13,7 +13,7 @@ import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 86fa791b8f..928e0b5bec 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -11,9 +11,9 @@ import com.gh.EventBusIndex; import com.gh.base.GHActivityLifecycleCallbacksImpl; import com.gh.base.GHUmengNotificationClickHandler; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.TokenUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.Injection; import com.leon.channel.helper.ChannelReaderUtil; import com.lightgame.utils.Utils; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java index 2ec61c1ffa..fbbdf5359e 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java @@ -26,6 +26,7 @@ import com.gh.common.constant.Config; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameUtils; @@ -36,7 +37,6 @@ import com.gh.common.util.PlatformUtils; import com.gh.common.util.RandomUtils; import com.gh.common.util.StringUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.KaiFuActivity; import com.gh.gamecenter.MainActivity; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java index 5e391fe4af..18a3190e76 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java @@ -14,10 +14,10 @@ import android.widget.TextView; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.NewsUtils; import com.gh.common.view.VerticalItemDecoration; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java index 5ade0b43aa..94f69bd2f9 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java @@ -6,12 +6,12 @@ import android.view.View; import android.view.ViewGroup; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java index 76f05da05b..42f7ac5c51 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java @@ -10,9 +10,9 @@ import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.DataUtils; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java index 62cce3bf1c..0a5218f258 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java @@ -11,7 +11,7 @@ import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; -import com.gh.gamecenter.DataUtils; +import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.GameDetailActivity;