Compare commits
3 Commits
pack/updat
...
feat/cw-te
| Author | SHA1 | Date | |
|---|---|---|---|
| 231401a13d | |||
| b436f7196d | |||
| d9eea295ff |
@ -72,14 +72,13 @@ android_build:
|
||||
only:
|
||||
- dev
|
||||
- release
|
||||
- pack/update_sentry_plugin_cache
|
||||
|
||||
# 代码检查
|
||||
sonarqube_analysis:
|
||||
tags:
|
||||
- offline-test
|
||||
stage: build&analyze
|
||||
image: hub.shanqu.cc/library/sonar-scanner-cli:latest
|
||||
image: sonarsource/sonar-scanner-cli:latest
|
||||
dependencies: [] #禁止传递来的artifact
|
||||
script:
|
||||
## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
|
||||
@ -157,5 +156,4 @@ oss-upload&send-email:
|
||||
- /usr/local/bin/python /ci-android-mail-jira-comment.py
|
||||
only:
|
||||
- dev
|
||||
- release
|
||||
- pack/update_sentry_plugin_cache
|
||||
- release
|
||||
@ -101,14 +101,13 @@ android {
|
||||
buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
|
||||
buildConfigField "String", "LOG_HUB_PROJECT", "\"${LOG_HUB_PROJECT}\""
|
||||
buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
|
||||
buildConfigField "String", "WGAME_CPM_BUSIAPPID", "\"${WGAME_CPM_BUSIAPPID}\""
|
||||
buildConfigField "String", "WGAME_CPM_API_HOST", "\"${WGAME_CPM_API_HOST}\""
|
||||
buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
|
||||
buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
|
||||
buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
|
||||
buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
|
||||
// 一体包的32位畅玩游戏助手包名
|
||||
buildConfigField "String", "EXT_PACKAGE_NAME", "\"${rootProject.ext.EXT_PACKAGE_NAME}\""
|
||||
buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
|
||||
}
|
||||
|
||||
// gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
|
||||
@ -130,20 +129,7 @@ android {
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
// exclude 部分冗余的文件
|
||||
exclude 'META-INF/gradle/incremental.annotation.processors'
|
||||
exclude 'darwin/x86_64/liblz4-java.dylib'
|
||||
|
||||
exclude 'assets/libwbsafeedit_x86'
|
||||
exclude 'assets/libwbsafeedit_x86_64'
|
||||
|
||||
exclude 'lib/armeabi-v7a/libRSSupport.so'
|
||||
exclude 'lib/arm64-v8a/libRSSupport.so'
|
||||
exclude 'lib/armeabi-v7a/librsjni.so'
|
||||
exclude 'lib/arm64-v8a/librsjni.so'
|
||||
|
||||
resources.excludes += "com/j256/*"
|
||||
resources.excludes += "org/apache/commons/codec/language/bm/*"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
@ -232,9 +218,6 @@ android {
|
||||
buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\""
|
||||
buildConfigField "String", "DEV_CSJ_APPID", "\"${DEV_CSJ_APPID}\""
|
||||
buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
|
||||
buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}-debug\""
|
||||
manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}-debug")
|
||||
}
|
||||
|
||||
// publish， 发布时候使用的 flavor，接口仅包含正式环境
|
||||
@ -248,9 +231,6 @@ android {
|
||||
buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
|
||||
buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
|
||||
buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
|
||||
manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
|
||||
}
|
||||
|
||||
tea {
|
||||
@ -264,10 +244,7 @@ android {
|
||||
buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
|
||||
buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
|
||||
|
||||
manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
|
||||
manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
|
||||
}
|
||||
|
||||
kuaishou {
|
||||
@ -280,9 +257,6 @@ android {
|
||||
buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
|
||||
buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
|
||||
buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
|
||||
manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
|
||||
}
|
||||
|
||||
gdt {
|
||||
@ -295,9 +269,6 @@ android {
|
||||
buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
|
||||
buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
|
||||
buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
|
||||
manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
|
||||
}
|
||||
|
||||
sm {
|
||||
@ -310,9 +281,6 @@ android {
|
||||
buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
|
||||
buildConfigField "String", "DEV_CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
buildConfigField "String", "CSJ_APPID", "\"${CSJ_APPID}\""
|
||||
|
||||
buildConfigField "String", "VA_VERSION_NAME", "\"${rootProject.ext.VA_VERSION}\""
|
||||
manifestPlaceholders.put("VA_VERSION_NAME", "${rootProject.ext.VA_VERSION}")
|
||||
}
|
||||
|
||||
// 港澳台
|
||||
@ -342,21 +310,6 @@ repositories {
|
||||
}
|
||||
}
|
||||
|
||||
// 删除不需要的 assets
|
||||
android.applicationVariants.configureEach { variant ->
|
||||
variant.mergeAssets.doLast {
|
||||
def assetDir = variant.mergeAssetsProvider.get().outputDir.get()
|
||||
def unwantedAssets = ['2011394667', 'gdt_plugin/gdtadv2.jar']
|
||||
|
||||
unwantedAssets.each { assetPath ->
|
||||
def file = new File([assetDir, assetPath].join(File.separator))
|
||||
if (file.exists()) {
|
||||
file.delete()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
|
||||
@ -380,6 +333,8 @@ dependencies {
|
||||
implementation "androidx.viewpager2:viewpager2:${viewpager2}"
|
||||
kapt "androidx.room:room-compiler:${room}"
|
||||
|
||||
implementation "com.kyleduo.switchbutton:library:${switchButton}"
|
||||
|
||||
implementation "com.tencent.vasdolly:helper:${apkChannelPackage}"
|
||||
implementation "com.tencent.vasdolly:writer:${apkChannelPackage}"
|
||||
|
||||
@ -402,9 +357,7 @@ dependencies {
|
||||
exclude module: "gsyvideoplayer-androidvideocache"
|
||||
exclude group: "tv.danmaku.ijk.media"
|
||||
})
|
||||
implementation ("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo") {
|
||||
exclude group: 'com.google.android.exoplayer', module: 'extension-rtmp'
|
||||
}
|
||||
implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"
|
||||
|
||||
implementation "com.llew.huawei:verifier:${verifier}"
|
||||
|
||||
@ -418,7 +371,7 @@ dependencies {
|
||||
|
||||
implementation "com.lg:easyfloat:${easyFloat}"
|
||||
|
||||
implementation("com.lg:apksig:${apksig}") {
|
||||
implementation ("com.lg:apksig:${apksig}") {
|
||||
exclude group: 'com.google.protobuf'
|
||||
}
|
||||
|
||||
@ -434,7 +387,7 @@ dependencies {
|
||||
implementation project(':vspace-bridge:vspace')
|
||||
implementation(project(':feature:xapk-installer'))
|
||||
|
||||
implementation(project(':module_common')) {
|
||||
implementation (project(':module_common')) {
|
||||
exclude group: 'androidx.swiperefreshlayout'
|
||||
}
|
||||
|
||||
@ -509,11 +462,9 @@ dependencies {
|
||||
implementation(project(':feature:sentry'))
|
||||
}
|
||||
|
||||
implementation(project(':feature:media_select'))
|
||||
|
||||
implementation(project(":module_va_api"))
|
||||
implementation(project(":va-archive-common"))
|
||||
if (!gradle.ext.excludeOptionalModules || gradle.ext.enableVa) {
|
||||
if(!gradle.ext.excludeOptionalModules || gradle.ext.enableVa) {
|
||||
implementation(project(":module_va_impl"))
|
||||
}
|
||||
debugImplementation "com.bytedance.tools.codelocator:codelocator-core:2.0.3"
|
||||
|
||||
@ -9,6 +9,7 @@ import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.gh.common.util.DialogUtils
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.fragment.ToolbarFragment
|
||||
import com.gh.gamecenter.common.exposure.meta.MetaUtil
|
||||
import com.gh.gamecenter.common.utils.dip2px
|
||||
@ -104,7 +105,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
|
||||
it.layoutManager = LinearLayoutManager(requireContext())
|
||||
val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext())
|
||||
.size(2F.dip2px())
|
||||
.color(com.gh.gamecenter.common.R.color.ui_divider.toColor(requireContext()))
|
||||
.color(R.color.ui_divider.toColor(requireContext()))
|
||||
.build()
|
||||
if (it.itemDecorationCount != 0) {
|
||||
it.removeItemDecorationAt(0)
|
||||
@ -193,6 +194,7 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
|
||||
VirtualAppManager.AIDL_SERVER_REMOTE_GUIDE_ACTIVITY
|
||||
)
|
||||
)
|
||||
intent.putExtra("isOpTest", true)
|
||||
requireActivity().startActivity(intent)
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
<resources>
|
||||
<string name="title_install_external_game">從SD卡安裝</string>
|
||||
<string name="text_install">安裝</string>
|
||||
<string name="text_update">更新</string>
|
||||
<string name="text_uninstall">卸載</string>
|
||||
<string name="text_start">啟動</string>
|
||||
</resources>
|
||||
@ -7,15 +7,6 @@
|
||||
<package android:name="com.gh.gamecenter" />
|
||||
</queries>
|
||||
|
||||
<queries>
|
||||
<package android:name="com.gh.toolmap" />
|
||||
<intent>
|
||||
<action android:name="android.intent.action.VIEW"/>
|
||||
<category android:name="android.intent.category.BROWSABLE"/>
|
||||
<data android:scheme="ghtoolmap"/>
|
||||
</intent>
|
||||
</queries>
|
||||
|
||||
<queries>
|
||||
<package android:name="com.lg.vspace" />
|
||||
<package android:name="com.gh.gamecenter.addon" />
|
||||
@ -194,8 +185,6 @@
|
||||
android:name="io.sentry.breadcrumbs.system-events"
|
||||
android:value="false" />
|
||||
|
||||
<meta-data android:name="module_version" android:value="${VA_VERSION_NAME}" />
|
||||
|
||||
<service android:name="com.gh.ndownload.NDownloadService" />
|
||||
|
||||
<activity
|
||||
@ -465,6 +454,9 @@
|
||||
android:name="com.gh.gamecenter.video.game.GameVideoActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
|
||||
<activity
|
||||
android:name="com.gh.gamecenter.qa.editor.LocalMediaActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
|
||||
<activity
|
||||
android:name="com.gh.gamecenter.servers.GameServersActivity"
|
||||
@ -582,6 +574,10 @@
|
||||
android:name=".personal.DeliveryInfoActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
|
||||
<activity
|
||||
android:name=".qa.editor.PreviewVideoActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
|
||||
<activity
|
||||
android:name=".qa.video.publish.VideoPublishActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
@ -803,12 +799,6 @@
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppCompatTheme.APP" />
|
||||
|
||||
<activity
|
||||
android:name=".search.SearchTabActivity"
|
||||
android:configChanges="keyboardHidden"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppCompatTheme.APP" />
|
||||
|
||||
<!-- <activity-->
|
||||
<!-- android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
|
||||
<!-- android:launchMode="singleTask"-->
|
||||
|
||||
1
app/src/main/assets/lottie/tab_forum.json
Normal file
1
app/src/main/assets/lottie/tab_forum.json
Normal file
@ -0,0 +1 @@
|
||||
{"v":"5.6.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"bottom bar tab/论坛/选中/E","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"白-修正","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"t":13,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":0,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":4,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-0.102],[2.5,0],[0,2.109],[-2.5,0],[-2.5,-0.102],[-1.3,-1.302],[1.3,-1.302]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":1,"y":0},"t":9,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.498,-1.845],[2.5,0],[0,2.734],[-2.5,0],[-2.502,-1.845],[-1.302,-3.045],[1.298,-3.045]],"c":true}]},{"t":13,"s":[{"i":[[0,-0.66],[0,0],[1.38,0],[0,1.38],[0,0],[-0.66,0],[0,0]],"o":[[0,0],[0,1.38],[-1.38,0],[0,0],[0,-0.66],[0,0],[0.66,0]],"v":[[2.5,-1.3],[2.5,0],[0,2.5],[-2.5,0],[-2.5,-1.3],[-1.3,-2.5],[1.3,-2.5]],"c":true}]}],"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"蓝","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.76,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.8,0.42],[-3.44,-0.79],[-0.09,-1.71],[0,0],[0,0],[1.98,-0.1],[0,0],[0,0],[0,0],[0.62,0.57],[0,0],[0,0],[0,0],[0,0],[0,0],[0.2,1.89],[0,0],[0,0],[0,0]],"o":[[3.44,-0.79],[1.74,0.41],[0,0],[0,0],[0,2],[0,0],[0,0],[0,0],[-0.69,0.52],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.94,0],[0,0],[0,0],[0,0],[0,-1.8]],"v":[[-6.39,-8.971],[6.39,-8.971],[9.49,-5.471],[9.5,-5.271],[9.5,3.249],[5.95,6.989],[5.75,6.999],[3.25,6.999],[0.3,9.209],[-1.95,9.089],[-2.06,8.969],[-2.17,8.849],[-2.21,8.779],[-3.4,6.999],[-5.75,6.999],[-9.48,3.639],[-9.49,3.449],[-9.5,3.249],[-9.5,-5.271]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-9.5,-9.561],"ix":5},"e":{"a":0,"k":[9.5,9.561],"ix":6},"t":1,"nm":"color","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"预合成 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[33,33,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[70,70,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":9,"s":[110,110,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":13,"s":[90,90,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"w":66,"h":66,"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}
|
||||
1
app/src/main/assets/lottie/tab_game.json
Normal file
1
app/src/main/assets/lottie/tab_game.json
Normal file
File diff suppressed because one or more lines are too long
1
app/src/main/assets/lottie/tab_video.json
Normal file
1
app/src/main/assets/lottie/tab_video.json
Normal file
@ -0,0 +1 @@
|
||||
{"v":"5.5.9","fr":30,"ip":0,"op":20,"w":66,"h":66,"nm":"tab_video","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"形状图层 1","parent":2,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.771],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[100]}],"ix":11},"r":{"a":0,"k":90,"ix":10},"p":{"a":0,"k":[-3.742,6.835,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[30.937,31.042,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":2,"d":1,"pt":{"a":0,"k":3,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"or":{"a":0,"k":29.286,"ix":7},"os":{"a":0,"k":75,"ix":9},"ix":1,"nm":"多边星形路径 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":13,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-20.75,-13.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[102.743,88.578],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"多边星形 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.657],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":2},"o":{"a":0,"k":-115,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"路径 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33.004,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.508,0.508,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.488,0.488,0.333],"y":[0,0,0]},"t":4,"s":[80,80,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.502,0.502,0.333],"y":[0,0,0]},"t":9,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.534,0.534,0.333],"y":[0,0,0]},"t":13,"s":[95,95,100]},{"t":16,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[2.16,0.38],[3.22,-0.55],[0.38,-2.16],[-0.55,-3.22],[-2.16,-0.38],[-1.63,0],[-1.61,0.27],[-0.38,2.16],[0.55,3.22]],"o":[[-0.38,-2.16],[-3.22,-0.55],[-2.16,0.38],[-0.55,3.22],[0.38,2.16],[1.61,0.27],[1.63,0],[2.16,-0.38],[0.55,-3.22],[0,0]],"v":[[9.09,-4.86],[4.86,-9.09],[-4.86,-9.09],[-9.09,-4.86],[-9.09,4.86],[-4.86,9.09],[0,9.5],[4.86,9.09],[9.09,4.86],[9.09,-4.86]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":0,"k":[0,0.266,0.638,1,0.5,0.242,0.595,1,1,0.217,0.552,1],"ix":9}},"s":{"a":0,"k":[-5.174,-4.43],"ix":5},"e":{"a":0,"k":[8.612,8.214],"ix":6},"t":1,"nm":"Gradient Fill 3","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"路径","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]}
|
||||
@ -588,7 +588,7 @@ document.addEventListener("selectionchange", function(e) {
|
||||
});
|
||||
|
||||
document.addEventListener("selectionchange", function(e) {
|
||||
setTimeout(() => RE.enabledEditingItems(e), 10)
|
||||
RE.enabledEditingItems(e)
|
||||
});
|
||||
|
||||
RE.recursion = function(dom) {
|
||||
|
||||
@ -28,7 +28,6 @@ import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.common.exposure.ExposureSource
|
||||
import com.gh.gamecenter.common.retrofit.BiResponse
|
||||
import com.gh.gamecenter.common.utils.*
|
||||
import com.gh.gamecenter.core.AppExecutor
|
||||
import com.gh.gamecenter.core.provider.ICsjAdProvider
|
||||
import com.gh.gamecenter.core.utils.CurrentActivityHolder
|
||||
import com.gh.gamecenter.core.utils.SPUtils
|
||||
@ -79,19 +78,6 @@ object AdDelegateHelper {
|
||||
var gameSearchKeyword = ""
|
||||
|
||||
fun initAdSdk(context: Context) {
|
||||
if (AdPluginDownloadHelper.isCsjPluginDownloaded()) {
|
||||
initAdSdkInternal(context)
|
||||
} else {
|
||||
// 首次启动，为了不影响首页加载，延迟 3 秒再下载广告插件并初始化
|
||||
AppExecutor.uiExecutor.executeWithDelay({
|
||||
AdPluginDownloadHelper.downloadPluginIfNeeded(isCsj = true) {
|
||||
initAdSdkInternal(context)
|
||||
}
|
||||
}, 3000L)
|
||||
}
|
||||
}
|
||||
|
||||
private fun initAdSdkInternal(context: Context) {
|
||||
// 初始化穿山甲
|
||||
if (mCsjAdImpl == null) {
|
||||
mCsjAdImpl =
|
||||
@ -241,7 +227,18 @@ object AdDelegateHelper {
|
||||
/**
|
||||
* 是否大于开屏广告展示间隔时长
|
||||
*/
|
||||
private fun isMatchStartUpAdDisplayRule(): Boolean = isMatchAdDisplayRule(mSplashAd, Constants.SP_LAST_SPLASH_AD_SHOW_TIME)
|
||||
private fun isMatchStartUpAdDisplayRule(): Boolean {
|
||||
mSplashAd?.displayRule?.run {
|
||||
if (adDisplayInterval > 0) {
|
||||
val lastShowTime = SPUtils.getLong(Constants.SP_LAST_SPLASH_AD_SHOW_TIME, 0L)
|
||||
val durationInMinutes = (System.currentTimeMillis() - lastShowTime).toFloat() / 1000 / 60
|
||||
return durationInMinutes > adDisplayInterval
|
||||
} else {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否大于广告管理展示间隔时长
|
||||
@ -295,7 +292,6 @@ object AdDelegateHelper {
|
||||
adViewHeightInDp: Float,
|
||||
startAdContainer: ViewGroup,
|
||||
sdkStartAdContainer: ViewGroup,
|
||||
sdkJumpBtn: TextView,
|
||||
adsViewGroup: FrameLayout,
|
||||
handler: BaseActivity.BaseHandler,
|
||||
isHotLaunch: Boolean,
|
||||
@ -317,7 +313,6 @@ object AdDelegateHelper {
|
||||
adViewHeightInDp,
|
||||
startAdContainer,
|
||||
sdkStartAdContainer,
|
||||
sdkJumpBtn,
|
||||
adsViewGroup,
|
||||
handler,
|
||||
isHotLaunch,
|
||||
@ -335,7 +330,6 @@ object AdDelegateHelper {
|
||||
adViewHeightInDp,
|
||||
startAdContainer,
|
||||
sdkStartAdContainer,
|
||||
sdkJumpBtn,
|
||||
adsViewGroup,
|
||||
handler,
|
||||
isHotLaunch,
|
||||
@ -359,7 +353,6 @@ object AdDelegateHelper {
|
||||
adViewHeightInDp: Float,
|
||||
startAdContainer: ViewGroup,
|
||||
sdkStartAdContainer: ViewGroup,
|
||||
sdkJumpBtn: TextView,
|
||||
adsViewGroup: FrameLayout,
|
||||
handler: BaseActivity.BaseHandler,
|
||||
isHotLaunch: Boolean,
|
||||
@ -381,7 +374,6 @@ object AdDelegateHelper {
|
||||
adViewHeightInDp,
|
||||
startAdContainer,
|
||||
sdkStartAdContainer,
|
||||
sdkJumpBtn,
|
||||
adsViewGroup,
|
||||
handler,
|
||||
isHotLaunch,
|
||||
@ -411,14 +403,13 @@ object AdDelegateHelper {
|
||||
sdkStartAdContainer.visibility = View.VISIBLE
|
||||
requestCsjSplashAd(
|
||||
activity,
|
||||
thirdPartyAd.slotId,
|
||||
adViewWidthInPx,
|
||||
adViewHeightInPx,
|
||||
adViewWidthInDp,
|
||||
adViewHeightInDp,
|
||||
sdkStartAdContainer,
|
||||
sdkJumpBtn,
|
||||
timeout,
|
||||
isHotLaunch,
|
||||
sdkSplashCallback
|
||||
)
|
||||
}
|
||||
@ -429,65 +420,27 @@ object AdDelegateHelper {
|
||||
*/
|
||||
private fun requestCsjSplashAd(
|
||||
activity: Activity,
|
||||
slotId: String,
|
||||
adViewWidthInPx: Int,
|
||||
adViewHeightInPx: Int,
|
||||
adViewWidthInDp: Float,
|
||||
adViewHeightInDp: Float,
|
||||
startAdContainer: ViewGroup,
|
||||
sdkJumpBtn: TextView,
|
||||
timeout: Int,
|
||||
isHotLaunch: Boolean,
|
||||
callback: (isSuccess: Boolean) -> Unit,
|
||||
) {
|
||||
val thirdPartyAd = if (isHotLaunch) mSplashAd?.hotStartThirdPartyAd else mSplashAd?.thirdPartyAd
|
||||
if (mCsjAdImpl == null || thirdPartyAd == null) {
|
||||
if (mCsjAdImpl == null) {
|
||||
callback.invoke(false)
|
||||
} else {
|
||||
sdkJumpBtn.setOnClickListener {
|
||||
callback.invoke(true)
|
||||
if (activity is BaseActivity) {
|
||||
activity.baseHandler.removeMessages(MainActivity.COUNTDOWN_SDK_AD)
|
||||
}
|
||||
}
|
||||
|
||||
val onAdShowAction = {
|
||||
sdkJumpBtn.visibility = View.VISIBLE
|
||||
if (activity is BaseActivity) {
|
||||
activity.baseHandler.sendEmptyMessageDelayed(MainActivity.COUNTDOWN_SDK_AD, 1000)
|
||||
}
|
||||
SensorsBridge.trackEvent("ThirdPartyAdShow",
|
||||
"ad_source", thirdPartyAd.sourceName,
|
||||
"ad_id", thirdPartyAd.slotId,
|
||||
"ad_format", mSplashAd?.typeChinese ?: "",
|
||||
"ad_placement", "光环启动",
|
||||
"launch_type", if (isHotLaunch) "热启动" else "冷启动",
|
||||
"ad_space_id", mSplashAd?.id ?: "",
|
||||
"ad_space_name", mSplashAd?.name ?: ""
|
||||
)
|
||||
}
|
||||
val onAdClickAction = {
|
||||
callback.invoke(true)
|
||||
SensorsBridge.trackEvent("ThirdPartyAdClick",
|
||||
"ad_source", thirdPartyAd.sourceName,
|
||||
"ad_id", thirdPartyAd.slotId,
|
||||
"ad_format", mSplashAd?.typeChinese ?: "",
|
||||
"ad_placement", "光环启动",
|
||||
"launch_type", if (isHotLaunch) "热启动" else "冷启动",
|
||||
"ad_space_id", mSplashAd?.id ?: "",
|
||||
"ad_space_name", mSplashAd?.name ?: ""
|
||||
)
|
||||
}
|
||||
mCsjAdImpl?.requestSplashAd(
|
||||
activity,
|
||||
thirdPartyAd.slotId,
|
||||
slotId,
|
||||
adViewWidthInPx,
|
||||
adViewHeightInPx,
|
||||
adViewWidthInDp,
|
||||
adViewHeightInDp,
|
||||
startAdContainer,
|
||||
timeout,
|
||||
onAdShowAction,
|
||||
onAdClickAction,
|
||||
callback,
|
||||
)
|
||||
}
|
||||
@ -504,7 +457,6 @@ object AdDelegateHelper {
|
||||
adViewHeightInDp: Float,
|
||||
startAdContainer: ViewGroup,
|
||||
sdkStartAdContainer: ViewGroup,
|
||||
sdkJumpBtn: TextView,
|
||||
adsViewGroup: FrameLayout,
|
||||
handler: BaseActivity.BaseHandler,
|
||||
isHotLaunch: Boolean,
|
||||
@ -522,7 +474,6 @@ object AdDelegateHelper {
|
||||
adViewHeightInDp,
|
||||
startAdContainer,
|
||||
sdkStartAdContainer,
|
||||
sdkJumpBtn,
|
||||
adsViewGroup,
|
||||
handler,
|
||||
isHotLaunch,
|
||||
@ -670,11 +621,9 @@ object AdDelegateHelper {
|
||||
slotId: String,
|
||||
adContainerView: ViewGroup,
|
||||
expressViewWidth: Float,
|
||||
onAdShowAction: () -> Unit,
|
||||
onAdClickAction: () -> Unit,
|
||||
callback: (isSuccess: Boolean) -> Unit,
|
||||
) {
|
||||
mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, onAdShowAction, onAdClickAction, callback)
|
||||
mCsjAdImpl?.requestFlowAd(fragment, adContainerView, slotId, expressViewWidth, callback)
|
||||
}
|
||||
|
||||
/**
|
||||
@ -685,8 +634,6 @@ object AdDelegateHelper {
|
||||
containerView: ViewGroup,
|
||||
ad: AdConfig.ThirdPartyAd,
|
||||
expressViewWidthInDp: Float,
|
||||
onAdShowAction: () -> Unit,
|
||||
onAdClickAction: () -> Unit,
|
||||
callback: (isSuccess: Boolean) -> Unit
|
||||
) {
|
||||
|
||||
@ -709,28 +656,6 @@ object AdDelegateHelper {
|
||||
slotId,
|
||||
expressViewWidthInDp,
|
||||
expressViewHeightInDp,
|
||||
onAdShowAction,
|
||||
onAdClickAction,
|
||||
callback
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取第三方 全屏/插屏 广告
|
||||
*/
|
||||
fun requestFullScreenAd(
|
||||
fragment: Fragment,
|
||||
ad: AdConfig.ThirdPartyAd,
|
||||
onAdShowAction: () -> Unit,
|
||||
onAdClickAction: () -> Unit,
|
||||
callback: (isSuccess: Boolean) -> Unit
|
||||
) {
|
||||
val slotId = ad.slotId
|
||||
mCsjAdImpl?.requestFullScreenAd(
|
||||
fragment,
|
||||
slotId,
|
||||
onAdShowAction,
|
||||
onAdClickAction,
|
||||
callback
|
||||
)
|
||||
}
|
||||
|
||||
@ -1,149 +0,0 @@
|
||||
package com.gh.ad
|
||||
|
||||
import com.gh.download.simple.DownloadMessageHandler
|
||||
import com.gh.download.simple.SimpleDownloadDatabase
|
||||
import com.gh.download.simple.SimpleDownloadManager
|
||||
import com.gh.gamecenter.core.runOnIoThread
|
||||
import com.gh.gamecenter.core.utils.PluginRedirectHelper
|
||||
import com.gh.gamecenter.core.utils.SPUtils
|
||||
import com.lg.download.DownloadError
|
||||
import com.lg.download.DownloadStatus
|
||||
import com.lg.download.httpclient.DefaultHttpClient
|
||||
import com.lg.download.listener.InnerDownloadListener
|
||||
import com.lg.ndownload.DownloadConfig
|
||||
import com.lg.ndownload.DownloadConfigBuilder
|
||||
import com.lg.ndownload.DownloadIoExecutor
|
||||
import com.lightgame.utils.Utils
|
||||
import java.lang.Exception
|
||||
import java.net.URLConnection
|
||||
|
||||
object AdPluginDownloadHelper : InnerDownloadListener {
|
||||
|
||||
private const val CSJ_FILE_NAME = "2011394667"
|
||||
private const val GDT_FILE_NAME = "gdt_plugin/gdtadv2.jar"
|
||||
|
||||
private const val CSJ_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/2011394667"
|
||||
private const val GDT_PLUGIN_URL = "https://and-static.ghzs66.com/android/static/gdtadv2.jar"
|
||||
|
||||
private var csjDownloadedCallback: (() -> Unit)? = null
|
||||
|
||||
/**
|
||||
* 是否已经下载了广告插件
|
||||
*/
|
||||
fun isCsjPluginDownloaded(): Boolean {
|
||||
return SPUtils.getBoolean(CSJ_FILE_NAME, false)
|
||||
}
|
||||
|
||||
/**
|
||||
* 下载广告插件并初始化 （初始化限定穿山甲）
|
||||
*/
|
||||
fun downloadPluginIfNeeded(isCsj: Boolean = false, isGdt: Boolean = false, csjCallback: (() -> Unit)? = null) {
|
||||
val isCsjPluginDownloaded = SPUtils.getBoolean(CSJ_FILE_NAME, false)
|
||||
val isGdtPluginDownloaded = SPUtils.getBoolean(GDT_FILE_NAME, false)
|
||||
|
||||
if (isCsj && isCsjPluginDownloaded) {
|
||||
csjCallback?.invoke()
|
||||
return
|
||||
}
|
||||
|
||||
if (isGdt && isGdtPluginDownloaded) {
|
||||
return
|
||||
}
|
||||
|
||||
runOnIoThread {
|
||||
csjDownloadedCallback = csjCallback
|
||||
|
||||
DownloadMessageHandler.init(SimpleDownloadDatabase.instance.downloadDao())
|
||||
|
||||
if (!isCsjPluginDownloaded && isCsj) {
|
||||
val csjPluginConfig = DownloadConfigBuilder()
|
||||
.setUniqueId(CSJ_FILE_NAME)
|
||||
.setUrl(CSJ_PLUGIN_URL)
|
||||
.setFileName(CSJ_FILE_NAME)
|
||||
.setHttpClient(DefaultHttpClient())
|
||||
.setDownloadThreadSize(2)
|
||||
.setPathToStore(PluginRedirectHelper.getAssetDir())
|
||||
.setDownloadExecutor(DownloadIoExecutor.getInstance())
|
||||
.setDownloadListener(this).build()
|
||||
|
||||
SimpleDownloadManager.download(csjPluginConfig)
|
||||
}
|
||||
|
||||
if (!isGdtPluginDownloaded && isGdt) {
|
||||
val gdtPluginConfig = DownloadConfigBuilder()
|
||||
.setUniqueId(GDT_FILE_NAME)
|
||||
.setUrl(GDT_PLUGIN_URL)
|
||||
.setFileName(GDT_FILE_NAME)
|
||||
.setHttpClient(DefaultHttpClient())
|
||||
.setDownloadThreadSize(2)
|
||||
.setPathToStore(PluginRedirectHelper.getAssetDir())
|
||||
.setDownloadExecutor(DownloadIoExecutor.getInstance())
|
||||
.setDownloadListener(this).build()
|
||||
|
||||
SimpleDownloadManager.download(gdtPluginConfig)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onError(id: String?, error: DownloadError?, exception: Exception?) {
|
||||
Utils.log("下载广告插件失败 $id")
|
||||
id?.let {
|
||||
if (it == CSJ_FILE_NAME) {
|
||||
csjDownloadedCallback = null
|
||||
}
|
||||
SimpleDownloadManager.cancel(it)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onProgress(id: String?, progress: Float) {
|
||||
Utils.log("下载广告插件进度 $id $progress")
|
||||
}
|
||||
|
||||
override fun onProgressWithoutThrottle(id: String?, progress: Float) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
override fun onSizeReceived(id: String?, fileSize: Long) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
override fun onReadyToDownload(id: String?, actualThreadSize: Int) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
override fun onStatusChanged(id: String?, status: DownloadStatus?) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
override fun onDownloadComplete(id: String?, elapsedTime: Long) {
|
||||
id?.let {
|
||||
// id 即为插件名
|
||||
SPUtils.setBoolean(it, true)
|
||||
if (it == CSJ_FILE_NAME) {
|
||||
csjDownloadedCallback?.invoke()
|
||||
csjDownloadedCallback = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onSpeedChanged(id: String?, speed: Float) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
override fun onRedirectingUrl(
|
||||
id: String?,
|
||||
connection: URLConnection?,
|
||||
config: DownloadConfig?
|
||||
) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
override fun onRedirectedUrl(
|
||||
id: String?,
|
||||
connection: URLConnection?,
|
||||
redirectedUrl: String?
|
||||
) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
}
|
||||
@ -3,105 +3,42 @@ package com.gh.ad
|
||||
import android.content.Context
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.view.ViewStub
|
||||
|
||||
import androidx.fragment.app.Fragment
|
||||
|
||||
import com.alibaba.android.arouter.facade.annotation.Route
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.common.provider.ILaunchAd
|
||||
import com.gh.gamecenter.common.utils.SensorsBridge
|
||||
import com.gh.gamecenter.common.utils.goneIf
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.core.utils.SPUtils
|
||||
import com.gh.gamecenter.entity.AdConfig
|
||||
|
||||
@Route(path = RouteConsts.provider.vaAd, name = "畅玩启动页广告")
|
||||
class LaunchAdImpl : ILaunchAd {
|
||||
override fun init(context: Context?) {
|
||||
}
|
||||
|
||||
override fun requestAd(fragment: Fragment, container: ViewGroup, maskView: View, topViewStub: ViewStub, bottomViewStub: ViewStub, adClickAction: () -> Unit): View {
|
||||
override fun requestAd(fragment: Fragment, container: ViewGroup, maskView: View) {
|
||||
if (AdDelegateHelper.shouldShowHelperLaunchAd()) {
|
||||
val launchAd = AdDelegateHelper.vGameLaunchAd
|
||||
val showThirdPartyAd = launchAd?.displayRule?.adSource == AdDelegateHelper.AD_TYPE_SDK
|
||||
val thirdPartyAd = launchAd?.thirdPartyAd
|
||||
if (showThirdPartyAd && thirdPartyAd != null) {
|
||||
val onAdShowAction = {
|
||||
SensorsBridge.trackEvent("ThirdPartyAdShow",
|
||||
"ad_source", thirdPartyAd.sourceName,
|
||||
"ad_id", thirdPartyAd.slotId,
|
||||
"ad_format", launchAd.typeChinese,
|
||||
"ad_placement", AD_PLACEMENT,
|
||||
"ad_space_id", launchAd.id,
|
||||
"ad_space_name", launchAd.name
|
||||
)
|
||||
}
|
||||
val onAdClickAction = {
|
||||
SensorsBridge.trackEvent("ThirdPartyAdClick",
|
||||
"ad_source", thirdPartyAd.sourceName,
|
||||
"ad_id", thirdPartyAd.slotId,
|
||||
"ad_format", launchAd.typeChinese,
|
||||
"ad_placement", AD_PLACEMENT,
|
||||
"ad_space_id", launchAd.id,
|
||||
"ad_space_name", launchAd.name
|
||||
)
|
||||
adClickAction.invoke()
|
||||
}
|
||||
|
||||
if (launchAd.type == AdConfig.TYPE_BANNER) {
|
||||
requestBannerAd(fragment, container, maskView, thirdPartyAd, onAdShowAction, onAdClickAction)
|
||||
return topViewStub.inflate()
|
||||
} else if (launchAd.type == AdConfig.TYPE_INTERSTITIAL) {
|
||||
requestFullScreenAd(fragment, thirdPartyAd, onAdShowAction, onAdClickAction)
|
||||
return bottomViewStub.inflate()
|
||||
AdDelegateHelper.requestThirdPartyBannerAd(
|
||||
fragment,
|
||||
container,
|
||||
thirdPartyAd,
|
||||
DisplayUtils.getScreenWidthInDp(fragment.requireActivity()),
|
||||
) { isSuccess ->
|
||||
maskView.goneIf(!isSuccess)
|
||||
if (isSuccess) {
|
||||
SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return bottomViewStub.inflate()
|
||||
}
|
||||
|
||||
private fun requestBannerAd(
|
||||
fragment: Fragment,
|
||||
container: ViewGroup,
|
||||
maskView: View,
|
||||
thirdPartyAd: AdConfig.ThirdPartyAd,
|
||||
onAdShowAction: () -> Unit,
|
||||
onAdClickAction: () -> Unit,
|
||||
) {
|
||||
AdDelegateHelper.requestThirdPartyBannerAd(
|
||||
fragment,
|
||||
container,
|
||||
thirdPartyAd,
|
||||
DisplayUtils.getScreenWidthInDp(fragment.requireActivity()),
|
||||
onAdShowAction,
|
||||
onAdClickAction
|
||||
) { isSuccess ->
|
||||
maskView.goneIf(!isSuccess)
|
||||
if (isSuccess) {
|
||||
SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun requestFullScreenAd(
|
||||
fragment: Fragment,
|
||||
thirdPartyAd: AdConfig.ThirdPartyAd,
|
||||
onAdShowAction: () -> Unit,
|
||||
onAdClickAction: () -> Unit
|
||||
) {
|
||||
AdDelegateHelper.requestFullScreenAd(
|
||||
fragment,
|
||||
thirdPartyAd,
|
||||
onAdShowAction,
|
||||
onAdClickAction
|
||||
) { isSuccess ->
|
||||
if (isSuccess) {
|
||||
SPUtils.setLong(Constants.SP_LAST_HELPER_LAUNCH_AD_SHOW_TIME, System.currentTimeMillis())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val AD_PLACEMENT = "畅玩启动"
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,8 +21,6 @@ import com.gh.common.view.RichEditor
|
||||
import com.gh.gamecenter.CropImageActivity
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.activity.ToolBarActivity
|
||||
import com.gh.gamecenter.common.entity.LocalVideoEntity
|
||||
import com.gh.gamecenter.feature.selector.LocalMediaActivity
|
||||
import com.gh.gamecenter.common.utils.*
|
||||
import com.gh.gamecenter.core.AppExecutor
|
||||
import com.gh.gamecenter.core.runOnIoThread
|
||||
@ -32,7 +30,6 @@ import com.gh.gamecenter.feature.entity.GameEntity
|
||||
import com.gh.gamecenter.qa.editor.*
|
||||
import com.gh.gamecenter.feature.entity.AnswerEntity
|
||||
import com.gh.gamecenter.feature.entity.ArticleEntity
|
||||
import com.gh.gamecenter.feature.selector.ChooseType
|
||||
import com.gh.gamecenter.qa.entity.EditorInsertEntity
|
||||
import com.gh.gamecenter.video.poster.PosterEditActivity
|
||||
import com.gh.gamecenter.video.upload.UploadManager
|
||||
@ -236,7 +233,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
|
||||
mKeyboardHeightProvider = KeyboardHeightProvider(this)
|
||||
mRichEditor.post { mKeyboardHeightProvider?.start() }
|
||||
mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
|
||||
mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
|
||||
mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
|
||||
mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
|
||||
// 防止个别手机在Js里无法获取粘贴内容
|
||||
mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
|
||||
@ -505,7 +502,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
|
||||
startActivityForResult(
|
||||
LocalMediaActivity.getIntent(
|
||||
this@BaseRichEditorActivity,
|
||||
ChooseType.VIDEO,
|
||||
LocalMediaActivity.ChooseType.VIDEO,
|
||||
maxChooseCount,
|
||||
if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
|
||||
), INSERT_MEDIA_VIDEO_CODE
|
||||
@ -534,7 +531,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
|
||||
val maxChooseCount = if (imageCount + 10 <= MAX_IMAGE_COUNT) 10 else MAX_IMAGE_COUNT - imageCount
|
||||
val intent = LocalMediaActivity.getIntent(
|
||||
this@BaseRichEditorActivity,
|
||||
ChooseType.IMAGE,
|
||||
LocalMediaActivity.ChooseType.IMAGE,
|
||||
maxChooseCount,
|
||||
if (mtaEventName() == "提问帖") "发提问帖" else "发帖子"
|
||||
)
|
||||
@ -800,9 +797,9 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> constructor(
|
||||
|
||||
override fun onDarkModeChanged() {
|
||||
super.onDarkModeChanged()
|
||||
updateStatusBarColor(com.gh.gamecenter.common.R.color.ui_surface, com.gh.gamecenter.common.R.color.ui_surface)
|
||||
updateStatusBarColor(R.color.ui_surface, R.color.ui_surface)
|
||||
mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
|
||||
mRichEditor.setEditorBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(this))
|
||||
mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this))
|
||||
mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A"))
|
||||
}
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@ import android.text.TextUtils
|
||||
import androidx.lifecycle.AndroidViewModel
|
||||
import androidx.lifecycle.MediatorLiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
|
||||
import com.gh.gamecenter.common.entity.ErrorEntity
|
||||
import com.gh.gamecenter.common.retrofit.BiResponse
|
||||
@ -19,7 +20,7 @@ import com.gh.gamecenter.core.runOnUiThread
|
||||
import com.gh.gamecenter.core.utils.MD5Utils
|
||||
import com.gh.gamecenter.core.utils.ToastUtils
|
||||
import com.gh.gamecenter.entity.ForumDetailEntity
|
||||
import com.gh.gamecenter.common.entity.LocalVideoEntity
|
||||
import com.gh.gamecenter.entity.LocalVideoEntity
|
||||
import com.gh.gamecenter.entity.QuoteCountEntity
|
||||
import com.gh.gamecenter.qa.BbsType
|
||||
import com.gh.gamecenter.retrofit.RetrofitManager
|
||||
@ -38,6 +39,8 @@ import retrofit2.HttpException
|
||||
import java.io.File
|
||||
import java.io.FileOutputStream
|
||||
import java.util.*
|
||||
import kotlin.collections.ArrayList
|
||||
import kotlin.collections.HashMap
|
||||
import kotlin.collections.LinkedHashMap
|
||||
import kotlin.collections.set
|
||||
|
||||
@ -83,7 +86,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
|
||||
val application: Application = getApplication()
|
||||
Utils.toast(
|
||||
getApplication(),
|
||||
application.getString(com.gh.gamecenter.common.R.string.pic_max_hint, count)
|
||||
application.getString(R.string.pic_max_hint, count)
|
||||
)
|
||||
continue
|
||||
}
|
||||
|
||||
@ -256,7 +256,7 @@ class DefaultJsApi(
|
||||
|
||||
@JavascriptInterface
|
||||
fun isInstalled(event: Any): String {
|
||||
val localInstalledPackageList = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
|
||||
val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
|
||||
val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
|
||||
|
||||
for (packageName in packageNameList) {
|
||||
@ -555,7 +555,7 @@ class DefaultJsApi(
|
||||
|
||||
@JavascriptInterface
|
||||
fun getInstallStatus(event: Any): String {
|
||||
val localInstalledPackageList = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance().application, 0)
|
||||
val localInstalledPackageList = PackageUtils.getAllPackageName(HaloApp.getInstance().application)
|
||||
val packageNameList: ArrayList<String> = event.toString().toObject() ?: ArrayList()
|
||||
val installStatusMap: HashMap<String, Boolean> = hashMapOf()
|
||||
|
||||
|
||||
@ -374,7 +374,7 @@ object DefaultUrlHandler {
|
||||
val iconSubscript = uri.getQueryParameter("game_icon_subscript") ?: ""
|
||||
val gameEntity =
|
||||
if (forumType == BbsType.OFFICIAL_BBS.value && gameId.isNotEmpty() && gameName.isNotEmpty() && icon.isNotEmpty()) {
|
||||
GameEntity(_id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
|
||||
GameEntity(id = gameId, mName = gameName, mIcon = icon, mIconSubscript = iconSubscript)
|
||||
} else null
|
||||
val activityLabelEntity = if (activityId.isNotEmpty() && activityName.isNotEmpty()) {
|
||||
ActivityLabelEntity(
|
||||
|
||||
@ -6,8 +6,8 @@ class DownloadChainBuilder {
|
||||
|
||||
private var processEndCallback: ((asVGame: Boolean, Any?) -> Unit)? = null
|
||||
|
||||
fun setProcessEndCallback(gameId: String, callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
|
||||
processEndCallback = VaPluginDownloadWrapper(gameId = gameId, callback = callback) // 其他需要添加行为的装饰者可以一直包装A(B(C(callback))), 执行顺序 A->B->C->callback
|
||||
fun setProcessEndCallback(callback: (asVGame: Boolean, Any?) -> Unit): DownloadChainBuilder {
|
||||
processEndCallback = callback
|
||||
return this
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
package com.gh.common.chain
|
||||
|
||||
import com.gh.vspace.VHelper
|
||||
|
||||
class VaPluginDownloadWrapper(val gameId: String, val callback: (Boolean, Any?) -> Unit) : (Boolean, Any?) -> Unit {
|
||||
override fun invoke(asVGame: Boolean, any: Any?) {
|
||||
callback.invoke(asVGame, any)
|
||||
if (asVGame) {
|
||||
VHelper.initVaPlugin(gameId)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -30,7 +30,7 @@ class VersionNumberHandler : DownloadChainHandler() {
|
||||
"温馨提示",
|
||||
gameEntity.getVersionNumberString(),
|
||||
"继续下载",
|
||||
com.gh.gamecenter.common.R.string.cancel.toResString(),
|
||||
R.string.cancel.toResString(),
|
||||
{
|
||||
confirmCallback.invoke()
|
||||
SensorsBridge.trackGameDemoDialogClick(
|
||||
@ -42,7 +42,7 @@ class VersionNumberHandler : DownloadChainHandler() {
|
||||
},
|
||||
cancelClickCallback = {
|
||||
SensorsBridge.trackGameDemoDialogClick(
|
||||
buttonName = com.gh.gamecenter.common.R.string.cancel.toResString(),
|
||||
buttonName = R.string.cancel.toResString(),
|
||||
gameId = gameEntity.id,
|
||||
gameName = gameEntity.name ?: "",
|
||||
gameType = gameEntity.categoryChinese
|
||||
|
||||
@ -7,7 +7,6 @@ import android.os.Build;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.gh.common.util.PackageHelper;
|
||||
@ -26,7 +25,6 @@ import com.gh.gamecenter.core.utils.GsonUtils;
|
||||
import com.gh.gamecenter.core.utils.SPUtils;
|
||||
import com.gh.gamecenter.core.utils.UrlFilterUtils;
|
||||
import com.gh.gamecenter.entity.AppEntity;
|
||||
import com.gh.gamecenter.entity.FloatWindowSettingEntity;
|
||||
import com.gh.gamecenter.entity.GameGuidePopupEntity;
|
||||
import com.gh.gamecenter.entity.NewApiSettingsEntity;
|
||||
import com.gh.gamecenter.entity.NewSettingsEntity;
|
||||
@ -48,7 +46,6 @@ import org.json.JSONObject;
|
||||
import java.io.IOException;
|
||||
import java.util.Locale;
|
||||
|
||||
import io.reactivex.Observable;
|
||||
import io.reactivex.Single;
|
||||
import io.reactivex.SingleSource;
|
||||
import io.reactivex.functions.Function;
|
||||
@ -63,9 +60,6 @@ public class Config {
|
||||
public static final String NEW_API_HOST = EnvHelper.getNewHost();
|
||||
public static final String VAPI_HOST = EnvHelper.getVHost();
|
||||
|
||||
public static final String WGAME_CPM_BUSIAPPID = BuildConfig.WGAME_CPM_BUSIAPPID;
|
||||
public static final String WGAME_CPM_API_HOST = EnvHelper.getWGameCPMHost();
|
||||
|
||||
// Third-Party confs
|
||||
public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
|
||||
public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;
|
||||
@ -84,12 +78,10 @@ public class Config {
|
||||
private static NewApiSettingsEntity.NightMode mNightModeSetting;
|
||||
private static SimulatorEntity mNewSimulatorEntity;
|
||||
private static VSetting mVSetting;
|
||||
private volatile static VNewSetting mVNewSetting;
|
||||
|
||||
private static FloatWindowSettingEntity mFloatWindowSetting;
|
||||
private static VNewSetting mVNewSetting;
|
||||
|
||||
private static AppEntity mNew32UpdateEntity;
|
||||
private static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
|
||||
public static BehaviorSubject<VNewSetting> vNewSettingSubject = BehaviorSubject.create();
|
||||
private static GameGuidePopupEntity mGameGuidePopupEntity;
|
||||
private static SharedPreferences mDefaultSharedPreferences;
|
||||
|
||||
@ -219,31 +211,6 @@ public class Config {
|
||||
}
|
||||
return mVNewSetting;
|
||||
}
|
||||
@Nullable
|
||||
public static FloatWindowSettingEntity getFloatWindowSettingEntity() {
|
||||
if (mFloatWindowSetting == null) {
|
||||
try {
|
||||
String json = SPUtils.getString(Constants.SP_FLOAT_WINDOW_SETTINGS);
|
||||
if (!TextUtils.isEmpty(json)) {
|
||||
mFloatWindowSetting = GsonUtils.fromJson(json, FloatWindowSettingEntity.class);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return mFloatWindowSetting;
|
||||
}
|
||||
|
||||
|
||||
@NonNull
|
||||
public static Observable<VNewSetting> getVNewSettingObservable() {
|
||||
if (mVNewSetting != null) {
|
||||
return Observable.just(mVNewSetting);
|
||||
} else {
|
||||
return vNewSettingSubject.hide();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Nullable
|
||||
public static AppEntity getNew32UpdateEntity() {
|
||||
@ -351,7 +318,6 @@ public class Config {
|
||||
|
||||
refreshVSettingEntity();
|
||||
getNewSetting();
|
||||
getFloatWindowSetting();
|
||||
|
||||
RetrofitManager.getInstance()
|
||||
.getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
|
||||
@ -430,20 +396,6 @@ public class Config {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
private static void getFloatWindowSetting() {
|
||||
RetrofitManager.getInstance().getNewApi()
|
||||
.getFloatWindowSettings()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.subscribe(new BiResponse<FloatWindowSettingEntity>() {
|
||||
@Override
|
||||
public void onSuccess(FloatWindowSettingEntity data) {
|
||||
mFloatWindowSetting = data;
|
||||
SPUtils.setString(Constants.SP_FLOAT_WINDOW_SETTINGS, GsonUtils.toJson(data));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static void observePackageChange(NewApiSettingsEntity.PackageObserveActions packageObserveActions) {
|
||||
PackageChangeBroadcastReceiver receiver = new PackageChangeBroadcastReceiver(packageObserveActions);
|
||||
IntentFilter intentFilter = new IntentFilter();
|
||||
|
||||
@ -120,14 +120,14 @@ object AddKaiFuBindingAdapter {
|
||||
@BindingAdapter("kaiFuTextColor", "kaiFuTextPosition")
|
||||
fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) {
|
||||
if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) {
|
||||
view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.secondary_red))
|
||||
view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.secondary_red))
|
||||
view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
|
||||
view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red))
|
||||
} else if (position == 0) {
|
||||
view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
|
||||
view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
|
||||
view.setTextColor(ContextCompat.getColor(view.context, R.color.hint))
|
||||
view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
|
||||
} else {
|
||||
view.setTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.text_primary))
|
||||
view.setHintTextColor(ContextCompat.getColor(view.context, com.gh.gamecenter.common.R.color.hint))
|
||||
view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary))
|
||||
view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint))
|
||||
}
|
||||
}
|
||||
|
||||
@ -176,7 +176,7 @@ object AddKaiFuBindingAdapter {
|
||||
popupWindow.isTouchable = true
|
||||
popupWindow.inputMethodMode = PopupWindow.INPUT_METHOD_NEEDED
|
||||
popupWindow.isOutsideTouchable = true
|
||||
popupWindow.animationStyle = com.gh.gamecenter.common.R.style.popwindow_option_anim_style
|
||||
popupWindow.animationStyle = R.style.popwindow_option_anim_style
|
||||
|
||||
// 设置偏移
|
||||
windowPos[1] = windowPos[1] - 12F.dip2px()
|
||||
|
||||
@ -27,6 +27,7 @@ import com.gh.common.chain.PackageCheckHandler;
|
||||
import com.gh.common.chain.UnsupportedFeatureHandler;
|
||||
import com.gh.common.chain.ValidateVSpaceHandler;
|
||||
import com.gh.common.chain.VersionNumberHandler;
|
||||
import com.gh.common.constant.Config;
|
||||
import com.gh.common.filter.RegionSetting;
|
||||
import com.gh.common.filter.RegionSettingHelper;
|
||||
import com.gh.common.history.HistoryHelper;
|
||||
@ -52,6 +53,7 @@ import com.gh.gamecenter.common.entity.LinkEntity;
|
||||
import com.gh.gamecenter.common.utils.DarkModeUtils;
|
||||
import com.gh.gamecenter.common.utils.ExtensionsKt;
|
||||
import com.gh.gamecenter.common.utils.FileUtils;
|
||||
import com.gh.gamecenter.common.utils.ImageUtils;
|
||||
import com.gh.gamecenter.common.utils.NewFlatLogUtils;
|
||||
import com.gh.gamecenter.common.utils.SensorsBridge;
|
||||
import com.gh.gamecenter.core.utils.MtaHelper;
|
||||
@ -170,7 +172,7 @@ public class BindingAdapters {
|
||||
builder.addHandler(new OverseaDownloadHandler());
|
||||
builder.addHandler(new CheckDownloadHandler());
|
||||
|
||||
builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
|
||||
builder.setProcessEndCallback((asVGame, isSubscribe) -> {
|
||||
download(v.getContext(),
|
||||
progressBar,
|
||||
gameEntity,
|
||||
@ -195,7 +197,7 @@ public class BindingAdapters {
|
||||
builder.addHandler(new GamePermissionHandler());
|
||||
builder.addHandler(new VersionNumberHandler());
|
||||
|
||||
builder.setProcessEndCallback(gameEntity.getId(), (asVGame, isSubscribe) -> {
|
||||
builder.setProcessEndCallback((asVGame, isSubscribe) -> {
|
||||
DownloadDialog.showDownloadDialog(
|
||||
v.getContext(),
|
||||
gameEntity,
|
||||
@ -294,7 +296,7 @@ public class BindingAdapters {
|
||||
});
|
||||
});
|
||||
} else {
|
||||
ReservationHelper.showCancelReservationDialog(progressBar.getContext(),gameEntity, () -> {
|
||||
ReservationHelper.showCancelReservationDialog(progressBar.getContext(), () -> {
|
||||
ReservationHelper.cancelReservation(gameEntity, () -> {
|
||||
updateReservation(progressBar, gameEntity);
|
||||
});
|
||||
@ -387,7 +389,7 @@ public class BindingAdapters {
|
||||
case diskisfull:
|
||||
case diskioerror:
|
||||
case waiting:
|
||||
progressBar.setText(com.gh.gamecenter.feature.R.string.downloading);
|
||||
progressBar.setText(R.string.downloading);
|
||||
if (downloadEntity.isPluggable() && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
|
||||
progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
|
||||
} else {
|
||||
@ -395,7 +397,7 @@ public class BindingAdapters {
|
||||
}
|
||||
break;
|
||||
case done:
|
||||
progressBar.setText(com.gh.gamecenter.feature.R.string.install);
|
||||
progressBar.setText(R.string.install);
|
||||
if (downloadEntity.isPluggable()
|
||||
&& PackagesManager.isInstalled(downloadEntity.getPackageName())) {
|
||||
progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
|
||||
@ -553,15 +555,15 @@ public class BindingAdapters {
|
||||
gameName = String.format("%s - %s", game.getName(),
|
||||
PlatformUtils.getInstance(view.getContext()).getPlatformName(
|
||||
game.getApk().get(0).getPlatform()));
|
||||
if (!gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
|
||||
if (!gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
|
||||
view.setText(gameName);
|
||||
view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
|
||||
view.setTag(R.string.tag_game_name_id, gameName);
|
||||
}
|
||||
} else {
|
||||
gameName = game.getName();
|
||||
if (gameName != null && !gameName.equals((String) view.getTag(com.gh.gamecenter.common.R.string.tag_game_name_id))) {
|
||||
if (gameName != null && !gameName.equals((String) view.getTag(R.string.tag_game_name_id))) {
|
||||
view.setText(gameName);
|
||||
view.setTag(com.gh.gamecenter.common.R.string.tag_game_name_id, gameName);
|
||||
view.setTag(R.string.tag_game_name_id, gameName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@ import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.gh.common.util.DirectUtils
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
|
||||
import com.gh.gamecenter.common.constant.EntranceConsts
|
||||
import com.gh.gamecenter.common.utils.dip2px
|
||||
@ -48,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
|
||||
requireContext(),
|
||||
startText.length,
|
||||
startText.length + mGroupNumber.length,
|
||||
com.gh.gamecenter.common.R.color.text_theme,
|
||||
R.color.text_theme,
|
||||
true
|
||||
) {
|
||||
DirectUtils.directToQqGroup(
|
||||
|
||||
@ -40,7 +40,7 @@ import java.lang.ref.WeakReference
|
||||
* 设备提醒弹窗
|
||||
*/
|
||||
class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val gameEntity: GameEntity) :
|
||||
Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog) {
|
||||
Dialog(context, R.style.GhAlertDialog) {
|
||||
private val mBinding: DialogDeviceRemindBinding by lazy { DialogDeviceRemindBinding.inflate(layoutInflater) }
|
||||
private var currentPage = 0
|
||||
private var mSlideLooperInterval = 3000L
|
||||
@ -136,13 +136,13 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
|
||||
val isFirst = SPUtils.getBoolean(Constants.SP_FIRST_DEVICE_REMIND, false)
|
||||
if (!isFirst) {
|
||||
mBinding.cancelTv.isEnabled = false
|
||||
mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_round_f5f5f5)
|
||||
mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_round_f5f5f5)
|
||||
disposable = countDownTimer(3) { finish, time ->
|
||||
if (finish) {
|
||||
mBinding.cancelTv.isEnabled = true
|
||||
mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
|
||||
mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
|
||||
mBinding.cancelTv.text = "我知道了"
|
||||
mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
|
||||
mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
|
||||
} else {
|
||||
mBinding.cancelTv.text = "我知道了(${time}S)"
|
||||
}
|
||||
@ -153,8 +153,8 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
|
||||
mBinding.noRemindAgainCb.visibility = View.VISIBLE
|
||||
mBinding.cancelTv.text = "我知道了"
|
||||
mBinding.cancelTv.isEnabled = true
|
||||
mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.white))
|
||||
mBinding.cancelTv.background = ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.button_blue_oval)
|
||||
mBinding.cancelTv.setTextColor(ContextCompat.getColor(context, R.color.white))
|
||||
mBinding.cancelTv.background = ContextCompat.getDrawable(context, R.drawable.button_blue_oval)
|
||||
}
|
||||
mBinding.cancelTv.setOnClickListener {
|
||||
SPUtils.setBoolean(Constants.SP_NO_REMIND_AGAIN, mBinding.noRemindAgainCb.isChecked)
|
||||
|
||||
@ -14,6 +14,7 @@ import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
|
||||
import com.gh.common.util.DirectUtils
|
||||
import com.gh.gamecenter.common.utils.dip2px
|
||||
import com.gh.gamecenter.common.utils.toColor
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
|
||||
import com.gh.gamecenter.feature.entity.GameEntity
|
||||
|
||||
@ -61,7 +62,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
|
||||
if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
|
||||
}
|
||||
siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
|
||||
siteTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(requireContext()))
|
||||
siteTv.setTextColor(R.color.text_theme.toColor(requireContext()))
|
||||
siteTv.text = site.text
|
||||
siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
|
||||
siteTv.setOnClickListener {
|
||||
|
||||
@ -76,12 +76,12 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() {
|
||||
contentText.setSpan(object : ClickableSpan() {
|
||||
override fun updateDrawState(ds: TextPaint) {
|
||||
super.updateDrawState(ds)
|
||||
ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
|
||||
ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
|
||||
ds.isUnderlineText = false
|
||||
}
|
||||
|
||||
override fun onClick(widget: View) {
|
||||
val privacyPolicyUrl = requireContext().getString(com.gh.gamecenter.common.R.string.privacy_policy_url)
|
||||
val privacyPolicyUrl = requireContext().getString(R.string.privacy_policy_url)
|
||||
val childrenPrivacyPolicyUrl = requireContext().getString(R.string.children_policy_url)
|
||||
val thirdPartySdkUrl = requireContext().getString(R.string.sdk_list_url)
|
||||
val permissionListUrl = requireContext().getString(R.string.permission_and_usage_url)
|
||||
|
||||
@ -22,6 +22,7 @@ import com.gh.common.util.LogUtils
|
||||
import com.gh.common.util.PackageHelper
|
||||
import com.gh.common.util.PackageUtils
|
||||
import com.gh.download.DownloadManager
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
|
||||
import com.gh.gamecenter.common.callback.ConfirmListener
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
@ -125,7 +126,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
|
||||
requireContext(),
|
||||
0,
|
||||
(link.title ?: "").length,
|
||||
com.gh.gamecenter.common.R.color.text_theme,
|
||||
R.color.text_theme,
|
||||
true
|
||||
) {
|
||||
LogUtils.uploadPackageCheck(
|
||||
@ -284,7 +285,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
|
||||
if (it >= mDuration) {
|
||||
mDisposable?.dispose()
|
||||
binding.downloadBtn.isEnabled = true
|
||||
binding.downloadBtn.background = com.gh.gamecenter.common.R.drawable.bg_notification_open_btn_style_2.toDrawable()
|
||||
binding.downloadBtn.background = R.drawable.bg_notification_open_btn_style_2.toDrawable()
|
||||
}
|
||||
}
|
||||
val animator = ValueAnimator.ofInt(0, 100)
|
||||
@ -391,10 +392,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
|
||||
val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages)
|
||||
if (isAllInstalled) {
|
||||
holder.binding.statusTv.text = "已安装"
|
||||
holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme))
|
||||
holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme))
|
||||
} else {
|
||||
holder.binding.statusTv.text = "未安装"
|
||||
holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.secondary_red))
|
||||
holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red))
|
||||
}
|
||||
holder.binding.statusTv.visibility = View.VISIBLE
|
||||
} else {
|
||||
|
||||
@ -12,6 +12,7 @@ import android.view.*
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import androidx.fragment.app.FragmentTransaction
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.WebActivity
|
||||
import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
@ -67,13 +68,13 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
|
||||
skipText.setSpan(object : ClickableSpan() {
|
||||
override fun updateDrawState(ds: TextPaint) {
|
||||
super.updateDrawState(ds)
|
||||
ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
|
||||
ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
|
||||
ds.isUnderlineText = false
|
||||
}
|
||||
|
||||
override fun onClick(widget: View) {
|
||||
val intent =
|
||||
WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.privacy_policy_url), true)
|
||||
WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
|
||||
context?.startActivity(intent)
|
||||
}
|
||||
}, skipText.length - 6, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
|
||||
@ -109,13 +110,13 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
|
||||
skipText.setSpan(object : ClickableSpan() {
|
||||
override fun updateDrawState(ds: TextPaint) {
|
||||
super.updateDrawState(ds)
|
||||
ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
|
||||
ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
|
||||
ds.isUnderlineText = false
|
||||
}
|
||||
|
||||
override fun onClick(widget: View) {
|
||||
val intent =
|
||||
WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.privacy_policy_url), true)
|
||||
WebActivity.getIntent(requireContext(), context!!.getString(R.string.privacy_policy_url), true)
|
||||
context?.startActivity(intent)
|
||||
}
|
||||
}, skipText.length - 9, skipText.length - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
|
||||
@ -123,12 +124,12 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
|
||||
skipText.setSpan(object : ClickableSpan() {
|
||||
override fun updateDrawState(ds: TextPaint) {
|
||||
super.updateDrawState(ds)
|
||||
ds.color = ContextCompat.getColor(requireContext(), com.gh.gamecenter.common.R.color.text_theme)
|
||||
ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme)
|
||||
ds.isUnderlineText = false
|
||||
}
|
||||
|
||||
override fun onClick(widget: View) {
|
||||
val intent = WebActivity.getIntent(requireContext(), context!!.getString(com.gh.gamecenter.common.R.string.disclaimer_url), true)
|
||||
val intent = WebActivity.getIntent(requireContext(), context!!.getString(R.string.disclaimer_url), true)
|
||||
context?.startActivity(intent)
|
||||
}
|
||||
}, skipText.length - 4, skipText.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
|
||||
|
||||
@ -1,42 +1,27 @@
|
||||
package com.gh.common.dialog
|
||||
|
||||
import android.content.Context
|
||||
import android.content.DialogInterface
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.recyclerview.widget.GridLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.gh.common.exposure.ExposureListener
|
||||
import com.gh.common.exposure.IExposable
|
||||
import com.gh.gamecenter.DownloadManagerActivity
|
||||
import com.gh.gamecenter.GameDetailActivity
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
|
||||
import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.exposure.ExposureSource
|
||||
import com.gh.gamecenter.common.utils.*
|
||||
import com.gh.gamecenter.common.entity.SimpleGameEntity
|
||||
import com.gh.gamecenter.common.utils.ImageUtils
|
||||
import com.gh.gamecenter.common.utils.fromHtml
|
||||
import com.gh.gamecenter.common.view.FixLinearLayoutManager
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.core.utils.SPUtils.getBoolean
|
||||
import com.gh.gamecenter.databinding.DialogReserveBinding
|
||||
import com.gh.gamecenter.databinding.DialogReserveItemBinding
|
||||
import com.gh.gamecenter.feature.entity.GameEntity
|
||||
import com.gh.gamecenter.feature.entity.ReserveOnlineEntity
|
||||
import com.gh.gamecenter.feature.exposure.ExposureEvent
|
||||
import com.gh.gamecenter.mygame.MyGameActivity
|
||||
import com.halo.assistant.HaloApp
|
||||
import com.lightgame.adapter.BaseRecyclerAdapter
|
||||
|
||||
class ReserveDialog : BaseDialogFragment() {
|
||||
|
||||
private lateinit var reserveOnlineEntity: ReserveOnlineEntity
|
||||
val games: List<GameEntity>
|
||||
get() = reserveOnlineEntity.games
|
||||
|
||||
private lateinit var mReserveList: List<SimpleGameEntity>
|
||||
private var mDismissListener: (() -> Unit)? = null
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@ -51,162 +36,66 @@ class ReserveDialog : BaseDialogFragment() {
|
||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
|
||||
val binding: DialogReserveBinding = DialogReserveBinding.inflate(layoutInflater, null, false)
|
||||
|
||||
reserveOnlineEntity = arguments?.getParcelable(RESERVE_ONLINE) ?: ReserveOnlineEntity()
|
||||
mReserveList = arguments?.getParcelableArrayList(RESERVE_LIST) ?: arrayListOf()
|
||||
|
||||
binding.tvTitle.text =
|
||||
resources.getString(R.string.dialog_reserve_title, reserveOnlineEntity.gamesTotal).fromHtml()
|
||||
binding.tvViewAllAppointment.setOnClickListener {
|
||||
SensorsBridge.trackAppointmentGameOnlineDialogClick(buttonName = "查看全部预约")
|
||||
binding.title.text = resources.getString(R.string.dialog_reserve_title, mReserveList.size).fromHtml()
|
||||
binding.more.visibility = if (mReserveList.size > 4) {
|
||||
View.VISIBLE
|
||||
} else View.GONE
|
||||
binding.more.setOnClickListener {
|
||||
val intent = MyGameActivity.getIntentWithConfig(requireContext(), MyGameActivity.RESERVATION_INDEX)
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
val adapter = ReserveDialogAdapter(requireContext(), games)
|
||||
binding.rvGames.layoutManager = FixLinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
|
||||
binding.rvGames.adapter = adapter
|
||||
|
||||
val exposureListener = ExposureListener(this, adapter)
|
||||
binding.rvGames.addOnScrollListener(exposureListener)
|
||||
|
||||
binding.ivClose.setOnClickListener {
|
||||
dismissAllowingStateLoss()
|
||||
}
|
||||
binding.recyclerView.layoutManager = if (mReserveList.size > 4) {
|
||||
GridLayoutManager(context, 4)
|
||||
} else {
|
||||
FixLinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
|
||||
}
|
||||
binding.recyclerView.adapter = object : BaseRecyclerAdapter<ReserveDialogItemViewHolder>(context) {
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReserveDialogItemViewHolder {
|
||||
val inflate = mLayoutInflater.inflate(R.layout.dialog_reserve_item, parent, false)
|
||||
return ReserveDialogItemViewHolder(DialogReserveItemBinding.bind(inflate))
|
||||
}
|
||||
|
||||
checkHasAutoDownload(binding)
|
||||
override fun getItemCount(): Int {
|
||||
return if (mReserveList.size > 4) 4 else mReserveList.size
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: ReserveDialogItemViewHolder, position: Int) {
|
||||
val entity = mReserveList[position]
|
||||
ImageUtils.display(holder.binding.icon, entity.icon)
|
||||
holder.binding.gameNameTv.text = entity.name
|
||||
holder.itemView.setOnClickListener {
|
||||
GameDetailActivity.startGameDetailActivity(mContext, entity.id, "(预约弹窗)")
|
||||
dismissAllowingStateLoss()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dialog?.setCanceledOnTouchOutside(true)
|
||||
return binding.root
|
||||
}
|
||||
|
||||
private fun checkHasAutoDownload(binding: DialogReserveBinding) {
|
||||
if (reserveOnlineEntity.wifiAutoDownloadTotal > 0) {
|
||||
// 开启自动下载
|
||||
binding.tvAutoDownloadTips.goneIf(false)
|
||||
var firstAutoDownloadGameName =
|
||||
reserveOnlineEntity.games.find { it.wifiAutoDownload && !it.isLandPageAddressDialog() }?.name
|
||||
|
||||
if(!firstAutoDownloadGameName.isNullOrBlank() && firstAutoDownloadGameName.length > GAME_NAME_SHOW_MAX_LENGTH){
|
||||
firstAutoDownloadGameName = "${firstAutoDownloadGameName.take(GAME_NAME_SHOW_MAX_LENGTH-1)}..."
|
||||
}
|
||||
val isWifiOpen = NetworkUtils.isWifiConnected(HaloApp.getInstance())
|
||||
binding.tvAutoDownloadTips.text =
|
||||
if (isWifiOpen) {
|
||||
if (firstAutoDownloadGameName.isNullOrBlank()) {
|
||||
getString(
|
||||
R.string.reserve_reminder_auto_download,
|
||||
"${reserveOnlineEntity.wifiAutoDownloadTotal}"
|
||||
)
|
||||
} else {
|
||||
getString(
|
||||
R.string.reserve_reminder_auto_download_with_name,
|
||||
firstAutoDownloadGameName,
|
||||
"${reserveOnlineEntity.wifiAutoDownloadTotal}"
|
||||
)
|
||||
}
|
||||
} else {
|
||||
if (firstAutoDownloadGameName.isNullOrBlank()) {
|
||||
getString(
|
||||
R.string.reserve_reminder_wait_for_wifi_to_auto_download,
|
||||
"${reserveOnlineEntity.wifiAutoDownloadTotal}"
|
||||
)
|
||||
} else {
|
||||
getString(
|
||||
R.string.reserve_reminder_wait_for_wifi_to_auto_download_with_name,
|
||||
firstAutoDownloadGameName,
|
||||
"${reserveOnlineEntity.wifiAutoDownloadTotal}"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
binding.tvAutoDownloadTips.setOnClickListener {
|
||||
SensorsBridge.trackAppointmentGameOnlineDialogClick(buttonName = "查看进度")
|
||||
val intent = DownloadManagerActivity.getDownloadMangerIntent(requireContext(), "")
|
||||
startActivity(intent)
|
||||
}
|
||||
} else {
|
||||
binding.tvAutoDownloadTips.goneIf(true)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fun setOnDismissListener(dismissListener: () -> Unit) {
|
||||
mDismissListener = dismissListener
|
||||
}
|
||||
|
||||
override fun onDismiss(dialog: DialogInterface) {
|
||||
super.onDismiss(dialog)
|
||||
SensorsBridge.trackAppointmentGameOnlineDialogClick(buttonName = "关闭弹窗")
|
||||
}
|
||||
|
||||
override fun onStart() {
|
||||
super.onStart()
|
||||
dialog?.window?.let {
|
||||
it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
val params = it.attributes
|
||||
params.width = DisplayUtils.dip2px(300F)
|
||||
it.attributes = params
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
super.onDestroy()
|
||||
mDismissListener?.invoke()
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val RESERVE_ONLINE = "reserve_online"
|
||||
private const val GAME_NAME_SHOW_MAX_LENGTH = 8
|
||||
const val RESERVE_LIST = "reserve_list"
|
||||
|
||||
@JvmStatic
|
||||
fun getInstance(reserveOnlineEntity: ReserveOnlineEntity?) = ReserveDialog().apply {
|
||||
arguments = Bundle().apply {
|
||||
putParcelable(RESERVE_ONLINE, reserveOnlineEntity)
|
||||
}
|
||||
fun getInstance(reserveList: List<SimpleGameEntity>) = ReserveDialog().apply {
|
||||
arguments = Bundle()
|
||||
arguments?.putParcelableArrayList(RESERVE_LIST, ArrayList(reserveList))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class ReserveDialogAdapter(
|
||||
context: Context,
|
||||
private val games: List<GameEntity>
|
||||
) :
|
||||
BaseRecyclerAdapter<ReserveDialogItemViewHolder>(context), IExposable {
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReserveDialogItemViewHolder {
|
||||
return ReserveDialogItemViewHolder(parent.toBinding())
|
||||
}
|
||||
|
||||
override fun getItemCount(): Int {
|
||||
return if (games.size > 8) 8 else games.size
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: ReserveDialogItemViewHolder, position: Int) {
|
||||
val entity = games[position]
|
||||
holder.binding.icon.displayGameIcon(entity)
|
||||
holder.binding.gameNameTv.text = entity.name
|
||||
holder.itemView.setOnClickListener {
|
||||
SensorsBridge.trackAppointmentGameOnlineDialogClick(
|
||||
"游戏",
|
||||
entity.id,
|
||||
entity.name ?: "",
|
||||
entity.categoryChinese,
|
||||
)
|
||||
GameDetailActivity.startGameDetailActivity(mContext, entity.id, "(预约弹窗)", entity.exposureEvent)
|
||||
}
|
||||
entity.exposureEvent = ExposureEvent.createEvent(
|
||||
entity,
|
||||
listOf(ExposureSource("预约上线弹窗", ""))
|
||||
)
|
||||
}
|
||||
|
||||
override fun getEventByPosition(pos: Int): ExposureEvent? {
|
||||
return games.getOrNull(pos)?.exposureEvent
|
||||
}
|
||||
|
||||
override fun getEventListByPosition(pos: Int): List<ExposureEvent>? {
|
||||
return null
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class ReserveDialogItemViewHolder(val binding: DialogReserveItemBinding) : BaseRecyclerViewHolder<Any>(binding.root)
|
||||
@ -1,278 +0,0 @@
|
||||
package com.gh.common.dialog
|
||||
|
||||
import android.app.Dialog
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
import android.text.InputFilter
|
||||
import android.view.LayoutInflater
|
||||
import androidx.core.widget.addTextChangedListener
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.retrofit.BiResponse
|
||||
import com.gh.gamecenter.common.retrofit.Response
|
||||
import com.gh.gamecenter.common.utils.singleToMain
|
||||
import com.gh.gamecenter.common.utils.toColor
|
||||
import com.gh.gamecenter.common.utils.toResString
|
||||
import com.gh.gamecenter.core.utils.ToastUtils
|
||||
import com.gh.gamecenter.databinding.DialogReserveReminderPhoneNumberBinding
|
||||
import com.gh.gamecenter.entity.ReserveModifyEntity
|
||||
import com.gh.gamecenter.entity.ValidateCodeResponse
|
||||
import com.halo.assistant.fragment.reserve.OnReserveReminderListener
|
||||
import com.halo.assistant.fragment.reserve.ReserveReminderRepository
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.disposables.Disposable
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import okhttp3.ResponseBody
|
||||
import org.json.JSONObject
|
||||
import retrofit2.HttpException
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
|
||||
class ReserveReminderPhoneNumberDialog(
|
||||
context: Context,
|
||||
themeResId: Int,
|
||||
private val dialogType: Int,
|
||||
private val phoneNumber: String,
|
||||
private var serviceId: String,
|
||||
private val gameId: String,
|
||||
private val repository: ReserveReminderRepository,
|
||||
private val listener: OnReserveReminderListener
|
||||
) :
|
||||
Dialog(context, themeResId) {
|
||||
|
||||
private val compositeDisposable = CompositeDisposable()
|
||||
|
||||
private lateinit var binding: DialogReserveReminderPhoneNumberBinding
|
||||
|
||||
private var hasValidated = false
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
binding = DialogReserveReminderPhoneNumberBinding.inflate(LayoutInflater.from(context))
|
||||
setContentView(binding.root)
|
||||
initView()
|
||||
}
|
||||
|
||||
private fun initView() {
|
||||
binding.vClose.setOnClickListener {
|
||||
dismiss()
|
||||
}
|
||||
|
||||
setSubmitState(phoneNumber)
|
||||
binding.etInput.addTextChangedListener {
|
||||
val content = binding.etInput.text?.toString() ?: ""
|
||||
if (dialogType == DIALOG_TYPE_BIND_PHONE || dialogType == DIALOG_TYPE_CHANGE_PHONE) {
|
||||
setSubmitState(content)
|
||||
} else {
|
||||
val length = content.length
|
||||
if (length == VALIDATE_CODE_LENGTH) {
|
||||
verifyPhoneNumber(content)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
when (dialogType) {
|
||||
DIALOG_TYPE_BIND_PHONE -> {
|
||||
binding.tvTitle.setText(R.string.enable_sms_reminder)
|
||||
binding.tvDescription.setText(R.string.enable_sms_reminder_description)
|
||||
binding.etInput.setText(phoneNumber)
|
||||
binding.etInput.setHint(com.gh.gamecenter.login.R.string.input_phone_hint)
|
||||
}
|
||||
|
||||
DIALOG_TYPE_CHANGE_PHONE -> {
|
||||
binding.tvTitle.setText(R.string.change_phone_number_2)
|
||||
binding.tvDescription.setText(R.string.enable_sms_reminder_description)
|
||||
binding.etInput.setText(phoneNumber)
|
||||
binding.etInput.setHint(com.gh.gamecenter.login.R.string.input_phone_hint)
|
||||
}
|
||||
|
||||
DIALOG_TYPE_VERIFY_PHONE -> {
|
||||
startCountDown()
|
||||
binding.tvTitle.setText(R.string.please_input_sms_verify_code)
|
||||
if (phoneNumber.length == PHONE_NUMBER_LENGTH) {
|
||||
val phoneNumberWithMask = phoneNumber.substring(0, 3) + MASK + phoneNumber.substring(7)
|
||||
binding.tvDescription.text =
|
||||
context.getString(R.string.verify_code_send_with_phone_number, phoneNumberWithMask)
|
||||
}
|
||||
binding.tvSubmit.alpha = 1.0F
|
||||
binding.etInput.filters = arrayOf<InputFilter>(InputFilter.LengthFilter(VALIDATE_CODE_LENGTH))
|
||||
binding.etInput.setHint(R.string.please_input_verify_code)
|
||||
|
||||
}
|
||||
}
|
||||
binding.tvSubmit.setOnClickListener {
|
||||
val text = binding.etInput.text?.toString() ?: ""
|
||||
if (dialogType == DIALOG_TYPE_VERIFY_PHONE) {
|
||||
resendValidateCode()
|
||||
} else {
|
||||
if (isEnableSubmit(text)) {
|
||||
when (dialogType) {
|
||||
DIALOG_TYPE_BIND_PHONE -> bindPhoneNumber(text)
|
||||
DIALOG_TYPE_CHANGE_PHONE -> bindPhoneNumber(text)
|
||||
}
|
||||
} else {
|
||||
if (text != phoneNumber) {
|
||||
ToastUtils.toast(R.string.invalid_phone_number_format.toResString())
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private fun resendValidateCode() {
|
||||
repository.sendVerifyCode(phoneNumber)
|
||||
.compose(singleToMain())
|
||||
.subscribe(object : BiResponse<ValidateCodeResponse>() {
|
||||
override fun onSuccess(data: ValidateCodeResponse) {
|
||||
serviceId = data.serviceId
|
||||
startCountDown()
|
||||
}
|
||||
|
||||
}).let(compositeDisposable::add)
|
||||
}
|
||||
|
||||
private fun verifyPhoneNumber(content: String) {
|
||||
repository.verifyPhoneNumber(phoneNumber, content, serviceId)
|
||||
.compose(singleToMain())
|
||||
.subscribe(object : BiResponse<ResponseBody>() {
|
||||
override fun onSuccess(data: ResponseBody) {
|
||||
hasValidated = true
|
||||
listener.phoneNumberValidateSuccessfully()
|
||||
ToastUtils.toast(R.string.phone_number_validate_successfully.toResString())
|
||||
dismiss()
|
||||
|
||||
}
|
||||
|
||||
override fun onFailure(exception: Exception) {
|
||||
super.onFailure(exception)
|
||||
binding.etInput.text = null
|
||||
ToastUtils.toast(R.string.phone_number_validate_failure.toResString())
|
||||
}
|
||||
}).let(compositeDisposable::add)
|
||||
}
|
||||
|
||||
|
||||
private fun bindPhoneNumber(phone: String) {
|
||||
repository.bindPhone(gameId, phone)
|
||||
.compose(singleToMain())
|
||||
.subscribe(object : BiResponse<ReserveModifyEntity>() {
|
||||
override fun onSuccess(data: ReserveModifyEntity) {
|
||||
listener.bindPhoneSuccessfully(data.smsConfig.mobileValidated, phone)
|
||||
dismiss()
|
||||
}
|
||||
|
||||
override fun onFailure(exception: Exception) {
|
||||
super.onFailure(exception)
|
||||
if (exception is HttpException) {
|
||||
try {
|
||||
val string = exception.response().errorBody()?.string()
|
||||
if (!string.isNullOrBlank()) {
|
||||
val json = JSONObject(string)
|
||||
val message = json.getJSONObject("toast").getString("sms_config.mobile")
|
||||
ToastUtils.showToast(message)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
// no implement
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}).let(compositeDisposable::add)
|
||||
}
|
||||
|
||||
|
||||
private fun startCountDown() {
|
||||
binding.tvSubmit.isEnabled = false
|
||||
binding.tvSubmit.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_light_fill_gray)
|
||||
binding.tvSubmit.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
|
||||
Observable.interval(0, 1, TimeUnit.SECONDS)
|
||||
.take(COUNT_DOWN_DURATION)
|
||||
.map {
|
||||
COUNT_DOWN_DURATION - it
|
||||
}
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(object : Response<Long>() {
|
||||
override fun onSubscribe(d: Disposable) {
|
||||
compositeDisposable.add(d)
|
||||
}
|
||||
|
||||
|
||||
override fun onNext(time: Long) {
|
||||
binding.tvSubmit.text = context.getString(R.string.resend_with_time, "$time")
|
||||
}
|
||||
|
||||
override fun onComplete() {
|
||||
binding.tvSubmit.isEnabled = true
|
||||
binding.tvSubmit.setBackgroundResource(com.gh.gamecenter.common.R.drawable.bg_common_button_fill_blue)
|
||||
binding.tvSubmit.setTextColor(com.gh.gamecenter.common.R.color.text_aw_primary.toColor(context))
|
||||
binding.tvSubmit.setText(R.string.resend)
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
override fun dismiss() {
|
||||
compositeDisposable.clear()
|
||||
if (dialogType == DIALOG_TYPE_VERIFY_PHONE && !hasValidated) {
|
||||
ToastUtils.toast(R.string.phone_number_validate_cancel.toResString())
|
||||
}
|
||||
super.dismiss()
|
||||
}
|
||||
|
||||
private fun isEnableSubmit(phone: String) =
|
||||
PHONE_NUMBER_PATTERN.toRegex().matches(phone)
|
||||
&& if (dialogType == DIALOG_TYPE_CHANGE_PHONE) phone != phoneNumber else true
|
||||
|
||||
private fun setSubmitState(phone: String) {
|
||||
val isEnable = isEnableSubmit(phone)
|
||||
binding.tvSubmit.alpha = if (isEnable) {
|
||||
TV_SUBMIT_ENABLE_ALPHA
|
||||
} else {
|
||||
TV_SUBMIT_UNABLE_ALPHA
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
private const val PHONE_NUMBER_PATTERN = "^1\\d{10}$"
|
||||
private const val MASK = "****"
|
||||
private const val PHONE_NUMBER_LENGTH = 11
|
||||
private const val VALIDATE_CODE_LENGTH = 6
|
||||
|
||||
const val DIALOG_TYPE_BIND_PHONE = 0
|
||||
const val DIALOG_TYPE_CHANGE_PHONE = 1
|
||||
const val DIALOG_TYPE_VERIFY_PHONE = 2
|
||||
|
||||
private const val COUNT_DOWN_DURATION = 60L
|
||||
|
||||
private const val TV_SUBMIT_ENABLE_ALPHA = 1F
|
||||
private const val TV_SUBMIT_UNABLE_ALPHA = 0.4F
|
||||
|
||||
fun create(
|
||||
context: Context,
|
||||
dialogType: Int,
|
||||
phoneNumber: String,
|
||||
serviceId: String,
|
||||
gameId: String,
|
||||
repository: ReserveReminderRepository,
|
||||
listener: OnReserveReminderListener
|
||||
) =
|
||||
ReserveReminderPhoneNumberDialog(
|
||||
context,
|
||||
com.gh.gamecenter.common.R.style.DialogWindowTransparent,
|
||||
dialogType,
|
||||
phoneNumber,
|
||||
serviceId,
|
||||
gameId,
|
||||
repository,
|
||||
listener
|
||||
)
|
||||
}
|
||||
}
|
||||
@ -1,428 +0,0 @@
|
||||
package com.gh.common.dialog
|
||||
|
||||
import android.app.Dialog
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.os.Bundle
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.text.TextUtils
|
||||
import android.view.*
|
||||
import android.view.ViewGroup.MarginLayoutParams
|
||||
import androidx.core.view.updateLayoutParams
|
||||
import com.gh.common.pop.EditBindPhoneInfoPop
|
||||
import com.gh.common.pop.EditBindWechatPop
|
||||
import com.gh.common.pop.RealNameTipsPop
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.utils.dip2px
|
||||
import com.gh.gamecenter.common.utils.goneIf
|
||||
import com.gh.gamecenter.common.utils.toObject
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.core.utils.SPUtils
|
||||
import com.gh.gamecenter.databinding.*
|
||||
import com.gh.gamecenter.entity.ReserveReminderEntity
|
||||
import com.gh.gamecenter.login.entity.UserInfoEntity
|
||||
import com.gh.gamecenter.login.user.UserManager
|
||||
import com.halo.assistant.HaloApp
|
||||
import com.halo.assistant.fragment.reserve.OnReserveReminderListener
|
||||
|
||||
class ReserveSuccessReminderDialog(
|
||||
context: Context,
|
||||
themeResId: Int,
|
||||
private val listener: OnReserveReminderListener
|
||||
) :
|
||||
Dialog(context, themeResId), OnReserveSuccessListener {
|
||||
|
||||
private var reserveReminder = ReserveReminderEntity()
|
||||
|
||||
private val handler = Handler(Looper.getMainLooper())
|
||||
|
||||
private val handlers = arrayListOf<ReminderContentHandler>()
|
||||
|
||||
private lateinit var binding: DialogReserveSuccessWithSmsBinding
|
||||
|
||||
private val realNameQuestionPop by lazy {
|
||||
RealNameTipsPop.create(context, listener)
|
||||
}
|
||||
|
||||
private var hasAutoPopped = false
|
||||
private var isInit = true
|
||||
|
||||
override fun onTouchEvent(event: MotionEvent): Boolean {
|
||||
if (event.action == MotionEvent.ACTION_UP) {
|
||||
if (realNameQuestionPop.isShowing) {
|
||||
realNameQuestionPop.dismiss()
|
||||
return true
|
||||
} else if (handlers.any { it.hasPopShowing }) {
|
||||
handlers.forEach {
|
||||
it.dismissPop()
|
||||
}
|
||||
return true
|
||||
}
|
||||
}
|
||||
return super.onTouchEvent(event)
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
binding = DialogReserveSuccessWithSmsBinding.inflate(LayoutInflater.from(context))
|
||||
setContentView(binding.root)
|
||||
|
||||
binding.ivClose.setOnClickListener {
|
||||
dismiss()
|
||||
}
|
||||
binding.ivQuestion.setOnClickListener {
|
||||
realNameQuestionPop.showAtLocation(binding.cbAutoDownload, Gravity.BOTTOM, 0, 4F.dip2px())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private fun initView() {
|
||||
handlers.clear()
|
||||
binding.flContentContainer.removeAllViews()
|
||||
|
||||
val smsConfig = reserveReminder.smsConfig
|
||||
val wechatConfig = reserveReminder.wechatConfig
|
||||
when {
|
||||
reserveReminder.onlyShowWechatReminder && !wechatConfig.isReminderEnable -> { // 只显示微信：未开启
|
||||
binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
|
||||
arrayListOf(OnlyWechatReminderUnableHandler(16.dp, binding.flContentContainer, this))
|
||||
}
|
||||
|
||||
|
||||
reserveReminder.onlyShowWechatReminder && wechatConfig.isReminderEnable -> { // 只显示微信:已开
|
||||
binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
|
||||
arrayListOf(
|
||||
WechatReminderEnableHandler(
|
||||
reserveReminder.wechatConfig.nickName,
|
||||
8.dp,
|
||||
binding.flContentContainer,
|
||||
this
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
!smsConfig.notice && !wechatConfig.isReminderEnable -> { // 短信，微信未开启
|
||||
binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
|
||||
arrayListOf(
|
||||
SmsReminderUnableHandler(16.dp, binding.flContentContainer, this),
|
||||
WechatReminderUnableHandler(8.dp, binding.flContentContainer, this)
|
||||
)
|
||||
}
|
||||
|
||||
smsConfig.notice && wechatConfig.isReminderEnable -> {// 短信，微信已开启
|
||||
binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
|
||||
arrayListOf(
|
||||
SmsReminderEnableHandler(reserveReminder.smsConfig, 8.dp, binding.flContentContainer, this),
|
||||
WechatReminderEnableHandler(
|
||||
reserveReminder.wechatConfig.nickName,
|
||||
8.dp,
|
||||
binding.flContentContainer,
|
||||
this
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
smsConfig.notice && !wechatConfig.isReminderEnable -> { // 短信开启，微信未开启
|
||||
binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
|
||||
arrayListOf(
|
||||
SmsReminderEnableHandler(smsConfig, 8.dp, binding.flContentContainer, this),
|
||||
WechatReminderUnableHandler(16.dp, binding.flContentContainer, this)
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
!smsConfig.notice && wechatConfig.isReminderEnable -> { // 微信开启，短信未开启
|
||||
binding.tvContent.setText(R.string.reverse_success_with_reminder_tips)
|
||||
arrayListOf(
|
||||
WechatReminderEnableHandler(
|
||||
wechatConfig.nickName,
|
||||
8.dp,
|
||||
binding.flContentContainer,
|
||||
this
|
||||
),
|
||||
SmsReminderUnableHandler(16.dp, binding.flContentContainer, this)
|
||||
)
|
||||
}
|
||||
|
||||
else -> {
|
||||
binding.tvContent.setText(R.string.reverse_success_without_reminder_tips)
|
||||
arrayListOf()
|
||||
}
|
||||
}.let {
|
||||
handlers.clear()
|
||||
handlers.addAll(it)
|
||||
}
|
||||
handlers.forEach {
|
||||
binding.flContentContainer.addView(it.init())
|
||||
}
|
||||
|
||||
if (isInit) {
|
||||
isInit = false
|
||||
binding.gAutoDownload.goneIf(!reserveReminder.isEnableAutoDownload)
|
||||
if (reserveReminder.isEnableAutoDownload) {
|
||||
binding.cbAutoDownload.isChecked = reserveReminder.wifiAutoDownload
|
||||
checkIfShowRealNamePop()
|
||||
}
|
||||
binding.cbAutoDownload.setOnCheckedChangeListener { _, isChecked ->
|
||||
listener.enableAutoDownload(isChecked)
|
||||
checkIfShowRealNamePop()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private fun checkIfShowRealNamePop() {
|
||||
if (hasAutoPopped) {
|
||||
return
|
||||
}
|
||||
hasAutoPopped = true
|
||||
handler.postDelayed({
|
||||
val idCard = UserManager.getInstance().userInfoEntity?.idCard
|
||||
if (idCard != null && idCard.status != 1 && idCard.minor != true) {
|
||||
// 账号已实名
|
||||
return@postDelayed
|
||||
}
|
||||
|
||||
val deviceCertificationInfoString =
|
||||
SPUtils.getString(Constants.SP_DEVICE_CERTIFICATION_PREFIX + HaloApp.getInstance().gid)
|
||||
if (!TextUtils.isEmpty(deviceCertificationInfoString)) {
|
||||
val deviceIdCard = deviceCertificationInfoString.toObject<UserInfoEntity>()?.idCard
|
||||
if (deviceIdCard != null && deviceIdCard.status != 1 && deviceIdCard.minor != true) {
|
||||
// 设备已实名
|
||||
return@postDelayed
|
||||
}
|
||||
}
|
||||
realNameQuestionPop.showAtLocation(binding.cbAutoDownload, Gravity.BOTTOM, 0, 0)
|
||||
}, 16)
|
||||
}
|
||||
|
||||
override fun updateSmsReminder(isEnable: Boolean) {
|
||||
listener.updateSmsReminder(isEnable)
|
||||
}
|
||||
|
||||
override fun updateWechatReminder() {
|
||||
listener.updateWechatReminder()
|
||||
}
|
||||
|
||||
override fun changePhoneNumber() {
|
||||
listener.changedPhoneNumber()
|
||||
}
|
||||
|
||||
override fun verifyPhoneNumber() {
|
||||
listener.verifyPhoneNumber()
|
||||
}
|
||||
|
||||
override fun changeWechatBinding() {
|
||||
listener.changeWechatBinding()
|
||||
}
|
||||
|
||||
override fun onStart() {
|
||||
super.onStart()
|
||||
window?.let {
|
||||
it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
val params = it.attributes
|
||||
params.width = DisplayUtils.dip2px(300F)
|
||||
it.attributes = params
|
||||
}
|
||||
}
|
||||
|
||||
fun updateReserveReminder(reserveReminder: ReserveReminderEntity) {
|
||||
this.reserveReminder = reserveReminder
|
||||
initView()
|
||||
}
|
||||
|
||||
override fun dismiss() {
|
||||
handler.removeCallbacksAndMessages(null)
|
||||
super.dismiss()
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val Int.dp: Int
|
||||
get() = DisplayUtils.dip2px(this.toFloat())
|
||||
|
||||
fun create(context: Context, listener: OnReserveReminderListener) =
|
||||
ReserveSuccessReminderDialog(
|
||||
context,
|
||||
com.gh.gamecenter.common.R.style.DialogWindowTransparent,
|
||||
listener
|
||||
).apply {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
abstract class ReminderContentHandler(
|
||||
val topMargin: Int,
|
||||
val parent: ViewGroup,
|
||||
val listener: OnReserveSuccessListener
|
||||
) {
|
||||
|
||||
open val hasPopShowing: Boolean = false
|
||||
|
||||
fun init(): View {
|
||||
val root = createView(LayoutInflater.from(parent.context))
|
||||
root.updateLayoutParams<MarginLayoutParams> {
|
||||
this.topMargin = this@ReminderContentHandler.topMargin
|
||||
}
|
||||
initView()
|
||||
return root
|
||||
}
|
||||
|
||||
protected abstract fun createView(inflater: LayoutInflater): View
|
||||
|
||||
protected abstract fun initView()
|
||||
|
||||
open fun dismissPop() = Unit
|
||||
}
|
||||
|
||||
class SmsReminderUnableHandler(topMargin: Int, parent: ViewGroup, listener: OnReserveSuccessListener) :
|
||||
ReminderContentHandler(topMargin, parent, listener) {
|
||||
|
||||
private lateinit var binding: LayoutReserveSmsReminderUnableBinding
|
||||
|
||||
override fun createView(inflater: LayoutInflater): View {
|
||||
return LayoutReserveSmsReminderUnableBinding.inflate(inflater, parent, false)
|
||||
.also {
|
||||
binding = it
|
||||
}.root
|
||||
}
|
||||
|
||||
override fun initView() {
|
||||
binding.vSmsAdd.setOnClickListener {
|
||||
listener.updateSmsReminder(true)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class WechatReminderUnableHandler(topMargin: Int, parent: ViewGroup, listener: OnReserveSuccessListener) :
|
||||
ReminderContentHandler(topMargin, parent, listener) {
|
||||
|
||||
private lateinit var binding: LayoutReserveWechatReminderUnableBinding
|
||||
|
||||
override fun createView(inflater: LayoutInflater): View {
|
||||
return LayoutReserveWechatReminderUnableBinding.inflate(inflater, parent, false)
|
||||
.also {
|
||||
binding = it
|
||||
}.root
|
||||
}
|
||||
|
||||
override fun initView() {
|
||||
binding.vWechatAdd.setOnClickListener {
|
||||
listener.updateWechatReminder()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class SmsReminderEnableHandler(
|
||||
private val smsConfig: ReserveReminderEntity.SmsConfig,
|
||||
topMargin: Int,
|
||||
parent: ViewGroup, listener:
|
||||
OnReserveSuccessListener
|
||||
) :
|
||||
ReminderContentHandler(topMargin, parent, listener) {
|
||||
|
||||
private lateinit var binding: LayoutReserveSmsReminderEnableBinding
|
||||
|
||||
override val hasPopShowing: Boolean
|
||||
get() = editBindPhoneInfoPop.isShowing
|
||||
|
||||
override fun dismissPop() {
|
||||
if (hasPopShowing) {
|
||||
editBindPhoneInfoPop.dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
private val editBindPhoneInfoPop by lazy {
|
||||
EditBindPhoneInfoPop.create(parent.context, smsConfig.mobileValidated, listener)
|
||||
}
|
||||
|
||||
override fun createView(inflater: LayoutInflater) =
|
||||
LayoutReserveSmsReminderEnableBinding.inflate(inflater, parent, false)
|
||||
.also {
|
||||
binding = it
|
||||
}.root
|
||||
|
||||
override fun initView() {
|
||||
binding.tvPhone.text = smsConfig.mobile
|
||||
binding.vSmsEdit.setOnClickListener {
|
||||
editBindPhoneInfoPop.showAsDropDown(
|
||||
binding.ivSmsEdit,
|
||||
(-104).dp,
|
||||
0,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class WechatReminderEnableHandler(
|
||||
private val nickName: String,
|
||||
topMargin: Int,
|
||||
parent: ViewGroup,
|
||||
listener: OnReserveSuccessListener
|
||||
) :
|
||||
ReminderContentHandler(topMargin, parent, listener) {
|
||||
|
||||
private lateinit var binding: LayoutReserveWechatReminderEnableBinding
|
||||
|
||||
private val editWechatPop by lazy {
|
||||
EditBindWechatPop.create(parent.context, listener)
|
||||
}
|
||||
|
||||
override fun createView(inflater: LayoutInflater) =
|
||||
LayoutReserveWechatReminderEnableBinding.inflate(inflater, parent, false)
|
||||
.also {
|
||||
binding = it
|
||||
}.root
|
||||
|
||||
override fun initView() {
|
||||
binding.tvWechat.text = nickName
|
||||
binding.vModifyWechat.setOnClickListener {
|
||||
editWechatPop.showAsDropDown(
|
||||
binding.ivModifyWechat,
|
||||
(-104).dp,
|
||||
0
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class OnlyWechatReminderUnableHandler(topMargin: Int, parent: ViewGroup, listener: OnReserveSuccessListener) :
|
||||
ReminderContentHandler(topMargin, parent, listener) {
|
||||
|
||||
private lateinit var binding: LayoutReserveOnlyWechatUnableBinding
|
||||
|
||||
override fun createView(inflater: LayoutInflater) =
|
||||
LayoutReserveOnlyWechatUnableBinding.inflate(inflater, parent, false)
|
||||
.also {
|
||||
binding = it
|
||||
}.root
|
||||
|
||||
override fun initView() {
|
||||
binding.vSubmitBackground.setOnClickListener {
|
||||
listener.updateWechatReminder()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
interface OnReserveSuccessListener {
|
||||
|
||||
fun updateSmsReminder(isEnable: Boolean)
|
||||
|
||||
fun updateWechatReminder()
|
||||
|
||||
fun changePhoneNumber()
|
||||
|
||||
fun verifyPhoneNumber()
|
||||
|
||||
fun changeWechatBinding()
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
package com.gh.common.dialog
|
||||
|
||||
import android.app.Dialog
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
|
||||
import com.gh.gamecenter.core.utils.CurrentActivityHolder
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.databinding.DialogWechatBindingConflictBinding
|
||||
|
||||
class WechatBindingConflictDialogFragment : BaseDialogFragment() {
|
||||
|
||||
private lateinit var binding: DialogWechatBindingConflictBinding
|
||||
|
||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||
return super.onCreateDialog(savedInstanceState).apply {
|
||||
setCanceledOnTouchOutside(true)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||
return DialogWechatBindingConflictBinding.inflate(inflater, container, false)
|
||||
.also {
|
||||
binding = it
|
||||
}.root
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
binding.tvIKnow.setOnClickListener {
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onStart() {
|
||||
super.onStart()
|
||||
dialog?.window?.let {
|
||||
it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
val params = it.attributes
|
||||
params.width = DisplayUtils.dip2px(300F)
|
||||
it.attributes = params
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
fun show(context: Context) {
|
||||
if (context is AppCompatActivity) {
|
||||
context.supportFragmentManager
|
||||
} else {
|
||||
(CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
|
||||
}?.let {
|
||||
WechatBindingConflictDialogFragment().show(it, WechatBindingConflictDialogFragment::class.java.name)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,125 +0,0 @@
|
||||
package com.gh.common.dialog
|
||||
|
||||
import android.app.Dialog
|
||||
import android.content.ClipData
|
||||
import android.content.ClipboardManager
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
|
||||
import com.gh.gamecenter.common.entity.ErrorEntity
|
||||
import com.gh.gamecenter.core.utils.CurrentActivityHolder
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.databinding.DialogWechatBindingFailedBinding
|
||||
import com.gh.gamecenter.login.user.UserRepository
|
||||
import com.lightgame.utils.Utils
|
||||
|
||||
class WechatBindingFailedDialogFragment : BaseDialogFragment() {
|
||||
|
||||
private lateinit var binding: DialogWechatBindingFailedBinding
|
||||
|
||||
private var currentUserId: String? = null
|
||||
private lateinit var userConflict: ErrorEntity.Data.UserConflict
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
userConflict = arguments?.getParcelable(KEY_USER_CONFLICT) ?: ErrorEntity.Data.UserConflict()
|
||||
}
|
||||
|
||||
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
|
||||
return super.onCreateDialog(savedInstanceState).apply {
|
||||
setCanceledOnTouchOutside(true)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||
return DialogWechatBindingFailedBinding.inflate(inflater, container, false)
|
||||
.also {
|
||||
binding = it
|
||||
}.root
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
UserRepository.getInstance().loginUserInfo.observe(viewLifecycleOwner) {
|
||||
currentUserId = it.data.getShortUserId()
|
||||
binding.tvCurrentName.text = it.data.name
|
||||
binding.ivCurrentAvatar.displayAvatar(it.data.icon)
|
||||
binding.tvUserId.text = getString(R.string.user_id, currentUserId)
|
||||
}
|
||||
|
||||
binding.tvConflictName.text = userConflict.name
|
||||
binding.ivConflictAvatar.displayAvatar(userConflict.icon)
|
||||
binding.tvConflictUserId.text = getString(R.string.user_id, userConflict.seq)
|
||||
|
||||
|
||||
binding.tvConflictProblem.setOnClickListener {
|
||||
dismiss()
|
||||
WechatBindingConflictDialogFragment.show(requireContext())
|
||||
}
|
||||
|
||||
binding.tvIKnow.setOnClickListener {
|
||||
dismiss()
|
||||
}
|
||||
|
||||
binding.tvUserId.setOnLongClickListener {
|
||||
currentUserId?.let {
|
||||
copyTextToClipboard(it)
|
||||
true
|
||||
} ?: false
|
||||
}
|
||||
|
||||
binding.tvConflictUserId.setOnLongClickListener {
|
||||
copyTextToClipboard(userConflict.id)
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
private fun copyTextToClipboard(text: String) {
|
||||
val clipboardManager = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
|
||||
if (clipboardManager != null) {
|
||||
val clip = ClipData.newPlainText(COPY_ID_TEXT, text)
|
||||
clipboardManager.setPrimaryClip(clip)
|
||||
Utils.toast(requireContext(), R.string.copy_user_id_successfully)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
override fun onStart() {
|
||||
super.onStart()
|
||||
dialog?.window?.let {
|
||||
it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
val params = it.attributes
|
||||
params.width = DisplayUtils.dip2px(300F)
|
||||
it.attributes = params
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
private const val COPY_ID_TEXT = "user_id"
|
||||
private const val KEY_USER_CONFLICT = "key_user_conflict"
|
||||
|
||||
fun show(context: Context, userConflict: ErrorEntity.Data.UserConflict?) {
|
||||
if (context is AppCompatActivity) {
|
||||
context.supportFragmentManager
|
||||
} else {
|
||||
(CurrentActivityHolder.getCurrentActivity() as? AppCompatActivity)?.supportFragmentManager
|
||||
}?.let {
|
||||
val fragment = WechatBindingFailedDialogFragment().apply {
|
||||
arguments = Bundle().apply {
|
||||
putParcelable(KEY_USER_CONFLICT, userConflict)
|
||||
}
|
||||
}
|
||||
fragment.show(it, WechatBindingFailedDialogFragment::class.java.name)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -6,7 +6,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import androidx.recyclerview.widget.RecyclerView.LayoutManager
|
||||
import androidx.recyclerview.widget.StaggeredGridLayoutManager
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.feature.exposure.ExposureEvent
|
||||
import io.reactivex.functions.Consumer
|
||||
|
||||
@ -17,9 +16,8 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
|
||||
|
||||
val throttleBus: ExposureThrottleBus by lazy {
|
||||
ExposureThrottleBus(
|
||||
{ commitExposure(it) },
|
||||
Consumer(Throwable::printStackTrace),
|
||||
{ commitWXCPMExposure(it) }
|
||||
Consumer { commitExposure(it) },
|
||||
Consumer(Throwable::printStackTrace)
|
||||
)
|
||||
}
|
||||
var layoutManager: LayoutManager? = null
|
||||
@ -95,32 +93,4 @@ class ExposureListener(var fragment: Fragment, var exposable: IExposable) : Recy
|
||||
ExposureManager.log(eventList)
|
||||
}
|
||||
|
||||
/**
|
||||
* 微信小游戏CPM曝光事件接口上报，由于普通曝光事件的上报通道存在节流特性，不符合CPM接口对于数据上报的实时性和准确性的要求，所以使用额外的通道进行上报
|
||||
*/
|
||||
private fun commitWXCPMExposure(visibleState: ExposureThrottleBus.VisibleState) {
|
||||
|
||||
val eventList = arrayListOf<ExposureEvent>()
|
||||
|
||||
for (pos in visibleState.firstVisiblePosition..visibleState.lastVisiblePosition) {
|
||||
try {
|
||||
exposable.getEventByPosition(pos)?.let {
|
||||
if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
|
||||
eventList.add(it)
|
||||
}
|
||||
}
|
||||
exposable.getEventListByPosition(pos)?.let { list ->
|
||||
list.forEach {
|
||||
if (it.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
|
||||
eventList.add(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (ignore: Exception) {
|
||||
// Just ignore the error.
|
||||
}
|
||||
}
|
||||
ExposureManager.logCPM(eventList)
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,13 +1,11 @@
|
||||
package com.gh.common.exposure
|
||||
|
||||
import com.gh.gamecenter.BuildConfig
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.loghub.TLogHubHelper
|
||||
import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
|
||||
import com.gh.gamecenter.common.utils.toJson
|
||||
import com.gh.gamecenter.core.AppExecutor
|
||||
import com.gh.gamecenter.feature.exposure.ExposureEvent
|
||||
import com.gh.gamecenter.feature.minigame.wechat.WGameSubjectCPMListReportHelper
|
||||
import com.lightgame.utils.Utils
|
||||
import com.volcengine.model.tls.LogItem
|
||||
|
||||
@ -34,9 +32,6 @@ object ExposureManager {
|
||||
*/
|
||||
fun log(event: ExposureEvent) {
|
||||
AppExecutor.logExecutor.execute {
|
||||
if (event.payload.miniGameType == Constants.WECHAT_MINI_GAME_CPM) {
|
||||
WGameSubjectCPMListReportHelper.reportExposure(event)
|
||||
}
|
||||
if (!exposureCache.contains(event.id)) {
|
||||
exposureSet.add(event)
|
||||
exposureCache.add(event.id)
|
||||
@ -63,17 +58,6 @@ object ExposureManager {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Log a wechat mini game cpm collection of exposure event.
|
||||
*/
|
||||
fun logCPM(eventList: List<ExposureEvent>) {
|
||||
AppExecutor.logExecutor.execute {
|
||||
if (eventList.isNotEmpty()) {
|
||||
WGameSubjectCPMListReportHelper.reportExposure(eventList.toSet())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param forcedUpload Ignore all restrictions.
|
||||
*/
|
||||
|
||||
@ -3,20 +3,16 @@ package com.gh.common.exposure
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.functions.Consumer
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class ExposureThrottleBus(
|
||||
var onSuccess: Consumer<VisibleState>,
|
||||
var onError: Consumer<Throwable>,
|
||||
onPreSuccess: Consumer<VisibleState>
|
||||
) {
|
||||
class ExposureThrottleBus(var onSuccess: Consumer<VisibleState>, var onError: Consumer<Throwable>) {
|
||||
|
||||
companion object {
|
||||
private const val THRESHOLD_TIME = 300L
|
||||
}
|
||||
|
||||
private val mPublishSubject: BehaviorSubject<VisibleState> = BehaviorSubject.create()
|
||||
private val mPublishSubject: PublishSubject<VisibleState> = PublishSubject.create()
|
||||
private val mCompositeDisposable: CompositeDisposable = CompositeDisposable()
|
||||
|
||||
init {
|
||||
@ -28,7 +24,6 @@ class ExposureThrottleBus(
|
||||
*/
|
||||
val disposable = mPublishSubject
|
||||
.distinctUntilChanged()
|
||||
.doOnNext(onPreSuccess)
|
||||
.throttleWithTimeout(THRESHOLD_TIME, TimeUnit.MILLISECONDS)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.subscribe(onSuccess, onError)
|
||||
|
||||
@ -53,6 +53,7 @@ object ExposureUtils {
|
||||
return exposureEvent
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun logADownloadCompleteExposureEvent(
|
||||
entity: GameEntity,
|
||||
platform: String?,
|
||||
@ -60,7 +61,6 @@ object ExposureUtils {
|
||||
speed: Long,
|
||||
host: String? = "unknown",
|
||||
path: String? = "unknown",
|
||||
redirectedUrlList: String? = "unknown",
|
||||
downloadType: DownloadType
|
||||
): ExposureEvent? {
|
||||
val gameEntity = entity.copy()
|
||||
@ -88,7 +88,6 @@ object ExposureUtils {
|
||||
exposureEvent.payload.host = host
|
||||
exposureEvent.payload.path = path
|
||||
exposureEvent.payload.speed = speed
|
||||
exposureEvent.payload.redirectedUrlList = redirectedUrlList
|
||||
|
||||
ExposureManager.log(exposureEvent)
|
||||
ExposureManager.commitSavedExposureEvents(forcedUpload = true)
|
||||
|
||||
@ -5,6 +5,6 @@ import com.gh.gamecenter.entity.BottomTab
|
||||
interface ISearchToolbarTab {
|
||||
fun onScrollChanged(totalHeight: Int, offset: Int, isDarkModeChanged: Boolean)
|
||||
fun changeAppBarColor(color: Int, pageId: String)
|
||||
fun updateSearchStyle(searchStyle: BottomTab.SearchStyle)
|
||||
fun setSearchStyle(searchStyle: BottomTab.SearchStyle)
|
||||
fun getCurrentTabIndex(): Int?
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
package com.gh.common.pop
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.updateLayoutParams
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
|
||||
import com.gh.gamecenter.common.view.BugFixedPopupWindow
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.databinding.LayoutAddKaifuPopupItemBinding
|
||||
|
||||
class BatchManagementPop(
|
||||
binding: LayoutPopupContainerBinding,
|
||||
private val listener: OnBatchManagementListener
|
||||
) :
|
||||
CommonPopupWindow(binding) {
|
||||
override val viewDataList: List<ViewData>
|
||||
get() = listOf(
|
||||
ViewData(R.string.enable_automatic_downloading_in_batches) {
|
||||
listener.enableAutoDownload()
|
||||
},
|
||||
ViewData(R.string.batch_management) {
|
||||
listener.batchManage()
|
||||
}
|
||||
)
|
||||
|
||||
companion object {
|
||||
|
||||
fun create(context: Context, listener: OnBatchManagementListener): BatchManagementPop {
|
||||
val binding = LayoutPopupContainerBinding.inflate(LayoutInflater.from(context))
|
||||
return BatchManagementPop(binding, listener).apply {
|
||||
initView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
interface OnBatchManagementListener {
|
||||
|
||||
fun enableAutoDownload()
|
||||
|
||||
fun batchManage()
|
||||
}
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
package com.gh.common.pop
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
|
||||
import com.gh.gamecenter.feature.entity.GameEntity
|
||||
|
||||
class CancelReservePop(
|
||||
private val game: GameEntity,
|
||||
binding: LayoutPopupContainerBinding,
|
||||
private val listener: OnCancelReserveListener
|
||||
|
||||
) : CommonPopupWindow(binding) {
|
||||
|
||||
override val viewDataList: List<ViewData>
|
||||
get() {
|
||||
val list = arrayListOf<ViewData>()
|
||||
if (game.wifiAutoDownloadEnable) {
|
||||
list.add(ViewData(if (game.wifiAutoDownload) R.string.cancel_auto_download_with_wifi else R.string.enable_automatic_downloading_with_wifi) {
|
||||
listener.enableAutoDownload(!game.wifiAutoDownload)
|
||||
})
|
||||
}
|
||||
list.add(ViewData(R.string.cancel_reserve, listener::cancelReserve))
|
||||
return list
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
fun create(
|
||||
game: GameEntity,
|
||||
context: Context,
|
||||
listener: OnCancelReserveListener
|
||||
): CancelReservePop {
|
||||
val inflater = LayoutInflater.from(context)
|
||||
val binding = LayoutPopupContainerBinding.inflate(inflater)
|
||||
return CancelReservePop(game, binding, listener).apply {
|
||||
initView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
interface OnCancelReserveListener {
|
||||
|
||||
fun enableAutoDownload(isEnable: Boolean)
|
||||
|
||||
fun cancelReserve()
|
||||
}
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
package com.gh.common.pop
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.updateLayoutParams
|
||||
import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
|
||||
import com.gh.gamecenter.common.view.BugFixedPopupWindow
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
|
||||
import com.gh.gamecenter.databinding.LayoutAddKaifuPopupItemBinding
|
||||
import com.gh.gamecenter.databinding.LayoutPopupOptionItemBinding
|
||||
import com.gh.gamecenter.databinding.LayoutPopupReserveReminderOptionItemBinding
|
||||
|
||||
abstract class CommonPopupWindow(
|
||||
private val binding: LayoutPopupContainerBinding,
|
||||
) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
|
||||
|
||||
private val inflater = LayoutInflater.from(binding.root.context)
|
||||
|
||||
abstract val viewDataList: List<ViewData>
|
||||
|
||||
fun initView() {
|
||||
isFocusable = true
|
||||
binding.container.updateLayoutParams<ViewGroup.LayoutParams> {
|
||||
width = DisplayUtils.dip2px(128F)
|
||||
}
|
||||
viewDataList.forEach {
|
||||
addItemView(it.textResId, it.click)
|
||||
}
|
||||
}
|
||||
|
||||
private fun addItemView(textResId: Int, click: () -> Unit) =
|
||||
LayoutPopupReserveReminderOptionItemBinding.inflate(inflater, binding.container, false)
|
||||
.also {
|
||||
it.hintText.setText(textResId)
|
||||
binding.container.addView(it.root)
|
||||
it.root.setOnClickListener {
|
||||
dismiss()
|
||||
click()
|
||||
}
|
||||
}.root
|
||||
|
||||
data class ViewData(
|
||||
val textResId: Int,
|
||||
val click: () -> Unit
|
||||
)
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
package com.gh.common.pop
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.updateLayoutParams
|
||||
import com.gh.common.dialog.OnReserveSuccessListener
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
|
||||
import com.gh.gamecenter.common.view.BugFixedPopupWindow
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.databinding.LayoutAddKaifuPopupItemBinding
|
||||
|
||||
class EditBindPhoneInfoPop(
|
||||
private val hasValidated: Boolean,
|
||||
private val binding: LayoutPopupContainerBinding,
|
||||
private val listener: OnReserveSuccessListener
|
||||
) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
|
||||
|
||||
private val context
|
||||
get() = binding.root.context
|
||||
|
||||
init {
|
||||
initView()
|
||||
}
|
||||
|
||||
private fun initView() {
|
||||
isOutsideTouchable = false
|
||||
isFocusable = true
|
||||
binding.container.updateLayoutParams<ViewGroup.LayoutParams> {
|
||||
width = DisplayUtils.dip2px(128F)
|
||||
}
|
||||
val inflater = LayoutInflater.from(context)
|
||||
fun createItemView(textResId: Int) =
|
||||
LayoutAddKaifuPopupItemBinding.inflate(inflater, binding.container, false)
|
||||
.also {
|
||||
it.hintText.setText(textResId)
|
||||
binding.container.addView(it.root)
|
||||
}.root
|
||||
|
||||
val tvChangePhoneNumber = createItemView(R.string.change_phone_number)
|
||||
if(!hasValidated){
|
||||
val tvVerifyPhoneNumber = createItemView(R.string.verify_phone_number)
|
||||
tvVerifyPhoneNumber.setOnClickListener {
|
||||
dismiss()
|
||||
listener.verifyPhoneNumber()
|
||||
}
|
||||
}
|
||||
|
||||
val tvTurnOffSmsReminder = createItemView(R.string.turn_off_sms_reminders)
|
||||
|
||||
tvChangePhoneNumber.setOnClickListener {
|
||||
dismiss()
|
||||
listener.changePhoneNumber()
|
||||
}
|
||||
|
||||
tvTurnOffSmsReminder.setOnClickListener {
|
||||
dismiss()
|
||||
listener.updateSmsReminder(false)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
fun create(context: Context, hasValidated: Boolean, listener: OnReserveSuccessListener): EditBindPhoneInfoPop {
|
||||
val binding = LayoutPopupContainerBinding.inflate(LayoutInflater.from(context))
|
||||
return EditBindPhoneInfoPop(hasValidated, binding, listener)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
package com.gh.common.pop
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import com.gh.common.dialog.OnReserveSuccessListener
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.databinding.LayoutPopupContainerBinding
|
||||
|
||||
class EditBindWechatPop(
|
||||
binding: LayoutPopupContainerBinding,
|
||||
private val listener: OnReserveSuccessListener
|
||||
) : CommonPopupWindow(binding) {
|
||||
|
||||
override val viewDataList: List<ViewData>
|
||||
get() = listOf(
|
||||
ViewData(R.string.change_the_wechat_binding, listener::changeWechatBinding)
|
||||
)
|
||||
|
||||
companion object {
|
||||
|
||||
fun create(context: Context, listener: OnReserveSuccessListener): EditBindWechatPop {
|
||||
val inflater = LayoutInflater.from(context)
|
||||
return EditBindWechatPop(LayoutPopupContainerBinding.inflate(inflater), listener).apply { initView() }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
package com.gh.common.pop
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
import android.text.SpannableString
|
||||
import android.text.TextPaint
|
||||
import android.text.method.LinkMovementMethod
|
||||
import android.text.style.ClickableSpan
|
||||
import android.text.style.ForegroundColorSpan
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.LinearLayout
|
||||
import androidx.core.text.set
|
||||
import com.gh.common.dialog.OnReserveSuccessListener
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.utils.toColor
|
||||
import com.gh.gamecenter.common.utils.toResString
|
||||
import com.gh.gamecenter.common.view.BugFixedPopupWindow
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.databinding.PopRealNameTipsBinding
|
||||
import com.halo.assistant.fragment.reserve.OnReserveReminderListener
|
||||
|
||||
class RealNameTipsPop(
|
||||
private val binding: PopRealNameTipsBinding,
|
||||
private val listener: OnReserveReminderListener
|
||||
) :
|
||||
BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
|
||||
|
||||
private val context: Context
|
||||
get() = binding.root.context
|
||||
|
||||
init {
|
||||
initView()
|
||||
}
|
||||
|
||||
private fun initView() {
|
||||
|
||||
val text = R.string.reserve_real_name_description.toResString()
|
||||
val spannableString = SpannableString(text)
|
||||
val clickSpan = object : ClickableSpan() {
|
||||
override fun updateDrawState(ds: TextPaint) {
|
||||
ds.bgColor = Color.TRANSPARENT
|
||||
ds.setColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
|
||||
}
|
||||
|
||||
override fun onClick(widget: View) {
|
||||
dismiss()
|
||||
listener.realName()
|
||||
}
|
||||
}
|
||||
spannableString.set(start = text.length - 6, end = text.length, span = clickSpan)
|
||||
binding.tvRealNameDescription.text = spannableString
|
||||
|
||||
binding.tvRealNameDescription.movementMethod = LinkMovementMethod.getInstance()
|
||||
binding.tvRealNameDescription.setHighlightColor(Color.TRANSPARENT)
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
@JvmStatic
|
||||
fun create(context: Context, listener: OnReserveReminderListener): RealNameTipsPop {
|
||||
val pop = RealNameTipsPop(PopRealNameTipsBinding.inflate(LayoutInflater.from(context)), listener)
|
||||
pop.isFocusable = true
|
||||
pop.isOutsideTouchable = false
|
||||
return pop
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,95 +0,0 @@
|
||||
package com.gh.common.pop
|
||||
|
||||
import android.content.Context
|
||||
import android.view.Gravity
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import android.widget.CompoundButton
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.utils.dip2px
|
||||
import com.gh.gamecenter.common.view.BugFixedPopupWindow
|
||||
import com.gh.gamecenter.databinding.PopReserveAllSelectBinding
|
||||
import com.gh.gamecenter.mygame.MyReservationFragment
|
||||
|
||||
class ReserveAllSelectPop(
|
||||
val binding: PopReserveAllSelectBinding,
|
||||
private val listener: OnReserveAllSelectListener
|
||||
) : BugFixedPopupWindow(binding.root, ViewGroup.LayoutParams.MATCH_PARENT, 56F.dip2px()) {
|
||||
|
||||
private var pageStatus: MyReservationFragment.ReservePageState =
|
||||
MyReservationFragment.ReservePageState.EnableAutoDownload
|
||||
|
||||
private val onCheckedChangeListener = { _: CompoundButton, isChecked: Boolean ->
|
||||
val count = listener.selectAll(isChecked)
|
||||
updateSelectedCount(count)
|
||||
}
|
||||
|
||||
init {
|
||||
isOutsideTouchable = false
|
||||
binding.cbAll.setOnCheckedChangeListener(onCheckedChangeListener)
|
||||
binding.tvSubmit.setOnClickListener {
|
||||
listener.submit()
|
||||
}
|
||||
}
|
||||
|
||||
fun show(state: MyReservationFragment.ReservePageState, context: Context) {
|
||||
enableSubmit(false)
|
||||
binding.tvSubmit.setText(
|
||||
if (state == MyReservationFragment.ReservePageState.EnableAutoDownload) {
|
||||
R.string.enable_automatic_downloading_with_wifi
|
||||
} else {
|
||||
R.string.cancel_reserve
|
||||
}
|
||||
)
|
||||
|
||||
// 清空上一次的状态
|
||||
pageStatus = state
|
||||
updateSelectedCount(0)
|
||||
|
||||
if (!isShowing) {
|
||||
showAtLocation((context as AppCompatActivity).window.decorView, Gravity.BOTTOM, 0, 0)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fun updateSelectedCount(count: Int) {
|
||||
if (count == 0) {
|
||||
enableSubmit(false)
|
||||
|
||||
binding.cbAll.setOnCheckedChangeListener(null)
|
||||
binding.cbAll.isChecked = false
|
||||
binding.cbAll.setOnCheckedChangeListener(onCheckedChangeListener)
|
||||
} else {
|
||||
enableSubmit(true)
|
||||
binding.tvNumber.text = binding.root.context.getString(R.string.count_with_parentheses, "$count")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private fun enableSubmit(isEnable: Boolean) {
|
||||
binding.tvSubmit.isEnabled = isEnable
|
||||
if (isEnable) {
|
||||
binding.tvSubmit.alpha = 1F
|
||||
} else {
|
||||
binding.tvSubmit.alpha = 0.4F
|
||||
binding.tvNumber.setText(null)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
fun create(context: Context, listener: OnReserveAllSelectListener): ReserveAllSelectPop {
|
||||
val inflater = LayoutInflater.from(context)
|
||||
return ReserveAllSelectPop(PopReserveAllSelectBinding.inflate(inflater), listener)
|
||||
}
|
||||
}
|
||||
|
||||
interface OnReserveAllSelectListener {
|
||||
|
||||
fun selectAll(isChecked: Boolean): Int
|
||||
|
||||
fun submit()
|
||||
}
|
||||
}
|
||||
@ -7,6 +7,7 @@ import android.view.LayoutInflater
|
||||
import android.widget.FrameLayout
|
||||
import com.gh.common.util.NewFlatLogUtils
|
||||
import com.gh.gamecenter.GameDetailActivity
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.view.BugFixedPopupWindow
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
@ -120,7 +121,7 @@ class AccelerateNotificationHandler(priority: Int) : PriorityChainHandler(priori
|
||||
isTouchable = true
|
||||
isFocusable = true
|
||||
isOutsideTouchable = true
|
||||
animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
|
||||
animationStyle = R.style.popup_window_ease_in_and_out_anim_style
|
||||
showAtLocation(
|
||||
activity.window.decorView,
|
||||
Gravity.TOP,
|
||||
|
||||
@ -8,6 +8,7 @@ import android.view.ViewGroup
|
||||
import android.widget.PopupWindow
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.core.view.updateLayoutParams
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.utils.dip2px
|
||||
import com.gh.gamecenter.common.view.BugFixedPopupWindow
|
||||
@ -152,7 +153,7 @@ class BottomTabGuideHandler(priority: Int): PriorityChainHandler(priority) {
|
||||
return popupWindow.apply {
|
||||
isFocusable = false
|
||||
isOutsideTouchable = false
|
||||
animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
|
||||
animationStyle = R.style.popup_window_ease_in_and_out_anim_style
|
||||
setOnDismissListener {
|
||||
dismissCallback?.invoke()
|
||||
}
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
package com.gh.common.prioritychain
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.widget.FrameLayout
|
||||
import com.airbnb.lottie.LottieAnimationView
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.core.utils.SPUtils
|
||||
import com.gh.gamecenter.databinding.LayoutCommunityHomeVideoGuideBinding
|
||||
|
||||
class CommunityHomeGuideHandler(
|
||||
priority: Int,
|
||||
private val context: Context,
|
||||
private val decorView: FrameLayout?,
|
||||
private val videoLottie: LottieAnimationView?
|
||||
) : PriorityChainHandler(priority) {
|
||||
|
||||
init {
|
||||
updateStatus(STATUS_VALID)
|
||||
}
|
||||
|
||||
override fun onProcess(): Boolean {
|
||||
return if (SPUtils.getBoolean(Constants.SP_SHOW_COMMUNITY_HOME_VIDEO_GUIDE, true)) {
|
||||
showHomeVideoGuide(context, decorView, videoLottie)
|
||||
processNext()
|
||||
true
|
||||
} else {
|
||||
processNext()
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun showHomeVideoGuide(context: Context, decorView: FrameLayout?, videoLottie: LottieAnimationView?) {
|
||||
val guideLayoutBinding = LayoutCommunityHomeVideoGuideBinding.inflate(
|
||||
LayoutInflater.from(context),
|
||||
decorView,
|
||||
true
|
||||
)
|
||||
guideLayoutBinding.root.setOnClickListener { view ->
|
||||
decorView?.removeView(view)
|
||||
SPUtils.setBoolean(Constants.SP_SHOW_COMMUNITY_HOME_VIDEO_GUIDE, false)
|
||||
|
||||
videoLottie?.playAnimation()
|
||||
SPUtils.setLong(
|
||||
Constants.SP_COMMUNITY_HOME_VIDEO_LOTTIE_LAST_PLAY_TIME,
|
||||
System.currentTimeMillis()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -5,35 +5,25 @@ import android.app.Activity
|
||||
import android.app.Application.ActivityLifecycleCallbacks
|
||||
import android.os.Bundle
|
||||
import android.preference.PreferenceManager
|
||||
import android.text.TextUtils
|
||||
import androidx.annotation.WorkerThread
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import com.gh.common.iinterface.ISuperiorChain
|
||||
import com.gh.common.util.CheckLoginUtils
|
||||
import com.gh.common.util.PackageUtils
|
||||
import com.gh.download.DownloadManager
|
||||
import com.gh.gamecenter.SplashAdActivity
|
||||
import com.gh.gamecenter.SplashScreenActivity
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.exposure.ExposureSource
|
||||
import com.gh.gamecenter.common.entity.SimpleGameEntity
|
||||
import com.gh.gamecenter.common.retrofit.BiResponse
|
||||
import com.gh.gamecenter.common.utils.*
|
||||
import com.gh.gamecenter.core.AppExecutor
|
||||
import com.gh.gamecenter.core.runOnIoThread
|
||||
import com.gh.gamecenter.core.utils.SPUtils
|
||||
import com.gh.gamecenter.core.utils.SPUtils.getBoolean
|
||||
import com.gh.gamecenter.core.utils.ToastUtils
|
||||
import com.gh.gamecenter.entity.DialogEntity
|
||||
import com.gh.gamecenter.feature.entity.GameEntity
|
||||
import com.gh.gamecenter.feature.entity.ReserveOnlineEntity
|
||||
import com.gh.gamecenter.feature.entity.WelcomeDialogEntity
|
||||
import com.gh.gamecenter.feature.exposure.ExposureEvent
|
||||
import com.gh.gamecenter.hud.PendingInstallHUDHandler
|
||||
import com.gh.gamecenter.hud.ResumeDownloadHudHandler
|
||||
import com.gh.gamecenter.login.entity.UserInfoEntity
|
||||
import com.gh.gamecenter.login.user.UserManager
|
||||
import com.gh.gamecenter.retrofit.RetrofitManager
|
||||
import com.halo.assistant.HaloApp
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
|
||||
/**
|
||||
@ -45,7 +35,6 @@ import io.reactivex.schedulers.Schedulers
|
||||
object GlobalPriorityChainHelper : ISuperiorChain {
|
||||
|
||||
private val api = RetrofitManager.getInstance().api
|
||||
private val newApi = RetrofitManager.getInstance().newApi
|
||||
private var inferiorChain: PriorityChain? = null
|
||||
private val mainChain: PriorityChain by lazy { PriorityChain { inferiorChain?.start() } }
|
||||
|
||||
@ -234,7 +223,7 @@ object GlobalPriorityChainHelper : ISuperiorChain {
|
||||
/**
|
||||
* 请求预约弹窗相关的数据
|
||||
*/
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
private fun requestReserveDialogData(reserveDialogHandler: ReserveDialogHandler) {
|
||||
// debugOnly {
|
||||
// reserveDialogHandler.doPreProcess(arrayListOf(SimpleGameEntity(
|
||||
@ -247,145 +236,23 @@ object GlobalPriorityChainHelper : ISuperiorChain {
|
||||
// }
|
||||
|
||||
if (CheckLoginUtils.isLogin()) {
|
||||
val isTeenagerMode = getBoolean(Constants.SP_TEENAGER_MODE)
|
||||
loadReserveDialogOnlineData(isTeenagerMode, reserveDialogHandler)
|
||||
api.getReserveDialog(UserManager.getInstance().userId)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(object : BiResponse<List<SimpleGameEntity>>() {
|
||||
override fun onSuccess(data: List<SimpleGameEntity>) {
|
||||
reserveDialogHandler.doPreProcess(data)
|
||||
}
|
||||
|
||||
override fun onFailure(exception: Exception) {
|
||||
reserveDialogHandler.doPreProcess(null)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
reserveDialogHandler.doPreProcess(null)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 由于用户预约的游戏个数没有限制，为避免一次加载游戏过多，这里采用先加载第一页，显示出dialog,后续数据在第二页返回
|
||||
* 注意:当page = 2 时，后台会将后续所有数据一次性返回，所以递归到第三层时，就会结束
|
||||
* @param isTeenagerMode 青少年模式关闭时才需要启动自动下载，所以当 isTeenagerMode == true 时，不需要加载后续数据，也不需要启动自动下载
|
||||
*/
|
||||
@SuppressLint("CheckResult")
|
||||
private fun loadReserveDialogOnlineData(isTeenagerMode: Boolean, handler: ReserveDialogHandler? = null) {
|
||||
newApi.getReserveDialog()
|
||||
.compose(singleToMain())
|
||||
.subscribe(object : BiResponse<ReserveOnlineEntity>() {
|
||||
override fun onSuccess(data: ReserveOnlineEntity) {
|
||||
handler?.doPreProcess(data)
|
||||
// 继续获取后续需要自动下载的游戏
|
||||
runOnIoThread {
|
||||
loadGamesWithAutoDownload(1, 20, isTeenagerMode)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onFailure(exception: Exception) {
|
||||
handler?.doPreProcess(null)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 由于这个方法本身就是在子线程调用的，这里不需要另外在做线程切换
|
||||
*/
|
||||
@SuppressLint("CheckResult")
|
||||
@WorkerThread
|
||||
private fun loadGamesWithAutoDownload(page: Int, pageSize: Int, isTeenagerMode: Boolean) {
|
||||
if (page >= 5) {
|
||||
// 为防止死循环，这里设置最多请求到第5页(正常情况下，第一页就是全部数据)
|
||||
return
|
||||
}
|
||||
val filter = "wifi_auto_download:true"
|
||||
newApi.loadGamesWithAutoDownload(page, pageSize, filter)
|
||||
.doOnSuccess(::trackAppointmentGameOnlineDialogShow)
|
||||
.subscribe(object : BiResponse<List<GameEntity>>() {
|
||||
|
||||
override fun onSuccess(data: List<GameEntity>) {
|
||||
// 请注意，这是在子线程中
|
||||
if (data.isNotEmpty()) {
|
||||
loadGamesWithAutoDownload(page + 1, pageSize, isTeenagerMode)
|
||||
startAutoDownloadIfNeed(data, isTeenagerMode)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
private fun startAutoDownloadIfNeed(games: List<GameEntity>, isTeenagerMode: Boolean) {
|
||||
val autoDownloadGameIds = mutableSetOf<String>()
|
||||
games.forEach {
|
||||
autoDownloadGameIds.add(it.id)
|
||||
if (it.wifiAutoDownload && !it.isLandPageAddressDialog() && !isTeenagerMode) {
|
||||
// 开启了 wifi 自动下载，并且不能为第三方落地页跳转
|
||||
val apk = when (it.getApk().size) {
|
||||
0 -> null
|
||||
1 -> it.getApk().first()
|
||||
else -> {
|
||||
// 自动下载，多版本默认：九游版
|
||||
it.getApk().find { apk -> "9u" == apk.getPlatform() && apk.isActive }
|
||||
}
|
||||
}
|
||||
if (apk != null) {
|
||||
val updateEntities = PackageUtils.getUpdateData(it, false)
|
||||
val isCanUpdate = if (updateEntities.size == 1) {
|
||||
true
|
||||
} else {
|
||||
// 多版本只需要判断九游版是否需要更新
|
||||
updateEntities.any { update -> "9u" == update.platform }
|
||||
}
|
||||
val isCanPluggable = PackageUtils.isCanPluggable(apk)
|
||||
if ((!PackageUtils.isInstalled(HaloApp.getInstance(), apk.packageName)
|
||||
|| isCanUpdate
|
||||
|| isCanPluggable)
|
||||
&& DownloadManager.getInstance().getDownloadEntityByUrl(apk.url) == null
|
||||
) {
|
||||
// 未下载/可更新/可插件化 且 之前没有下载记录
|
||||
val msg = FileUtils.isCanDownload(HaloApp.getInstance(), apk.size ?: "")
|
||||
if (msg.isNullOrBlank()) {
|
||||
val isWifiOpen = NetworkUtils.isWifiConnected(HaloApp.getInstance())
|
||||
val isSubscribe = !isWifiOpen
|
||||
DownloadManager.createDownload(
|
||||
HaloApp.getInstance(),
|
||||
apk,
|
||||
it,
|
||||
false,
|
||||
false,
|
||||
"",
|
||||
"",
|
||||
isSubscribe,
|
||||
ExposureEvent.createEvent(it, listOf(ExposureSource("预约上线弹窗-自动下载", "")))
|
||||
)
|
||||
} else {
|
||||
// 存储空间不足，直接跳出循环，放弃后续的所有游戏
|
||||
ToastUtils.showToast(msg)
|
||||
return@forEach
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (autoDownloadGameIds.isNotEmpty()) {
|
||||
val body = hashMapOf(
|
||||
"game_ids" to autoDownloadGameIds,
|
||||
"type" to "wifi_auto_download"
|
||||
)
|
||||
newApi.logAutoDownload(body)
|
||||
.subscribe({}, {})
|
||||
}
|
||||
}
|
||||
|
||||
private fun trackAppointmentGameOnlineDialogShow(games: List<GameEntity>) {
|
||||
if (games.isNotEmpty()) {
|
||||
val gameIds = arrayListOf<String>()
|
||||
val gameNames = arrayListOf<String>()
|
||||
val gameTypes = arrayListOf<String>()
|
||||
games.forEach { game ->
|
||||
gameIds.add(game.id)
|
||||
gameNames.add(game.name ?: "")
|
||||
gameTypes.add(game.categoryChinese)
|
||||
}
|
||||
val gameId = gameIds.joinToString()
|
||||
val gameName = gameNames.joinToString()
|
||||
val gameType = gameTypes.joinToString()
|
||||
SensorsBridge.trackAppointmentGameOnlineDialogShow(gameId, gameName, gameType)
|
||||
}
|
||||
}
|
||||
|
||||
override fun registerInferiorChain(chain: PriorityChain) {
|
||||
inferiorChain = chain
|
||||
if (mainChain.isHandlerQueueEmpty()) {
|
||||
|
||||
@ -6,6 +6,7 @@ import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.widget.PopupWindow
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.utils.dip2px
|
||||
import com.gh.gamecenter.common.utils.goneIf
|
||||
@ -281,7 +282,7 @@ class MultiTabGuideHandler(priority: Int): PriorityChainHandler(priority) {
|
||||
isTouchable = false
|
||||
isFocusable = false
|
||||
isOutsideTouchable = true
|
||||
animationStyle = com.gh.gamecenter.common.R.style.popup_window_ease_in_and_out_anim_style
|
||||
animationStyle = R.style.popup_window_ease_in_and_out_anim_style
|
||||
setOnDismissListener {
|
||||
dismissCallback?.invoke()
|
||||
}
|
||||
|
||||
@ -2,28 +2,28 @@ package com.gh.common.prioritychain
|
||||
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import com.gh.common.dialog.ReserveDialog
|
||||
import com.gh.gamecenter.common.entity.SimpleGameEntity
|
||||
import com.gh.gamecenter.core.utils.CurrentActivityHolder
|
||||
import com.gh.gamecenter.feature.entity.ReserveOnlineEntity
|
||||
|
||||
class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
|
||||
|
||||
private var mReserveData: ReserveOnlineEntity? = null
|
||||
private var mReserveData: List<SimpleGameEntity>? = null
|
||||
|
||||
/**
|
||||
* 提前预处理显示弹窗的内容
|
||||
*/
|
||||
fun doPreProcess(reserveData: ReserveOnlineEntity?) {
|
||||
fun doPreProcess(reserveData: List<SimpleGameEntity>?) {
|
||||
mReserveData = reserveData
|
||||
|
||||
if (getStatus() == STATUS_PENDING) {
|
||||
if (reserveData?.games.isNullOrEmpty()) {
|
||||
if (reserveData.isNullOrEmpty()) {
|
||||
processNext()
|
||||
} else {
|
||||
updateStatus(STATUS_VALID)
|
||||
process()
|
||||
}
|
||||
} else {
|
||||
if (reserveData?.games.isNullOrEmpty()) {
|
||||
if (reserveData.isNullOrEmpty()) {
|
||||
updateStatus(STATUS_INVALID)
|
||||
} else {
|
||||
updateStatus(STATUS_VALID)
|
||||
@ -37,7 +37,7 @@ class ReserveDialogHandler(priority: Int) : PriorityChainHandler(priority) {
|
||||
if (GlobalPriorityChainHelper.isThisActivityValid(currentActivity)) {
|
||||
when (getStatus()) {
|
||||
STATUS_VALID -> {
|
||||
val reserveDialog = ReserveDialog.getInstance(mReserveData ?:ReserveOnlineEntity())
|
||||
val reserveDialog = ReserveDialog.getInstance(mReserveData!!)
|
||||
reserveDialog.setOnDismissListener {
|
||||
processNext()
|
||||
}
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
package com.gh.common.prioritychain
|
||||
|
||||
import com.gh.gamecenter.home.video.ScrollCalculatorHelper
|
||||
|
||||
class VideoHandler(priority: Int, val scrollCalculatorHelper: ScrollCalculatorHelper): PriorityChainHandler(priority) {
|
||||
|
||||
init {
|
||||
updateStatus(STATUS_VALID)
|
||||
}
|
||||
|
||||
override fun onProcess(): Boolean {
|
||||
scrollCalculatorHelper.enableAndPlayIfValid()
|
||||
return true
|
||||
}
|
||||
|
||||
}
|
||||
@ -33,9 +33,5 @@ class BuildConfigImpl : IBuildConfigProvider {
|
||||
|
||||
override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
|
||||
|
||||
override fun getWGameCPMApiHost(): String = BuildConfig.WGAME_CPM_API_HOST
|
||||
|
||||
override fun getWGameCPMBusiAppId(): String = BuildConfig.WGAME_CPM_BUSIAPPID
|
||||
|
||||
override fun getLogProducerProject(): String = BuildConfig.LOG_HUB_PROJECT
|
||||
}
|
||||
@ -17,6 +17,7 @@ import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.common.utils.toArrayList
|
||||
import com.gh.gamecenter.core.provider.IConcernArticleUtilsProvider
|
||||
import com.gh.gamecenter.databinding.RecyclerGameArticleBinding
|
||||
import com.gh.gamecenter.R
|
||||
|
||||
@Route(path = RouteConsts.provider.concernContentUtils, name = "ConcernContentUtils暴露服务")
|
||||
class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
|
||||
@ -39,13 +40,13 @@ class ConcernArticleUtilsProviderImpl : IConcernArticleUtilsProvider {
|
||||
if (binding is RecyclerGameArticleBinding) {
|
||||
val context = binding.root.context
|
||||
binding.root
|
||||
.setBackground(ContextCompat.getDrawable(context, com.gh.gamecenter.common.R.drawable.reuse_listview_item_style))
|
||||
binding.tvGameName.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_primary))
|
||||
binding.tvTime.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
|
||||
binding.tvTitle.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_primary))
|
||||
binding.tvDescription.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_secondary))
|
||||
binding.tvComment.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
|
||||
binding.tvShare.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_tertiary))
|
||||
.setBackground(ContextCompat.getDrawable(context, R.drawable.reuse_listview_item_style))
|
||||
binding.tvGameName.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
|
||||
binding.tvTime.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
|
||||
binding.tvTitle.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
|
||||
binding.tvDescription.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
|
||||
binding.tvComment.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
|
||||
binding.tvShare.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@ import android.view.ViewGroup
|
||||
import android.widget.TextView
|
||||
import androidx.viewbinding.ViewBinding
|
||||
import com.alibaba.android.arouter.facade.annotation.Route
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.common.utils.goneIf
|
||||
import com.gh.gamecenter.common.utils.toColor
|
||||
@ -26,10 +27,10 @@ class ConcernGiftPackUtilsProviderImpl : IConcernGiftPackUtilsProvider {
|
||||
override fun initStyle(viewBinding: ViewBinding) {
|
||||
with(viewBinding as RecyclerGiftPackBinding) {
|
||||
val context = root.context
|
||||
tvGameName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
|
||||
tvTime.setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
|
||||
tvGiftPackName.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
|
||||
tvGiftPackContent.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
|
||||
tvGameName.setTextColor(R.color.text_primary.toColor(context))
|
||||
tvTime.setTextColor(R.color.text_tertiary.toColor(context))
|
||||
tvGiftPackName.setTextColor(R.color.text_primary.toColor(context))
|
||||
tvGiftPackContent.setTextColor(R.color.text_secondary.toColor(context))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -62,13 +62,7 @@ class DirectProviderImpl : IDirectProvider {
|
||||
DirectUtils.directToCommunityArticle(context, articleId, communityId, entrance, path, sourceEntrance)
|
||||
}
|
||||
|
||||
override fun directToVideoDetail(
|
||||
context: Context,
|
||||
videoId: String,
|
||||
entrance: String?,
|
||||
path: String?,
|
||||
sourceEntrance: String
|
||||
) {
|
||||
override fun directToVideoDetail(context: Context, videoId: String, entrance: String?, path: String?, sourceEntrance: String) {
|
||||
DirectUtils.directToVideoDetail(context, videoId, entrance, path, sourceEntrance)
|
||||
}
|
||||
|
||||
@ -84,13 +78,8 @@ class DirectProviderImpl : IDirectProvider {
|
||||
DirectUtils.directToQQGameById(activity, qqAppId)
|
||||
}
|
||||
|
||||
override fun directToWechatGameById(
|
||||
activity: Activity,
|
||||
wechatAppId: String,
|
||||
wechatAppPath: String,
|
||||
wechatAppExtData: String
|
||||
) {
|
||||
DirectUtils.directToWechatGameById(activity, wechatAppId, wechatAppPath, wechatAppExtData)
|
||||
override fun directToWechatGameById(activity: Activity, qqAppId: String) {
|
||||
DirectUtils.directToWechatGameById(activity, qqAppId)
|
||||
}
|
||||
|
||||
override fun directToExternalBrowser(context: Context, url: String) {
|
||||
|
||||
@ -3,6 +3,7 @@ package com.gh.common.provider
|
||||
import android.content.Context
|
||||
import com.alibaba.android.arouter.facade.annotation.Route
|
||||
import com.gh.common.util.NewFlatLogUtils
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.GlobalActivityManager
|
||||
import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.common.exposure.ExposureSource
|
||||
@ -106,7 +107,7 @@ class DownloadButtonClickedProviderImpl : IDownloadButtonClickedProvider {
|
||||
) {
|
||||
|
||||
val text = downloadButton.text.ifEmpty {
|
||||
downloadButton.getTag(com.gh.gamecenter.feature.R.string.download) ?: ""
|
||||
downloadButton.getTag(R.string.download) ?: ""
|
||||
}.toString()
|
||||
|
||||
val downloadType = if (text.contains("畅玩")) {
|
||||
|
||||
@ -2,15 +2,12 @@ package com.gh.common.provider
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import com.alibaba.android.arouter.facade.annotation.Route
|
||||
import com.gh.common.util.EntranceUtils
|
||||
import com.gh.gamecenter.common.avoidcallback.Callback
|
||||
import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.core.provider.IEntranceUtilsProvider
|
||||
import com.lightgame.utils.AppManager
|
||||
|
||||
@Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务")
|
||||
class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
|
||||
@ -23,16 +20,11 @@ class EntranceUtilsProviderImpl : IEntranceUtilsProvider {
|
||||
}
|
||||
|
||||
override fun jumpActivityWithCallback(context: Context, bundle: Bundle, callback: () -> Unit) {
|
||||
if (context is FragmentActivity && !context.supportFragmentManager.isDestroyed) {
|
||||
EntranceUtils.jumpActivityCompat(context, bundle, null, object : Callback {
|
||||
override fun onActivityResult(resultCode: Int, data: Intent?) {
|
||||
callback()
|
||||
}
|
||||
})
|
||||
} else {
|
||||
EntranceUtils.jumpActivityCompat(AppManager.getInstance().currentActivity(), bundle)
|
||||
}
|
||||
|
||||
EntranceUtils.jumpActivity(context, null, bundle, object : Callback {
|
||||
override fun onActivityResult(resultCode: Int, data: Intent?) {
|
||||
callback()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
override fun init(context: Context?) {
|
||||
|
||||
@ -9,7 +9,7 @@ import com.gh.gamecenter.core.provider.IPackageHelperProvider
|
||||
@Route(path = RouteConsts.provider.packageHelper, name = "PackageHelper暴露服务")
|
||||
class PackageHelperProviderImpl : IPackageHelperProvider {
|
||||
|
||||
override fun getLocalPackageNameSet(): Set<String> {
|
||||
override fun getLocalPackageNameSet(): HashSet<String> {
|
||||
return PackageHelper.localPackageNameSet
|
||||
}
|
||||
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
package com.gh.common.provider
|
||||
|
||||
import android.content.Context
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import com.alibaba.android.arouter.facade.annotation.Route
|
||||
import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.core.provider.ISearchTabUtilsProvider
|
||||
import com.gh.gamecenter.search.viewmodel.SearchTabViewModel
|
||||
|
||||
@Route(path = RouteConsts.provider.searchTabUtils, name = "SearchTabUtils暴露服务")
|
||||
class SearchTabUtilsProviderImpl : ISearchTabUtilsProvider {
|
||||
|
||||
override fun obtainParentViewModel(fragment: Fragment): ViewModel {
|
||||
val store = (fragment.parentFragment ?: fragment).viewModelStore
|
||||
val factory = fragment.defaultViewModelProviderFactory
|
||||
return ViewModelProvider(
|
||||
store,
|
||||
factory
|
||||
).get(SearchTabViewModel::class.java)
|
||||
}
|
||||
|
||||
override fun getKeyAndTypeLiveData(viewModel: ViewModel?): LiveData<Pair<String, String>>? =
|
||||
if (viewModel is SearchTabViewModel) {
|
||||
viewModel.searchKeyAndType
|
||||
} else {
|
||||
null
|
||||
}
|
||||
|
||||
|
||||
override fun init(context: Context?) {
|
||||
// no implement
|
||||
}
|
||||
}
|
||||
@ -4,19 +4,16 @@ import android.content.Context
|
||||
import com.alibaba.android.arouter.facade.annotation.Route
|
||||
import com.gh.common.util.WechatBindHelper
|
||||
import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.common.entity.WechatConfigEntity
|
||||
import com.gh.gamecenter.core.provider.IWechatBindHelperProvider
|
||||
|
||||
@Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务")
|
||||
class WechatHelperProviderImpl : IWechatBindHelperProvider<WechatConfigEntity> {
|
||||
|
||||
override fun getWechatConfig(callback: ((WechatConfigEntity) -> Unit)?) {
|
||||
class WechatHelperProviderImpl : IWechatBindHelperProvider {
|
||||
override fun getWechatConfig(callback: (() -> Unit)?) {
|
||||
WechatBindHelper.getWechatConfig {
|
||||
callback?.invoke(it)
|
||||
callback?.invoke()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
override fun init(context: Context?) {
|
||||
// Do nothing
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ import com.gh.common.constant.Config
|
||||
import com.gh.common.util.LogUtils
|
||||
import com.gh.common.util.NewFlatLogUtils
|
||||
import com.gh.gamecenter.BuildConfig
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.utils.*
|
||||
import com.gh.gamecenter.core.utils.EmptyCallback
|
||||
import com.gh.gamecenter.core.utils.SPUtils
|
||||
@ -90,7 +91,7 @@ object NewSimulatorGameManager {
|
||||
},
|
||||
uiModificationCallback = { binding ->
|
||||
binding.contentTv.gravity = Gravity.START
|
||||
binding.contentTv.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(context))
|
||||
binding.contentTv.setTextColor(R.color.text_secondary.toColor(context))
|
||||
},
|
||||
extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
|
||||
)
|
||||
|
||||
@ -339,8 +339,8 @@ class SimulatorDownloadManager private constructor() {
|
||||
Utils.toast(context, "当前使用移动数据进行下载")
|
||||
}
|
||||
|
||||
downloadDialog = TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "模拟器下载", "下载中弹窗")
|
||||
downloadDialog?.window?.setBackgroundDrawableResource(com.gh.gamecenter.common.R.color.transparent)
|
||||
downloadDialog = TrackableDialog(context, R.style.GhAlertDialog, "模拟器下载", "下载中弹窗")
|
||||
downloadDialog?.window?.setBackgroundDrawableResource(R.color.transparent)
|
||||
|
||||
val view = View.inflate(context, R.layout.download_simulator_dialog, null)
|
||||
|
||||
@ -392,7 +392,7 @@ class SimulatorDownloadManager private constructor() {
|
||||
ToastUtils.showToast("该模拟器暂未提供下载")
|
||||
},
|
||||
uiModificationCallback = { binding ->
|
||||
binding.confirmTv.setTextColor(com.gh.gamecenter.common.R.color.text_instance.toColor(context))
|
||||
binding.confirmTv.setTextColor(R.color.text_instance.toColor(context))
|
||||
},
|
||||
extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
|
||||
)
|
||||
|
||||
@ -95,13 +95,13 @@ object ArchiveDownloadButtonHelper {
|
||||
R.string.archive_dialog_title.toResString(),
|
||||
R.string.archive_vspace_dialog_content.toResString(),
|
||||
R.string.archive_vspace_dialog_confirm.toResString(),
|
||||
com.gh.gamecenter.common.R.string.cancel.toResString(),
|
||||
R.string.cancel.toResString(),
|
||||
{
|
||||
NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.archive_vspace_dialog_confirm.toResString())
|
||||
VHelper.showVSpaceDialog(context, gameEntity)
|
||||
},
|
||||
{
|
||||
NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(com.gh.gamecenter.common.R.string.cancel.toResString())
|
||||
NewFlatLogUtils.logCloudArchiveVSpaceDownloadDialogClick(R.string.cancel.toResString())
|
||||
},
|
||||
extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
|
||||
)
|
||||
@ -114,14 +114,14 @@ object ArchiveDownloadButtonHelper {
|
||||
R.string.archive_dialog_title.toResString(),
|
||||
R.string.archive_download_dialog_content.toResString(),
|
||||
R.string.archive_download_dialog_confirm.toResString(),
|
||||
com.gh.gamecenter.common.R.string.cancel.toResString(),
|
||||
R.string.cancel.toResString(),
|
||||
confirmClickCallback = {
|
||||
NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.archive_download_dialog_confirm.toResString())
|
||||
VHelper.disableLaunchGameAfterInstallation()
|
||||
EventBus.getDefault().post(EBReuse("download"))
|
||||
},
|
||||
cancelClickCallback = {
|
||||
NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(com.gh.gamecenter.common.R.string.cancel.toResString())
|
||||
NewFlatLogUtils.logCloudArchiveGameDownloadDialogClick(R.string.cancel.toResString())
|
||||
},
|
||||
extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
|
||||
)
|
||||
@ -178,7 +178,7 @@ object ArchiveDownloadButtonHelper {
|
||||
VArchiveHelper.downloadArchive(archiveEntity)
|
||||
|
||||
// 下载进度弹窗
|
||||
val archiveLoadingDialog = Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent)
|
||||
val archiveLoadingDialog = Dialog(context, R.style.DialogWindowTransparent)
|
||||
val archiveLoadingBinding = DialogArchiveLoadingBinding.inflate(context.layoutInflater)
|
||||
showArchiveLoadingDialog(archiveLoadingDialog, archiveLoadingBinding.root)
|
||||
|
||||
@ -271,7 +271,7 @@ object ArchiveDownloadButtonHelper {
|
||||
R.string.archive_dialog_title.toResString(),
|
||||
R.string.archive_apply_dialog_content.toResString(),
|
||||
R.string.archive_apply.toResString(),
|
||||
com.gh.gamecenter.common.R.string.cancel.toResString(),
|
||||
R.string.cancel.toResString(),
|
||||
{
|
||||
if(gameEntity.is32() && VHelper.isInnerInstalled(packageName) && !VCore.getInstance().isExtPackageInstalled()) {
|
||||
// 32位的游戏 并且 32位畅玩没有安装 并且 一体化
|
||||
|
||||
@ -41,7 +41,7 @@ object BbsReportHelper {
|
||||
CurrentActivityHolder.getCurrentActivity()?.apply {
|
||||
if (this.isFinishing) return@apply
|
||||
|
||||
val dialog = Dialog(this, com.gh.gamecenter.common.R.style.DialogWindowTransparent)
|
||||
val dialog = Dialog(this, R.style.DialogWindowTransparent)
|
||||
val binding: DialogReportReasonBinding =
|
||||
DialogReportReasonBinding.inflate(LayoutInflater.from(this))
|
||||
val reportReasonAdapter = ReportReasonAdapter(
|
||||
@ -64,7 +64,7 @@ object BbsReportHelper {
|
||||
this,
|
||||
1f,
|
||||
false,
|
||||
com.gh.gamecenter.common.R.color.ui_background
|
||||
R.color.ui_background
|
||||
)
|
||||
)
|
||||
binding.reasonRv.adapter = reportReasonAdapter
|
||||
@ -94,7 +94,7 @@ object BbsReportHelper {
|
||||
binding.otherReasonEt.doOnTextChanged { text, start, before, count ->
|
||||
val tvCount: Int = text.toString().length
|
||||
if (tvCount >= 500) {
|
||||
binding.tvCount.setTextColor(com.gh.gamecenter.common.R.color.secondary_red.toColor(binding.tvCount.context))
|
||||
binding.tvCount.setTextColor(R.color.secondary_red.toColor(binding.tvCount.context))
|
||||
}
|
||||
binding.tvCount.text = "$tvCount/500"
|
||||
}
|
||||
|
||||
@ -74,7 +74,7 @@ public class CheckLoginUtils {
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
|
||||
bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
|
||||
EntranceUtils.jumpActivityCompat(context, bundle, nextToBundle, (resultCode, data) -> {
|
||||
EntranceUtils.jumpActivity(context, nextToBundle, bundle, (resultCode, data) -> {
|
||||
if (isTriggerNextStep && listener != null && isLogin()) {
|
||||
listener.onLogin();
|
||||
}
|
||||
|
||||
@ -177,7 +177,7 @@ object CommentHelper {
|
||||
}
|
||||
|
||||
val inflater = LayoutInflater.from(context)
|
||||
val layout = inflater.inflate(com.gh.gamecenter.common.R.layout.layout_popup_container, null)
|
||||
val layout = inflater.inflate(R.layout.layout_popup_container, null)
|
||||
val popupWindow = BugFixedPopupWindow(
|
||||
layout,
|
||||
LinearLayout.LayoutParams.WRAP_CONTENT,
|
||||
|
||||
@ -117,7 +117,7 @@ public class CommentUtils {
|
||||
) {
|
||||
Context context = anchor.getContext();
|
||||
LayoutInflater inflater = LayoutInflater.from(context);
|
||||
View contentView = inflater.inflate(com.gh.gamecenter.common.R.layout.layout_popup_container, null);
|
||||
View contentView = inflater.inflate(R.layout.layout_popup_container, null);
|
||||
PopupWindow popupWindow = new PopupWindow(
|
||||
contentView,
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT,
|
||||
@ -198,14 +198,14 @@ public class CommentUtils {
|
||||
LinearLayout container = new LinearLayout(context);
|
||||
container.setOrientation(LinearLayout.VERTICAL);
|
||||
container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
|
||||
container.setBackgroundColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.ui_surface));
|
||||
container.setBackgroundColor(ContextCompat.getColor(context, R.color.ui_surface));
|
||||
|
||||
for (final String s : arrReportType) {
|
||||
TextView reportTypeTv = new TextView(context);
|
||||
reportTypeTv.setText(s);
|
||||
reportTypeTv.setTextSize(17);
|
||||
reportTypeTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.title));
|
||||
reportTypeTv.setBackgroundResource(com.gh.gamecenter.common.R.drawable.textview_white_style);
|
||||
reportTypeTv.setTextColor(ContextCompat.getColor(context, R.color.title));
|
||||
reportTypeTv.setBackgroundResource(R.drawable.textview_white_style);
|
||||
reportTypeTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10,
|
||||
LinearLayout.LayoutParams.WRAP_CONTENT));
|
||||
reportTypeTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12),
|
||||
@ -248,12 +248,12 @@ public class CommentUtils {
|
||||
public static void postVote(final Context context, final CommentEntity commentEntity,
|
||||
final TextView commentLikeCountTv, final ImageView commentLikeIv,
|
||||
final OnVoteListener listener) {
|
||||
if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme)) {
|
||||
if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
|
||||
ToastUtils.INSTANCE.showToast("已经点过赞啦！");
|
||||
return;
|
||||
}
|
||||
commentEntity.setVote(commentEntity.getVote() + 1);
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
|
||||
commentLikeIv.setImageResource(R.drawable.comment_vote_select);
|
||||
commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
|
||||
commentLikeCountTv.setVisibility(View.VISIBLE);
|
||||
@ -271,7 +271,7 @@ public class CommentUtils {
|
||||
public void postFailed(Throwable e) {
|
||||
|
||||
commentEntity.setVote(commentEntity.getVote() - 1);
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
|
||||
commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
|
||||
commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
|
||||
if (commentEntity.getVote() == 0) {
|
||||
@ -318,12 +318,12 @@ public class CommentUtils {
|
||||
entrance = "视频流-评论-点赞";
|
||||
}
|
||||
CheckLoginUtils.checkLogin(context, entrance, () -> {
|
||||
if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme)) {
|
||||
if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) {
|
||||
ToastUtils.INSTANCE.showToast("已经点过赞啦！");
|
||||
return;
|
||||
}
|
||||
commentEntity.setVote(commentEntity.getVote() + 1);
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
|
||||
commentLikeIv.setImageResource(R.drawable.comment_vote_select);
|
||||
commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
|
||||
commentLikeCountTv.setVisibility(View.VISIBLE);
|
||||
@ -340,7 +340,7 @@ public class CommentUtils {
|
||||
@Override
|
||||
public void postFailed(Throwable e) {
|
||||
commentEntity.setVote(commentEntity.getVote() - 1);
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
|
||||
commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
|
||||
commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
|
||||
if (commentEntity.getVote() == 0) {
|
||||
@ -394,7 +394,7 @@ public class CommentUtils {
|
||||
@Override
|
||||
public void postFailed(Throwable e) {
|
||||
commentEntity.setVote(commentEntity.getVote() - 1);
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.hint));
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.hint));
|
||||
commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
|
||||
commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
|
||||
if (commentEntity.getVote() == 0) {
|
||||
@ -444,7 +444,7 @@ public class CommentUtils {
|
||||
public void onFailure(@Nullable HttpException e) {
|
||||
super.onFailure(e);
|
||||
commentEntity.setVote(commentEntity.getVote() + 1);
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, com.gh.gamecenter.common.R.color.text_theme));
|
||||
commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme));
|
||||
commentLikeIv.setImageResource(R.drawable.comment_vote_select);
|
||||
commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
|
||||
commentLikeCountTv.setVisibility(View.VISIBLE);
|
||||
@ -487,7 +487,7 @@ public class CommentUtils {
|
||||
// 设置评论item 用户相关的view(点赞/头像/用户名)
|
||||
public static void setCommentUserView(Context mContext, CommentViewHolder holder, CommentEntity entity) {
|
||||
MeEntity userDataEntity = entity.getMe();
|
||||
holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.hint));
|
||||
holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.hint));
|
||||
holder.commentLikeIv.setImageResource(R.drawable.comment_vote_unselect);
|
||||
|
||||
if (userDataEntity == null || !userDataEntity.isCommentOwner()) {
|
||||
@ -502,7 +502,7 @@ public class CommentUtils {
|
||||
holder.commentLikeCountTv.setVisibility(View.GONE);
|
||||
} else { // 检查是否已点赞
|
||||
if (userDataEntity != null && (userDataEntity.isCommentVoted())) {
|
||||
holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.text_theme));
|
||||
holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme));
|
||||
holder.commentLikeIv.setImageResource(R.drawable.comment_vote_select);
|
||||
}
|
||||
holder.commentLikeCountTv.setVisibility(View.VISIBLE);
|
||||
|
||||
@ -194,7 +194,7 @@ public class DetailDownloadUtils {
|
||||
|
||||
if (showAsVGame) {
|
||||
// 显示为畅玩游戏
|
||||
if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
|
||||
if (context.getString(R.string.launch).equals(rawBtnText)) {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
|
||||
} else {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
|
||||
@ -203,13 +203,13 @@ public class DetailDownloadUtils {
|
||||
String decoratedBtnText;
|
||||
// 双下载按钮时，显示特殊样式
|
||||
if (showDualDownloadButton
|
||||
&& (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.smooth).equals(rawBtnText) || context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText))) {
|
||||
if (context.getString(com.gh.gamecenter.feature.R.string.smooth).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.download_v);
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.update_v);
|
||||
&& (context.getString(R.string.launch).equals(rawBtnText) || context.getString(R.string.install).equals(rawBtnText) || context.getString(R.string.smooth).equals(rawBtnText) || context.getString(R.string.update).equals(rawBtnText))) {
|
||||
if (context.getString(R.string.smooth).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(R.string.download_v);
|
||||
} else if (context.getString(R.string.update).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(R.string.update_v);
|
||||
} else {
|
||||
decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.launch_v);
|
||||
decoratedBtnText = context.getString(R.string.launch_v);
|
||||
}
|
||||
|
||||
if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
|
||||
@ -221,8 +221,8 @@ public class DetailDownloadUtils {
|
||||
decoratedBtnText = rawBtnText + (containsAddWord? "" : downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
|
||||
|
||||
if (overlayTv != null && downloadButton.getVisibility() != View.GONE) {
|
||||
if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)
|
||||
|| context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
|
||||
if (context.getString(R.string.launch).equals(rawBtnText)
|
||||
|| context.getString(R.string.install).equals(rawBtnText)) {
|
||||
overlayTv.setVisibility(View.VISIBLE);
|
||||
overlayTv.setText("启动（畅玩）");
|
||||
} else {
|
||||
@ -246,11 +246,11 @@ public class DetailDownloadUtils {
|
||||
}
|
||||
} else {
|
||||
// 非畅玩，显示为普通游戏
|
||||
if (context.getString(com.gh.gamecenter.feature.R.string.pluggable).equals(rawBtnText)) {
|
||||
if (context.getString(R.string.pluggable).equals(rawBtnText)) {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
|
||||
} else if (context.getString(R.string.launch).equals(rawBtnText)) {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
|
||||
} else if (context.getString(R.string.install).equals(rawBtnText)) {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
|
||||
} else {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
|
||||
@ -278,14 +278,14 @@ public class DetailDownloadUtils {
|
||||
if (viewHolder.isNewsDetail()) {
|
||||
decoratedBtnText = rawBtnText;
|
||||
localBtnText = rawBtnText;
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.pluggable).equals(rawBtnText)) {
|
||||
} else if (context.getString(R.string.pluggable).equals(rawBtnText)) {
|
||||
decoratedBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord) + getWrappedDownloadSizeText(viewHolder);
|
||||
localBtnText = "升级" + (!containsAddWord ? "" : "至" + downloadAddWord);
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.launch).equals(rawBtnText)) {
|
||||
} else if (context.getString(R.string.launch).equals(rawBtnText)) {
|
||||
decoratedBtnText = rawBtnText + (!containsAddWord ? "" : "-" + downloadAddWord);
|
||||
localBtnText = context.getString(com.gh.gamecenter.feature.R.string.launch_local);
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.attempt).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.attempt);
|
||||
localBtnText = context.getString(R.string.launch_local);
|
||||
} else if (context.getString(R.string.attempt).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(R.string.attempt);
|
||||
localBtnText = rawBtnText;
|
||||
if (showDualDownloadButton
|
||||
&& viewHolder.getLocalDownloadContainer() != null
|
||||
@ -294,12 +294,12 @@ public class DetailDownloadUtils {
|
||||
} else if (viewHolder.getOverlayTv() != null) {
|
||||
useAlternativeTextStyle = true;
|
||||
}
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.install).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.install);
|
||||
localBtnText = context.getString(com.gh.gamecenter.feature.R.string.install_local);
|
||||
} else if (context.getString(com.gh.gamecenter.feature.R.string.update).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(com.gh.gamecenter.feature.R.string.update);
|
||||
localBtnText = context.getString(com.gh.gamecenter.feature.R.string.update_local);
|
||||
} else if (context.getString(R.string.install).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(R.string.install);
|
||||
localBtnText = context.getString(R.string.install_local);
|
||||
} else if (context.getString(R.string.update).equals(rawBtnText)) {
|
||||
decoratedBtnText = context.getString(R.string.update);
|
||||
localBtnText = context.getString(R.string.update_local);
|
||||
if (showDualDownloadButton
|
||||
&& viewHolder.getLocalDownloadContainer() != null
|
||||
&& viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
|
||||
@ -311,7 +311,7 @@ public class DetailDownloadUtils {
|
||||
} else {
|
||||
decoratedBtnText = rawBtnText;
|
||||
}
|
||||
localBtnText = context.getString(com.gh.gamecenter.feature.R.string.download_local);
|
||||
localBtnText = context.getString(R.string.download_local);
|
||||
if (showDualDownloadButton
|
||||
&& viewHolder.getLocalDownloadContainer() != null
|
||||
&& viewHolder.getLocalDownloadContainer().getVisibility() == View.VISIBLE) {
|
||||
@ -346,9 +346,9 @@ public class DetailDownloadUtils {
|
||||
}
|
||||
|
||||
if (overlayTv != null && overlayTv.getVisibility() == View.VISIBLE) {
|
||||
downloadButton.setTag(com.gh.gamecenter.feature.R.string.download, overlayTv.getText());
|
||||
downloadButton.setTag(R.string.download, overlayTv.getText());
|
||||
} else {
|
||||
downloadButton.setTag(com.gh.gamecenter.feature.R.string.download, downloadButton.getText());
|
||||
downloadButton.setTag(R.string.download, downloadButton.getText());
|
||||
}
|
||||
|
||||
if (downloadEntity == null) return;
|
||||
@ -488,7 +488,7 @@ public class DetailDownloadUtils {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
|
||||
break;
|
||||
case waiting:
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.waiting);
|
||||
downloadButton.setText(R.string.waiting);
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
|
||||
break;
|
||||
case overflow:
|
||||
@ -498,12 +498,12 @@ public class DetailDownloadUtils {
|
||||
case diskisfull:
|
||||
case diskioerror:
|
||||
case pause:
|
||||
String pausedText = viewHolder.getContext().getString(com.gh.gamecenter.feature.R.string.paused);
|
||||
String pausedText = viewHolder.getContext().getString(R.string.paused);
|
||||
downloadButton.setText(getValidProgress(downloadEntity) + "% " + pausedText);
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
|
||||
break;
|
||||
case done:
|
||||
String updateText = viewHolder.getContext().getString(com.gh.gamecenter.feature.R.string.update);
|
||||
String updateText = viewHolder.getContext().getString(R.string.update);
|
||||
if (!status.contains(updateText)) {
|
||||
if (VHelper.isInstalled(downloadEntity.getPackageName())) {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
|
||||
@ -544,7 +544,7 @@ public class DetailDownloadUtils {
|
||||
case diskisfull:
|
||||
case diskioerror:
|
||||
case overflow:
|
||||
String pausedText = context.getString(com.gh.gamecenter.feature.R.string.paused);
|
||||
String pausedText = context.getString(R.string.paused);
|
||||
String downloadingText = SpeedUtils.getSpeed(downloadEntity.getSpeed());
|
||||
String resumeText = getValidProgress(downloadEntity) + "% " + pausedText;
|
||||
downloadButton.setText((downloadEntity.getStatus() == DownloadStatus.downloading || downloadEntity.getStatus() == DownloadStatus.redirected) ? downloadingText : resumeText);
|
||||
@ -555,7 +555,7 @@ public class DetailDownloadUtils {
|
||||
}
|
||||
break;
|
||||
case waiting:
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.waiting);
|
||||
downloadButton.setText(R.string.waiting);
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.WAITING);
|
||||
break;
|
||||
case done:
|
||||
@ -563,21 +563,21 @@ public class DetailDownloadUtils {
|
||||
boolean isInstalled = PackageUtils.isInstalledFromAllPackage(context, gameEntity.getSimulator().getApk().getPackageName());
|
||||
boolean isInstalledNewSimulator = SimulatorGameManager.isNewSimulatorInstalled(context);
|
||||
if (isInstalled || isInstalledNewSimulator) {
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.launch);
|
||||
downloadButton.setText(R.string.launch);
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
|
||||
} else {
|
||||
if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.browser_install_install);
|
||||
downloadButton.setText(R.string.browser_install_install);
|
||||
} else {
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
|
||||
downloadButton.setText(R.string.install);
|
||||
}
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
|
||||
}
|
||||
} else {
|
||||
if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) && !Objects.equals(Constants.XAPK_APKS_FORMAT, downloadEntity.getFormat())) {
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.browser_install_install);
|
||||
downloadButton.setText(R.string.browser_install_install);
|
||||
} else {
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
|
||||
downloadButton.setText(R.string.install);
|
||||
}
|
||||
}
|
||||
|
||||
@ -617,7 +617,7 @@ public class DetailDownloadUtils {
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_UNZIPPING);
|
||||
return true;
|
||||
} else if (XapkUnzipStatus.FAILURE.name().equals(xapkStatus)) {
|
||||
downloadButton.setText(com.gh.gamecenter.feature.R.string.install);
|
||||
downloadButton.setText(R.string.install);
|
||||
downloadButton.setButtonStyle(DownloadButton.ButtonStyle.XAPK_FAILURE);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@ package com.gh.common.util;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
@ -67,7 +66,6 @@ import com.gh.gamecenter.databinding.DialogReportReasonBinding;
|
||||
import com.gh.gamecenter.databinding.DialogWechatReserveSuccessBinding;
|
||||
import com.gh.gamecenter.databinding.ImprintContentItemBinding;
|
||||
import com.gh.gamecenter.entity.BadgeEntity;
|
||||
import com.gh.gamecenter.entity.ReserveReminderEntity;
|
||||
import com.gh.gamecenter.entity.TrackableEntity;
|
||||
import com.gh.gamecenter.feature.entity.ApkEntity;
|
||||
import com.gh.gamecenter.feature.entity.Badge;
|
||||
@ -75,7 +73,6 @@ import com.gh.gamecenter.feature.entity.GameEntity;
|
||||
import com.gh.gamecenter.feature.entity.SettingsEntity;
|
||||
import com.gh.gamecenter.help.HelpAndFeedbackBridge;
|
||||
import com.gh.gamecenter.setting.SettingBridge;
|
||||
import com.halo.assistant.fragment.reserve.ReserveReminderContainerFragment;
|
||||
import com.lightgame.download.DownloadEntity;
|
||||
import com.lightgame.utils.AppManager;
|
||||
import com.lightgame.utils.Util_System_Keyboard;
|
||||
@ -94,13 +91,13 @@ public class DialogUtils {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
Dialog dialog = new Dialog(context);
|
||||
View view = View.inflate(context, com.gh.gamecenter.common.R.layout.set_wait_dialog, null);
|
||||
TextView message = view.findViewById(com.gh.gamecenter.common.R.id.set_wait_message);
|
||||
View view = View.inflate(context, R.layout.set_wait_dialog, null);
|
||||
TextView message = view.findViewById(R.id.set_wait_message);
|
||||
message.setText(msg);
|
||||
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||
dialog.setContentView(view);
|
||||
dialog.setCanceledOnTouchOutside(false);
|
||||
dialog.getWindow().setBackgroundDrawableResource(com.gh.gamecenter.common.R.drawable.background_shape_white_radius_8);
|
||||
dialog.getWindow().setBackgroundDrawableResource(R.drawable.background_shape_white_radius_8);
|
||||
WindowManager.LayoutParams layoutParams = dialog.getWindow().getAttributes();
|
||||
layoutParams.width = DisplayUtils.dip2px(160);
|
||||
dialog.getWindow().setAttributes(layoutParams);
|
||||
@ -151,7 +148,6 @@ public class DialogUtils {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static void showNoConnectionDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
|
||||
DialogHelper.showDialog(context, "下载提示", "网络异常，请检查手机网络状态", "知道了", "WiFi自动下载", listener::onConfirm, cancelListener::onCancel, false, "", "");
|
||||
}
|
||||
@ -163,7 +159,7 @@ public class DialogUtils {
|
||||
|
||||
NewFlatLogUtils.logDownloadMobileDataDialogShow(gameId, gameName);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_download_traffic, null);
|
||||
View allowOnce = contentView.findViewById(R.id.allow_once);
|
||||
@ -259,7 +255,7 @@ public class DialogUtils {
|
||||
final ConfirmListener cmListener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_community, null);
|
||||
View contentContainer = contentView.findViewById(R.id.content_container);
|
||||
@ -318,7 +314,7 @@ public class DialogUtils {
|
||||
EmptyCallback callback) {
|
||||
final Context activityContext = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(activityContext, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(activityContext, R.style.DialogWindowTransparent);
|
||||
|
||||
View contentView = LayoutInflater.from(activityContext).inflate(R.layout.dialog_disallow_privacy_policy, null);
|
||||
View backButton = contentView.findViewById(R.id.back_button);
|
||||
@ -354,14 +350,14 @@ public class DialogUtils {
|
||||
final ConfirmListener cmListener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_video_upload_draft, null);
|
||||
TextView negativeTv = contentView.findViewById(R.id.negative);
|
||||
TextView positiveTv = contentView.findViewById(R.id.positive);
|
||||
TextView content = contentView.findViewById(R.id.content);
|
||||
positiveTv.setBackground(DrawableView.getOvalDrawable(com.gh.gamecenter.common.R.color.ui_background, 999));
|
||||
negativeTv.setBackground(DrawableView.getOvalDrawable(com.gh.gamecenter.common.R.color.primary_theme, 999));
|
||||
positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.ui_background, 999));
|
||||
negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.primary_theme, 999));
|
||||
content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content)));
|
||||
|
||||
negativeTv.setOnClickListener(view -> {
|
||||
@ -411,7 +407,7 @@ public class DialogUtils {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final TrackableDialog dialog = new TrackableDialog(context,
|
||||
com.gh.gamecenter.common.R.style.GhAlertDialog,
|
||||
R.style.GhAlertDialog,
|
||||
trackableEntity.getEvent(),
|
||||
trackableEntity.getKey(),
|
||||
trackableEntity.getValue(),
|
||||
@ -427,7 +423,7 @@ public class DialogUtils {
|
||||
window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
|
||||
}
|
||||
} else {
|
||||
contentView = LayoutInflater.from(context).inflate(com.gh.gamecenter.common.R.layout.dialog_alert, null);
|
||||
contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
|
||||
}
|
||||
|
||||
TextView contentTv = contentView.findViewById(R.id.dialog_content);
|
||||
@ -482,7 +478,7 @@ public class DialogUtils {
|
||||
public static Dialog showUsageStatsDialog(Context context, final ConfirmListener cmListener, final CancelListener clListener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_usage_stats, null);
|
||||
TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
|
||||
@ -522,7 +518,7 @@ public class DialogUtils {
|
||||
public static void showDownloadMutexDialog(Context context) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_downlaod_mutex, null);
|
||||
TextView positive = contentView.findViewById(R.id.dialog_positive);
|
||||
@ -562,7 +558,7 @@ public class DialogUtils {
|
||||
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
|
||||
|
||||
@ -629,7 +625,7 @@ public class DialogUtils {
|
||||
public static void showLandPageAddressDialog(Context context, GameEntity gameEntity, @NonNull ConfirmListener listener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
|
||||
|
||||
@ -700,7 +696,7 @@ public class DialogUtils {
|
||||
public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
DialogAddressConfirmationBinding binding = DialogAddressConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
|
||||
|
||||
@ -741,7 +737,7 @@ public class DialogUtils {
|
||||
params = window.getAttributes();
|
||||
params.width = (int) (context.getResources().getDisplayMetrics().widthPixels * 0.9);
|
||||
window.setAttributes(params);
|
||||
window.setBackgroundDrawableResource(com.gh.gamecenter.common.R.drawable.textview_white_up);
|
||||
window.setBackgroundDrawableResource(R.drawable.textview_white_up);
|
||||
}
|
||||
|
||||
inflate.findViewById(R.id.imprint_close).setOnClickListener(v -> dialog.dismiss());
|
||||
@ -771,7 +767,7 @@ public class DialogUtils {
|
||||
|
||||
// close line
|
||||
View view = new View(context);
|
||||
view.setBackgroundColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_5d5d5d));
|
||||
view.setBackgroundColor(context.getResources().getColor(R.color.text_5d5d5d));
|
||||
view.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(1)));
|
||||
content.addView(view);
|
||||
}
|
||||
@ -779,7 +775,7 @@ public class DialogUtils {
|
||||
public static void showKaifuRemindDialog(Context context, String content, String gameName) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "开服说明弹窗", "弹窗", gameName, null, null, true);
|
||||
final Dialog dialog = new TrackableDialog(context, R.style.GhAlertDialog, "开服说明弹窗", "弹窗", gameName, null, null, true);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_kaifu_remind, null);
|
||||
|
||||
@ -809,7 +805,7 @@ public class DialogUtils {
|
||||
public static void showStopServerExplanationDialog(Context context, String content, String gameName) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new TrackableDialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog, "评论说明弹窗", "弹窗", gameName, null, null, true);
|
||||
final Dialog dialog = new TrackableDialog(context, R.style.GhAlertDialog, "评论说明弹窗", "弹窗", gameName, null, null, true);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_stop_service_explanation, null);
|
||||
|
||||
@ -854,7 +850,7 @@ public class DialogUtils {
|
||||
|
||||
final Dialog dialog = new TrackableDialog(
|
||||
context,
|
||||
com.gh.gamecenter.common.R.style.GhAlertDialog,
|
||||
R.style.GhAlertDialog,
|
||||
"礼仪考试",
|
||||
"礼仪考试弹窗",
|
||||
null, null, null,
|
||||
@ -908,9 +904,9 @@ public class DialogUtils {
|
||||
public static void showNoticeDialog(Context context, String title, String content, @NonNull ConfirmListener listener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(com.gh.gamecenter.common.R.layout.dialog_notice, null);
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_notice, null);
|
||||
TextView titleTv = contentView.findViewById(R.id.dialog_title);
|
||||
TextView contentTv = contentView.findViewById(R.id.dialog_content);
|
||||
|
||||
@ -935,7 +931,7 @@ public class DialogUtils {
|
||||
public static void showViewBadgeDialog(Context context, Badge badge, ConfirmListener listener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_view_badge, null);
|
||||
TextView titleTv = contentView.findViewById(R.id.dialog_title);
|
||||
@ -956,7 +952,7 @@ public class DialogUtils {
|
||||
});
|
||||
}
|
||||
|
||||
Animation animation = AnimationUtils.loadAnimation(context, com.gh.gamecenter.common.R.anim.anim_badge_light_bg);
|
||||
Animation animation = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
|
||||
badgeLightBg.startAnimation(animation);
|
||||
|
||||
contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
|
||||
@ -973,7 +969,7 @@ public class DialogUtils {
|
||||
public static void showReceiveBadgeDialog(Context context, BadgeEntity badge, ConfirmListener listener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_receive_badge, null);
|
||||
TextView titleTv = contentView.findViewById(R.id.dialog_title);
|
||||
@ -1003,7 +999,7 @@ public class DialogUtils {
|
||||
receiveTv.setText(R.string.apply_badge);
|
||||
}
|
||||
|
||||
Animation animation = AnimationUtils.loadAnimation(context, com.gh.gamecenter.common.R.anim.anim_badge_light_bg);
|
||||
Animation animation = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
|
||||
badgeLightBg.startAnimation(animation);
|
||||
|
||||
contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
|
||||
@ -1020,7 +1016,7 @@ public class DialogUtils {
|
||||
public static void showPassRegulationDialog(Context context, String icon) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_pass_regulation, null);
|
||||
SimpleDraweeView userIcon = contentView.findViewById(R.id.dialog_icon);
|
||||
@ -1039,7 +1035,7 @@ public class DialogUtils {
|
||||
public static void showShortCutPermissionDialog(Context context) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_shortcut_permission, null);
|
||||
|
||||
@ -1064,7 +1060,7 @@ public class DialogUtils {
|
||||
, String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_cancel_reservation, null);
|
||||
TextView contentTv = contentView.findViewById(R.id.dialog_content);
|
||||
@ -1105,11 +1101,11 @@ public class DialogUtils {
|
||||
|
||||
public static void showSimulatorParseErrorDialog(Context context, String gameId, String gameName, ConfirmListener confirmListener) {
|
||||
context = checkDialogContext(context);
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.GhAlertDialog);
|
||||
final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
|
||||
|
||||
DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false);
|
||||
Context finalContext = context;
|
||||
SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, com.gh.gamecenter.common.R.color.text_theme, true, new Function0<Unit>() {
|
||||
SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.text_theme, true, new Function0<Unit>() {
|
||||
@Override
|
||||
public Unit invoke() {
|
||||
SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "", "");
|
||||
@ -1149,7 +1145,7 @@ public class DialogUtils {
|
||||
public static void showReportReasonDialog(Context context, ArrayList<String> items, String title, ReportReasonCallBack callBack) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
DialogReportReasonBinding binding = DialogReportReasonBinding.inflate(LayoutInflater.from(context));
|
||||
|
||||
if (!title.isEmpty()) {
|
||||
@ -1168,7 +1164,7 @@ public class DialogUtils {
|
||||
return null;
|
||||
});
|
||||
binding.reasonRv.setLayoutManager(new LinearLayoutManager(context));
|
||||
binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, com.gh.gamecenter.common.R.color.ui_background));
|
||||
binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.ui_background));
|
||||
binding.reasonRv.setAdapter(reportReasonAdapter);
|
||||
|
||||
binding.negativeBtn.setOnClickListener(v -> {
|
||||
@ -1190,7 +1186,7 @@ public class DialogUtils {
|
||||
ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> {
|
||||
int tvCount = s.length();
|
||||
if (tvCount >= 500) {
|
||||
binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, com.gh.gamecenter.common.R.color.secondary_red));
|
||||
binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.secondary_red));
|
||||
}
|
||||
binding.tvCount.setText(tvCount + "/500");
|
||||
return null;
|
||||
@ -1204,7 +1200,7 @@ public class DialogUtils {
|
||||
public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
DialogBindPhoneBinding binding = DialogBindPhoneBinding.inflate(LayoutInflater.from(context));
|
||||
|
||||
binding.positiveTv.setOnClickListener(v -> {
|
||||
@ -1225,10 +1221,10 @@ public class DialogUtils {
|
||||
public static void showReserveOrVoteSuccess2WechatBindDialog(Context context, Boolean isReserve, ConfirmListener confirmListener, CancelListener cancelListener) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
DialogWechatReserveSuccessBinding binding = DialogWechatReserveSuccessBinding.inflate(LayoutInflater.from(context));
|
||||
binding.titleIv.setImageResource(isReserve ? R.drawable.bg_reserve_success : R.drawable.bg_vote_success);
|
||||
binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒" : "版本上线时，您将在消息中心收到通知。为了避免错过通知，亦建议您开启微信公众号提醒");
|
||||
binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒": "版本上线时，您将在消息中心收到通知。为了避免错过通知，亦建议您开启微信公众号提醒");
|
||||
binding.closeBtn.setOnClickListener(v -> {
|
||||
cancelListener.onCancel();
|
||||
dialog.dismiss();
|
||||
@ -1252,7 +1248,7 @@ public class DialogUtils {
|
||||
public static void showReserveOrVoteSuccessDialog(Context context, Boolean isReserve) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
DialogAlertDefaultBinding binding = DialogAlertDefaultBinding.inflate(LayoutInflater.from(context));
|
||||
binding.titleTv.setText(isReserve ? "游戏预约成功" : "版本投票成功");
|
||||
binding.contentTv.setText(isReserve ? "游戏上线时，您将在消息中心和微信公众号收到通知，不会错过任何预约的游戏" : "版本上线时，您将在消息中心和微信公众号收到通知，不会错过任何投票的版本");
|
||||
@ -1273,14 +1269,10 @@ public class DialogUtils {
|
||||
}
|
||||
}
|
||||
|
||||
public static void showReserveReminderDialog(Context context, GameEntity gameEntity, ReserveReminderEntity reserveReminder) {
|
||||
ReserveReminderContainerFragment.show(context, gameEntity, reserveReminder);
|
||||
}
|
||||
|
||||
public static void showRelievePhoneDialog(Context context) {
|
||||
context = checkDialogContext(context);
|
||||
|
||||
final Dialog dialog = new Dialog(context, com.gh.gamecenter.common.R.style.DialogWindowTransparent);
|
||||
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
|
||||
DialogRelievePhoneBinding binding = DialogRelievePhoneBinding.inflate(LayoutInflater.from(context));
|
||||
|
||||
Context finalContext = context;
|
||||
|
||||
@ -12,7 +12,6 @@ import android.text.TextUtils
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.os.bundleOf
|
||||
import com.alibaba.android.arouter.launcher.ARouter
|
||||
import com.gh.ad.AdPluginDownloadHelper
|
||||
import com.gh.common.constant.Config
|
||||
import com.gh.common.exposure.ExposureManager.log
|
||||
import com.gh.common.exposure.ExposureTraceUtils.appendTrace
|
||||
@ -79,7 +78,6 @@ import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
|
||||
import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
|
||||
import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
|
||||
import com.gh.gamecenter.retrofit.RetrofitManager
|
||||
import com.gh.gamecenter.SearchActivity
|
||||
import com.gh.gamecenter.servers.GameServerTestActivity
|
||||
import com.gh.gamecenter.servers.GameServersActivity
|
||||
import com.gh.gamecenter.servers.gametest2.GameServerTestV2Activity
|
||||
@ -179,8 +177,7 @@ object DirectUtils {
|
||||
"bbs_section",
|
||||
"qa",
|
||||
"feedback",
|
||||
"toolkit",
|
||||
"float_window_game"
|
||||
"toolkit"
|
||||
)
|
||||
|
||||
fun directToLinkPage(
|
||||
@ -485,13 +482,11 @@ object DirectUtils {
|
||||
ColumnCollectionDetailFragment.TYPE_QQ_MINI_GAME_COLUMN -> directToQGameHome(context)
|
||||
|
||||
// QQ游戏专题详情页
|
||||
ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN,
|
||||
ViewPagerFragmentHelper.TYPE_WECHAT_GAME_COLUMN,
|
||||
ViewPagerFragmentHelper.TYPE_WECHAT_GAME_CPM_COLUMN -> {
|
||||
val subjectType = when (linkEntity.type) {
|
||||
ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN -> SubjectData.SubjectType.QQ_GAME
|
||||
ViewPagerFragmentHelper.TYPE_WECHAT_GAME_CPM_COLUMN -> SubjectData.SubjectType.WECHAT_GAME_CPM
|
||||
else -> SubjectData.SubjectType.WECHAT_GAME
|
||||
ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN, ViewPagerFragmentHelper.TYPE_WECHAT_GAME_COLUMN -> {
|
||||
val subjectType = if (linkEntity.type == ViewPagerFragmentHelper.TYPE_QQ_MINI_GAME_COLUMN) {
|
||||
SubjectData.SubjectType.QQ_GAME
|
||||
} else {
|
||||
SubjectData.SubjectType.WECHAT_GAME
|
||||
}
|
||||
directToSubject(
|
||||
context = context,
|
||||
@ -554,22 +549,6 @@ object DirectUtils {
|
||||
MiniGameItemHelper.launchMiniGame(it, Constants.WECHAT_MINI_GAME)
|
||||
}
|
||||
|
||||
"float_window_game" -> linkEntity.link?.let { link ->
|
||||
if (PackageUtils.isInstalled(context, Constants.TOOL_MAP_PACKAGE_NAME)) {
|
||||
val intent = Intent(
|
||||
Intent.ACTION_VIEW,
|
||||
Uri.parse("ghtoolmap://floatWindow")
|
||||
).also {
|
||||
it.addCategory(Intent.CATEGORY_DEFAULT)
|
||||
it.addCategory(Intent.CATEGORY_BROWSABLE)
|
||||
it.putExtra("gameId", linkEntity.link)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
} else {
|
||||
directToGameDetail(context, Config.getFloatWindowSettingEntity()?.gameId ?: "")
|
||||
}
|
||||
}
|
||||
|
||||
"" -> {
|
||||
// do nothing
|
||||
}
|
||||
@ -1985,23 +1964,19 @@ object DirectUtils {
|
||||
return
|
||||
}
|
||||
|
||||
val qGameProvider = ARouter
|
||||
.getInstance()
|
||||
.build(RouteConsts.provider.qGame)
|
||||
.navigation() as? IQGameProvider
|
||||
|
||||
if (qGameProvider == null) return
|
||||
|
||||
// 下载广点通广告插件，供 QQ 小游戏启动使用 （当次启动不保证能用，但是下一次就大概率就能了）
|
||||
AdPluginDownloadHelper.downloadPluginIfNeeded(isGdt = true)
|
||||
|
||||
CheckLoginUtils.checkLogin(activity, null, true, "QQ小游戏-秒开") {
|
||||
CheckLoginUtils.checkLogin(
|
||||
activity, null, true, "QQ小游戏-秒开"
|
||||
) {
|
||||
val userToken = UserManager.getInstance().token
|
||||
val userId = UserManager.getInstance().userId
|
||||
val userName = UserManager.getInstance().userInfoEntity?.name ?: "unknown"
|
||||
|
||||
qGameProvider.setLoginInfo(activity, userId, userName, userToken)
|
||||
qGameProvider.launchGame(activity, qqAppId) { _, _ ->
|
||||
val qGameProvider = ARouter
|
||||
.getInstance()
|
||||
.build(RouteConsts.provider.qGame)
|
||||
.navigation() as? IQGameProvider
|
||||
qGameProvider?.setLoginInfo(activity, userId, userName, userToken)
|
||||
qGameProvider?.launchGame(activity, qqAppId) { _, _ ->
|
||||
MiniGameRecentlyPlayUseCase.submitRecentPlayedQGame(qqAppId, userId)
|
||||
}
|
||||
}
|
||||
@ -2011,8 +1986,6 @@ object DirectUtils {
|
||||
fun directToWechatGameById(
|
||||
activity: Activity,
|
||||
wechatAppId: String,
|
||||
wechatAppPath: String = "",
|
||||
wechatAppExtData: String = ""
|
||||
) {
|
||||
|
||||
val wxApiProxy = WXAPIFactory.createWXAPI(
|
||||
@ -2027,9 +2000,8 @@ object DirectUtils {
|
||||
wxApiProxy.sendReq(
|
||||
WXLaunchMiniProgram.Req().apply {
|
||||
userName = wechatAppId
|
||||
path = wechatAppPath.ifEmpty { Constants.WECHAT_MINI_GAME_PCS }
|
||||
extData = wechatAppExtData
|
||||
miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE
|
||||
path = Constants.WECHAT_MINI_GAME_PCS
|
||||
miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@ -27,8 +27,6 @@ import com.gh.download.server.BrowserInstallHelper
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.WebActivity
|
||||
import com.gh.gamecenter.adapter.viewholder.GameViewHolder
|
||||
import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
|
||||
import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
|
||||
import com.gh.gamecenter.common.callback.CancelListener
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.constant.EntranceConsts
|
||||
@ -39,10 +37,10 @@ import com.gh.gamecenter.core.utils.*
|
||||
import com.gh.gamecenter.feature.entity.GameEntity
|
||||
import com.gh.gamecenter.feature.entity.PluginLocation
|
||||
import com.gh.gamecenter.feature.exposure.ExposureEvent
|
||||
import com.gh.gamecenter.feature.minigame.MiniGameItemHelper
|
||||
import com.gh.gamecenter.feature.view.DownloadButton
|
||||
import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
|
||||
import com.gh.gamecenter.manager.PackagesManager
|
||||
import com.gh.gamecenter.feature.minigame.MiniGameItemHelper
|
||||
import com.gh.gamecenter.teenagermode.TeenagerModeActivity
|
||||
import com.gh.vspace.VHelper
|
||||
import com.lightgame.download.DownloadConfig
|
||||
@ -130,7 +128,6 @@ object DownloadItemUtils {
|
||||
holder.gameDownloadBtn.text = "已预约"
|
||||
holder.gameDownloadBtn.visibility = View.VISIBLE
|
||||
holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.RESERVED
|
||||
holder.multiVersionDownloadTv.visibility = View.GONE
|
||||
updateItemViewStatus(holder, null, null)
|
||||
}
|
||||
}
|
||||
@ -244,9 +241,9 @@ object DownloadItemUtils {
|
||||
if (RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id) != null) {
|
||||
downloadBtn.apply {
|
||||
isClickable = true
|
||||
text = context.getString(com.gh.gamecenter.feature.R.string.check)
|
||||
setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
|
||||
setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
|
||||
text = context.getString(R.string.check)
|
||||
setBackgroundResource(R.drawable.download_button_normal_style)
|
||||
setTextColor(R.color.white.toColor(context))
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -254,15 +251,15 @@ object DownloadItemUtils {
|
||||
if (gameEntity.isMiniGameOffShelve()) {
|
||||
downloadBtn.apply {
|
||||
isClickable = false
|
||||
text = context.getString(com.gh.gamecenter.feature.R.string.off_shelve)
|
||||
text = context.getString(R.string.off_shelve)
|
||||
buttonStyle = DownloadButton.ButtonStyle.NONE
|
||||
}
|
||||
} else {
|
||||
downloadBtn.apply {
|
||||
isClickable = true
|
||||
setBackgroundResource(com.gh.gamecenter.common.R.drawable.download_button_normal_style)
|
||||
setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
|
||||
text = context.getString(com.gh.gamecenter.feature.R.string.quick_play)
|
||||
setBackgroundResource(R.drawable.download_button_normal_style)
|
||||
setTextColor(R.color.white.toColor(context))
|
||||
text = context.getString(R.string.quick_play)
|
||||
}
|
||||
}
|
||||
return
|
||||
@ -273,21 +270,21 @@ object DownloadItemUtils {
|
||||
downloadBtn.apply {
|
||||
if (h5LinkEntity != null) {
|
||||
text = if ("play" == h5LinkEntity.type) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.start_playing)
|
||||
context.getString(R.string.start_playing)
|
||||
} else {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.check)
|
||||
context.getString(R.string.check)
|
||||
}
|
||||
isClickable = true
|
||||
buttonStyle = DownloadButton.ButtonStyle.NORMAL
|
||||
} else {
|
||||
if ("dialog" == offStatus) {
|
||||
text = context.getString(com.gh.gamecenter.feature.R.string.check)
|
||||
text = context.getString(R.string.check)
|
||||
buttonStyle = DownloadButton.ButtonStyle.NORMAL
|
||||
} else if ("updating" == offStatus) {
|
||||
text = context.getString(com.gh.gamecenter.feature.R.string.updating)
|
||||
text = context.getString(R.string.updating)
|
||||
buttonStyle = DownloadButton.ButtonStyle.UPDATING
|
||||
} else {
|
||||
text = context.getString(com.gh.gamecenter.feature.R.string.none)
|
||||
text = context.getString(R.string.none)
|
||||
buttonStyle = DownloadButton.ButtonStyle.NONE
|
||||
if (hideDownloadBtnIfNoAvailableContent) {
|
||||
visibility = View.GONE
|
||||
@ -300,13 +297,11 @@ object DownloadItemUtils {
|
||||
// 来自于下载管理的实体快照
|
||||
val entityFromDownloadManager = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
|
||||
// 是否正在下载中
|
||||
val isDownloading =
|
||||
entityFromDownloadManager != null && entityFromDownloadManager.status != DownloadStatus.done
|
||||
val isDownloading = entityFromDownloadManager != null && entityFromDownloadManager.status != DownloadStatus.done
|
||||
// 是否已安装至本地
|
||||
val isInstalledLocally = PackagesManager.isInstalled(gameEntity.getUniquePackageName())
|
||||
// 来自于畅玩安装列表的实体快照，若存在，代表游戏已下载并成功安装
|
||||
val entityFromInstalledVGame =
|
||||
VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
|
||||
val entityFromInstalledVGame = VHelper.getVDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
|
||||
// 是否已安装至畅玩
|
||||
val isInstalledToVSpace = entityFromInstalledVGame != null
|
||||
// 是否处于待安装状态 (仅本地安装有这个状态)
|
||||
@ -323,20 +318,19 @@ object DownloadItemUtils {
|
||||
// 3. 存在待安装任务时，待安装任务优先
|
||||
// 4. 存在一个已安装，已安装的显示优先
|
||||
// 5. 都已安装，按后台配置显示的状态优先
|
||||
val isVGamePreferred =
|
||||
if (!isInstalledLocally && !isInstalledToVSpace && entityFromDownloadManager == null) {
|
||||
gameEntity.isVGamePreferred()
|
||||
} else if (isDownloading || isPendingToInstall) {
|
||||
entityFromDownloadManager?.isVGameDownloadInDualDownloadMode() == true
|
||||
} else if (isInstalledLocally && isInstalledToVSpace) {
|
||||
gameEntity.isVGamePreferred()
|
||||
} else if (isInstalledLocally) {
|
||||
false
|
||||
} else if (isInstalledToVSpace) {
|
||||
true
|
||||
} else {
|
||||
gameEntity.isVGamePreferred()
|
||||
}
|
||||
val isVGamePreferred = if (!isInstalledLocally && !isInstalledToVSpace && entityFromDownloadManager == null) {
|
||||
gameEntity.isVGamePreferred()
|
||||
} else if (isDownloading || isPendingToInstall) {
|
||||
entityFromDownloadManager?.isVGameDownloadInDualDownloadMode() == true
|
||||
} else if (isInstalledLocally && isInstalledToVSpace) {
|
||||
gameEntity.isVGamePreferred()
|
||||
} else if (isInstalledLocally) {
|
||||
false
|
||||
} else if (isInstalledToVSpace) {
|
||||
true
|
||||
} else {
|
||||
gameEntity.isVGamePreferred()
|
||||
}
|
||||
|
||||
val downloadEntity: DownloadEntity? = if (isDownloading) {
|
||||
entityFromDownloadManager
|
||||
@ -364,17 +358,17 @@ object DownloadItemUtils {
|
||||
asVGame = true
|
||||
)
|
||||
) {
|
||||
setText(com.gh.gamecenter.feature.R.string.update)
|
||||
setText(R.string.update)
|
||||
DownloadButton.ButtonStyle.NORMAL
|
||||
} else {
|
||||
setText(com.gh.gamecenter.feature.R.string.launch)
|
||||
setText(R.string.launch)
|
||||
DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
|
||||
}
|
||||
} else {
|
||||
val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
|
||||
if (XapkUnzipStatus.SUCCESS.name == xapkStatus && isInstalling(downloadEntity.path)) {
|
||||
progress = 100
|
||||
setText(com.gh.gamecenter.feature.R.string.installing)
|
||||
setText(R.string.installing)
|
||||
buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
|
||||
return
|
||||
}
|
||||
@ -385,27 +379,23 @@ object DownloadItemUtils {
|
||||
buttonStyle = DownloadButton.ButtonStyle.XAPK_UNZIPPING
|
||||
return
|
||||
} else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
|
||||
setText(com.gh.gamecenter.feature.R.string.install)
|
||||
setText(R.string.install)
|
||||
buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
|
||||
return
|
||||
}
|
||||
|
||||
if (PackagesManager.isInstalled(downloadEntity.packageName) && !downloadEntity.isUpdate) {
|
||||
// 双下载按钮快速安装时存在已下载的安装包过时，需要重新下载的情况
|
||||
if (PackagesManager.isCanUpdate(
|
||||
downloadEntity.gameId,
|
||||
downloadEntity.packageName
|
||||
)
|
||||
) {
|
||||
if (PackagesManager.isCanUpdate(downloadEntity.gameId, downloadEntity.packageName)) {
|
||||
buttonStyle = DownloadButton.ButtonStyle.NORMAL
|
||||
setText(com.gh.gamecenter.feature.R.string.update)
|
||||
setText(R.string.update)
|
||||
} else {
|
||||
buttonStyle = DownloadButton.ButtonStyle.LAUNCH_OR_OPEN
|
||||
setText(com.gh.gamecenter.feature.R.string.launch)
|
||||
setText(R.string.launch)
|
||||
}
|
||||
} else {
|
||||
buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
|
||||
setText(com.gh.gamecenter.feature.R.string.install)
|
||||
setText(R.string.install)
|
||||
}
|
||||
}
|
||||
buttonStyle =
|
||||
@ -424,7 +414,7 @@ object DownloadItemUtils {
|
||||
DownloadStatus.diskioerror,
|
||||
DownloadStatus.overflow -> {
|
||||
buttonStyle = DownloadButton.ButtonStyle.NORMAL
|
||||
setText(com.gh.gamecenter.feature.R.string.resume)
|
||||
setText(R.string.resume)
|
||||
}
|
||||
|
||||
DownloadStatus.cancel -> {
|
||||
@ -510,13 +500,13 @@ object DownloadItemUtils {
|
||||
DownloadStatus.downloading -> {
|
||||
if (isMultiVersion) {
|
||||
holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
|
||||
val darkMode = (holder.gameDownloadTips?.getTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id) as? Boolean) ?: false
|
||||
val darkMode = (holder.gameDownloadTips?.getTag(R.string.is_dark_mode_on_id) as? Boolean) ?: false
|
||||
val isDarkModeChanged = DarkModeUtils.isDarkModeOn(context) != darkMode
|
||||
if (holder.gameDownloadTips?.visibility == View.GONE || holder.gameDownloadTips?.isAnimating == false || isDarkModeChanged) {
|
||||
holder.gameDownloadTips?.visibility = View.VISIBLE
|
||||
holder.gameDownloadTips?.setDownloadTipsAnimation(true)
|
||||
}
|
||||
holder.gameDownloadTips?.setTag(com.gh.gamecenter.common.R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
|
||||
holder.gameDownloadTips?.setTag(R.string.is_dark_mode_on_id, DarkModeUtils.isDarkModeOn(context))
|
||||
} else {
|
||||
holder.gameDownloadTips?.visibility = View.GONE
|
||||
holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
|
||||
@ -531,7 +521,7 @@ object DownloadItemUtils {
|
||||
holder.gameDownloadTips?.setDownloadTipsAnimation(false)
|
||||
}
|
||||
holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.WAITING
|
||||
holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.waiting)
|
||||
holder.gameDownloadBtn.text = context.getString(R.string.waiting)
|
||||
}
|
||||
|
||||
DownloadStatus.pause,
|
||||
@ -546,7 +536,7 @@ object DownloadItemUtils {
|
||||
holder.gameDownloadTips?.setDownloadTipsAnimation(false)
|
||||
}
|
||||
holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.NORMAL
|
||||
holder.gameDownloadBtn.text = context.getString(com.gh.gamecenter.feature.R.string.resume)
|
||||
holder.gameDownloadBtn.text = context.getString(R.string.resume)
|
||||
}
|
||||
|
||||
DownloadStatus.done -> {
|
||||
@ -561,7 +551,7 @@ object DownloadItemUtils {
|
||||
holder.gameDownloadBtn.text = "$percent%"
|
||||
return
|
||||
} else if (XapkUnzipStatus.FAILURE.name == xapkStatus) {
|
||||
holder.gameDownloadBtn.setText(com.gh.gamecenter.feature.R.string.install)
|
||||
holder.gameDownloadBtn.setText(R.string.install)
|
||||
holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.INSTALL_NORMAL
|
||||
return
|
||||
}
|
||||
@ -636,17 +626,7 @@ object DownloadItemUtils {
|
||||
location: String,
|
||||
sourceEntrance: String = "其他"
|
||||
) {
|
||||
setOnClickListener(
|
||||
context,
|
||||
downloadBtn,
|
||||
gameEntity,
|
||||
position,
|
||||
adapter,
|
||||
entrance,
|
||||
sourceEntrance,
|
||||
location,
|
||||
null
|
||||
)
|
||||
setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, sourceEntrance, location, null)
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
@ -661,18 +641,7 @@ object DownloadItemUtils {
|
||||
location: String,
|
||||
traceEvent: ExposureEvent?,
|
||||
) {
|
||||
setOnClickListener(
|
||||
context,
|
||||
downloadBtn,
|
||||
gameEntity,
|
||||
position,
|
||||
adapter,
|
||||
entrance,
|
||||
sourceEntrance,
|
||||
location,
|
||||
traceEvent,
|
||||
null
|
||||
)
|
||||
setOnClickListener(context, downloadBtn, gameEntity, position, adapter, entrance, sourceEntrance, location, traceEvent, null)
|
||||
}
|
||||
|
||||
/**
|
||||
@ -728,7 +697,7 @@ object DownloadItemUtils {
|
||||
// 为 downloadButton 添加游戏实体，供点击的时候上报用
|
||||
downloadBtn.putObject(gameEntity)
|
||||
|
||||
val gamePermissionDialogFragment = (context as? AppCompatActivity)?.supportFragmentManager?.findFragmentByTag(
|
||||
val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
|
||||
GamePermissionDialogFragment::class.java.name
|
||||
) as GamePermissionDialogFragment?
|
||||
gamePermissionDialogFragment?.dismissAllowingStateLoss()
|
||||
@ -810,18 +779,14 @@ object DownloadItemUtils {
|
||||
if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) {
|
||||
SensorsBridge.trackEvent(
|
||||
"AppointmentGame",
|
||||
"game_name", gameEntity.name ?: "",
|
||||
"game_id", gameEntity.id,
|
||||
"game_type", gameEntity.categoryChinese,
|
||||
"source_entrance", sourceEntrance,
|
||||
"page_name", getCurrentPageEntity().pageName,
|
||||
"page_id", getCurrentPageEntity().pageId,
|
||||
"page_business_id", getCurrentPageEntity().pageBusinessId,
|
||||
"last_page_name", getLastPageEntity().pageName,
|
||||
"last_page_id", getLastPageEntity().pageId,
|
||||
"last_page_business_id", getLastPageEntity().pageBusinessId,
|
||||
"source", gameEntity.exposureEvent?.source?.toString() ?: "",
|
||||
*gameEntity.customPageTrackData?.toKV() ?: arrayOf()
|
||||
"game_name",
|
||||
gameEntity.name ?: "",
|
||||
"game_id",
|
||||
gameEntity.id,
|
||||
"game_type",
|
||||
gameEntity.categoryChinese,
|
||||
"source_entrance",
|
||||
sourceEntrance
|
||||
)
|
||||
allStateClickCallback?.onCallback()
|
||||
CheckLoginUtils.checkLogin(context, entrance) {
|
||||
@ -847,7 +812,7 @@ object DownloadItemUtils {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
ReservationHelper.showCancelReservationDialog(context, gameEntity,{
|
||||
ReservationHelper.showCancelReservationDialog(context, {
|
||||
NewFlatLogUtils.logMyGameCancelReserveDialogClick(
|
||||
"确定取消",
|
||||
gameEntity.id,
|
||||
@ -880,7 +845,7 @@ object DownloadItemUtils {
|
||||
}
|
||||
if (gameEntity.isMiniGame()) {
|
||||
downloadBtn.setOnClickListener {
|
||||
MiniGameItemHelper.launchMiniGame(gameEntity)
|
||||
MiniGameItemHelper.launchMiniGame(gameEntity.miniGameAppId, gameEntity.miniGameType)
|
||||
clickCallback?.onCallback()
|
||||
allStateClickCallback?.onCallback()
|
||||
}
|
||||
@ -922,7 +887,7 @@ object DownloadItemUtils {
|
||||
}
|
||||
|
||||
// 启动不需要请求存储权限
|
||||
if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(com.gh.gamecenter.feature.R.string.launch)) {
|
||||
if (downloadBtn is DownloadButton && downloadBtn.text == context.getString(R.string.launch)) {
|
||||
clickRunnable.onCallback()
|
||||
} else {
|
||||
PermissionHelper.checkStoragePermissionBeforeAction(
|
||||
@ -945,7 +910,7 @@ object DownloadItemUtils {
|
||||
addHandler(CheckStoragePermissionHandler())
|
||||
addHandler(VersionNumberHandler())
|
||||
}
|
||||
.setProcessEndCallback(gameEntity.id) { _, _ ->
|
||||
.setProcessEndCallback { _, _ ->
|
||||
DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
|
||||
}
|
||||
.buildHandlerChain()
|
||||
@ -970,13 +935,13 @@ object DownloadItemUtils {
|
||||
traceEvent: ExposureEvent? = null,
|
||||
refreshCallback: EmptyCallback? = null
|
||||
) {
|
||||
val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(com.gh.gamecenter.feature.R.string.download)
|
||||
val str = if (downloadBtn is DownloadButton) downloadBtn.text else context.getString(R.string.download)
|
||||
if (gameEntity.getApk().isEmpty()) return
|
||||
val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
|
||||
|
||||
val shouldPerformAsVGame = GameUtils.shouldPerformAsVGame(gameEntity)
|
||||
|
||||
if (str == context.getString(com.gh.gamecenter.feature.R.string.download)) {
|
||||
if (str == context.getString(R.string.download)) {
|
||||
DownloadChainBuilder().apply {
|
||||
addHandler(UnsupportedFeatureHandler())
|
||||
addHandler(UpdateNewSimulatorHandler())
|
||||
@ -988,13 +953,13 @@ object DownloadItemUtils {
|
||||
addHandler(LandPageAddressHandler())
|
||||
addHandler(CheckDownloadHandler())
|
||||
}
|
||||
.setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
|
||||
.setProcessEndCallback { asVGame, isSubscribe ->
|
||||
download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
|
||||
}
|
||||
.buildHandlerChain()
|
||||
?.handleRequest(context, gameEntity, shouldPerformAsVGame)
|
||||
DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
|
||||
} else if (str == context.getString(com.gh.gamecenter.feature.R.string.attempt)) {
|
||||
} else if (str == context.getString(R.string.attempt)) {
|
||||
DownloadChainBuilder().apply {
|
||||
addHandler(UnsupportedFeatureHandler())
|
||||
addHandler(UpdateNewSimulatorHandler())
|
||||
@ -1007,13 +972,13 @@ object DownloadItemUtils {
|
||||
addHandler(OverseaDownloadHandler())
|
||||
addHandler(CheckDownloadHandler())
|
||||
}
|
||||
.setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
|
||||
.setProcessEndCallback { asVGame, isSubscribe ->
|
||||
download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
|
||||
}
|
||||
.buildHandlerChain()
|
||||
?.handleRequest(context, gameEntity, shouldPerformAsVGame)
|
||||
DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
|
||||
} else if (str == context.getString(com.gh.gamecenter.feature.R.string.smooth)) {
|
||||
} else if (str == context.getString(R.string.smooth)) {
|
||||
DownloadChainBuilder().apply {
|
||||
addHandler(UnsupportedFeatureHandler())
|
||||
addHandler(GamePermissionHandler())
|
||||
@ -1026,7 +991,7 @@ object DownloadItemUtils {
|
||||
addHandler(ValidateVSpaceHandler())
|
||||
addHandler(CheckDownloadHandler())
|
||||
}
|
||||
.setProcessEndCallback(gameEntity.id) { asVGame, isSubscribe ->
|
||||
.setProcessEndCallback { asVGame, isSubscribe ->
|
||||
download(context, gameEntity, downloadBtn, entrance, location, asVGame, isSubscribe as Boolean, traceEvent)
|
||||
}
|
||||
.buildHandlerChain()
|
||||
@ -1039,13 +1004,13 @@ object DownloadItemUtils {
|
||||
addHandler(DownloadDialogHelperHandler())
|
||||
addHandler(CheckDownloadHandler())
|
||||
}
|
||||
.setProcessEndCallback(gameEntity.id) { _, isSubscribe ->
|
||||
.setProcessEndCallback { _, isSubscribe ->
|
||||
plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe as Boolean, traceEvent)
|
||||
}
|
||||
.buildHandlerChain()
|
||||
?.handleRequest(context, gameEntity, shouldPerformAsVGame)
|
||||
}
|
||||
} else if (str == context.getString(com.gh.gamecenter.feature.R.string.install)) {
|
||||
} else if (str == context.getString(R.string.install)) {
|
||||
val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
|
||||
|
||||
com.gh.gamecenter.common.utils.NewFlatLogUtils.logGameInstall(
|
||||
@ -1085,15 +1050,14 @@ object DownloadItemUtils {
|
||||
}
|
||||
|
||||
install(context, gameEntity, position, adapter, refreshCallback)
|
||||
} else if (str == context.getString(com.gh.gamecenter.feature.R.string.launch)) {
|
||||
} else if (str == context.getString(R.string.launch)) {
|
||||
//启动模拟器游戏
|
||||
if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
|
||||
if (NewSimulatorGameManager.shouldShowUpdateNewSimulatorAlert(context)) {
|
||||
NewSimulatorGameManager.showUpdateNewsSimulator(context, gameEntity, null)
|
||||
return
|
||||
}
|
||||
val downloadEntity =
|
||||
SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().firstOrNull()?.url)
|
||||
val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk().firstOrNull()?.url)
|
||||
if (downloadEntity != null) {
|
||||
val file = File(downloadEntity.path)
|
||||
if (!file.exists()) {
|
||||
@ -1116,7 +1080,7 @@ object DownloadItemUtils {
|
||||
}
|
||||
|
||||
PackageLauncher.launch(context, gameEntity)
|
||||
} else if (str == context.getString(com.gh.gamecenter.feature.R.string.update)) {
|
||||
} else if (str == context.getString(R.string.update)) {
|
||||
if (shouldPerformAsVGame) {
|
||||
VHelper.updateOrReDownload(gameEntity)
|
||||
return
|
||||
@ -1125,7 +1089,7 @@ object DownloadItemUtils {
|
||||
DownloadChainBuilder()
|
||||
.apply {
|
||||
addHandler(LandPageAddressHandler())
|
||||
}.setProcessEndCallback(gameEntity.id) { asVGame, _ ->
|
||||
}.setProcessEndCallback { asVGame, _ ->
|
||||
DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk) {
|
||||
DialogUtils.checkDownload(
|
||||
context,
|
||||
@ -1158,11 +1122,11 @@ object DownloadItemUtils {
|
||||
return
|
||||
}
|
||||
when (str) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.resume) -> {
|
||||
context.getString(R.string.resume) -> {
|
||||
DownloadManager.getInstance().resume(downloadEntity, false)
|
||||
}
|
||||
|
||||
context.getString(com.gh.gamecenter.feature.R.string.waiting) -> {
|
||||
context.getString(R.string.waiting) -> {
|
||||
Utils.toast(context, "最多只能同时下载三个任务，请稍等")
|
||||
}
|
||||
|
||||
@ -1240,7 +1204,7 @@ object DownloadItemUtils {
|
||||
}, 1000)
|
||||
}
|
||||
if (downloadBtn is DownloadButton) {
|
||||
downloadBtn.setText(com.gh.gamecenter.feature.R.string.downloading)
|
||||
downloadBtn.setText(R.string.downloading)
|
||||
downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
|
||||
}
|
||||
} else {
|
||||
@ -1262,7 +1226,7 @@ object DownloadItemUtils {
|
||||
val path = downloadEntity.path
|
||||
when {
|
||||
FileUtils.isEmptyFile(path) -> {
|
||||
Utils.toast(context, com.gh.gamecenter.common.R.string.install_failure_hint)
|
||||
Utils.toast(context, R.string.install_failure_hint)
|
||||
DownloadManager.getInstance().cancel(downloadEntity.url)
|
||||
gameEntity.getEntryMap().remove(apkEntity?.getPlatform())
|
||||
adapter?.notifyItemChanged(position)
|
||||
|
||||
@ -10,6 +10,7 @@ import android.os.Build
|
||||
import androidx.core.app.NotificationCompat
|
||||
import com.gh.common.xapk.XapkInstaller
|
||||
import com.gh.common.xapk.XapkUnzipStatus
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.constant.EntranceConsts
|
||||
import com.gh.gamecenter.common.utils.getMetaExtra
|
||||
@ -198,6 +199,6 @@ object DownloadNotificationHelper {
|
||||
}
|
||||
|
||||
private fun getNotificationIcon(): Int {
|
||||
return com.gh.gamecenter.common.R.mipmap.logo
|
||||
return R.mipmap.logo
|
||||
}
|
||||
}
|
||||
@ -30,7 +30,6 @@ import com.gh.gamecenter.feature.entity.SimulatorEntity
|
||||
import com.gh.gamecenter.feature.utils.PlatformUtils
|
||||
import com.gh.gamecenter.help.HelpAndFeedbackBridge
|
||||
import com.gh.gamecenter.pkg.PkgHelper
|
||||
import com.gh.ndownload.NDownloadBridge
|
||||
import com.gh.vspace.VHelper
|
||||
import com.halo.assistant.HaloApp
|
||||
import com.lightgame.download.DataWatcher
|
||||
@ -54,12 +53,6 @@ object DownloadObserver {
|
||||
|
||||
private val mRetryableHashMap = hashMapOf<String, Boolean>()
|
||||
|
||||
/**
|
||||
* 当下载任务是 预约上线提醒 触发的，则所有弹窗均不显示
|
||||
*/
|
||||
private val DownloadEntity.isDownloadByReserveOnlineReminder: Boolean
|
||||
get() = !meta?.get(Constants.IS_RESERVE_ONLINE_REMINDER).isNullOrBlank()
|
||||
|
||||
// 如果在WIFI状态下,下载自动暂停,则再重试一遍
|
||||
@JvmStatic
|
||||
fun initObserver() {
|
||||
@ -76,16 +69,11 @@ object DownloadObserver {
|
||||
DownloadDataHelper.uploadDownloadEvent(downloadEntity)
|
||||
}
|
||||
|
||||
val status = downloadEntity.status
|
||||
|
||||
if (DownloadStatus.hijack == status) {
|
||||
if (DownloadStatus.hijack == downloadEntity.status) {
|
||||
// 链接被劫持
|
||||
if (downloadEntity.isDownloadByReserveOnlineReminder) {
|
||||
return
|
||||
}
|
||||
processHijack(downloadEntity)
|
||||
return
|
||||
} else if (DownloadStatus.notfound == status) {
|
||||
} else if (DownloadStatus.notfound == downloadEntity.status) {
|
||||
// 404 Not Found
|
||||
// 删除任务
|
||||
downloadEntity.status = DownloadStatus.cancel
|
||||
@ -99,9 +87,7 @@ object DownloadObserver {
|
||||
gameName = downloadEntity.name,
|
||||
gameType = downloadEntity.categoryChinese
|
||||
)
|
||||
if (downloadEntity.isDownloadByReserveOnlineReminder) {
|
||||
return
|
||||
}
|
||||
|
||||
DialogHelper.showDialog(
|
||||
currentActivity,
|
||||
"下载失败",
|
||||
@ -141,9 +127,10 @@ object DownloadObserver {
|
||||
extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
|
||||
)
|
||||
return
|
||||
} else if (DownloadStatus.neterror == status
|
||||
|| DownloadStatus.diskioerror == status
|
||||
|| DownloadStatus.timeout == status
|
||||
} else if (DownloadStatus.neterror == downloadEntity.status
|
||||
|| DownloadStatus.timeout == downloadEntity.status
|
||||
|| DownloadStatus.diskioerror == downloadEntity.status
|
||||
|| DownloadStatus.diskisfull == downloadEntity.status
|
||||
) {
|
||||
if (mRetryableHashMap[downloadEntity.url] == true
|
||||
&& NetworkUtils.isWifiConnected(HaloApp.getInstance().application)
|
||||
@ -152,7 +139,9 @@ object DownloadObserver {
|
||||
mRetryableHashMap[downloadEntity.url] = false
|
||||
Utils.log(TAG, "下载重试->" + downloadEntity.toJson())
|
||||
} else {
|
||||
if (DownloadStatus.diskioerror == status) {
|
||||
if (DownloadStatus.diskisfull == downloadEntity.status) {
|
||||
ToastUtils.toast("磁盘已满，请清理空间后重试下载")
|
||||
} else if (DownloadStatus.diskioerror == downloadEntity.status) {
|
||||
ToastUtils.toast("磁盘 IO 异常，请稍后重试")
|
||||
} else {
|
||||
ToastUtils.toast("网络不稳定，下载任务已暂停")
|
||||
@ -161,27 +150,21 @@ object DownloadObserver {
|
||||
DataLogUtils.uploadNeterrorLog(mApplication, downloadEntity)
|
||||
Utils.log(TAG, "下载自动暂停->" + downloadEntity.toJson())
|
||||
}
|
||||
} else if (DownloadStatus.diskisfull == status) {
|
||||
ToastUtils.toast("磁盘已满，请清理空间后重试下载")
|
||||
|
||||
downloadManager.pause(downloadEntity.url)
|
||||
} else if (DownloadStatus.redirected == status) {
|
||||
} else if (DownloadStatus.redirected == downloadEntity.status) {
|
||||
Utils.log(TAG, "重定向完毕")
|
||||
DownloadDataHelper.uploadRedirectEvent(downloadEntity)
|
||||
} else if (DownloadStatus.unqualified == status) {
|
||||
} else if (DownloadStatus.unqualified == downloadEntity.status) {
|
||||
// 未成年
|
||||
if (!downloadEntity.isDownloadByReserveOnlineReminder) {
|
||||
RealNameHelper.showRealNameUnqualifiedDialog(downloadEntity)
|
||||
}
|
||||
RealNameHelper.showRealNameUnqualifiedDialog(downloadEntity)
|
||||
|
||||
// 删除任务
|
||||
downloadEntity.status = DownloadStatus.cancel
|
||||
downloadManager.cancel(downloadEntity.url)
|
||||
} else if (DownloadStatus.unavailable == status) {
|
||||
} else if (DownloadStatus.unavailable == downloadEntity.status) {
|
||||
// 未接入防沉迷系统
|
||||
val currentActivity = AppManager.getInstance().currentActivity()
|
||||
|
||||
if (currentActivity != null && !downloadEntity.isDownloadByReserveOnlineReminder) {
|
||||
if (currentActivity != null) {
|
||||
DialogHelper.showDialog(
|
||||
context = currentActivity,
|
||||
title = "温馨提示",
|
||||
@ -196,11 +179,11 @@ object DownloadObserver {
|
||||
// 删除任务
|
||||
downloadEntity.status = DownloadStatus.cancel
|
||||
downloadManager.cancel(downloadEntity.url)
|
||||
} else if (DownloadStatus.isCertificating == status) {
|
||||
} else if (DownloadStatus.isCertificating == downloadEntity.status) {
|
||||
// 未接入防沉迷系统
|
||||
val currentActivity = AppManager.getInstance().currentActivity()
|
||||
|
||||
if (currentActivity != null && !downloadEntity.isDownloadByReserveOnlineReminder) {
|
||||
if (currentActivity != null) {
|
||||
DialogHelper.showDialog(
|
||||
context = currentActivity,
|
||||
title = "实名提示",
|
||||
@ -224,34 +207,28 @@ object DownloadObserver {
|
||||
// 删除任务
|
||||
downloadEntity.status = DownloadStatus.cancel
|
||||
downloadManager.cancel(downloadEntity.url)
|
||||
} else if (DownloadStatus.uncertificated == status) {
|
||||
} else if (DownloadStatus.uncertificated == downloadEntity.status) {
|
||||
// 未实名
|
||||
if (!downloadEntity.isDownloadByReserveOnlineReminder) {
|
||||
RealNameHelper.showRealNameUncertificatedDialog(downloadEntity)
|
||||
}
|
||||
RealNameHelper.showRealNameUncertificatedDialog(downloadEntity)
|
||||
|
||||
// 删除任务
|
||||
downloadEntity.status = DownloadStatus.cancel
|
||||
downloadManager.cancel(downloadEntity.url)
|
||||
} else if (DownloadStatus.banned == status) {
|
||||
} else if (DownloadStatus.banned == downloadEntity.status) {
|
||||
ToastUtils.showToast("网络异常")
|
||||
// 删除任务
|
||||
downloadEntity.status = DownloadStatus.cancel
|
||||
downloadManager.cancel(downloadEntity.url)
|
||||
}
|
||||
|
||||
if (DownloadStatus.done == status) {
|
||||
if (DownloadStatus.done == downloadEntity.status) {
|
||||
if (mDoneDebouncePair?.first != downloadEntity.url) {
|
||||
mDoneDebouncePair = Pair(downloadEntity.url, System.currentTimeMillis())
|
||||
// 清理临时变量
|
||||
downloadEntity.addMetaExtra(Constants.IS_RESERVE_ONLINE_REMINDER, "")
|
||||
performDownloadCompleteAction(downloadEntity, downloadManager)
|
||||
} else {
|
||||
if (mDoneDebouncePair?.second == 0L
|
||||
|| System.currentTimeMillis() - (mDoneDebouncePair?.second ?: 0) > 500
|
||||
) {
|
||||
// 清理临时变量
|
||||
downloadEntity.addMetaExtra(Constants.IS_RESERVE_ONLINE_REMINDER, "")
|
||||
performDownloadCompleteAction(downloadEntity, downloadManager)
|
||||
}
|
||||
}
|
||||
@ -264,7 +241,7 @@ object DownloadObserver {
|
||||
DownloadNotificationHelper.addOrUpdateDownloadNotification(downloadEntity)
|
||||
|
||||
// 如果已下载大小发生变化,表示成功恢复下载,则重置重试标记
|
||||
if (status == DownloadStatus.downloading) {
|
||||
if (downloadEntity.status == DownloadStatus.downloading) {
|
||||
mRetryableHashMap[downloadEntity.url] = true
|
||||
}
|
||||
}
|
||||
@ -372,7 +349,7 @@ object DownloadObserver {
|
||||
val isAutoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
|
||||
if (downloadType != Constants.VSPACE_32_DOWNLOAD_ONLY && (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall)) {
|
||||
if (FileUtils.isEmptyFile(downloadEntity.path)) {
|
||||
Utils.toast(mApplication, com.gh.gamecenter.common.R.string.install_failure_hint)
|
||||
Utils.toast(mApplication, R.string.install_failure_hint)
|
||||
downloadManager.cancel(downloadEntity.url)
|
||||
} else {
|
||||
if (PackageUtils.isCanLaunchSetup(mApplication, downloadEntity.path)
|
||||
@ -494,7 +471,7 @@ object DownloadObserver {
|
||||
java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
|
||||
val exposureEvent = ExposureUtils.logADownloadCompleteExposureEvent(
|
||||
GameEntity(
|
||||
_id = downloadEntity.gameId,
|
||||
id = downloadEntity.gameId,
|
||||
mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR),
|
||||
gameVersion = downloadEntity.versionName ?: "",
|
||||
isPlatformRecommend = isPlatformRecommend,
|
||||
@ -506,7 +483,6 @@ object DownloadObserver {
|
||||
downloadSpeed,
|
||||
downloadEntity.meta[DownloadEntity.DOWNLOAD_HOST_KEY] ?: "unknown",
|
||||
downloadEntity.meta[DownloadEntity.DOWNLOAD_PATH_KEY] ?: "unknown",
|
||||
downloadEntity.meta[NDownloadBridge.REDIRECTED_URL_LIST] ?: "unknown",
|
||||
type
|
||||
)
|
||||
|
||||
@ -532,7 +508,7 @@ object DownloadObserver {
|
||||
"space_schema_type",
|
||||
if (downloadEntity.packageName == VHelper.VSPACE_32BIT_PACKAGENAME) "32位" else "64位"
|
||||
)
|
||||
} else if (downloadEntity.gameId == Constants.HALO_FUN_NEW_32_GAME_ID) {
|
||||
} else if(downloadEntity.gameId == Constants.HALO_FUN_NEW_32_GAME_ID) {
|
||||
SensorsBridge.trackEvent(
|
||||
"HaloFunDownloadDone",
|
||||
"space_schema_type",
|
||||
|
||||
@ -27,6 +27,7 @@ import com.gh.gamecenter.core.utils.ClassUtils;
|
||||
import com.gh.gamecenter.core.utils.GsonUtils;
|
||||
import com.gh.gamecenter.core.utils.SPUtils;
|
||||
import com.halo.assistant.HaloApp;
|
||||
import com.lightgame.utils.AppManager;
|
||||
import com.lightgame.utils.Utils;
|
||||
|
||||
import org.json.JSONException;
|
||||
@ -37,18 +38,7 @@ import java.util.Set;
|
||||
|
||||
public class EntranceUtils {
|
||||
|
||||
public static void jumpActivity(Context context, Bundle bundle) {
|
||||
jumpActivityCompat(context, bundle, null, null);
|
||||
}
|
||||
|
||||
public static void jumpActivityCompat(Context context, Bundle bundle) {
|
||||
jumpActivityCompat(context, bundle, null,null);
|
||||
}
|
||||
|
||||
public static void jumpActivityCompat(Context context,
|
||||
Bundle bundle,
|
||||
@Nullable Bundle nextToBundle,
|
||||
@Nullable Callback callback) {
|
||||
bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
|
||||
|
||||
if (HaloApp.getInstance().isRunningForeground || HaloApp.getInstance().isAlreadyUpAndRunning) {
|
||||
@ -58,18 +48,6 @@ public class EntranceUtils {
|
||||
if (clazz == null) clazz = MainActivity.class;
|
||||
if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
|
||||
ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
|
||||
} else if (callback != null ) {
|
||||
Intent intent1 = new Intent(context, clazz);
|
||||
//TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用
|
||||
//intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
intent1.putExtras(bundle);
|
||||
if (context instanceof AppCompatActivity) {
|
||||
AvoidOnResultManager.Companion.getInstance((AppCompatActivity) context)
|
||||
.startForResult(intent1, callback);
|
||||
} else {
|
||||
// 不要回调，正常跳转
|
||||
context.startActivity(intent1);
|
||||
}
|
||||
} else {
|
||||
Intent intent1 = new Intent(context, clazz);
|
||||
intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
@ -80,6 +58,57 @@ public class EntranceUtils {
|
||||
intent1.putExtras(bundle);
|
||||
context.startActivity(intent1);
|
||||
}
|
||||
} else {
|
||||
// 应用未在运行
|
||||
context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle));
|
||||
}
|
||||
}
|
||||
|
||||
public static void jumpActivity(Context context, Bundle bundle) {
|
||||
bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
|
||||
|
||||
if (AppManager.getInstance().findActivity(MainActivity.class) != null) {
|
||||
// 应用正在运行，前台或后台，且MainActivity在栈中
|
||||
String to = bundle.getString(KEY_TO);
|
||||
Class<?> clazz = ClassUtils.forName(to);
|
||||
if (clazz == null) clazz = MainActivity.class;
|
||||
if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
|
||||
ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
|
||||
} else {
|
||||
Intent intent1 = new Intent(context, clazz);
|
||||
intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
// 如果 activity 名称有 singleton 的就添加 reorder_to_front 标签 (有点粗暴有点蠢，但暂时就先这样吧 :C )
|
||||
if (clazz.getSimpleName().toLowerCase().contains("singleton")) {
|
||||
intent1.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
}
|
||||
intent1.putExtras(bundle);
|
||||
context.startActivity(intent1);
|
||||
}
|
||||
} else {
|
||||
// 应用未在运行
|
||||
context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle));
|
||||
}
|
||||
}
|
||||
|
||||
public static void jumpActivity(Context context, Bundle nextToBundle, Bundle bundle, Callback callback) {
|
||||
bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
|
||||
|
||||
if (AppManager.getInstance().findActivity(MainActivity.class) != null) {
|
||||
// 应用正在运行，前台或后台，且MainActivity在栈中
|
||||
String to = bundle.getString(KEY_TO);
|
||||
Class<?> clazz = ClassUtils.forName(to);
|
||||
if (clazz == null) clazz = MainActivity.class;
|
||||
if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
|
||||
ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
|
||||
} else {
|
||||
Intent intent1 = new Intent(context, clazz);
|
||||
//TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用
|
||||
//intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
intent1.putExtras(bundle);
|
||||
|
||||
AvoidOnResultManager.Companion.getInstance((AppCompatActivity) context)
|
||||
.startForResult(intent1, callback);
|
||||
}
|
||||
} else {
|
||||
// 应用未在运行
|
||||
if (nextToBundle != null) {
|
||||
|
||||
@ -7,13 +7,13 @@ import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.gh.common.constant.Config
|
||||
import com.gh.common.dialog.WechatBindingFailedDialogFragment
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.ShellActivity
|
||||
import com.gh.gamecenter.VerifyPhoneActivity
|
||||
import com.gh.gamecenter.WebActivity
|
||||
import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
|
||||
import com.gh.gamecenter.common.avoidcallback.Callback
|
||||
import com.gh.gamecenter.common.callback.CancelListener
|
||||
import com.gh.gamecenter.common.callback.ConfirmListener
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.constant.EntranceConsts
|
||||
@ -188,10 +188,10 @@ object ErrorHelper {
|
||||
403015 -> Utils.toast(context, "已经关注过了")
|
||||
404001 -> Utils.toast(context, "请求的资源不存在")
|
||||
403016 -> Utils.toast(context, "标签内容可能包含敏感信息，请修改后再提交")
|
||||
403018 -> Utils.toast(context, com.gh.gamecenter.common.R.string.comment_failed_unable)
|
||||
403018 -> Utils.toast(context, R.string.comment_failed_unable)
|
||||
403070 -> Utils.toast(context, "请勿重复提交~")
|
||||
403073 -> Utils.toast(context, "标题违规，请重新编辑")
|
||||
403074 -> handleErrorWithRepeatWechatBinding(context, errorEntity)
|
||||
403074 -> Utils.toast(context, "该微信号（${errorEntity.data?.nickname}）已绑定")
|
||||
403078 -> Utils.toast(context, "已点赞")
|
||||
403072 -> Utils.toast(context, R.string.comment_failed_userblocked)
|
||||
403082 -> Utils.toast(context, "作者已关闭评论")
|
||||
@ -234,10 +234,6 @@ object ErrorHelper {
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleErrorWithRepeatWechatBinding(context: Context, errorEntity: ErrorEntity) {
|
||||
WechatBindingFailedDialogFragment.show(context, errorEntity.data?.userConflict)
|
||||
}
|
||||
|
||||
private fun handleAskFrequentlyError(context: Context, showHighPriorityHint: Boolean) {
|
||||
if (showHighPriorityHint) {
|
||||
DialogHelper.showDialog(
|
||||
@ -265,7 +261,7 @@ object ErrorHelper {
|
||||
SensorsBridge.trackVerificationDialogShow(
|
||||
gameId = gameEntity?.id ?: "",
|
||||
gameName = gameEntity?.name ?: "",
|
||||
gameType = gameEntity?.categoryChinese ?: "",
|
||||
gameType = gameEntity?.categoryChinese ?:"",
|
||||
articleType = articleType,
|
||||
verificationType = verificationType
|
||||
)
|
||||
@ -296,7 +292,7 @@ object ErrorHelper {
|
||||
)
|
||||
}
|
||||
binding.hintTv.text = errorEntity.data?.text
|
||||
binding.hintTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
|
||||
binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
|
||||
binding.hintTv.setOnClickListener {
|
||||
errorEntity.data?.toLinkEntity()?.let { entity ->
|
||||
DirectUtils.directToLinkPage(context, entity, "实名提醒弹窗", "")
|
||||
@ -365,7 +361,7 @@ object ErrorHelper {
|
||||
)
|
||||
}
|
||||
binding.hintTv.text = errorEntity.data?.text
|
||||
binding.hintTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
|
||||
binding.hintTv.setTextColor(R.color.text_theme.toColor(context))
|
||||
binding.hintTv.setOnClickListener {
|
||||
errorEntity.data?.toLinkEntity()?.let { entity ->
|
||||
DirectUtils.directToLinkPage(context, entity, "手机号验证", "")
|
||||
|
||||
@ -207,8 +207,8 @@ object GameActivityDownloadHelper {
|
||||
pluginLocation = PluginLocation.only_game
|
||||
)
|
||||
if (downloadEntity != null
|
||||
&& str != context.getString(com.gh.gamecenter.feature.R.string.install)
|
||||
&& str != context.getString(com.gh.gamecenter.feature.R.string.launch)
|
||||
&& str != context.getString(R.string.install)
|
||||
&& str != context.getString(R.string.launch)
|
||||
) {
|
||||
ToastUtils.toast("${gameEntity.name}已加入下载队列")
|
||||
if (BrowserInstallHelper.shouldAutoSwitchAssistantInstall(gameEntity)) {
|
||||
@ -219,23 +219,22 @@ object GameActivityDownloadHelper {
|
||||
}
|
||||
} else {
|
||||
when {
|
||||
str == context.getString(com.gh.gamecenter.feature.R.string.download) || str == context.getString(
|
||||
com.gh.gamecenter.feature.R.string.attempt) -> {
|
||||
str == context.getString(R.string.download) || str == context.getString(R.string.attempt) -> {
|
||||
handleDownloadStatus(context, gameEntity, apk, entrance, location, traceEvent)
|
||||
}
|
||||
str == context.getString(com.gh.gamecenter.feature.R.string.smooth) -> {
|
||||
str == context.getString(R.string.smooth) -> {
|
||||
handleSmoothStatus(context, gameEntity, apk, entrance, location, traceEvent)
|
||||
}
|
||||
str.contains("化") -> {
|
||||
handlePluginStatus(context, gameEntity, apk, entrance, location, traceEvent)
|
||||
}
|
||||
str == context.getString(com.gh.gamecenter.feature.R.string.install) -> {
|
||||
str == context.getString(R.string.install) -> {
|
||||
handleInstallStatus(context, gameEntity, apk, downloadEntity)
|
||||
}
|
||||
str == context.getString(com.gh.gamecenter.feature.R.string.launch) -> {
|
||||
str == context.getString(R.string.launch) -> {
|
||||
handleLaunchStatus(context, gameEntity, apk, entrance, location, traceEvent)
|
||||
}
|
||||
str == context.getString(com.gh.gamecenter.feature.R.string.update) -> {
|
||||
str == context.getString(R.string.update) -> {
|
||||
handleUpdateStatus(context, gameEntity, apk, entrance, location, traceEvent)
|
||||
}
|
||||
else -> {
|
||||
@ -526,7 +525,7 @@ object GameActivityDownloadHelper {
|
||||
val path = downloadEntity.path
|
||||
when {
|
||||
FileUtils.isEmptyFile(path) -> {
|
||||
Utils.toast(context, com.gh.gamecenter.common.R.string.install_failure_hint)
|
||||
Utils.toast(context, R.string.install_failure_hint)
|
||||
DownloadManager.getInstance().cancel(downloadEntity.url)
|
||||
gameEntity.getEntryMap().remove(apkEntity.getPlatform())
|
||||
}
|
||||
|
||||
@ -7,7 +7,6 @@ import com.gh.gamecenter.common.utils.toObject
|
||||
import com.gh.gamecenter.feature.entity.GameEntity
|
||||
import com.gh.gamecenter.entity.SubjectEntity
|
||||
import com.gh.gamecenter.common.retrofit.Response
|
||||
import com.gh.gamecenter.manager.PackagesManager
|
||||
import com.gh.gamecenter.retrofit.RetrofitManager
|
||||
import com.halo.assistant.HaloApp
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
@ -112,14 +111,6 @@ object GameSubstituteRepositoryHelper {
|
||||
}
|
||||
}
|
||||
|
||||
// 检查是否已安装该游戏 id
|
||||
if (PackagesManager.getInstalledDataByGameId(game.id) != null) {
|
||||
// 将该位置的游戏标记为需要替换
|
||||
positionOfGameToBeReplacedList.add(index)
|
||||
thisPositionNeedToBeReplaced = true
|
||||
break
|
||||
}
|
||||
|
||||
// 若此游戏所包含的 apk 没有已安装，那么再检查是否已安装有预设相关包名
|
||||
if (!thisPositionNeedToBeReplaced) {
|
||||
var relatedPackageList = arrayListOf<String>()
|
||||
|
||||
@ -8,6 +8,7 @@ import com.gh.common.simulator.SimulatorGameManager.findDownloadEntityByUrl
|
||||
import com.gh.common.simulator.SimulatorGameManager.isNewSimulatorInstalled
|
||||
import com.gh.common.simulator.SimulatorGameManager.isSimulatorGame
|
||||
import com.gh.download.DownloadManager
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.utils.isLocalDownloadInDualDownloadMode
|
||||
import com.gh.gamecenter.common.utils.isVGameDownloadInDualDownloadMode
|
||||
import com.gh.gamecenter.core.AppExecutor.lightWeightIoExecutor
|
||||
@ -65,7 +66,7 @@ object GameUtils {
|
||||
)
|
||||
uiExecutor.execute {
|
||||
downloadBtn.text = status
|
||||
if (context.getString(com.gh.gamecenter.feature.R.string.pluggable) == status) {
|
||||
if (context.getString(R.string.pluggable) == status) {
|
||||
downloadBtn.buttonStyle = DownloadButton.ButtonStyle.PLUGIN
|
||||
var pluginDesc = gameEntity.pluginDesc
|
||||
if (pluginDesc.length > 3) pluginDesc = pluginDesc.substring(0, 3)
|
||||
@ -186,7 +187,7 @@ object GameUtils {
|
||||
}
|
||||
|
||||
if ((isRelatedEmulatorInstalled || isInstalledNewSimulator) && doneCount != 0) {
|
||||
return context.getString(com.gh.gamecenter.feature.R.string.launch)
|
||||
return context.getString(R.string.launch)
|
||||
}
|
||||
|
||||
if (performAsVGame) {
|
||||
@ -208,18 +209,18 @@ object GameUtils {
|
||||
}
|
||||
|
||||
return if (doneCount != 0) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.install)
|
||||
context.getString(R.string.install)
|
||||
} else if (pluginCount != 0 && !isSimulatorGame(gameEntity)) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.pluggable)
|
||||
context.getString(R.string.pluggable)
|
||||
} else if (updateCount != 0 && !isSimulatorGame(gameEntity)) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.update)
|
||||
context.getString(R.string.update)
|
||||
} else if (installCount != 0) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.launch)
|
||||
context.getString(R.string.launch)
|
||||
} else if ("demo" == gameEntity.downloadStatus) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.attempt)
|
||||
context.getString(R.string.attempt)
|
||||
} else {
|
||||
if (performAsVGame) {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.smooth)
|
||||
context.getString(R.string.smooth)
|
||||
} else {
|
||||
// if (Constants.V_GAME == gameEntity.downloadStatus || Constants.V_GAME_32 == gameEntity.downloadStatus) {
|
||||
// val gameCategory = gameEntity.getGameCategory()
|
||||
@ -230,7 +231,7 @@ object GameUtils {
|
||||
// context.getString(R.string.attempt)
|
||||
// }
|
||||
// } else {
|
||||
context.getString(com.gh.gamecenter.feature.R.string.download)
|
||||
context.getString(R.string.download)
|
||||
// }
|
||||
}
|
||||
}
|
||||
@ -307,7 +308,7 @@ object GameUtils {
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否默认以畅玩游戏的形式来处理
|
||||
* 是否以畅玩游戏的形式来处理
|
||||
*/
|
||||
@JvmStatic
|
||||
fun shouldPerformAsVGame(gameEntity: GameEntity): Boolean {
|
||||
|
||||
@ -26,12 +26,16 @@ object HomeBottomBarHelper {
|
||||
} catch (ignore: Exception) {
|
||||
|
||||
}
|
||||
val animationCode = HaloApp.getInstance().application.assets
|
||||
.open("lottie/tab_game.json")
|
||||
.bufferedReader().use { it.readText() }
|
||||
return SubjectRecommendEntity(
|
||||
link = "5de21b5d75e6fa054f784882",
|
||||
type = "block",
|
||||
text = "游戏库",
|
||||
name = "游戏库",
|
||||
position = 2,
|
||||
animationCode = animationCode,
|
||||
default = false,
|
||||
display = Display()
|
||||
)
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
package com.gh.common.util;
|
||||
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
@ -16,8 +19,10 @@ import org.greenrobot.eventbus.EventBus;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* 下载完成跳安装，
|
||||
*/
|
||||
@ -44,15 +49,15 @@ public class InstallUtils {
|
||||
@Override
|
||||
public void handleMessage(Message msg) {
|
||||
if (msg.what == INSTALL_WHAT && packageManager != null) {
|
||||
List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
|
||||
ArrayList<String> list = new ArrayList<>(packageNameList);
|
||||
if (installMap != null && installMap.size() != 0) {
|
||||
ArrayList<String> keys = new ArrayList<>();
|
||||
for (String packageName : installMap.keySet()) {
|
||||
if (TextUtils.isEmpty(packageName)) continue;
|
||||
|
||||
long time = installMap.get(packageName);
|
||||
if (System.currentTimeMillis() - time >= MAX_TIME) {
|
||||
keys.add(packageName);
|
||||
} else if (PackageUtils.isInstalled(context, packageName)) {
|
||||
} else if (list.contains(packageName)) {
|
||||
keys.add(packageName);
|
||||
|
||||
DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByPackageName(packageName);
|
||||
@ -60,7 +65,7 @@ public class InstallUtils {
|
||||
if (!TextUtils.isEmpty(installVersion) && downloadEntity != null &&
|
||||
installVersion.equals(downloadEntity.getVersionName())) {
|
||||
if (!downloadEntity.isPluggable() || PackageUtils.isSignedByGh(context, packageName)) {
|
||||
EventBus.getDefault().post(new EBPackage(EBPackage.TYPE_INSTALLED, packageName, installVersion, false));
|
||||
EventBus.getDefault().post(new EBPackage(EBPackage.TYPE_INSTALLED, packageName, installVersion));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -75,9 +80,9 @@ public class InstallUtils {
|
||||
long time = uninstallMap.get(packageName);
|
||||
if (System.currentTimeMillis() - time >= MAX_TIME) {
|
||||
keys.add(packageName);
|
||||
} else if (!PackageUtils.isInstalled(context, packageName)) {
|
||||
} else if (!list.contains(packageName)) {
|
||||
keys.add(packageName);
|
||||
EventBus.getDefault().post(new EBPackage("卸载", packageName, "", false));
|
||||
EventBus.getDefault().post(new EBPackage("卸载", packageName, ""));
|
||||
}
|
||||
}
|
||||
for (String key : keys) {
|
||||
@ -100,8 +105,6 @@ public class InstallUtils {
|
||||
}
|
||||
|
||||
public void addInstall(String packageName) {
|
||||
if (TextUtils.isEmpty(packageName)) return;
|
||||
|
||||
if (installMap == null) {
|
||||
installMap = Collections.synchronizedMap(new HashMap<String, Long>());
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@ package com.gh.common.util;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.graphics.Color;
|
||||
import android.text.Html;
|
||||
import android.text.Spanned;
|
||||
@ -181,28 +182,28 @@ public class LibaoUtils {
|
||||
break;
|
||||
case "coming":
|
||||
libaoBtn.setText(R.string.libao_coming);
|
||||
libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_round_gray_light);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_tertiary));
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.text_tertiary));
|
||||
break;
|
||||
case "used_up":
|
||||
libaoBtn.setText(R.string.libao_used_up);
|
||||
libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
|
||||
break;
|
||||
case "finish":
|
||||
libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_finish);
|
||||
libaoBtn.setText(R.string.libao_finish);
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
|
||||
break;
|
||||
case "linged":
|
||||
libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_linged);
|
||||
libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_round_gray_light);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_tertiary));
|
||||
libaoBtn.setText(R.string.libao_linged);
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.text_tertiary));
|
||||
break;
|
||||
case "taoed":
|
||||
libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_taoed);
|
||||
libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
|
||||
libaoBtn.setText(R.string.libao_taoed);
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
|
||||
break;
|
||||
case "copy":
|
||||
libaoBtn.setText(R.string.libao_copy);
|
||||
@ -211,19 +212,19 @@ public class LibaoUtils {
|
||||
case "repeatLing":
|
||||
case "repeatLinged":
|
||||
libaoBtn.setText(R.string.libao_repeat_ling);
|
||||
libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
|
||||
break;
|
||||
case "repeatTao":
|
||||
case "repeatTaoed":
|
||||
libaoBtn.setText(R.string.libao_repeat_tao);
|
||||
libaoBtn.setBackgroundResource(com.gh.gamecenter.feature.R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.text_theme));
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme));
|
||||
break;
|
||||
case "unshelve":
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
|
||||
libaoBtn.setText(R.string.libao_unshelve);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
|
||||
break;
|
||||
case "check":
|
||||
libaoBtn.setText(R.string.libao_check);
|
||||
@ -232,7 +233,7 @@ public class LibaoUtils {
|
||||
default:
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
|
||||
libaoBtn.setText("异常");
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -320,13 +321,13 @@ public class LibaoUtils {
|
||||
// 类型为复制的，不需要登录也可以直接复制
|
||||
if ("copy".equals(libaoEntity.getReceiveMethod())) {
|
||||
if ("finish".equals(libaoEntity.getStatus())) {
|
||||
libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_finish);
|
||||
libaoBtn.setText(R.string.libao_finish);
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray);
|
||||
libaoBtn.setTextColor(context.getResources().getColor(com.gh.gamecenter.common.R.color.button_gray));
|
||||
libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray));
|
||||
libaoBtn.setOnClickListener(v -> ToastUtils.toast("兑换码领取已结束"));
|
||||
} else {
|
||||
libaoBtn.setText(R.string.libao_copy);
|
||||
libaoBtn.setTextColor(ExtensionsKt.toColor(com.gh.gamecenter.common.R.color.white, context));
|
||||
libaoBtn.setTextColor(ExtensionsKt.toColor(R.color.white, context));
|
||||
libaoBtn.setBackgroundResource(R.drawable.button_normal_round_style);
|
||||
libaoBtn.setOnClickListener(v -> {
|
||||
LogUtils.uploadReceiveGift(
|
||||
@ -681,7 +682,7 @@ public class LibaoUtils {
|
||||
}
|
||||
|
||||
if (libaoBtn != null) {
|
||||
libaoBtn.setText(com.gh.gamecenter.feature.R.string.libao_linged);
|
||||
libaoBtn.setText(R.string.libao_linged);
|
||||
libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
|
||||
libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector));
|
||||
}
|
||||
|
||||
@ -79,6 +79,32 @@ public class MessageShareUtils {
|
||||
|
||||
|
||||
private String[] mArrLabel = {"微信好友", "朋友圈", "QQ好友", "QQ空间", "保存"};
|
||||
private int[] arrLogo = {
|
||||
R.drawable.share_wechat_logo,
|
||||
R.drawable.share_wechatmoments_logo,
|
||||
R.drawable.share_qq_logo,
|
||||
R.drawable.share_qzone_logo,
|
||||
R.drawable.share_save
|
||||
};
|
||||
|
||||
public enum ShareWay {
|
||||
qq("qq"),
|
||||
qqZone("qq空间"),
|
||||
weibo("微博"),
|
||||
wechat("微信"),
|
||||
wechatMoments("朋友圈");
|
||||
|
||||
private String name;
|
||||
|
||||
ShareWay(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
//QQ或者QQ空间分享回调处理
|
||||
public IUiListener QqShareListener = new IUiListener() {
|
||||
@Override
|
||||
@ -113,7 +139,7 @@ public class MessageShareUtils {
|
||||
|
||||
@Override
|
||||
public void onCancel() {
|
||||
Utils.toast(mContext, com.gh.gamecenter.common.R.string.share_cancel_hint);
|
||||
Utils.toast(mContext, R.string.share_cancel_hint);
|
||||
if (isFromInviteFriends) {
|
||||
IntegralLogHelper.INSTANCE.logInviteResult("取消", shareWay.getName());
|
||||
}
|
||||
@ -125,31 +151,6 @@ public class MessageShareUtils {
|
||||
}
|
||||
};
|
||||
|
||||
public enum ShareWay {
|
||||
qq("qq"),
|
||||
qqZone("qq空间"),
|
||||
weibo("微博"),
|
||||
wechat("微信"),
|
||||
wechatMoments("朋友圈");
|
||||
|
||||
private String name;
|
||||
|
||||
ShareWay(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
private int[] arrLogo = {
|
||||
com.gh.gamecenter.common.R.drawable.share_wechat_logo,
|
||||
com.gh.gamecenter.common.R.drawable.share_wechatmoments_logo,
|
||||
com.gh.gamecenter.common.R.drawable.share_qq_logo,
|
||||
com.gh.gamecenter.common.R.drawable.share_qzone_logo,
|
||||
com.gh.gamecenter.common.R.drawable.share_save
|
||||
};
|
||||
|
||||
// 适配快传成绩单分享
|
||||
private int contentSize;
|
||||
private int paddTop;
|
||||
@ -333,7 +334,7 @@ public class MessageShareUtils {
|
||||
Utils.toast(mContext, "分享跳转中...");
|
||||
|
||||
if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) {
|
||||
Utils.toast(mContext, mContext.getString(com.gh.gamecenter.common.R.string.share_no_wechat_hint));
|
||||
Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -398,7 +399,7 @@ public class MessageShareUtils {
|
||||
Utils.toast(mContext, "分享跳转中...");
|
||||
|
||||
if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) {
|
||||
Utils.toast(mContext, mContext.getString(com.gh.gamecenter.common.R.string.share_no_wechat_hint));
|
||||
Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -434,7 +435,7 @@ public class MessageShareUtils {
|
||||
Utils.toast(mContext, "分享跳转中...");
|
||||
|
||||
if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) {
|
||||
Utils.toast(mContext, mContext.getString(com.gh.gamecenter.common.R.string.share_no_wechat_hint));
|
||||
Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -580,7 +581,7 @@ public class MessageShareUtils {
|
||||
linearLayout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(mContext, itemSize)));
|
||||
linearLayout.setOrientation(LinearLayout.VERTICAL);
|
||||
linearLayout.setGravity(Gravity.CENTER_HORIZONTAL);
|
||||
linearLayout.setBackgroundResource(com.gh.gamecenter.common.R.drawable.cardview_item_style);
|
||||
linearLayout.setBackgroundResource(R.drawable.cardview_item_style);
|
||||
|
||||
ImageView shareLogo = new ImageView(mContext);
|
||||
LinearLayout.LayoutParams logoParams = new LinearLayout.LayoutParams(DisplayUtils.dip2px(mContext, picSize), DisplayUtils.dip2px(mContext, picSize));
|
||||
@ -592,7 +593,7 @@ public class MessageShareUtils {
|
||||
layoutParams.setMargins(0, DisplayUtils.dip2px(mContext, 10), 0, 0);
|
||||
shareLabel.setLayoutParams(layoutParams);
|
||||
shareLabel.setGravity(Gravity.CENTER);
|
||||
shareLabel.setTextColor(ContextCompat.getColor(mContext, com.gh.gamecenter.common.R.color.text_3a3a3a));
|
||||
shareLabel.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a));
|
||||
shareLabel.setTextSize(marImg);
|
||||
|
||||
linearLayout.addView(shareLogo);
|
||||
|
||||
@ -30,9 +30,6 @@ object NewFlatLogUtils {
|
||||
private const val EVENT_LOGIN_FROM_GHZS_SHOW = "halo_fun_login_from_ghzs_show"
|
||||
private const val EVENT_LOGIN_FROM_GHZS_CLICK = "halo_fun_login_from_ghzs_click"
|
||||
|
||||
private const val EVENT_INSTALLED_LAUNCH_DIALOG_SHOW = "halo_fun_installed_launch_dialog_show"
|
||||
private const val EVENT_INSTALLED_LAUNCH_DIALOG_CLICK = "halo_fun_installed_launch_dialog_click"
|
||||
|
||||
private fun log(jsonObject: JSONObject, logStore: String = "event", uploadImmediately: Boolean = false) {
|
||||
Utils.log("NewFlatLogUtils", jsonObject.toString(4))
|
||||
LoghubUtils.log(jsonObject, logStore, uploadImmediately, true)
|
||||
@ -553,8 +550,6 @@ object NewFlatLogUtils {
|
||||
// 搜索-点击搜索榜单内容
|
||||
@JvmStatic
|
||||
fun logSearchClickRankDetail(
|
||||
key: String,
|
||||
rankType: String,
|
||||
rankName: String,
|
||||
rankSequence: String,
|
||||
linkId: String,
|
||||
@ -563,8 +558,6 @@ object NewFlatLogUtils {
|
||||
) {
|
||||
val json = json {
|
||||
KEY_EVENT to "search_click_rank_detail"
|
||||
"key" to key
|
||||
"rank_type" to rankType
|
||||
"rank_name" to rankName
|
||||
"rank_sequence" to rankSequence
|
||||
"link_id" to linkId
|
||||
@ -661,14 +654,12 @@ object NewFlatLogUtils {
|
||||
@JvmStatic
|
||||
fun logSearchBbs(
|
||||
searchType: String,
|
||||
searchKey: String,
|
||||
location: String
|
||||
searchKey: String
|
||||
) {
|
||||
json {
|
||||
KEY_EVENT to "search_bbs"
|
||||
"search_type" to searchType
|
||||
"key" to searchKey
|
||||
KEY_LOCATION to location
|
||||
parseAndPutMeta()()
|
||||
}.let(::log)
|
||||
}
|
||||
@ -680,8 +671,7 @@ object NewFlatLogUtils {
|
||||
bbsId: String,
|
||||
sequence: Int,
|
||||
name: String,
|
||||
button: String,
|
||||
location: String
|
||||
button: String
|
||||
) {
|
||||
json {
|
||||
KEY_EVENT to "search_bbs_click"
|
||||
@ -691,7 +681,6 @@ object NewFlatLogUtils {
|
||||
"sequence" to sequence
|
||||
"name" to name
|
||||
"button" to button
|
||||
KEY_LOCATION to location
|
||||
parseAndPutMeta()()
|
||||
}.let(::log)
|
||||
}
|
||||
@ -699,14 +688,12 @@ object NewFlatLogUtils {
|
||||
@JvmStatic
|
||||
fun logSearchUser(
|
||||
searchType: String,
|
||||
searchKey: String,
|
||||
location: String
|
||||
searchKey: String
|
||||
) {
|
||||
json {
|
||||
KEY_EVENT to "search_user"
|
||||
"search_type" to searchType
|
||||
"key" to searchKey
|
||||
KEY_LOCATION to location
|
||||
parseAndPutMeta()()
|
||||
}.let(::log)
|
||||
}
|
||||
@ -717,8 +704,7 @@ object NewFlatLogUtils {
|
||||
searchKey: String,
|
||||
userId: String,
|
||||
name: String,
|
||||
sequence: Int,
|
||||
location: String
|
||||
sequence: Int
|
||||
) {
|
||||
json {
|
||||
KEY_EVENT to "search_user_click"
|
||||
@ -727,7 +713,6 @@ object NewFlatLogUtils {
|
||||
"user_id" to userId
|
||||
"name" to name
|
||||
"sequence" to sequence
|
||||
KEY_LOCATION to location
|
||||
parseAndPutMeta()()
|
||||
}.let(::log)
|
||||
}
|
||||
@ -1352,13 +1337,7 @@ object NewFlatLogUtils {
|
||||
}
|
||||
|
||||
// 上传存档弹窗点击事件
|
||||
fun logCloudArchiveUploadDialogClick(
|
||||
gameId: String,
|
||||
gameName: String,
|
||||
cloudSaveId: String,
|
||||
cloudSaveName: String,
|
||||
isSuccess: Boolean
|
||||
) {
|
||||
fun logCloudArchiveUploadDialogClick(gameId: String, gameName: String, cloudSaveId: String, cloudSaveName: String, isSuccess: Boolean) {
|
||||
val json = json {
|
||||
KEY_EVENT to "cloud_save_upload_dialog_click"
|
||||
KEY_GAME_ID to gameId
|
||||
@ -2709,73 +2688,4 @@ object NewFlatLogUtils {
|
||||
parseAndPutMeta()(this)
|
||||
}.let(::log)
|
||||
}
|
||||
|
||||
fun logHaloFunInstalledLaunchDialogShow() {
|
||||
json {
|
||||
KEY_EVENT to EVENT_INSTALLED_LAUNCH_DIALOG_SHOW
|
||||
parseAndPutMeta()(this)
|
||||
}.let(::log)
|
||||
}
|
||||
|
||||
fun logHaloFunInstalledLaunchDialogClick(
|
||||
gameId: String,
|
||||
gameName: String,
|
||||
buttonType: String
|
||||
) {
|
||||
json {
|
||||
KEY_EVENT to EVENT_INSTALLED_LAUNCH_DIALOG_CLICK
|
||||
"game_id" to gameId
|
||||
"game_name" to gameName
|
||||
"button_type" to buttonType
|
||||
parseAndPutMeta()(this)
|
||||
}.let(::log)
|
||||
}
|
||||
|
||||
// 用户访问分流器
|
||||
fun logByPassBrowsing(
|
||||
source: String,
|
||||
bypassName: String,
|
||||
bypassId: String,
|
||||
branchId: String,
|
||||
branchName: String,
|
||||
inProcessTime: Int,
|
||||
bypassVisitTime: Int,
|
||||
linkType: String,
|
||||
linkId: String,
|
||||
linkText: String,
|
||||
bypassStatus: Int
|
||||
) {
|
||||
json {
|
||||
KEY_EVENT to "BypassBrowsing"
|
||||
"source" to source
|
||||
"bypass_name" to bypassName
|
||||
"bypass_id" to bypassId
|
||||
"branch_id" to branchId
|
||||
"branch_name" to branchName
|
||||
"inprocess_time" to inProcessTime
|
||||
"bypass_visit_time" to bypassVisitTime
|
||||
"link_type" to linkType
|
||||
"link_id" to linkId
|
||||
"link_text" to linkText
|
||||
"bypass_status" to bypassStatus
|
||||
parseAndPutMeta()(this)
|
||||
}.let(::log)
|
||||
}
|
||||
|
||||
// 分流失败
|
||||
fun logFailByPass(
|
||||
source: String,
|
||||
bypassName: String,
|
||||
bypassId: String,
|
||||
defeatedReason: String
|
||||
) {
|
||||
json {
|
||||
KEY_EVENT to "FailBypass"
|
||||
"source" to source
|
||||
"bypass_name" to bypassName
|
||||
"bypass_id" to bypassId
|
||||
"defeated_reason" to defeatedReason
|
||||
parseAndPutMeta()(this)
|
||||
}.let(::log)
|
||||
}
|
||||
}
|
||||
@ -1815,6 +1815,60 @@ object NewLogUtils {
|
||||
log(json, LOG_STORE_EVENT)
|
||||
}
|
||||
|
||||
//成功预约游戏
|
||||
@JvmStatic
|
||||
fun logReserveGameSuccess(wechatConfigEntity: WechatConfigEntity) {
|
||||
val json = json {
|
||||
KEY_EVENT to "appointment_wechat_appointment_game"
|
||||
"wechat_is_bind" to wechatConfigEntity.bind
|
||||
"wechat_is_follow" to wechatConfigEntity.follow
|
||||
"wechat_is_remind" to wechatConfigEntity.notice
|
||||
KEY_TIMESTAMP to System.currentTimeMillis() / 1000
|
||||
parseAndPutMeta().invoke(this)
|
||||
}
|
||||
log(json, "appointment", false)
|
||||
}
|
||||
|
||||
//引导设置微信提醒弹窗事件
|
||||
@JvmStatic
|
||||
fun logReserveWechatRemindPopShow(wechatConfigEntity: WechatConfigEntity) {
|
||||
val json = json {
|
||||
KEY_EVENT to "appointment_wechat_remind_pop_show"
|
||||
"wechat_is_bind" to wechatConfigEntity.bind
|
||||
"wechat_is_follow" to wechatConfigEntity.follow
|
||||
"wechat_is_remind" to wechatConfigEntity.notice
|
||||
KEY_TIMESTAMP to System.currentTimeMillis() / 1000
|
||||
parseAndPutMeta().invoke(this)
|
||||
}
|
||||
log(json, "appointment", false)
|
||||
}
|
||||
|
||||
//引导设置微信提醒弹窗点击事件
|
||||
@JvmStatic
|
||||
fun logReserveWechatRemindPopClick(wechatConfigEntity: WechatConfigEntity, operationType: String) {
|
||||
val json = json {
|
||||
KEY_EVENT to "appointment_wechat_remind_pop_click"
|
||||
"wechat_is_bind" to wechatConfigEntity.bind
|
||||
"wechat_is_follow" to wechatConfigEntity.follow
|
||||
"wechat_is_remind" to wechatConfigEntity.notice
|
||||
"operation_type" to operationType
|
||||
KEY_TIMESTAMP to System.currentTimeMillis() / 1000
|
||||
parseAndPutMeta().invoke(this)
|
||||
}
|
||||
log(json, "appointment", false)
|
||||
}
|
||||
|
||||
//预约成功弹窗事件
|
||||
@JvmStatic
|
||||
fun logReserveWechatSuccessPopShow() {
|
||||
val json = json {
|
||||
KEY_EVENT to "appointment_wechat_success_pop_show"
|
||||
KEY_TIMESTAMP to System.currentTimeMillis() / 1000
|
||||
parseAndPutMeta().invoke(this)
|
||||
}
|
||||
log(json, "appointment", false)
|
||||
}
|
||||
|
||||
//选择图片上传方式
|
||||
@JvmStatic
|
||||
fun logShowGameCollectionCoverTypeDialog() {
|
||||
|
||||
@ -90,7 +90,7 @@ object PackageChangeHelper : DefaultLifecycleObserver {
|
||||
pendingPackageTriple = null
|
||||
pendingGhId = null
|
||||
|
||||
PackageRepository.addInstalledGame(PackageRepository.packageFilterManager, packageName)
|
||||
PackageRepository.addInstalledGame(packageName)
|
||||
|
||||
// 添加到额外的包名白名单，下次启动同时查询此包的安装情况
|
||||
PackageHelper.updateAdditionalWhiteListPackageName(packageName = packageName, isAdd = true)
|
||||
|
||||
@ -81,33 +81,33 @@ object PackageHelper {
|
||||
|
||||
// 评论黑名单包名列表，避免用户安装了 Xposed Installer 这样的工具，也能在包含该安装包的游戏详情页评论
|
||||
private var _commentPackageNameBlackList = arrayListOf<String>()
|
||||
val commentPackageNameBlackList: ArrayList<String>
|
||||
get() = _commentPackageNameBlackList
|
||||
val commentPackageNameBlackList: ArrayList<String> = _commentPackageNameBlackList
|
||||
|
||||
// 关闭下载的包列表
|
||||
private var _downloadPackageNameBlackList = arrayListOf<String>()
|
||||
val downloadPackageNameBlackList: ArrayList<String>
|
||||
get() = _downloadPackageNameBlackList
|
||||
val downloadPackageNameBlackList: ArrayList<String> = _downloadPackageNameBlackList
|
||||
|
||||
// 本地已安装的包去掉关闭下载的包后的列表
|
||||
private var _validLocalPackageNameSet = hashSetOf<String>()
|
||||
val validLocalPackageNameSet: HashSet<String>
|
||||
get() = _validLocalPackageNameSet
|
||||
val validLocalPackageNameSet: HashSet<String> = _validLocalPackageNameSet
|
||||
|
||||
// 游戏包名匹配列表
|
||||
private var _relatedPackageList = arrayListOf<SettingsEntity.GameWithPackages>()
|
||||
val relatedPackageList: ArrayList<SettingsEntity.GameWithPackages>
|
||||
get() = _relatedPackageList
|
||||
val relatedPackageList: ArrayList<SettingsEntity.GameWithPackages> = _relatedPackageList
|
||||
|
||||
// 接口控制的已安装应用列表获取开关状态 (UI 显示)
|
||||
private var _installedPackageApiSwitchStatusLiveData = MutableLiveData<Boolean>()
|
||||
val installedPackageApiSwitchStatusLiveData: LiveData<Boolean>
|
||||
get() = _installedPackageApiSwitchStatusLiveData
|
||||
val installedPackageApiSwitchStatusLiveData: LiveData<Boolean> = _installedPackageApiSwitchStatusLiveData
|
||||
|
||||
// 本地已安装包的列表
|
||||
var localPackageNameSet = setOf<String>()
|
||||
var localPackageNameSet = hashSetOf<String>()
|
||||
get() {
|
||||
return HashSet(cachedInstalledPackageNameList)
|
||||
return if (field.isEmpty()) {
|
||||
field = getAllPackageName(HaloApp.getInstance().application)
|
||||
field
|
||||
} else {
|
||||
field
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -456,10 +456,9 @@ object PackageHelper {
|
||||
* 进行包名初始化相关的操作
|
||||
*/
|
||||
fun initPackageRelatedData() {
|
||||
PackageRepository.initData {
|
||||
refreshLocalPackageList()
|
||||
refreshPackageNameList()
|
||||
}
|
||||
PackageRepository.initData()
|
||||
refreshLocalPackageList()
|
||||
refreshPackageNameList()
|
||||
}
|
||||
|
||||
/**
|
||||
@ -542,7 +541,6 @@ object PackageHelper {
|
||||
Utils.log(TAG, "addInstalledButMissingPackages 需要请求接口获取的包数量为 ${installedPackageNameSet.size}")
|
||||
|
||||
PackageRepository.addInstalledGames(
|
||||
packageFilterManager = PackageRepository.packageFilterManager,
|
||||
pkgNameList = ArrayList(installedPackageNameSet),
|
||||
updateInstallStatus = true
|
||||
)
|
||||
@ -814,7 +812,7 @@ object PackageHelper {
|
||||
uploadUIDGapLog = false
|
||||
|
||||
val uidGap = (android.os.Process.LAST_APPLICATION_UID - lastValidUid) / 100 * 100
|
||||
// SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
|
||||
SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
|
||||
}
|
||||
|
||||
return packageList
|
||||
|
||||
@ -4,7 +4,6 @@ import android.app.Activity
|
||||
import android.app.PendingIntent
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
@ -16,6 +15,7 @@ import com.gh.download.server.BrowserInstallHelper
|
||||
import com.gh.gamecenter.BuildConfig
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.gamecenter.common.utils.*
|
||||
import com.gh.gamecenter.core.utils.CurrentActivityHolder
|
||||
import com.gh.gamecenter.core.utils.MD5Utils
|
||||
import com.gh.gamecenter.core.utils.ToastUtils
|
||||
import com.gh.gamecenter.install.InstallService
|
||||
@ -31,15 +31,6 @@ object PackageInstaller {
|
||||
|
||||
private val listeners = mutableListOf<OnInstallListener>()
|
||||
|
||||
private val packageInstallerPackageName = arrayOf(
|
||||
"com.android.packageinstaller",
|
||||
"com.miui.packageinstaller",
|
||||
"com.google.android.packageinstaller",
|
||||
"com.samsung.android.packageinstaller",
|
||||
"com.lenovo",
|
||||
"com.zhuoyi"
|
||||
)
|
||||
|
||||
/**
|
||||
* 为了兼容java代码
|
||||
*/
|
||||
@ -283,27 +274,11 @@ object PackageInstaller {
|
||||
}
|
||||
installIntent.setDataAndType(uri, "application/vnd.android.package-archive")
|
||||
}
|
||||
|
||||
updateSystemInstallerIfAvailable(context, installIntent)
|
||||
|
||||
InstallUtils.getInstance()
|
||||
.addInstall(PackageUtils.getPackageNameByPath(context, path))
|
||||
return installIntent
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找并设置系统安装器作为安装 intent 的包名
|
||||
*/
|
||||
private fun updateSystemInstallerIfAvailable(context: Context, intent: Intent) {
|
||||
for (rf in context.packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)) {
|
||||
val targetPackageName = packageInstallerPackageName.firstOrNull { rf.activityInfo.packageName.contains(it) }
|
||||
if (!targetPackageName.isNullOrEmpty()) {
|
||||
intent.setPackage(targetPackageName)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 卸载应用
|
||||
*/
|
||||
|
||||
@ -14,7 +14,6 @@ import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.PowerManager;
|
||||
import android.text.TextUtils;
|
||||
import android.util.AndroidException;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
@ -223,8 +222,8 @@ public class PackageUtils {
|
||||
if (metaDate != null) {
|
||||
return metaDate.get(name);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} catch (NameNotFoundException e) {
|
||||
// e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@ -486,6 +485,7 @@ public class PackageUtils {
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
SentryHelper.INSTANCE.onEvent("GET_PACKAGE_INFO_ERROR", "path", path);
|
||||
}
|
||||
|
||||
return null;
|
||||
@ -565,7 +565,8 @@ public class PackageUtils {
|
||||
}
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
boolean isInstalled = PackageHelper.INSTANCE.getLocalPackageNameSet().contains(packageName);
|
||||
ArrayList<String> allPackageName = getAllPackageName(context);
|
||||
boolean isInstalled = allPackageName.contains(packageName);
|
||||
|
||||
if (isInstalled) {
|
||||
// 能进这里说明上面的 try {} 结果有问题，记录一下
|
||||
@ -626,8 +627,8 @@ public class PackageUtils {
|
||||
try {
|
||||
return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
|
||||
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionName;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} catch (NameNotFoundException e) {
|
||||
// do nothing
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@ -639,8 +640,8 @@ public class PackageUtils {
|
||||
try {
|
||||
return HaloApp.getInstance().getApplication().getPackageManager().getPackageInfo(packageName,
|
||||
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionCode;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} catch (NameNotFoundException e) {
|
||||
// do nothing
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -653,12 +654,31 @@ public class PackageUtils {
|
||||
try {
|
||||
PackageManager packageManager = context.getApplicationContext().getPackageManager();
|
||||
return packageManager.getApplicationIcon(packageName);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} catch (NameNotFoundException e) {
|
||||
// do nothing
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/*
|
||||
* 获取所有已安装的软件的包名（包括系统应用）
|
||||
*/
|
||||
public static ArrayList<String> getAllPackageName(Context context) {
|
||||
ArrayList<String> list = new ArrayList<>();
|
||||
List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
|
||||
for (String packageName : packageNameList) {
|
||||
if (!context.getPackageName().equals(packageName)) {
|
||||
list.add(packageName);
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
public static ArrayList<String> getAllPackageNameIncludeGh(Context context) {
|
||||
List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
|
||||
return new ArrayList<>(packageNameList);
|
||||
}
|
||||
|
||||
public static JSONArray getAppList(Context context) {
|
||||
JSONArray jsonArray = new JSONArray();
|
||||
try {
|
||||
@ -686,7 +706,7 @@ public class PackageUtils {
|
||||
jsonObject.put("version", packageInfo.versionName);
|
||||
}
|
||||
return jsonObject;
|
||||
} catch (Exception e) {
|
||||
} catch (JSONException | NameNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
return jsonObject;
|
||||
}
|
||||
|
||||
@ -130,7 +130,7 @@ object PureModeHelper {
|
||||
binding.hintTv.buildSpannableString {
|
||||
addText(guide.linkTextPrefix)
|
||||
addText(guide.linkText) {
|
||||
setColor(ColorResId(com.gh.gamecenter.common.R.color.text_theme))
|
||||
setColor(ColorResId(R.color.text_theme))
|
||||
onClick(false) {
|
||||
binding.extraHintIv.performClick()
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@ object RecommendPopupHelper {
|
||||
//判断是否符合包名限制
|
||||
val nameRule = entity.recommendPackage.nameRule
|
||||
val packages = entity.recommendPackage.details
|
||||
val installedPackages = PackageHelper.getInstalledPackageNameList(HaloApp.getInstance(), 0)
|
||||
val installedPackages = PackageUtils.getAllPackageNameIncludeGh(HaloApp.getInstance())
|
||||
var isMatchSuccess = true
|
||||
val checkInstalled: (splitPackages: List<String>) -> Boolean = {
|
||||
var isInstalled = false
|
||||
|
||||
@ -2,29 +2,22 @@ package com.gh.common.util
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
import com.alibaba.android.arouter.launcher.ARouter
|
||||
import com.gh.gamecenter.common.constant.Constants
|
||||
import com.gh.common.repository.ReservationRepository
|
||||
import com.gh.gamecenter.WebActivity
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.common.base.GlobalActivityManager.getCurrentPageEntity
|
||||
import com.gh.gamecenter.common.base.GlobalActivityManager.getLastPageEntity
|
||||
import com.gh.gamecenter.WebActivity
|
||||
import com.gh.gamecenter.common.callback.CancelListener
|
||||
import com.gh.gamecenter.common.callback.ConfirmListener
|
||||
import com.gh.gamecenter.common.constant.RouteConsts
|
||||
import com.gh.gamecenter.common.entity.WechatConfigEntity
|
||||
import com.gh.gamecenter.core.utils.*
|
||||
import com.gh.gamecenter.feature.entity.GameEntity
|
||||
import com.gh.gamecenter.common.retrofit.BiResponse
|
||||
import com.gh.gamecenter.common.utils.*
|
||||
import com.gh.gamecenter.core.provider.IPushProvider
|
||||
import com.gh.gamecenter.entity.ReserveReminderEntity
|
||||
import com.gh.gamecenter.retrofit.RetrofitManager
|
||||
import com.halo.assistant.HaloApp
|
||||
import com.lightgame.utils.Utils
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import okhttp3.RequestBody
|
||||
import okhttp3.ResponseBody
|
||||
|
||||
object ReservationHelper {
|
||||
@ -45,22 +38,18 @@ object ReservationHelper {
|
||||
deleteReservation: Boolean,
|
||||
refreshCallback: EmptyCallback
|
||||
) {
|
||||
|
||||
val retrofit = RetrofitManager.getInstance()
|
||||
val requestMap = hashMapOf<String, String>()
|
||||
requestMap["game_id"] = game.id
|
||||
|
||||
val single = if (deleteReservation) {
|
||||
retrofit.newApi
|
||||
.deleteGameReservation(
|
||||
game.id,
|
||||
getReserveRequestBody(game, context = HaloApp.getInstance().application)
|
||||
)
|
||||
retrofit.api
|
||||
.deleteGameReservation(requestMap.createRequestBody())
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
} else {
|
||||
retrofit.newApi
|
||||
.cancelGameReservation(
|
||||
game.id,
|
||||
getReserveRequestBody(game, context = HaloApp.getInstance().application)
|
||||
)
|
||||
retrofit.api
|
||||
.cancelGameReservation(requestMap.createRequestBody())
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
}
|
||||
@ -81,65 +70,71 @@ object ReservationHelper {
|
||||
@JvmStatic
|
||||
@SuppressLint("CheckResult")
|
||||
fun reserve(context: Context, game: GameEntity?, sourceEntrance: String = "其他", callback: EmptyCallback) {
|
||||
|
||||
RetrofitManager.getInstance().newApi
|
||||
.createNewGameReservation(game?.id ?: "", getReserveRequestBody(game, context))
|
||||
val requestMap = hashMapOf<String, String>()
|
||||
requestMap["game_id"] = game?.id ?: ""
|
||||
RetrofitManager.getInstance().api
|
||||
.createNewGameReservation(requestMap.createRequestBody())
|
||||
.compose(singleToMain())
|
||||
.subscribe(object : BiResponse<ReserveReminderEntity>() {
|
||||
.subscribe(object : BiResponse<ResponseBody>() {
|
||||
|
||||
override fun onSuccess(data: ReserveReminderEntity) {
|
||||
override fun onSuccess(data: ResponseBody) {
|
||||
SensorsBridge.trackEvent(
|
||||
"AppointmentGameResult",
|
||||
"game_name", game?.name ?: "",
|
||||
"game_id", game?.id ?: "",
|
||||
"game_type", game?.categoryChinese ?: "",
|
||||
"result", "成功",
|
||||
"source_entrance", sourceEntrance,
|
||||
"page_name", getCurrentPageEntity().pageName,
|
||||
"page_id", getCurrentPageEntity().pageId,
|
||||
"page_business_id", getCurrentPageEntity().pageBusinessId,
|
||||
"last_page_name", getLastPageEntity().pageName,
|
||||
"last_page_id", getLastPageEntity().pageId,
|
||||
"last_page_business_id", getLastPageEntity().pageBusinessId,
|
||||
"source", game?.exposureEvent?.source?.toString() ?: "",
|
||||
*game?.customPageTrackData?.toKV() ?: arrayOf()
|
||||
"game_name",
|
||||
game?.name ?: "",
|
||||
"game_id",
|
||||
game?.id ?: "",
|
||||
"game_type",
|
||||
game?.categoryChinese ?: "",
|
||||
"result",
|
||||
"成功",
|
||||
"source_entrance",
|
||||
sourceEntrance
|
||||
)
|
||||
|
||||
ReservationRepository.addReservationToMemoryAndRefresh(game?.id ?: "")
|
||||
callback.onCallback()
|
||||
|
||||
checkWechatConfigEntityUpdated(data.wechatConfig)
|
||||
|
||||
game?.let {
|
||||
SensorsBridge.trackAppointmentSuccessDialogShow(
|
||||
it.id,
|
||||
it.name ?: "",
|
||||
it.categoryChinese,
|
||||
data.wechatConfig.isReminderEnable,
|
||||
if (data.hasSmsConfig) data.smsConfig.notice else null,
|
||||
if (data.isEnableAutoDownload) data.wifiAutoDownload else null
|
||||
)
|
||||
val wechatConfig = SPUtils.getString(Constants.SP_WECHAT_CONFIG).toObject<WechatConfigEntity>()
|
||||
wechatConfig?.run {
|
||||
NewLogUtils.logReserveGameSuccess(wechatConfig)
|
||||
if (bind && follow && notice) {
|
||||
NewLogUtils.logReserveWechatSuccessPopShow()
|
||||
DialogUtils.showReserveOrVoteSuccessDialog(context, true)
|
||||
} else {
|
||||
NewLogUtils.logReserveWechatRemindPopShow(wechatConfig)
|
||||
SensorsBridge.trackEvent("AppointmenWechatRemindDialogShow")
|
||||
DialogUtils.showReserveOrVoteSuccess2WechatBindDialog(context, true, {
|
||||
NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "开启微信提醒")
|
||||
SensorsBridge.trackEvent("AppointmenWechatRemindDialogClick")
|
||||
context.startActivity(WebActivity.getBindWechatIntent(context))
|
||||
SensorsBridge.trackEvent(
|
||||
"AppointmenWechatRemindConfigPageShow",
|
||||
"source_entrance",
|
||||
"设置微信提醒弹窗"
|
||||
)
|
||||
}, object : CancelListener {
|
||||
override fun onCancel() {
|
||||
NewLogUtils.logReserveWechatRemindPopClick(wechatConfig, "关闭弹窗")
|
||||
SensorsBridge.trackEvent("AppointmenWechatRemindDialogClick")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
DialogUtils.showReserveReminderDialog(context, game, data)
|
||||
}
|
||||
|
||||
override fun onFailure(exception: Exception) {
|
||||
SensorsBridge.trackEvent(
|
||||
"AppointmentGameResult",
|
||||
"game_name", game?.name ?: "",
|
||||
"game_id", game?.id ?: "",
|
||||
"game_type", game?.categoryChinese ?: "",
|
||||
"result", "失败",
|
||||
"source_entrance", sourceEntrance,
|
||||
"page_name", getCurrentPageEntity().pageName,
|
||||
"page_id", getCurrentPageEntity().pageId,
|
||||
"page_business_id", getCurrentPageEntity().pageBusinessId,
|
||||
"last_page_name", getLastPageEntity().pageName,
|
||||
"last_page_id", getLastPageEntity().pageId,
|
||||
"last_page_business_id", getLastPageEntity().pageBusinessId,
|
||||
"source", game?.exposureEvent?.source?.toString() ?: "",
|
||||
*game?.customPageTrackData?.toKV() ?: arrayOf()
|
||||
"game_name",
|
||||
game?.name ?: "",
|
||||
"game_id",
|
||||
game?.id ?: "",
|
||||
"game_type",
|
||||
game?.categoryChinese ?: "",
|
||||
"result",
|
||||
"失败",
|
||||
"source_entrance",
|
||||
sourceEntrance
|
||||
)
|
||||
ToastUtils.showToast(exception.message ?: "")
|
||||
}
|
||||
@ -162,85 +157,24 @@ object ReservationHelper {
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun showCancelReservationDialog(context: Context, game: GameEntity?, emptyCallback: EmptyCallback) {
|
||||
showCancelReservationDialog(context, game, emptyCallback, null)
|
||||
fun showCancelReservationDialog(context: Context, emptyCallback: EmptyCallback) {
|
||||
showCancelReservationDialog(context, emptyCallback, null)
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun showCancelReservationDialog(
|
||||
context: Context,
|
||||
game: GameEntity?,
|
||||
emptyCallback: EmptyCallback,
|
||||
cancelListener: CancelListener?,
|
||||
dialogCancelCallback: (() -> Unit)? = null
|
||||
) {
|
||||
if (game != null) {
|
||||
SensorsBridge.trackCancelAppointmentDialogShow(game.id, game.name ?: "", game.categoryChinese)
|
||||
}
|
||||
fun showCancelReservationDialog(context: Context, emptyCallback: EmptyCallback, cancelListener: CancelListener?) {
|
||||
DialogHelper.showDialog(context, "取消预约",
|
||||
"取消之后你将无法收到游戏上线的通知，确定取消预约吗？",
|
||||
"确定取消",
|
||||
"暂不取消", confirmClickCallback = {
|
||||
if (game != null) {
|
||||
SensorsBridge.trackCancelAppointmentDialogClick(
|
||||
game.id,
|
||||
game.name ?: "",
|
||||
game.categoryChinese,
|
||||
"确定取消"
|
||||
)
|
||||
}
|
||||
emptyCallback.onCallback()
|
||||
}, cancelClickCallback = {
|
||||
if (game != null) {
|
||||
SensorsBridge.trackCancelAppointmentDialogClick(
|
||||
game.id,
|
||||
game.name ?: "",
|
||||
game.categoryChinese,
|
||||
"暂不取消"
|
||||
)
|
||||
}
|
||||
cancelListener?.onCancel()
|
||||
}, uiModificationCallback = {
|
||||
it.confirmTv.setTextColor(com.gh.gamecenter.common.R.color.secondary_red.toColor(context))
|
||||
}, extraConfig = DialogHelper.Config(centerContent = true, centerTitle = true),
|
||||
dialogCancelCallback = {
|
||||
if (game != null) {
|
||||
SensorsBridge.trackCancelAppointmentDialogClick(
|
||||
game.id,
|
||||
game.name ?: "",
|
||||
game.categoryChinese,
|
||||
"关闭弹窗"
|
||||
)
|
||||
}
|
||||
dialogCancelCallback?.invoke()
|
||||
}
|
||||
it.confirmTv.setTextColor(R.color.secondary_red.toColor(context))
|
||||
}, extraConfig = DialogHelper.Config(centerContent = true, centerTitle = true)
|
||||
)
|
||||
}
|
||||
|
||||
private fun checkWechatConfigEntityUpdated(newWechatConfig: WechatConfigEntity) {
|
||||
val wechatConfig = SPUtils.getString(Constants.SP_WECHAT_CONFIG).toObject<WechatConfigEntity>()
|
||||
if (newWechatConfig.bind != wechatConfig?.bind
|
||||
|| newWechatConfig.follow != wechatConfig.follow
|
||||
|| newWechatConfig.notice != wechatConfig.notice
|
||||
|| newWechatConfig.nickName != wechatConfig.nickName
|
||||
) {
|
||||
SPUtils.setString(Constants.SP_WECHAT_CONFIG, newWechatConfig.toJson())
|
||||
}
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun getReserveRequestBody(game: GameEntity?, context: Context): RequestBody {
|
||||
val jPushId =
|
||||
(ARouter.getInstance().build(RouteConsts.provider.push).navigation() as? IPushProvider)
|
||||
?.getRegistrationId(context) ?: ""
|
||||
var mirrorPosition = game?.getMirrorPosition() ?: 0
|
||||
if (mirrorPosition == -1) {
|
||||
mirrorPosition = 0
|
||||
}
|
||||
val body = hashMapOf(
|
||||
"jpush_id" to jPushId,
|
||||
"mirror_type" to mirrorPosition
|
||||
).toRequestBody()
|
||||
return body
|
||||
}
|
||||
}
|
||||
@ -27,9 +27,7 @@ import com.gh.gamecenter.retrofit.RetrofitManager
|
||||
import com.halo.assistant.HaloApp
|
||||
import com.lightgame.utils.Utils
|
||||
import okhttp3.MediaType
|
||||
import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
||||
import okhttp3.RequestBody
|
||||
import okhttp3.RequestBody.Companion.toRequestBody
|
||||
import okhttp3.ResponseBody
|
||||
import org.json.JSONArray
|
||||
import org.json.JSONObject
|
||||
@ -126,12 +124,11 @@ object UsageStatsHelper {
|
||||
&& curEvent.className == nextEvent.className
|
||||
) {
|
||||
val diff = nextEvent.timeStamp - curEvent.timeStamp
|
||||
val packageName = curEvent.packageName ?: continue
|
||||
|
||||
if (pakAndTime[packageName] == null) {
|
||||
pakAndTime[packageName] = diff
|
||||
if (pakAndTime[curEvent.packageName] == null) {
|
||||
pakAndTime[curEvent.packageName] = diff
|
||||
} else {
|
||||
pakAndTime[packageName] = pakAndTime[packageName]!! + diff
|
||||
pakAndTime[curEvent.packageName] = pakAndTime[curEvent.packageName]!! + diff
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -178,7 +175,7 @@ object UsageStatsHelper {
|
||||
return
|
||||
}
|
||||
|
||||
val body = postBody.toString().toRequestBody("application/json".toMediaTypeOrNull())
|
||||
val body = RequestBody.create(MediaType.parse("application/json"), postBody.toString())
|
||||
mApi.postUsageStatus(body, UserManager.getInstance().userId)
|
||||
.subscribe(object : BiResponse<ResponseBody>() {
|
||||
override fun onSuccess(data: ResponseBody) {
|
||||
|
||||
@ -65,7 +65,6 @@ object ViewPagerFragmentHelper {
|
||||
const val TYPE_COLUMN = "column" // 游戏专题详情页
|
||||
const val TYPE_QQ_MINI_GAME_COLUMN = "qq_mini_game_column_detail" // QQ小游戏专题详情页
|
||||
const val TYPE_WECHAT_GAME_COLUMN = "wechat_game_column_detail" // 微信小游戏专题详情页
|
||||
const val TYPE_WECHAT_GAME_CPM_COLUMN = "wechat_game_cpm_column_detail" // 微信小游戏CPM专题详情页
|
||||
const val TYPE_COLUMN_COLLECTION = "column_collection" // 专题合集详情页
|
||||
const val TYPE_SERVER = "server" // 开服表
|
||||
const val TYPE_COLUMN_TEST = "column_test_v2" // 新游开测
|
||||
@ -83,7 +82,6 @@ object ViewPagerFragmentHelper {
|
||||
const val TYPE_TOOLKIT = "toolkit" // 工具箱
|
||||
|
||||
fun createFragment(parentFragment: Fragment?, bundle: Bundle, linkEntity: LinkEntity, isTabWrapper: Boolean): Fragment {
|
||||
val superiorChain = if (parentFragment is ISuperiorChain) parentFragment else null
|
||||
return when (linkEntity.type) {
|
||||
// 游戏详情页
|
||||
TYPE_GAME -> {
|
||||
@ -92,12 +90,11 @@ object ViewPagerFragmentHelper {
|
||||
}
|
||||
// 我的光环
|
||||
TYPE_MY_HALO -> {
|
||||
val superiorChain = if (parentFragment is ISuperiorChain) parentFragment else null
|
||||
HaloPersonalFragment().setSuperiorChain(superiorChain).with(bundle)
|
||||
}
|
||||
// 社区首页
|
||||
TYPE_COMMUNITY_HOME -> {
|
||||
CommunityHomeFragment().setSuperiorChain(superiorChain).with(bundle)
|
||||
}
|
||||
TYPE_COMMUNITY_HOME -> CommunityHomeFragment().with(bundle)
|
||||
// 视频信息流
|
||||
TYPE_VIDEO_STREAM -> {
|
||||
bundle.putBoolean(EntranceConsts.KEY_IS_HOME_VIDEO, true)
|
||||
@ -151,11 +148,11 @@ object ViewPagerFragmentHelper {
|
||||
NewQuestionDetailFragment().with(bundle)
|
||||
}
|
||||
// 其他原来带Toolbar的Fragment
|
||||
else -> createToolbarWrapperFragment(parentFragment, bundle, linkEntity, isTabWrapper)
|
||||
else -> createToolbarWrapperFragment(bundle, linkEntity, isTabWrapper)
|
||||
}
|
||||
}
|
||||
|
||||
private fun createToolbarWrapperFragment(parentFragment: Fragment?, bundle: Bundle, entity: LinkEntity, isTabWrapper: Boolean): Fragment {
|
||||
private fun createToolbarWrapperFragment(bundle: Bundle, entity: LinkEntity, isTabWrapper: Boolean): Fragment {
|
||||
var className = ReloadFragment::class.java.name
|
||||
|
||||
when (entity.type) {
|
||||
@ -164,11 +161,10 @@ object ViewPagerFragmentHelper {
|
||||
className = GameCollectionSquareFragment::class.java.name
|
||||
}
|
||||
// 游戏专题详情页/QQ游戏专题详情页
|
||||
TYPE_COLUMN, TYPE_QQ_MINI_GAME_COLUMN, TYPE_WECHAT_GAME_COLUMN, TYPE_WECHAT_GAME_CPM_COLUMN -> {
|
||||
TYPE_COLUMN, TYPE_QQ_MINI_GAME_COLUMN, TYPE_WECHAT_GAME_COLUMN -> {
|
||||
val subjectType = when(entity.type) {
|
||||
TYPE_QQ_MINI_GAME_COLUMN -> SubjectData.SubjectType.QQ_GAME
|
||||
TYPE_WECHAT_GAME_COLUMN -> SubjectData.SubjectType.WECHAT_GAME
|
||||
TYPE_WECHAT_GAME_CPM_COLUMN -> SubjectData.SubjectType.WECHAT_GAME_CPM
|
||||
else -> SubjectData.SubjectType.NORMAL
|
||||
}
|
||||
className = SubjectFragment::class.java.name
|
||||
@ -176,7 +172,6 @@ object ViewPagerFragmentHelper {
|
||||
EntranceConsts.KEY_SUBJECT_DATA,
|
||||
SubjectData(entity.link, entity.text, false, subjectType = subjectType)
|
||||
)
|
||||
bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "detail")
|
||||
bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
|
||||
}
|
||||
// 专题合集详情页
|
||||
@ -186,7 +181,6 @@ object ViewPagerFragmentHelper {
|
||||
bundle.putInt(EntranceConsts.KEY_POSITION, 0)
|
||||
bundle.putString(EntranceConsts.KEY_COLUMNNAME, entity.text)
|
||||
bundle.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
|
||||
bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
|
||||
}
|
||||
// 开服表
|
||||
TYPE_SERVER -> {
|
||||
|
||||
@ -22,7 +22,7 @@ object WechatBindHelper {
|
||||
fun getWechatConfig(callback: ((WechatConfigEntity) -> Unit)? = null) {
|
||||
if (!UserManager.getInstance().isLoggedIn) return
|
||||
RetrofitManager.getInstance()
|
||||
.newApi
|
||||
.api
|
||||
.wechatConfig
|
||||
.compose(singleToMain())
|
||||
.subscribe(object : BiResponse<WechatConfigEntity>() {
|
||||
@ -36,7 +36,7 @@ object WechatBindHelper {
|
||||
@SuppressLint("CheckResult")
|
||||
fun bindWechat(wechatLoginInfoMap: Map<String, String>, callback: BiCallback<Boolean, Boolean>) {
|
||||
RetrofitManager.getInstance()
|
||||
.newApi
|
||||
.api
|
||||
.postBindWechat(wechatLoginInfoMap.createRequestBody())
|
||||
.compose(singleToMain())
|
||||
.subscribe(object : BiResponse<ResponseBody>() {
|
||||
|
||||
@ -85,12 +85,12 @@ class CategoryFilterView @JvmOverloads constructor(
|
||||
targetTextView.setTextColor(Color.WHITE)
|
||||
} else {
|
||||
targetTextView.background = null
|
||||
targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, com.gh.gamecenter.common.R.color.text_757575))
|
||||
targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, R.color.text_757575))
|
||||
}
|
||||
}
|
||||
|
||||
private fun showSelectTypePopupWindow(containerView: View, typeTv: TextView, typeText: String) {
|
||||
typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
|
||||
typeTv.setTextColor(R.color.text_theme.toColor(context))
|
||||
typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
|
||||
|
||||
val inflater = LayoutInflater.from(typeTv.context)
|
||||
@ -136,7 +136,7 @@ class CategoryFilterView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
popupWindow.setOnDismissListener {
|
||||
typeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
|
||||
typeTv.setTextColor(R.color.text_757575.toColor(context))
|
||||
typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
|
||||
mTypePopupWindow = null
|
||||
}
|
||||
@ -148,7 +148,7 @@ class CategoryFilterView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
private fun showSelectSizePopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
|
||||
sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
|
||||
sizeTv.setTextColor(R.color.text_theme.toColor(context))
|
||||
sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
|
||||
|
||||
val inflater = LayoutInflater.from(sizeTv.context)
|
||||
@ -204,7 +204,7 @@ class CategoryFilterView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
popupWindow.setOnDismissListener {
|
||||
sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
|
||||
sizeTv.setTextColor(R.color.text_757575.toColor(context))
|
||||
sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
|
||||
mSizePopupWindow = null
|
||||
}
|
||||
|
||||
@ -87,7 +87,7 @@ class ConfigFilterView @JvmOverloads constructor(
|
||||
SortType.RATING -> updateHighlightedTextView(ratingTv)
|
||||
SortType.UPDATE -> updateHighlightedTextView(updateTv)
|
||||
}
|
||||
mSizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
|
||||
mSizeTv.setTextColor(R.color.text_757575.toColor(context))
|
||||
}
|
||||
|
||||
fun setOnConfigSetupListener(onConfigFilterSetupListener: OnConfigFilterSetupListener) {
|
||||
@ -97,10 +97,10 @@ class ConfigFilterView @JvmOverloads constructor(
|
||||
private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) {
|
||||
if (highlightIt) {
|
||||
targetTextView.background = R.drawable.bg_tag_text.toDrawable()
|
||||
targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_white.toColor(context))
|
||||
targetTextView.setTextColor(R.color.text_white.toColor(context))
|
||||
} else {
|
||||
targetTextView.background = null
|
||||
targetTextView.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
|
||||
targetTextView.setTextColor(R.color.text_757575.toColor(context))
|
||||
}
|
||||
}
|
||||
|
||||
@ -112,7 +112,7 @@ class ConfigFilterView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
private fun showSelectionPopupWindow(containerView: View, sizeTv: TextView, sizeText: String) {
|
||||
sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(sizeTv.context))
|
||||
sizeTv.setTextColor(R.color.text_theme.toColor(sizeTv.context))
|
||||
sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
|
||||
|
||||
val inflater = LayoutInflater.from(sizeTv.context)
|
||||
@ -171,7 +171,7 @@ class ConfigFilterView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
popupWindow.setOnDismissListener {
|
||||
sizeTv.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(sizeTv.context))
|
||||
sizeTv.setTextColor(R.color.text_757575.toColor(sizeTv.context))
|
||||
sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_down)
|
||||
mPopupWindow = null
|
||||
}
|
||||
|
||||
@ -86,9 +86,9 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
||||
mSelectedSubFilter = filter
|
||||
mBinding?.subFilterTv?.text = filter
|
||||
if (filter != mSubFilterList.firstOrNull() && mHighlightSubFilterIfItsNotDefault) {
|
||||
mBinding?.subFilterTv?.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
|
||||
mBinding?.subFilterTv?.setTextColor(R.color.text_theme.toColor(context))
|
||||
} else {
|
||||
mBinding?.subFilterTv?.setTextColor(com.gh.gamecenter.common.R.color.text_757575.toColor(context))
|
||||
mBinding?.subFilterTv?.setTextColor(R.color.text_757575.toColor(context))
|
||||
}
|
||||
}
|
||||
|
||||
@ -98,7 +98,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
||||
targetTextView.setTextColor(Color.WHITE)
|
||||
} else {
|
||||
targetTextView.background = null
|
||||
targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, com.gh.gamecenter.common.R.color.text_757575))
|
||||
targetTextView.setTextColor(ContextCompat.getColor(targetTextView.context, R.color.text_757575))
|
||||
}
|
||||
}
|
||||
|
||||
@ -108,7 +108,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
||||
subFilterText: String,
|
||||
selectedCallback: ((String) -> Unit)
|
||||
) {
|
||||
subFilterTv.setTextColor(com.gh.gamecenter.common.R.color.text_theme.toColor(context))
|
||||
subFilterTv.setTextColor(R.color.text_theme.toColor(context))
|
||||
subFilterTv.setDrawableEnd(R.drawable.ic_filter_arrow_up)
|
||||
|
||||
val inflater = LayoutInflater.from(subFilterTv.context)
|
||||
@ -213,10 +213,10 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet
|
||||
|
||||
if (mSelectedFilter == mFilterList[position]) {
|
||||
holder.binding.titleTv.background = R.drawable.bg_tag_text.toDrawable(context)
|
||||
holder.binding.titleTv.setTextColor(com.gh.gamecenter.common.R.color.white.toColor(context))
|
||||
holder.binding.titleTv.setTextColor(R.color.white.toColor(context))
|
||||
} else {
|
||||
holder.binding.titleTv.setBackgroundColor(com.gh.gamecenter.common.R.color.ui_surface.toColor(context))
|
||||
holder.binding.titleTv.setTextColor(com.gh.gamecenter.common.R.color.text_777777.toColor(context))
|
||||
holder.binding.titleTv.setBackgroundColor(R.color.ui_surface.toColor(context))
|
||||
holder.binding.titleTv.setTextColor(R.color.text_777777.toColor(context))
|
||||
}
|
||||
|
||||
holder.binding.titleTv.text = mFilterList[position]
|
||||
|
||||
@ -91,7 +91,7 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib
|
||||
val params = LayoutParams(mLastItemWidth, mItemHeight)
|
||||
layoutParams = params
|
||||
setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_game_detail_label_more))
|
||||
if (DarkModeUtils.isDarkModeOn(context)) setColorFilter(com.gh.gamecenter.common.R.color.text_primary.toColor(context))
|
||||
if (DarkModeUtils.isDarkModeOn(context)) setColorFilter(R.color.text_primary.toColor(context))
|
||||
background = createNormalBackgroundDrawable()
|
||||
scaleType = ImageView.ScaleType.CENTER
|
||||
}
|
||||
@ -114,7 +114,7 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib
|
||||
setPadding(mPadding, 0, mPadding, 0)
|
||||
layoutParams = params
|
||||
|
||||
setTextColor(if (tag.isTop) "#${tag.color}".hexStringToIntColor() else com.gh.gamecenter.common.R.color.text_primary.toColor(context))
|
||||
setTextColor(if (tag.isTop) "#${tag.color}".hexStringToIntColor() else R.color.text_primary.toColor(context))
|
||||
background = if (tag.isTop) createTopBackgroundDrawable(tag) else createNormalBackgroundDrawable()
|
||||
setOnClickListener {
|
||||
onClickListener?.onItemClickListener(tag, position)
|
||||
|
||||
@ -11,6 +11,7 @@ import android.widget.LinearLayout
|
||||
import android.widget.TextView
|
||||
import com.gh.gamecenter.core.utils.DisplayUtils
|
||||
import com.gh.gamecenter.common.utils.toColor
|
||||
import com.gh.gamecenter.R
|
||||
import com.gh.gamecenter.feature.entity.TagStyleEntity
|
||||
import kotlin.math.ceil
|
||||
|
||||
@ -79,7 +80,7 @@ class GameTagFlexLinearLayout @JvmOverloads constructor(context: Context, attrs:
|
||||
includeFontPadding = false
|
||||
textSize = mTextSize
|
||||
gravity = Gravity.CENTER
|
||||
setTextColor(com.gh.gamecenter.common.R.color.text_tertiary.toColor(context))
|
||||
setTextColor(R.color.text_tertiary.toColor(context))
|
||||
|
||||
val params = LayoutParams(LayoutParams.WRAP_CONTENT, mItemHeight)
|
||||
params.setMargins(0, 0, mMargin, 0)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user