diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index 7b0e0f20a4..732c13071c 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -116,6 +116,8 @@ public class Constants { public static final String SP_WEIBO_SHOW_BIND_PHONE_TIME = "weibo_show_bind_phone_time" + HaloApp.getInstance().getGid(); public static final String SP_DOUYIN_SHOW_BIND_PHONE_TIME = "douyin_show_bind_phone_time" + HaloApp.getInstance().getGid(); + public static final String SP_IS_USER_ACCEPTED_PRIVACY_STATEMENT = "has_user_accepted_privacy_statement"; + //手机号码匹配规则 public static final String REGEX_MOBILE = "^((13[0-9])|(15[^4,\\D])|(18[0,5-9]))\\d{8}$"; public static final String REGEX_ACCOUNT = "^[a-zA-Z_]\\w{5,17}$"; diff --git a/app/src/main/java/com/gh/common/exposure/meta/MetaUtil.kt b/app/src/main/java/com/gh/common/exposure/meta/MetaUtil.kt index 99b42ce397..8c373072d6 100644 --- a/app/src/main/java/com/gh/common/exposure/meta/MetaUtil.kt +++ b/app/src/main/java/com/gh/common/exposure/meta/MetaUtil.kt @@ -10,6 +10,8 @@ import android.os.Build import android.provider.Settings import android.telephony.TelephonyManager import android.text.TextUtils +import com.gh.common.constant.Constants +import com.gh.common.util.SPUtils import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.manager.UserManager import com.halo.assistant.HaloApp @@ -23,6 +25,7 @@ object MetaUtil { private var channel = "" private var m: Meta? = null + private var imei: String? = null fun refreshMeta() { m = Meta(mac = getMac(), @@ -96,18 +99,30 @@ object MetaUtil { /** * Get IMEI */ - fun getIMEI(): String? { + @JvmStatic + fun getIMEI(): String { - if (application.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) + if (!SPUtils.getBoolean(Constants.SP_IS_USER_ACCEPTED_PRIVACY_STATEMENT)) { return "" + } + + if (imei != null) { + return imei ?: "" + } + + if (application.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) { + return "" + } val telephonyManager = application.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager - if (Build.VERSION.SDK_INT >= 26) { - return telephonyManager.imei + if (Build.VERSION.SDK_INT >= 29) { + return "".apply { imei = this } + } else if (Build.VERSION.SDK_INT >= 26) { + return (telephonyManager.imei ?: "").apply { imei = this } } - return telephonyManager.getDeviceId() + return (telephonyManager.getDeviceId() ?: "").apply { imei = this } } diff --git a/app/src/main/java/com/gh/common/util/DataLogUtils.java b/app/src/main/java/com/gh/common/util/DataLogUtils.java index 36949298e1..f4c905618d 100644 --- a/app/src/main/java/com/gh/common/util/DataLogUtils.java +++ b/app/src/main/java/com/gh/common/util/DataLogUtils.java @@ -2,10 +2,10 @@ package com.gh.common.util; import android.content.Context; +import com.gh.common.exposure.meta.MetaUtil; import com.gh.common.loghub.LoghubUtils; import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; -import com.lightgame.utils.Util_System_Phone_State; import com.lightgame.utils.Utils; import org.json.JSONObject; @@ -53,7 +53,7 @@ public class DataLogUtils { String channel = HaloApp.getInstance().getChannel(); map.put("version", version); map.put("user", user); - map.put("device_id", Util_System_Phone_State.getDeviceId(context)); + map.put("device_id", MetaUtil.getIMEI()); map.put("channel", channel); Map params = new HashMap<>(); diff --git a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt index 24024fcdde..cd181e700c 100644 --- a/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt +++ b/app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt @@ -3,12 +3,12 @@ package com.gh.common.util import android.content.Context import android.os.Environment import android.preference.PreferenceManager +import com.gh.common.exposure.meta.MetaUtil import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.entity.TimeEntity import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp -import com.lightgame.utils.Util_System_Phone_State import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -60,7 +60,7 @@ object DeviceTokenUtils { lunchType = LunchType.FIRST } // 保存deviceId - var deviceId = Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application) + var deviceId = MetaUtil.getIMEI() if (deviceId.isNullOrEmpty()) { deviceId = Utils.getTime(HaloApp.getInstance().application).toString() } diff --git a/app/src/main/java/com/gh/common/util/DeviceUtils.java b/app/src/main/java/com/gh/common/util/DeviceUtils.java index d3c25e8164..88bbd65851 100644 --- a/app/src/main/java/com/gh/common/util/DeviceUtils.java +++ b/app/src/main/java/com/gh/common/util/DeviceUtils.java @@ -13,6 +13,7 @@ import android.util.Log; import androidx.annotation.Nullable; +import com.gh.common.exposure.meta.MetaUtil; import com.halo.assistant.HaloApp; import com.lightgame.utils.Util_System_Phone_State; import com.tencent.stat.StatConfig; @@ -46,7 +47,7 @@ public class DeviceUtils { context = context.getApplicationContext(); JSONObject object = new JSONObject(); object.put("os", "Android"); - object.put("imei", Util_System_Phone_State.getDeviceId(context)); + object.put("imei", MetaUtil.getIMEI()); object.put("mac", getMac(context)); object.put("model", MODEL); object.put("manufacturer", MANUFACTURER); @@ -62,7 +63,7 @@ public class DeviceUtils { public static JSONObject getUserDevice(Context context) { // 判断新老用户device数据 JSONObject object = new JSONObject(); try { - object.put("IMEI", Util_System_Phone_State.getDeviceId(context)); + object.put("IMEI", MetaUtil.getIMEI()); object.put("ANDROID_ID", Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID)); object.put("MAC", getMac(context)); object.put("MTA_ID", StatConfig.getMid(context)); diff --git a/app/src/main/java/com/gh/common/util/DownloadObserver.kt b/app/src/main/java/com/gh/common/util/DownloadObserver.kt index 7844696dbf..fcd5255dc9 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -6,6 +6,7 @@ import android.preference.PreferenceManager import com.gh.base.BaseActivity import com.gh.common.constant.Constants import com.gh.common.exposure.ExposureUtils +import com.gh.common.exposure.meta.MetaUtil import com.gh.common.xapk.XapkInstaller import com.gh.download.DownloadDataHelper import com.gh.download.DownloadManager @@ -26,7 +27,6 @@ import com.lightgame.download.DownloadEntity import com.lightgame.download.DownloadStatus import com.lightgame.download.FileUtils import com.lightgame.utils.AppManager -import com.lightgame.utils.Util_System_Phone_State import com.lightgame.utils.Utils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers @@ -197,7 +197,7 @@ object DownloadObserver { kv1["版本"] = platform kv1["状态"] = "下载完成" kv1["用户机型"] = Build.MODEL - kv1["设备IMEI"] = Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application) + kv1["设备IMEI"] = MetaUtil.getIMEI() kv1["网络状态"] = DeviceUtils.getNetwork(HaloApp.getInstance().application) kv1["光环助手版本"] = BuildConfig.VERSION_NAME if (downloadEntity.isUpdate) { diff --git a/app/src/main/java/com/gh/common/util/Installation.java b/app/src/main/java/com/gh/common/util/Installation.java index 6eba7ef2f5..3602b9e19e 100644 --- a/app/src/main/java/com/gh/common/util/Installation.java +++ b/app/src/main/java/com/gh/common/util/Installation.java @@ -4,7 +4,7 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import com.lightgame.utils.Util_System_Phone_State; +import com.gh.common.exposure.meta.MetaUtil; import java.io.File; import java.io.FileOutputStream; @@ -19,7 +19,7 @@ public class Installation { private static String sID = null; public synchronized static String getUUID(Context context) { - String imei = Util_System_Phone_State.getDeviceId(context); + String imei = MetaUtil.getIMEI(); if (!TextUtils.isEmpty(imei)) { return imei; } diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java index eaa68928a8..0bc6429ccc 100644 --- a/app/src/main/java/com/gh/common/util/LogUtils.java +++ b/app/src/main/java/com/gh/common/util/LogUtils.java @@ -27,7 +27,6 @@ import com.gh.gamecenter.qa.entity.Questions; import com.gh.gamecenter.retrofit.EmptyResponse; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; -import com.lightgame.utils.Util_System_Phone_State; import com.lightgame.utils.Utils; import org.json.JSONException; @@ -263,8 +262,7 @@ public class LogUtils { object.put("user_id", UserManager.getInstance().getUserId()); object.put("device_system", android.os.Build.VERSION.RELEASE); object.put("device_model", android.os.Build.MODEL); - object.put("imei", Util_System_Phone_State.getImei(HaloApp.getInstance() - .getApplication())); + object.put("imei", MetaUtil.getIMEI()); object.put("G_ID", UserManager.getInstance().getDeviceId()); } catch (JSONException e) { e.printStackTrace(); @@ -288,8 +286,7 @@ public class LogUtils { object.put("user_id", UserManager.getInstance().getUserId()); object.put("device_system", android.os.Build.VERSION.RELEASE); object.put("device_model", android.os.Build.MODEL); - object.put("imei", Util_System_Phone_State.getImei(HaloApp.getInstance() - .getApplication())); + object.put("imei", MetaUtil.getIMEI()); object.put("G_ID", UserManager.getInstance().getDeviceId()); } catch (JSONException e) { e.printStackTrace(); diff --git a/app/src/main/java/com/gh/common/util/MtaHelper.kt b/app/src/main/java/com/gh/common/util/MtaHelper.kt index 446d1ce25e..d1321c6377 100644 --- a/app/src/main/java/com/gh/common/util/MtaHelper.kt +++ b/app/src/main/java/com/gh/common/util/MtaHelper.kt @@ -2,6 +2,8 @@ package com.gh.common.util import android.os.Build import android.text.TextUtils +import com.gh.common.exposure.meta.MetaUtil +import com.gh.common.exposure.meta.MetaUtil.getIMEI import com.gh.gamecenter.BuildConfig import com.halo.assistant.HaloApp import com.lightgame.utils.Util_System_Phone_State @@ -76,7 +78,7 @@ object MtaHelper { prop.setProperty("光环版本", BuildConfig.VERSION_NAME) prop.setProperty("网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().application)) - prop.setProperty("IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application)) + prop.setProperty("IMEI", MetaUtil.getIMEI()) prop.setProperty("机型", Build.MODEL) prop.setProperty("厂商", Build.MANUFACTURER) prop.setProperty("Android版本", Build.VERSION.RELEASE) diff --git a/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt b/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt index bd315c0f79..b8bb3d3ab9 100644 --- a/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt +++ b/app/src/main/java/com/gh/common/xapk/XapkInstaller.kt @@ -3,13 +3,13 @@ package com.gh.common.xapk import android.content.Context import android.os.Build import com.gh.common.AppExecutor +import com.gh.common.exposure.meta.MetaUtil import com.gh.common.util.* import com.gh.download.DownloadManager import com.gh.gamecenter.BuildConfig import com.halo.assistant.HaloApp import com.lightgame.download.DataChanger import com.lightgame.download.DownloadEntity -import com.lightgame.utils.Util_System_Phone_State import com.lightgame.utils.Utils import java.text.DecimalFormat import java.util.* @@ -126,7 +126,7 @@ object XapkInstaller : IXapkUnzipListener { MtaHelper.onEvent("解压失败" , "安卓版本", Build.VERSION.RELEASE - , "IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application) + , "IMEI", MetaUtil.getIMEI() , "光环版本", BuildConfig.VERSION_NAME , "厂商", Build.MANUFACTURER , "机型", Build.MODEL diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index a7c5911ca0..b8ec566082 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -129,6 +129,9 @@ public class SplashScreenActivity extends BaseActivity { HaloApp.getInstance().isBrandNewInstall = true; showPrivacyPolicy(() -> { // Dialog dismiss 后的回调 + SPUtils.setBoolean(Constants.SP_IS_USER_ACCEPTED_PRIVACY_STATEMENT, true); + HaloApp.getInstance().initDataRelatedAction(); + guideLayout.setVisibility(View.VISIBLE); SPUtils.setBoolean(SP_BRAND_NEW_USER, false); requestPermission(); diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 83a0e1fe5b..a8377dd373 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -38,6 +38,7 @@ import com.gh.base.ToolBarActivity; import com.gh.base.fragment.WaitingDialogFragment; import com.gh.common.AppExecutor; import com.gh.common.dialog.TrackableDialog; +import com.gh.common.exposure.meta.MetaUtil; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.im.ImManager; import com.gh.common.util.AdHelper; @@ -75,7 +76,6 @@ import com.gh.gamecenter.suggest.SuggestSelectGameAdapter; import com.gh.gamecenter.suggest.SuggestType; import com.halo.assistant.HaloApp; import com.lightgame.utils.Util_System_Keyboard; -import com.lightgame.utils.Util_System_Phone_State; import com.lightgame.utils.Utils; import com.walkud.rom.checker.RomIdentifier; @@ -1030,7 +1030,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall params.put("sdk", String.valueOf(android.os.Build.VERSION.SDK_INT)); params.put("version", android.os.Build.VERSION.RELEASE); params.put("source", getString(R.string.app_name)); - params.put("imei", Util_System_Phone_State.getDeviceId(this)); + params.put("imei", MetaUtil.getIMEI()); params.put("manufacturer", Build.MANUFACTURER); params.put("rom", RomIdentifier.getRom().name() + " " + RomIdentifier.getRom().getVersionName()); @@ -1060,7 +1060,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall params.put("sdk", String.valueOf(android.os.Build.VERSION.SDK_INT)); params.put("version", android.os.Build.VERSION.RELEASE); params.put("source", getString(R.string.app_name)); - params.put("imei", Util_System_Phone_State.getDeviceId(this)); + params.put("imei", MetaUtil.getIMEI()); params.put("manufacturer", Build.MANUFACTURER); params.put("rom", RomIdentifier.getRom().name() + " " + RomIdentifier.getRom().getVersionName()); params.put("link", mLinkEt.getText().toString()); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt index 8af3841c44..a816bd1fea 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescViewModel.kt @@ -10,6 +10,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.facebook.common.util.UriUtil import com.gh.common.constant.Constants +import com.gh.common.exposure.meta.MetaUtil +import com.gh.common.exposure.meta.MetaUtil.getIMEI import com.gh.common.repository.RemenkapaiRepository import com.gh.common.util.* import com.gh.gamecenter.R @@ -178,7 +180,7 @@ class DescViewModel(application: Application, params["sdk"] = android.os.Build.VERSION.SDK_INT.toString() params["version"] = Build.VERSION.RELEASE params["source"] = HaloApp.getInstance().application.getString(R.string.app_name) - params["imei"] = Util_System_Phone_State.getDeviceId(HaloApp.getInstance().application) + params["imei"] = MetaUtil.getIMEI() params["manufacturer"] = Build.MANUFACTURER params["rom"] = RomIdentifier.getRom().name + " " + RomIdentifier.getRom().versionName diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java b/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java index faa2efedde..0a0751571f 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GtDialog.java @@ -11,7 +11,7 @@ import android.view.Window; import android.widget.RelativeLayout; import android.widget.TextView; -import com.lightgame.utils.Util_System_Phone_State; +import com.gh.common.exposure.meta.MetaUtil; import com.lightgame.utils.Utils; import org.json.JSONException; @@ -104,7 +104,7 @@ class GtDialog extends Dialog { return "?" + paramsString // + "&challenge=" + this.challenge // + "&success=" + (this.success ? 1 : 0) - + "&imei=" + Util_System_Phone_State.getDeviceId(getContext()) + + "&imei=" + MetaUtil.getIMEI() + "&mType=" + Build.MODEL + "&osType=" + "android" + "&osVerInt=" + Build.VERSION.RELEASE diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java index d7d307b630..0f7166eb68 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -1,15 +1,14 @@ package com.gh.gamecenter.manager; import android.content.Context; -import android.util.Pair; +import com.gh.common.exposure.meta.MetaUtil; import com.gh.common.loghub.LoghubUtils; import com.gh.common.util.Installation; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.db.DataCollectionDao; import com.gh.gamecenter.db.info.DataCollectionInfo; import com.halo.assistant.HaloApp; -import com.lightgame.utils.Util_System_Phone_State; import com.lightgame.utils.Utils; import org.json.JSONArray; @@ -54,7 +53,7 @@ public class DataCollectionManager { String channel = HaloApp.getInstance().getChannel(); map.put("version", version); map.put("user", user); - map.put("device_id", Util_System_Phone_State.getDeviceId(mContext)); + map.put("device_id", MetaUtil.getIMEI()); map.put("channel", channel); map.put("updateOn", Utils.getTime(HaloApp.getInstance().getApplication())); map.put("type", type); @@ -128,7 +127,7 @@ public class DataCollectionManager { JSONObject jsonObject = jsonArray.getJSONObject(i); jsonObject.put("version", version); jsonObject.put("user", user); - jsonObject.put("device_id", Util_System_Phone_State.getDeviceId(mContext)); + jsonObject.put("device_id", MetaUtil.getIMEI()); jsonObject.put("channel", channel); JSONObject jsonWrapper = new JSONObject(); diff --git a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java index 8e9663cef3..88e5aa44a2 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -30,7 +30,6 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.retrofit.service.ApiService; import com.gh.gamecenter.user.UserRepository; import com.halo.assistant.HaloApp; -import com.lightgame.utils.Util_System_Phone_State; import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; @@ -226,7 +225,7 @@ public class UserManager { "用户ID", UserManager.getInstance().getUserId(), "光环版本", BuildConfig.VERSION_NAME, "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()), - "IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().getApplication()), + "IMEI", MetaUtil.getIMEI(), "机型", Build.MODEL, "厂商", Build.MANUFACTURER, "Android版本", Build.VERSION.RELEASE @@ -238,7 +237,7 @@ public class UserManager { , "错误码_RefreshToken", code + "_" + refreshToken.getValue() , "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()) , "用户机型", Build.MODEL - , "设备IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().getApplication())); + , "设备IMEI", MetaUtil.getIMEI()); // 重复统计,产品就是要这种效果=.= DataUtils.onMtaEvent(HaloApp.getInstance().getApplication(), "登录失效" @@ -250,7 +249,7 @@ public class UserManager { "用户ID", UserManager.getInstance().getUserId(), "光环版本", BuildConfig.VERSION_NAME, "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()), - "IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().getApplication()), + "IMEI", MetaUtil.getIMEI(), "机型", Build.MODEL, "厂商", Build.MANUFACTURER, "Android版本", Build.VERSION.RELEASE); @@ -264,7 +263,7 @@ public class UserManager { , "错误码_RefreshToken", code + "_" + e.code() + errorMessage + "_" + e1.toString() , "网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()) , "用户机型", Build.MODEL - , "设备IMEI", Util_System_Phone_State.getDeviceId(HaloApp.getInstance().getApplication())); + , "设备IMEI", MetaUtil.getIMEI()); } } else { try { diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt index 08a36133bc..72f2560bf8 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.preference.PreferenceManager import android.text.TextUtils import androidx.lifecycle.MutableLiveData +import com.gh.common.exposure.meta.MetaUtil import com.gh.common.filter.RegionSettingHelper import com.gh.common.loghub.LoghubUtils import com.gh.common.runOnIoThread @@ -23,7 +24,6 @@ import com.gh.gamecenter.retrofit.ObservableUtil import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp -import com.lightgame.utils.Util_System_Phone_State import com.lightgame.utils.Utils import com.tencent.bugly.beta.tinker.TinkerManager.getApplication import io.reactivex.android.schedulers.AndroidSchedulers @@ -142,7 +142,7 @@ object PackageRepository { dataObject.put("type", "PUT") dataObject.put("device_id", HaloApp.getInstance().gid) dataObject.put("app", appList) - dataObject.put("imei", Util_System_Phone_State.getImei(HaloApp.getInstance().application)) + dataObject.put("imei", MetaUtil.getIMEI()) dataObject.put("user_id", UserManager.getInstance().userId) dataObject.put("time", Utils.getTime(HaloApp.getInstance().application)) wrapperObject.put("content", dataObject.toString()) diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java index 3a563273aa..14138179e2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/select/VotingViewModel.java @@ -1,10 +1,12 @@ package com.gh.gamecenter.qa.select; import android.app.Application; -import androidx.lifecycle.MutableLiveData; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.lifecycle.MutableLiveData; +import com.gh.common.exposure.meta.MetaUtil; import com.gh.common.util.PackageUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.gamecenter.R; @@ -16,7 +18,6 @@ import com.gh.gamecenter.qa.entity.CommunitySelectEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; -import com.lightgame.utils.Util_System_Phone_State; import com.lightgame.utils.Utils; import org.json.JSONException; @@ -73,7 +74,7 @@ public class VotingViewModel extends ListViewModel