Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
luckyfarm_xynt
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
luckyfarm_xynt
Commits
390725c0
Commit
390725c0
authored
Mar 29, 2021
by
王雪伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[提交人]:王雪伟
[提交简述] :幸运农田 [实现方案] :升级广点通广告SDK
parent
7170827e
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
10 deletions
+13
-10
build.gradle
app/build.gradle
+1
-0
TurntableDialog.kt
app/src/main/java/com/ym/game/view/TurntableDialog.kt
+3
-1
version.properties
app/version.properties
+2
-2
build.gradle
build.gradle
+1
-1
build.gradle
library/build.gradle
+1
-1
GDTSDK.unionNormal.4.333.1203.aar
library/libs/GDTSDK.unionNormal.4.333.1203.aar
+0
-0
AndroidManifest.xml
library/src/main/AndroidManifest.xml
+2
-1
WebViewActivity.java
...rc/main/java/com/ym/library/activity/WebViewActivity.java
+0
-2
NetConfig.java
library/src/main/java/com/ym/library/net/NetConfig.java
+1
-1
AdUtils.kt
library/src/main/java/com/ym/library/utils/AdUtils.kt
+2
-1
No files found.
app/build.gradle
View file @
390725c0
...
@@ -105,6 +105,7 @@ android {
...
@@ -105,6 +105,7 @@ android {
hykb
{}
hykb
{}
kuaishou
{}
kuaishou
{}
_233
{}
_233
{}
sigmob
{}
}
}
productFlavors
.
all
{
productFlavors
.
all
{
...
...
app/src/main/java/com/ym/game/view/TurntableDialog.kt
View file @
390725c0
...
@@ -11,6 +11,7 @@ import android.view.MotionEvent
...
@@ -11,6 +11,7 @@ import android.view.MotionEvent
import
android.view.View
import
android.view.View
import
android.widget.ImageView
import
android.widget.ImageView
import
android.widget.TextView
import
android.widget.TextView
import
com.ym.admodule.config.AdInfo
import
com.ym.admodule.config.AdManager
import
com.ym.admodule.config.AdManager
import
com.ym.admodule.listener.ZXADVideoListener
import
com.ym.admodule.listener.ZXADVideoListener
import
com.ym.game.listener.IDialogViewCloseCallback
import
com.ym.game.listener.IDialogViewCloseCallback
...
@@ -136,7 +137,8 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
...
@@ -136,7 +137,8 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
"turntable_lottery"
,
"turntable_lottery"
,
(
context
as
Activity
),
(
context
as
Activity
),
object
:
ZXADVideoListener
{
object
:
ZXADVideoListener
{
override
fun
onAdClose
()
{
override
fun
onAdClose
(
adInfo
:
AdInfo
)
{
getVideoAcceleratorsReceive3
();
getVideoAcceleratorsReceive3
();
reset
()
reset
()
btnTurntableLottery
?.
isEnabled
=
false
btnTurntableLottery
?.
isEnabled
=
false
...
...
app/version.properties
View file @
390725c0
PACKAGE_NAME
=
com.ym.xynt
PACKAGE_NAME
=
com.ym.xynt
VERSION_CODE
=
4
VERSION_CODE
=
5
VERSION_NAME
=
1.0.3
VERSION_NAME
=
1.0.4
\ No newline at end of file
\ No newline at end of file
build.gradle
View file @
390725c0
...
@@ -32,7 +32,7 @@ allprojects {
...
@@ -32,7 +32,7 @@ allprojects {
url
"http://test.vlion.cn:8081/nexus/content/repositories/inland/"
url
"http://test.vlion.cn:8081/nexus/content/repositories/inland/"
}
}
maven
{
maven
{
url
"http://zx-maven.huolea.com/repository/
admodule
/"
url
"http://zx-maven.huolea.com/repository/
ymad_sdk
/"
}
}
}
}
...
...
library/build.gradle
View file @
390725c0
...
@@ -67,7 +67,7 @@ dependencies {
...
@@ -67,7 +67,7 @@ dependencies {
// api ("com.bx:adsdk:1.3.3"){
// api ("com.bx:adsdk:1.3.3"){
// exclude group: 'com.google.code.gson'
// exclude group: 'com.google.code.gson'
// }
// }
api
'com.ym.admodule:
admodule:1.0.3.45
'
api
'com.ym.admodule:
ymad_sdk:1.0.4.0
'
api
'com.airbnb.android:lottie:3.1.0'
api
'com.airbnb.android:lottie:3.1.0'
api
'com.google.zxing:core:3.2.1'
//zxing核心依赖
api
'com.google.zxing:core:3.2.1'
//zxing核心依赖
api
'com.journeyapps:zxing-android-embedded:3.3.0'
//生成二维码依赖
api
'com.journeyapps:zxing-android-embedded:3.3.0'
//生成二维码依赖
...
...
library/libs/GDTSDK.unionNormal.4.
232.1102
.aar
→
library/libs/GDTSDK.unionNormal.4.
333.1203
.aar
View file @
390725c0
No preview for this file type
library/src/main/AndroidManifest.xml
View file @
390725c0
...
@@ -155,7 +155,8 @@
...
@@ -155,7 +155,8 @@
<activity
<activity
android:name=
"com.qq.e.ads.LandscapeADActivity"
android:name=
"com.qq.e.ads.LandscapeADActivity"
android:configChanges=
"keyboard|keyboardHidden|orientation|screenSize"
android:configChanges=
"keyboard|keyboardHidden|orientation|screenSize"
android:screenOrientation=
"landscape"
/>
android:screenOrientation=
"landscape"
tools:replace=
"android:screenOrientation"
/>
<uses-library
<uses-library
android:name=
"org.apache.http.legacy"
android:name=
"org.apache.http.legacy"
...
...
library/src/main/java/com/ym/library/activity/WebViewActivity.java
View file @
390725c0
...
@@ -156,7 +156,5 @@ public class WebViewActivity extends MyBaseActivity {
...
@@ -156,7 +156,5 @@ public class WebViewActivity extends MyBaseActivity {
public
WebJavaInterface
(
@NotNull
Activity
act
,
@NotNull
WebView
web
)
{
public
WebJavaInterface
(
@NotNull
Activity
act
,
@NotNull
WebView
web
)
{
super
(
act
,
web
);
super
(
act
,
web
);
}
}
}
}
}
}
library/src/main/java/com/ym/library/net/NetConfig.java
View file @
390725c0
...
@@ -28,7 +28,7 @@ public class NetConfig {
...
@@ -28,7 +28,7 @@ public class NetConfig {
public static String BASE_FEED_URL = "";
public static String BASE_FEED_URL = "";
public static String BASE_AD_URL = "";
public static String BASE_AD_URL = "";
public static final String URL_USER_BASE = "https://api.zhangxinhulian.com/";
public static final String URL_USER_BASE = "https://api.zhangxinhulian.com/";
public static String URL_REPORT_BASE = "";
public static String
URL_REPORT_BASE = "";
// public static final String URL_REPORT_BASE = "http://report.zhangxinhulian.com/";
// public static final String URL_REPORT_BASE = "http://report.zhangxinhulian.com/";
// public static final String URL_REPORT_BASE = "http://reporttest.zhangxinhulian.com/";
// public static final String URL_REPORT_BASE = "http://reporttest.zhangxinhulian.com/";
...
...
library/src/main/java/com/ym/library/utils/AdUtils.kt
View file @
390725c0
...
@@ -5,6 +5,7 @@ import android.os.Handler
...
@@ -5,6 +5,7 @@ import android.os.Handler
import
android.os.Message
import
android.os.Message
import
android.util.Log
import
android.util.Log
import
android.widget.FrameLayout
import
android.widget.FrameLayout
import
com.ym.admodule.config.AdInfo
import
com.ym.admodule.config.AdManager
import
com.ym.admodule.config.AdManager
import
com.ym.admodule.config.ZXADSizeConfig
import
com.ym.admodule.config.ZXADSizeConfig
import
com.ym.admodule.listener.ZXADVideoListener
import
com.ym.admodule.listener.ZXADVideoListener
...
@@ -41,7 +42,7 @@ object AdUtils {
...
@@ -41,7 +42,7 @@ object AdUtils {
object
:
ZXADVideoListener
{
object
:
ZXADVideoListener
{
override
fun
onSuccess
()
{}
override
fun
onSuccess
()
{}
override
fun
onAdClose
()
{
override
fun
onAdClose
(
adInfo
:
AdInfo
)
{
listener
?.
onAdClose
()
listener
?.
onAdClose
()
//预加载
//预加载
// loadNextCacheRewardVideoAd(activity)
// loadNextCacheRewardVideoAd(activity)
...
...
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