Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_fiveworld
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
android
android_fiveworld
Commits
2fdc23e3
Commit
2fdc23e3
authored
Oct 20, 2021
by
jyx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新通知栏广告为新插屏半屏
parent
0cd8cbbd
Changes
12
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
446 additions
and
38 deletions
+446
-38
merger.xml
...ermediates/incremental/mergeDebugJniLibFolders/merger.xml
+1
-1
merger.xml
...ld/intermediates/incremental/mergeDebugShaders/merger.xml
+1
-1
merger.xml
...d/intermediates/incremental/packageDebugAssets/merger.xml
+1
-1
compile-file-map.properties
...emental/packageDebugResources/compile-file-map.properties
+1
-1
merger.xml
...ntermediates/incremental/packageDebugResources/merger.xml
+2
-2
manifest-merger-blame-debug-report.txt
...e_blame_file/debug/manifest-merger-blame-debug-report.txt
+2
-2
manifest-merger-debug-report.txt
...brary/build/outputs/logs/manifest-merger-debug-report.txt
+18
-18
Notice_NewOutSceneFull.java
...a/com/mints/fiveworld/ad/half/Notice_NewOutSceneFull.java
+410
-0
WifiAdManager.kt
...rc/main/java/com/mints/fiveworld/ad/wifi/WifiAdManager.kt
+6
-7
HitChanceKeeper.kt
...java/com/mints/fiveworld/common/random/HitChanceKeeper.kt
+3
-0
SplashActivity.java
...java/com/mints/fiveworld/ui/activitys/SplashActivity.java
+0
-4
CycleProgress.java
...in/java/com/mints/fiveworld/ui/widgets/CycleProgress.java
+1
-1
No files found.
animlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
View file @
2fdc23e3
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/main/jniLibs"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/debug/jniLibs"
/></dataSet></merger>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/main/jniLibs"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/debug/jniLibs"
/></dataSet></merger>
\ No newline at end of file
\ No newline at end of file
animlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml
View file @
2fdc23e3
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/main/shaders"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/debug/shaders"
/></dataSet></merger>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/main/shaders"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/debug/shaders"
/></dataSet></merger>
\ No newline at end of file
\ No newline at end of file
animlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml
View file @
2fdc23e3
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/main/assets"
/><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/build/intermediates/shader_assets/debug/out"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/debug/assets"
/></dataSet></merger>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/main/assets"
/><source
path=
"/Users/hello/android_fiveworld/animlibrary/build/intermediates/shader_assets/debug/out"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/debug/assets"
/></dataSet></merger>
\ No newline at end of file
\ No newline at end of file
animlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
View file @
2fdc23e3
#
Mon Oct 18 13:57:14
CST 2021
#
Wed Oct 20 11:20:50
CST 2021
animlibrary/build/intermediates/incremental/packageDebugResources/merger.xml
View file @
2fdc23e3
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"main$Generated"
generated=
"true"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/
mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/main/res"
/><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/build/generated/res/rs/debug"
/><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/build/generated/res/resValues/debug"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"main"
generated-set=
"main$Generated"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/main/res"
><file
path=
"/Users/mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/res/values/attrs.xml"
qualifiers=
""
><declare-styleable
name=
"AnimatedSvgView"
>
<merger
version=
"3"
><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"main$Generated"
generated=
"true"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/
hello/android_fiveworld/animlibrary/src/main/res"
/><source
path=
"/Users/hello/android_fiveworld/animlibrary/build/generated/res/rs/debug"
/><source
path=
"/Users/hello/android_fiveworld/animlibrary/build/generated/res/resValues/debug"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"main"
generated-set=
"main$Generated"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/main/res"
><file
path=
"/Users/hello/android_fivew
orld/animlibrary/src/main/res/values/attrs.xml"
qualifiers=
""
><declare-styleable
name=
"AnimatedSvgView"
>
<attr
format=
"integer"
name=
"animatedSvgImageSizeX"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeX"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeY"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeY"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTime"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTime"
/>
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<attr
format=
"reference"
name=
"animatedSvgTraceResidueColors"
/>
<attr
format=
"reference"
name=
"animatedSvgTraceResidueColors"
/>
<attr
format=
"integer"
name=
"animatedSvgTraceMarkerLength"
/>
<attr
format=
"integer"
name=
"animatedSvgTraceMarkerLength"
/>
<attr
format=
"reference"
name=
"animatedSvgFillColors"
/>
<attr
format=
"reference"
name=
"animatedSvgFillColors"
/>
</declare-styleable></file></source><source
path=
"/Users/
mcg/Documents/worker/androidspace/My5GWorld/animlibrary/build/generated/res/rs/debug"
/><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/build/generated/res/resValues/debug"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"debug$Generated"
generated=
"true"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GWorld/animlibrary/src/debug/res"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"debug"
generated-set=
"debug$Generated"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/debug/res"
/></dataSet><mergedItems><configuration
qualifiers=
""
><declare-styleable
name=
"AnimatedSvgView"
>
</declare-styleable></file></source><source
path=
"/Users/
hello/android_fiveworld/animlibrary/build/generated/res/rs/debug"
/><source
path=
"/Users/hello/android_fiveworld/animlibrary/build/generated/res/resValues/debug"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"debug$Generated"
generated=
"true"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fiveworld/animlibrary/src/debug/res"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"debug"
generated-set=
"debug$Generated"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"/Users/hello/android_fivew
orld/animlibrary/src/debug/res"
/></dataSet><mergedItems><configuration
qualifiers=
""
><declare-styleable
name=
"AnimatedSvgView"
>
<attr
format=
"integer"
name=
"animatedSvgImageSizeX"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeX"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeY"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeY"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTime"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTime"
/>
...
...
animlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
View file @
2fdc23e3
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
4
4
5 <uses-sdk
5 <uses-sdk
6 android:minSdkVersion="14"
6 android:minSdkVersion="14"
6-->/Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
6-->/Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
7 android:targetSdkVersion="28" />
7 android:targetSdkVersion="28" />
7-->/Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
7-->/Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
8
8
9</manifest>
9</manifest>
animlibrary/build/outputs/logs/manifest-merger-debug-report.txt
View file @
2fdc23e3
-- Merging decision tree log ---
-- Merging decision tree log ---
manifest
manifest
ADDED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
ADDED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
package
package
ADDED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml:1:11-61
ADDED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml:1:11-61
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
xmlns:android
xmlns:android
ADDED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
ADDED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml:1:1-63
uses-sdk
uses-sdk
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
android:targetSdkVersion
android:targetSdkVersion
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
ADDED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
ADDED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
android:minSdkVersion
android:minSdkVersion
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
ADDED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
ADDED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
mcg/Documents/worker/androidspace/My5GW
orld/animlibrary/src/main/AndroidManifest.xml
INJECTED from /Users/
hello/android_fivew
orld/animlibrary/src/main/AndroidManifest.xml
app/src/main/java/com/mints/fiveworld/ad/half/Notice_NewOutSceneFull.java
0 → 100644
View file @
2fdc23e3
This diff is collapsed.
Click to expand it.
app/src/main/java/com/mints/fiveworld/ad/wifi/WifiAdManager.kt
View file @
2fdc23e3
...
@@ -5,10 +5,9 @@ import android.os.Bundle
...
@@ -5,10 +5,9 @@ import android.os.Bundle
import
com.mints.fiveworld.ad.full.OutSceneFull
import
com.mints.fiveworld.ad.full.OutSceneFull
import
com.mints.fiveworld.ad.full.InSceneFull
import
com.mints.fiveworld.ad.full.InSceneFull
import
com.mints.fiveworld.ad.full.Notice_OutSceneFull
import
com.mints.fiveworld.ad.full.Notice_OutSceneFull
import
com.mints.fiveworld.ad.inscreen.InSceneInterstitial
import
com.mints.fiveworld.ad.half.NewInSceneFull
import
com.mints.fiveworld.ad.half.NewInSceneFull
import
com.mints.fiveworld.ad.half.NewOutSceneFull
import
com.mints.fiveworld.ad.half.NewOutSceneFull
import
com.mints.fiveworld.ad.
inscreen.Notice_OutSceneInterstitia
l
import
com.mints.fiveworld.ad.
half.Notice_NewOutSceneFul
l
import
com.mints.fiveworld.common.Constant
import
com.mints.fiveworld.common.Constant
import
com.mints.fiveworld.common.random.HitChanceKeeper
import
com.mints.fiveworld.common.random.HitChanceKeeper
import
com.mints.fiveworld.manager.ad.CsjGroMoreManager
import
com.mints.fiveworld.manager.ad.CsjGroMoreManager
...
@@ -110,7 +109,7 @@ class WifiAdManager private constructor() {
...
@@ -110,7 +109,7 @@ class WifiAdManager private constructor() {
fun
getInCurrentAdStatus
():
Boolean
{
fun
getInCurrentAdStatus
():
Boolean
{
when
(
inCurrentAdType
)
{
when
(
inCurrentAdType
)
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
return
InSceneInterstitia
l
.
getInstance
().
loadStatus
==
2
return
NewInSceneFul
l
.
getInstance
().
loadStatus
==
2
}
}
Constant
.
GROMORE_FULL_AD
->
{
Constant
.
GROMORE_FULL_AD
->
{
return
InSceneFull
.
getInstance
().
loadStatus
==
2
return
InSceneFull
.
getInstance
().
loadStatus
==
2
...
@@ -198,7 +197,7 @@ class WifiAdManager private constructor() {
...
@@ -198,7 +197,7 @@ class WifiAdManager private constructor() {
fun
getOutCurrentAdStatus
():
Boolean
{
fun
getOutCurrentAdStatus
():
Boolean
{
when
(
outCurrentAdType
)
{
when
(
outCurrentAdType
)
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
return
Notice_
OutSceneInterstitia
l
.
getInstance
().
loadStatus
==
2
return
Notice_
NewOutSceneFul
l
.
getInstance
().
loadStatus
==
2
}
}
Constant
.
GROMORE_FULL_AD
->
{
Constant
.
GROMORE_FULL_AD
->
{
return
Notice_OutSceneFull
.
getInstance
().
loadStatus
==
2
return
Notice_OutSceneFull
.
getInstance
().
loadStatus
==
2
...
@@ -266,7 +265,7 @@ class WifiAdManager private constructor() {
...
@@ -266,7 +265,7 @@ class WifiAdManager private constructor() {
when
(
noticeOutCurrentAdType
)
{
when
(
noticeOutCurrentAdType
)
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
Notice_
OutSceneInterstitial
.
getInstance
().
preloadInsertScreen
Ad
(
activity
,
carrier
)
Notice_
NewOutSceneFull
.
getInstance
().
preloadFull
Ad
(
activity
,
carrier
)
}
}
Constant
.
GROMORE_FULL_AD
->
{
Constant
.
GROMORE_FULL_AD
->
{
Notice_OutSceneFull
.
getInstance
().
preloadFullAd
(
activity
,
carrier
)
Notice_OutSceneFull
.
getInstance
().
preloadFullAd
(
activity
,
carrier
)
...
@@ -285,8 +284,8 @@ class WifiAdManager private constructor() {
...
@@ -285,8 +284,8 @@ class WifiAdManager private constructor() {
)
{
)
{
when
(
noticeOutCurrentAdType
)
{
when
(
noticeOutCurrentAdType
)
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
Constant
.
GROMORE_INSERTSCREEN_AD
->
{
Notice_
OutSceneInterstitia
l
.
getInstance
()
Notice_
NewOutSceneFul
l
.
getInstance
()
.
show
Interaction
Ad
(
_activity
,
wifiAdStatusListener
,
carrier
)
.
show
Full
Ad
(
_activity
,
wifiAdStatusListener
,
carrier
)
}
}
Constant
.
GROMORE_FULL_AD
->
{
Constant
.
GROMORE_FULL_AD
->
{
Notice_OutSceneFull
.
getInstance
()
Notice_OutSceneFull
.
getInstance
()
...
...
app/src/main/java/com/mints/fiveworld/common/random/HitChanceKeeper.kt
View file @
2fdc23e3
package
com.mints.fiveworld.common.random
package
com.mints.fiveworld.common.random
import
android.util.Log
import
android.util.Log
import
com.mints.fiveworld.common.Constant
import
com.mints.fiveworld.mvp.model.WeightBean
import
com.mints.fiveworld.mvp.model.WeightBean
import
com.mints.fiveworld.utils.LogUtil
import
com.mints.fiveworld.utils.LogUtil
import
kotlin.random.Random
import
kotlin.random.Random
...
@@ -105,6 +106,8 @@ object HitChanceKeeper {
...
@@ -105,6 +106,8 @@ object HitChanceKeeper {
weightArr
:
List
<
WeightBean
>?,
weightArr
:
List
<
WeightBean
>?,
defaultChance
:
String
=
""
defaultChance
:
String
=
""
):
String
{
):
String
{
return
Constant
.
GROMORE_INSERTSCREEN_AD
if
(
weight
==
0
||
weightArr
==
null
||
weightArr
.
isEmpty
())
return
defaultChance
if
(
weight
==
0
||
weightArr
==
null
||
weightArr
.
isEmpty
())
return
defaultChance
LogUtil
.
d
(
TAG
,
"-->>> 1、权重总值:${weight}"
)
LogUtil
.
d
(
TAG
,
"-->>> 1、权重总值:${weight}"
)
...
...
app/src/main/java/com/mints/fiveworld/ui/activitys/SplashActivity.java
View file @
2fdc23e3
...
@@ -8,13 +8,9 @@ import android.view.KeyEvent;
...
@@ -8,13 +8,9 @@ import android.view.KeyEvent;
import
android.view.View
;
import
android.view.View
;
import
android.widget.FrameLayout
;
import
android.widget.FrameLayout
;
import
com.bytedance.msdk.adapter.pangle.PangleNetworkRequestInfo
;
import
com.bytedance.msdk.api.AdError
;
import
com.bytedance.msdk.api.AdError
;
import
com.bytedance.msdk.api.NetworkPlatformConst
;
import
com.bytedance.msdk.api.NetworkPlatformConst
;
import
com.bytedance.msdk.api.splash.TTSplashAdListener
;
import
com.bytedance.msdk.api.GMAdEcpmInfo
;
import
com.bytedance.msdk.api.v2.GMAdConstant
;
import
com.bytedance.msdk.api.v2.GMAdConstant
;
import
com.bytedance.msdk.api.v2.GMNetworkPlatformConst
;
import
com.bytedance.msdk.api.v2.GMNetworkRequestInfo
;
import
com.bytedance.msdk.api.v2.GMNetworkRequestInfo
;
import
com.bytedance.msdk.api.v2.ad.splash.GMSplashAd
;
import
com.bytedance.msdk.api.v2.ad.splash.GMSplashAd
;
import
com.bytedance.msdk.api.v2.ad.splash.GMSplashAdListener
;
import
com.bytedance.msdk.api.v2.ad.splash.GMSplashAdListener
;
...
...
app/src/main/java/com/mints/fiveworld/ui/widgets/CycleProgress.java
View file @
2fdc23e3
...
@@ -104,7 +104,7 @@ public class CycleProgress extends View {
...
@@ -104,7 +104,7 @@ public class CycleProgress extends View {
pathMeasure
.
getSegment
(
0
,
pathMeasure
.
getLength
()
*
mAnimatorValue
,
dstPath
,
true
);
pathMeasure
.
getSegment
(
0
,
pathMeasure
.
getLength
()
*
mAnimatorValue
,
dstPath
,
true
);
//渐变
//渐变
Shader
mShader
=
new
LinearGradient
(
mStrokeWidth
/
2
,
mStrokeWidth
/
2
,
mProgressWidth
,
mHeight
-
mStrokeWidth
/
2
,
Shader
mShader
=
new
LinearGradient
(
mStrokeWidth
/
2
,
mStrokeWidth
/
2
,
mProgressWidth
,
mHeight
-
mStrokeWidth
/
2
,
Color
.
parseColor
(
"#
DEAEC5"
),
Color
.
parseColor
(
"#FB918A
"
),
Shader
.
TileMode
.
REPEAT
);
Color
.
parseColor
(
"#
38A8F5"
),
Color
.
parseColor
(
"#468df8
"
),
Shader
.
TileMode
.
REPEAT
);
//遮罩
//遮罩
mProgressPaint
.
setXfermode
(
new
PorterDuffXfermode
(
PorterDuff
.
Mode
.
SRC_IN
));
mProgressPaint
.
setXfermode
(
new
PorterDuffXfermode
(
PorterDuff
.
Mode
.
SRC_IN
));
mProgressPaint
.
setShader
(
mShader
);
mProgressPaint
.
setShader
(
mShader
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment