Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_goodmoney
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_goodmoney
Commits
940f1c6c
Commit
940f1c6c
authored
Oct 28, 2020
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
隐藏广告
parent
b50f0f26
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
39 additions
and
43 deletions
+39
-43
AndroidManifest.xml
GoodMoney/app/src/main/AndroidManifest.xml
+1
-1
MintsApplication.java
...p/src/main/java/com/mints/goodmoney/MintsApplication.java
+3
-3
AppConfig.java
...p/src/main/java/com/mints/goodmoney/common/AppConfig.java
+1
-1
AwardActivity.kt
...in/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
+2
-2
LoginActivity.kt
...in/java/com/mints/goodmoney/ui/activitys/LoginActivity.kt
+1
-1
WaterActivity.kt
...in/java/com/mints/goodmoney/ui/activitys/WaterActivity.kt
+0
-3
MyFragment.kt
...c/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
+25
-26
ForegroundOrBackground.java
...ava/com/mints/goodmoney/utils/ForegroundOrBackground.java
+6
-6
ic_sign_finish.png
GoodMoney/app/src/main/res/mipmap-xhdpi/ic_sign_finish.png
+0
-0
No files found.
GoodMoney/app/src/main/AndroidManifest.xml
View file @
940f1c6c
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
android:value=
"${JPUSH_CHANNEL}"
/>
android:value=
"${JPUSH_CHANNEL}"
/>
<activity
<activity
android:name=
".ui.activitys.Splash
Ylh
Activity"
android:name=
".ui.activitys.SplashActivity"
android:screenOrientation=
"portrait"
>
android:screenOrientation=
"portrait"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<action
android:name=
"android.intent.action.MAIN"
/>
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/MintsApplication.java
View file @
940f1c6c
...
@@ -101,7 +101,7 @@ public class MintsApplication extends MultiDexApplication {
...
@@ -101,7 +101,7 @@ public class MintsApplication extends MultiDexApplication {
}
}
// 优量汇
// 优量汇
initYlh
();
//
initYlh();
// 穿山甲
// 穿山甲
initCsj
();
initCsj
();
...
@@ -110,10 +110,10 @@ public class MintsApplication extends MultiDexApplication {
...
@@ -110,10 +110,10 @@ public class MintsApplication extends MultiDexApplication {
initYL
();
initYL
();
// 鱼丸盒子
// 鱼丸盒子
initYwhz
();
//
initYwhz();
// 猎豹游戏初始化
// 猎豹游戏初始化
LiebaoManager
.
getInstance
().
initCmGameSdk
();
//
LiebaoManager.getInstance().initCmGameSdk();
}
}
/**
/**
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/common/AppConfig.java
View file @
940f1c6c
...
@@ -26,6 +26,6 @@ public class AppConfig {
...
@@ -26,6 +26,6 @@ public class AppConfig {
/**
/**
* csjVedio 剩余广告播放数
* csjVedio 剩余广告播放数
*/
*/
public
static
int
csjVedioAdCount
=
0
;
public
static
int
csjVedioAdCount
=
5
;
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
View file @
940f1c6c
...
@@ -171,8 +171,8 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
...
@@ -171,8 +171,8 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
Constant
.
CARRIER_CHALLENGE_TURN
,
Constant
.
CARRIER_CHALLENGE_CARD
,
Constant
.
CARRIER_CHALLENGE_TURN
,
Constant
.
CARRIER_CHALLENGE_CARD
,
Constant
.
CARRIER_VERSUS_VIDEO
,
Constant
.
CARRIER_WALK_BUBBLE
,
Constant
.
CARRIER_VERSUS_VIDEO
,
Constant
.
CARRIER_WALK_BUBBLE
,
Constant
.
CARRIER_CHALLENGE_SHAREFRIEND_DOUBLE
,
Constant
.
CARRIER_HOMEVEDIO_BIG
->
{
Constant
.
CARRIER_CHALLENGE_SHAREFRIEND_DOUBLE
,
Constant
.
CARRIER_HOMEVEDIO_BIG
->
{
awardVedio
()
//
awardVedio()
//
finish()
finish
()
}
}
else
->
{
else
->
{
finish
()
finish
()
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/LoginActivity.kt
View file @
940f1c6c
...
@@ -157,7 +157,7 @@ class LoginActivity : BaseActivity()
...
@@ -157,7 +157,7 @@ class LoginActivity : BaseActivity()
override
fun
loginSuc
()
{
override
fun
loginSuc
()
{
try
{
try
{
// 登录成功初始化鱼玩盒子userid
// 登录成功初始化鱼玩盒子userid
baseApplication
.
initYwSdk
()
//
baseApplication.initYwSdk()
}
catch
(
e
:
Exception
)
{
}
catch
(
e
:
Exception
)
{
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WaterActivity.kt
View file @
940f1c6c
...
@@ -10,9 +10,6 @@ import com.mints.goodmoney.mvp.model.WaterBean
...
@@ -10,9 +10,6 @@ import com.mints.goodmoney.mvp.model.WaterBean
import
com.mints.goodmoney.mvp.presenters.WaterPresenter
import
com.mints.goodmoney.mvp.presenters.WaterPresenter
import
com.mints.goodmoney.ui.activitys.base.BaseActivity
import
com.mints.goodmoney.ui.activitys.base.BaseActivity
import
com.mints.goodmoney.ui.widgets.WaterView
import
com.mints.goodmoney.ui.widgets.WaterView
import
com.mints.goodmoney.ui.widgets.countdowntimer.CountDownTimerSupport
import
com.mints.goodmoney.ui.widgets.countdowntimer.OnCountDownTimerListener
import
kotlinx.android.synthetic.main.activity_walk.*
import
kotlinx.android.synthetic.main.activity_water.*
import
kotlinx.android.synthetic.main.activity_water.*
/**
/**
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @
940f1c6c
...
@@ -46,7 +46,6 @@ import kotlinx.android.synthetic.main.item_fragment_main_my_clock.*
...
@@ -46,7 +46,6 @@ import kotlinx.android.synthetic.main.item_fragment_main_my_clock.*
import
kotlinx.android.synthetic.main.item_fragment_main_my_promotions.*
import
kotlinx.android.synthetic.main.item_fragment_main_my_promotions.*
import
kotlinx.android.synthetic.main.item_fragment_main_my_title.*
import
kotlinx.android.synthetic.main.item_fragment_main_my_title.*
import
kotlinx.android.synthetic.main.view_title.*
import
kotlinx.android.synthetic.main.view_title.*
import
net.grandcentrix.tray.AppPreferences
import
java.util.*
import
java.util.*
/**
/**
...
@@ -387,33 +386,33 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -387,33 +386,33 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
}
}
val
task2
=
TaskBean
(
R
.
mipmap
.
icon_my_invite
,
"邀好友,赚金币"
,
progressStrInvited
,
btnStr
,
2
)
val
task2
=
TaskBean
(
R
.
mipmap
.
icon_my_invite
,
"邀好友,赚金币"
,
progressStrInvited
,
btnStr
,
2
)
// 看福利视频赚金币
// 看福利视频赚金币
var
progressStrVideo
=
""
//
var progressStrVideo = ""
var
task3Str
=
""
//
var task3Str = ""
if
(
userConfig
!=
null
)
{
//
if (userConfig != null) {
progressStrVideo
=
"("
+
userConfig
!!
.
taskVeido
.
complete
+
"/"
+
userConfig
!!
.
taskVeido
.
max
+
")"
//
progressStrVideo = "(" + userConfig!!.taskVeido.complete + "/" + userConfig!!.taskVeido.max + ")"
if
(
userConfig
!!
.
taskVeido
.
complete
==
userConfig
!!
.
taskVeido
.
max
)
{
//
if (userConfig!!.taskVeido.complete == userConfig!!.taskVeido.max) {
task3Str
=
"已完成"
//
task3Str = "已完成"
}
else
{
//
} else {
task3Str
=
"赚金币"
//
task3Str = "赚金币"
}
//
}
}
//
}
val
task3
=
TaskBean
(
R
.
mipmap
.
icon_my_video
,
"看福利视频赚金币"
,
progressStrVideo
,
task3Str
,
3
)
//
val task3 = TaskBean(R.mipmap.icon_my_video, "看福利视频赚金币", progressStrVideo, task3Str, 3)
// 玩游戏,赚金币
//
// 玩游戏,赚金币
var
task4Str
=
""
//
var task4Str = ""
if
(
userConfig
!=
null
)
{
//
if (userConfig != null) {
task4Str
=
if
(
userConfig
!!
.
taskGame
.
status
==
0
)
"赚金币"
else
"立即领取"
//
task4Str = if (userConfig!!.taskGame.status == 0) "赚金币" else "立即领取"
}
//
}
val
task4
=
TaskBean
(
R
.
mipmap
.
icon_my_game
,
"玩游戏,赚金币"
,
""
,
task4Str
,
4
)
//
val task4 = TaskBean(R.mipmap.icon_my_game, "玩游戏,赚金币", "", task4Str, 4)
// 小说免费看,金币大家赚
//
// 小说免费看,金币大家赚
// val task5 = TaskBean(R.mipmap.icon_my_fiction, "小说免费看,金币大家赚", "", "去阅读", 5)
//
//
val task5 = TaskBean(R.mipmap.icon_my_fiction, "小说免费看,金币大家赚", "", "去阅读", 5)
// 试玩平台
//
// 试玩平台
val
task6
=
TaskBean
(
R
.
mipmap
.
icon_my_demo
,
"试玩平台"
,
""
,
"赚金币"
,
5
)
//
val task6 = TaskBean(R.mipmap.icon_my_demo, "试玩平台", "", "赚金币", 5)
dataList
.
add
(
task1
)
dataList
.
add
(
task1
)
dataList
.
add
(
task2
)
dataList
.
add
(
task2
)
dataList
.
add
(
task3
)
//
dataList.add(task3)
dataList
.
add
(
task4
)
//
dataList.add(task4)
// dataList.add(task5)
//
//
dataList.add(task5)
dataList
.
add
(
task6
)
//
dataList.add(task6)
mainMyAdapter
?.
notifyDataSetChanged
()
mainMyAdapter
?.
notifyDataSetChanged
()
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ForegroundOrBackground.java
View file @
940f1c6c
...
@@ -78,12 +78,12 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
...
@@ -78,12 +78,12 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
return
;
return
;
}
}
if
(
count
==
0
)
{
//
if (count == 0) {
if
(
intent
==
null
){
//
if(intent==null){
intent
=
new
Intent
(
activity
,
SplashADActivity
.
class
);
//
intent = new Intent(activity, SplashADActivity.class);
}
//
}
activity
.
startActivity
(
intent
);
//
activity.startActivity(intent);
}
//
}
count
++;
count
++;
}
}
...
...
GoodMoney/app/src/main/res/mipmap-xhdpi/ic_sign_finish.png
View replaced file @
b50f0f26
View file @
940f1c6c
3.01 KB
|
W:
|
H:
2.58 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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