diff --git a/app/src/main/java/com/gh/common/exposure/meta/Meta.kt b/app/src/main/java/com/gh/common/exposure/meta/Meta.kt index 26f5152d05..566932267b 100644 --- a/app/src/main/java/com/gh/common/exposure/meta/Meta.kt +++ b/app/src/main/java/com/gh/common/exposure/meta/Meta.kt @@ -17,6 +17,7 @@ data class Meta( val network: String? = "", val ip: String? = "", val os: String? = "", + val gid: String? = "", val channel: String? = "", val appVersion: String? = "", val userId: String? = "", 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 93c5a06bad..075a539ccf 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 @@ -12,6 +12,7 @@ import android.telephony.TelephonyManager import android.text.TextUtils import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.manager.UserManager +import com.halo.assistant.HaloApp import com.leon.channel.helper.ChannelReaderUtil import java.io.File @@ -28,7 +29,7 @@ object MetaUtil { fun refreshMeta() { m = Meta(getMac(), getIMEI(), getModel(), getManufacturer(), getAndroidId(), getAndroidSDK(), - getAndroidVersion(), getNetwork(), getIP(), getOS(), getChannel(), BuildConfig.VERSION_NAME, UserManager.getInstance().userId, BuildConfig.EXPOSURE_VERSION) + getAndroidVersion(), getNetwork(), getIP(), getOS(), HaloApp.getInstance().gid, getChannel(), BuildConfig.VERSION_NAME, UserManager.getInstance().userId, BuildConfig.EXPOSURE_VERSION) } fun getMeta(): Meta { diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 2181424bb5..34ccc4ff15 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -32,6 +32,7 @@ import com.gh.gamecenter.manager.FilterManager; import com.gh.gamecenter.user.UserRepository; import com.gh.gid.GidCallback; import com.gh.gid.GidHelper; +import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadEntity; import com.lightgame.download.FileUtils; import com.lightgame.utils.AppManager; @@ -186,6 +187,8 @@ public class SplashScreenActivity extends BaseActivity { Utils.log("Gid", s); Utils.toast(SplashScreenActivity.this, "光环ID -> " + s); mSharedPreferences.edit().putString(Constants.DEVICE_KEY, s).apply(); + + HaloApp.getInstance().setGid(s); } @Override diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 9c89b3c4d0..f44b86a9dd 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -8,6 +8,7 @@ import android.support.v4.util.ArrayMap; import android.text.TextUtils; import android.util.Log; +import com.danikula.videocache.HttpProxyCacheServer; import com.facebook.drawee.backends.pipeline.Fresco; import com.gh.base.GHActivityLifecycleCallbacksImpl; import com.gh.common.LocalBroadcastReceiver; @@ -33,6 +34,10 @@ public class HaloApp extends TinkerAppLike { private static ArrayMap sObjectMap = new ArrayMap<>(); private String mChannel; private String mGid; + private HttpProxyCacheServer mProxy; + + // 全局视频静音标记 + public boolean isMute = true; public Executor getMainExecutor() { return mMainExecutor; @@ -58,6 +63,10 @@ public class HaloApp extends TinkerAppLike { mGid = gid; } + public String getGid() { + return mGid; + } + public static synchronized HaloApp getInstance() { return mInstance; } @@ -79,7 +88,7 @@ public class HaloApp extends TinkerAppLike { mChannel = ChannelReaderUtil.getChannel(getApplication()); if (TextUtils.isEmpty(mChannel)) { //默认用Android Studio run时并没有写入channel magic number到apk包里面,所以需要fallback - mChannel = "GH_123"; + mChannel = "GH_TEST"; } Log.e("CHANNEL_ID", mChannel); @@ -110,7 +119,10 @@ public class HaloApp extends TinkerAppLike { } catch (Exception e) { e.printStackTrace(); } + } + public HttpProxyCacheServer getProxy() { + return mProxy == null ? (mProxy = new HttpProxyCacheServer(getApplication())) : mProxy; } private void initLocalBroadcast() {