Merge remote-tracking branch 'origin/release' into dev

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt
#	dependencies.gradle
This commit is contained in:
juntao
2021-11-09 17:52:15 +08:00
47 changed files with 981 additions and 253 deletions

View File

@ -76,6 +76,9 @@ public class Constants {
public static final String SP_IMEI = "imei";
public static final String SP_ANDROID_ID = "android_id";
// 安装类型
public static final String SP_INSTALL_TYPE = "install_type";
public static final String LAST_INSTALL_GAME = "last_install_game";
// 骨架图配置
@ -210,6 +213,9 @@ public class Constants {
// 新分类2.0引导
public static final String SP_SHOW_CATEGORY_GUIDE = "show_category_guide";
// 用户是否需要 weibo x86 so
public static final String SP_USER_NEED_WEIBO_X86_SO = "user_need_weibo_x86_so";
// 内容视频播放选项
public static final String SP_CONTENT_VIDEO_OPTION = "content_video_option";