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
1e4580a5
Commit
1e4580a5
authored
Mar 02, 2021
by
jyx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改圣于地珊瑚顺序配置,进度条显示不全
parent
b4476efa
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
205 additions
and
133 deletions
+205
-133
TzTaskBean.java
...c/main/java/com/mints/goodmoney/mvp/model/TzTaskBean.java
+11
-26
TaskPresenter.kt
.../java/com/mints/goodmoney/mvp/presenters/TaskPresenter.kt
+9
-4
TaskView.kt
...p/src/main/java/com/mints/goodmoney/mvp/views/TaskView.kt
+1
-1
AwardActivity.kt
...in/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
+5
-3
MyFragment.kt
...c/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
+6
-9
TaskCpdFragment.kt
...n/java/com/mints/goodmoney/ui/fragment/TaskCpdFragment.kt
+171
-86
progress_horizontal.xml
GoodMoney/app/src/main/res/layout/progress_horizontal.xml
+1
-1
view_dialog_update.xml
GoodMoney/app/src/main/res/layout/view_dialog_update.xml
+1
-3
No files found.
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/TzTaskBean.java
View file @
1e4580a5
...
@@ -27,7 +27,7 @@ public class TzTaskBean {
...
@@ -27,7 +27,7 @@ public class TzTaskBean {
private
String
aid
;
private
String
aid
;
public
TzTaskBean
(
String
icon
,
String
title
,
String
description
,
boolean
isShCpd
,
int
coin
,
int
state
,
String
downLoadPkgName
)
{
public
TzTaskBean
(
String
icon
,
String
title
,
String
description
,
boolean
isShCpd
,
int
coin
,
int
state
,
String
downLoadPkgName
)
{
this
.
icon
=
icon
;
this
.
icon
=
icon
;
this
.
title
=
title
;
this
.
title
=
title
;
this
.
description
=
description
;
this
.
description
=
description
;
...
@@ -38,7 +38,7 @@ public class TzTaskBean {
...
@@ -38,7 +38,7 @@ public class TzTaskBean {
this
.
downLoadPkgName
=
downLoadPkgName
;
this
.
downLoadPkgName
=
downLoadPkgName
;
}
}
public
TzTaskBean
(
String
icon
,
String
title
,
int
coin
,
int
state
,
String
currentPkgName
,
String
aid
)
{
public
TzTaskBean
(
String
icon
,
String
title
,
int
coin
,
int
state
,
String
currentPkgName
,
String
aid
)
{
this
.
icon
=
icon
;
this
.
icon
=
icon
;
this
.
title
=
title
;
this
.
title
=
title
;
this
.
coin
=
coin
;
this
.
coin
=
coin
;
...
@@ -75,19 +75,19 @@ public class TzTaskBean {
...
@@ -75,19 +75,19 @@ public class TzTaskBean {
this
.
app_url
=
app_url
;
this
.
app_url
=
app_url
;
}
}
//
public CpdModelBean.DataBean.MaterialsBean.TrackerBean getTrackerBean() {
public
CpdModelBean
.
DataBean
.
MaterialsBean
.
TrackerBean
getTrackerBean
()
{
//
return trackerBean;
return
trackerBean
;
//
}
}
//
//
public void setTrackerBean(CpdModelBean.DataBean.MaterialsBean.TrackerBean trackerBean) {
public
void
setTrackerBean
(
CpdModelBean
.
DataBean
.
MaterialsBean
.
TrackerBean
trackerBean
)
{
//
this.trackerBean = trackerBean;
this
.
trackerBean
=
trackerBean
;
//
}
}
public
SydCpdListBean
.
DataBean
.
MaterialsBean
.
TrackerBean
getTrackerBean
()
{
public
SydCpdListBean
.
DataBean
.
MaterialsBean
.
TrackerBean
getTracker
List
Bean
()
{
return
trackerListBean
;
return
trackerListBean
;
}
}
public
void
setTrackerBean
(
SydCpdListBean
.
DataBean
.
MaterialsBean
.
TrackerBean
trackerListBean
)
{
public
void
setTracker
List
Bean
(
SydCpdListBean
.
DataBean
.
MaterialsBean
.
TrackerBean
trackerListBean
)
{
this
.
trackerListBean
=
trackerListBean
;
this
.
trackerListBean
=
trackerListBean
;
}
}
...
@@ -143,19 +143,4 @@ public class TzTaskBean {
...
@@ -143,19 +143,4 @@ public class TzTaskBean {
this
.
currentPkgName
=
currentPkgName
;
this
.
currentPkgName
=
currentPkgName
;
}
}
@Override
public
String
toString
()
{
return
"TzTaskBean{"
+
"icon='"
+
icon
+
'\''
+
", title='"
+
title
+
'\''
+
", description='"
+
description
+
'\''
+
", app_url='"
+
app_url
+
'\''
+
", isShCpd="
+
isShCpd
+
", coralAd="
+
coralAd
+
", trackerBean="
+
trackerBean
+
", coin="
+
coin
+
", state="
+
state
+
", currentPkgName='"
+
currentPkgName
+
'\''
+
'}'
;
}
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/TaskPresenter.kt
View file @
1e4580a5
...
@@ -43,8 +43,13 @@ class TaskPresenter : BasePresenter<TaskView>() {
...
@@ -43,8 +43,13 @@ class TaskPresenter : BasePresenter<TaskView>() {
when
(
code
)
{
when
(
code
)
{
200
->
{
200
->
{
if
(
data
!=
null
)
{
if
(
data
!=
null
)
{
view
.
getShCpdTimeSuc
(
data
.
get
(
"needSeconds"
).
asInt
,
data
.
get
(
"coin"
).
asInt
,
view
.
getShCpdTimeSuc
(
data
.
get
(
"CPD"
).
asInt
,
data
.
get
(
"CPD_SYD"
).
asInt
)
data
.
get
(
"needSeconds"
).
asInt
,
data
.
get
(
"coin"
).
asInt
,
data
.
get
(
"CPD"
).
asInt
,
data
.
get
(
"CPD_SYD"
).
asInt
,
data
.
get
(
"cpdOrder"
).
asString
)
}
}
}
}
}
}
...
@@ -104,9 +109,9 @@ class TaskPresenter : BasePresenter<TaskView>() {
...
@@ -104,9 +109,9 @@ class TaskPresenter : BasePresenter<TaskView>() {
})
})
}
}
fun
getCpdListDetail
(
ip
:
String
,
number
:
Int
)
{
fun
getCpdListDetail
(
ip
:
String
,
number
:
Int
)
{
AppHttpManager
.
getInstance
(
loanApplication
)
AppHttpManager
.
getInstance
(
loanApplication
)
.
call
(
CpdService
.
Factory
.
getInstance
().
getAdVedio
(
CpdManager
.
getCpdLisrUrl
(),
CpdManager
.
getCpdListBody
(
ip
,
number
)),
.
call
(
CpdService
.
Factory
.
getInstance
().
getAdVedio
(
CpdManager
.
getCpdLisrUrl
(),
CpdManager
.
getCpdListBody
(
ip
,
number
)),
object
:
BaseSubscriber
<
JsonObject
>()
{
object
:
BaseSubscriber
<
JsonObject
>()
{
override
fun
onCompleted
()
{
override
fun
onCompleted
()
{
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/views/TaskView.kt
View file @
1e4580a5
...
@@ -4,7 +4,7 @@ import com.mints.goodmoney.mvp.model.CpdModelBean
...
@@ -4,7 +4,7 @@ import com.mints.goodmoney.mvp.model.CpdModelBean
import
com.mints.goodmoney.mvp.model.SydCpdListBean
import
com.mints.goodmoney.mvp.model.SydCpdListBean
interface
TaskView
:
BaseView
{
interface
TaskView
:
BaseView
{
fun
getShCpdTimeSuc
(
time
:
Int
,
coin
:
Int
,
CPD
:
Int
,
CPD_SYD
:
Int
)
fun
getShCpdTimeSuc
(
time
:
Int
,
coin
:
Int
,
CPD
:
Int
,
CPD_SYD
:
Int
,
CPD_ORDER
:
String
?
)
fun
getCpdModelSuc
(
dataBean
:
CpdModelBean
.
DataBean
)
fun
getCpdModelSuc
(
dataBean
:
CpdModelBean
.
DataBean
)
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
View file @
1e4580a5
...
@@ -377,10 +377,12 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
...
@@ -377,10 +377,12 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
AppConfig
.
isSuperTask
=
false
AppConfig
.
isSuperTask
=
false
if
(
mReceiverBroadcastReceiver
!=
null
)
{
if
(
mReceiverBroadcastReceiver
!=
null
)
{
if
(
mReceiverBroadcastReceiver
!!
.
isInitialStickyBroadcast
)
{
mContext
.
stopService
(
Intent
(
context
,
AppInstallService
::
class
.
java
))
mContext
.
stopService
(
Intent
(
context
,
AppInstallService
::
class
.
java
))
mContext
.
unregisterReceiver
(
mReceiverBroadcastReceiver
)
mContext
.
unregisterReceiver
(
mReceiverBroadcastReceiver
)
mReceiverBroadcastReceiver
=
null
mReceiverBroadcastReceiver
=
null
}
}
}
awardPresenter
.
setHighTaskType
(
"0"
)
awardPresenter
.
setHighTaskType
(
"0"
)
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @
1e4580a5
...
@@ -2,11 +2,11 @@ package com.mints.goodmoney.ui.fragment
...
@@ -2,11 +2,11 @@ package com.mints.goodmoney.ui.fragment
import
android.Manifest
import
android.Manifest
import
android.annotation.SuppressLint
import
android.annotation.SuppressLint
import
android.app.Dialog
import
android.content.BroadcastReceiver
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.content.IntentFilter
import
android.content.IntentFilter
import
android.app.Dialog
import
android.os.Bundle
import
android.os.Bundle
import
android.text.TextUtils
import
android.text.TextUtils
import
android.view.View
import
android.view.View
...
@@ -34,14 +34,11 @@ import com.mints.goodmoney.ui.adapter.GvMyAdapter
...
@@ -34,14 +34,11 @@ import com.mints.goodmoney.ui.adapter.GvMyAdapter
import
com.mints.goodmoney.ui.adapter.MainMyAdapter
import
com.mints.goodmoney.ui.adapter.MainMyAdapter
import
com.mints.goodmoney.ui.adapter.listener.OnItemChildClickListener
import
com.mints.goodmoney.ui.adapter.listener.OnItemChildClickListener
import
com.mints.goodmoney.ui.fragment.base.BaseFragment
import
com.mints.goodmoney.ui.fragment.base.BaseFragment
import
com.mints.goodmoney.ui.widgets.dialog.DialogListener
import
com.mints.goodmoney.ui.widgets.ShareDialog
import
com.mints.goodmoney.ui.widgets.ShareDialog
import
com.mints.goodmoney.ui.widgets.dialog.DialogListener
import
com.mints.goodmoney.ui.widgets.dialog.DialogUtils
import
com.mints.goodmoney.ui.widgets.dialog.DialogUtils
import
com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils
import
com.mints.goodmoney.ui.widgets.seekbar.BubbleUtils
import
com.mints.goodmoney.utils.AppUtil
import
com.mints.goodmoney.utils.*
import
com.mints.goodmoney.utils.LogUtil
import
com.mints.goodmoney.utils.QQJumpUtil
import
com.mints.goodmoney.utils.SpanUtils
import
com.mints.library.net.netstatus.NetUtils
import
com.mints.library.net.netstatus.NetUtils
import
com.mints.library.utils.CommonUtils
import
com.mints.library.utils.CommonUtils
import
com.mints.library.utils.GlideUtils
import
com.mints.library.utils.GlideUtils
...
@@ -721,7 +718,7 @@ class MyFragment : BaseFragment(),
...
@@ -721,7 +718,7 @@ class MyFragment : BaseFragment(),
0
->
{
0
->
{
// 牧场人生包名
// 牧场人生包名
pkgMCRSCarrier
=
Constant
.
CARRIER_MC_FIRSTDOWNLOAD
pkgMCRSCarrier
=
Constant
.
CARRIER_MC_FIRSTDOWNLOAD
pkgMCRSKey
=
""
pkgMCRSKey
=
""
pkgMCRSName
=
taskBean
.
otherConfig
.
pkg
pkgMCRSName
=
taskBean
.
otherConfig
.
pkg
// 下载牧场人生
// 下载牧场人生
...
@@ -1157,7 +1154,7 @@ class MyFragment : BaseFragment(),
...
@@ -1157,7 +1154,7 @@ class MyFragment : BaseFragment(),
}
}
private
fun
initExpress
(
flowAdRules
:
FlowAdRulesBean
)
{
private
fun
initExpress
(
flowAdRules
:
FlowAdRulesBean
)
{
PreLoadExpressManager
.
init
(
flowAdRules
.
csj
,
flowAdRules
.
ylh
,
flowAdRules
.
ks
)
PreLoadExpressManager
.
init
(
flowAdRules
.
csj
,
flowAdRules
.
ylh
,
flowAdRules
.
ks
)
}
}
/**
/**
...
@@ -1305,7 +1302,7 @@ class MyFragment : BaseFragment(),
...
@@ -1305,7 +1302,7 @@ class MyFragment : BaseFragment(),
myPresenter
.
setHighTaskType
(
Constant
.
CARRIER_HIGH_ACTIVITY
,
"3"
)
myPresenter
.
setHighTaskType
(
Constant
.
CARRIER_HIGH_ACTIVITY
,
"3"
)
}
else
if
(
TextUtils
.
equals
(
pkg
,
pkgMCRSName
))
{
}
else
if
(
TextUtils
.
equals
(
pkg
,
pkgMCRSName
))
{
// 上报后台更新按钮状态
// 上报后台更新按钮状态
myPresenter
.
setHighTaskType
(
pkgMCRSCarrier
,
"1"
,
pkgMCRSKey
)
myPresenter
.
setHighTaskType
(
pkgMCRSCarrier
,
"1"
,
pkgMCRSKey
)
}
}
}
catch
(
e
:
Exception
)
{
}
catch
(
e
:
Exception
)
{
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/TaskCpdFragment.kt
View file @
1e4580a5
This diff is collapsed.
Click to expand it.
GoodMoney/app/src/main/res/layout/progress_horizontal.xml
View file @
1e4580a5
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<ProgressBar
xmlns:android=
"http://schemas.android.com/apk/res/android"
<ProgressBar
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/my_profile_tracker"
android:id=
"@+id/my_profile_tracker"
style=
"?android:attr/progressBarStyleHorizontal"
style=
"?android:attr/progressBarStyleHorizontal"
android:layout_width=
"
fill
_parent"
android:layout_width=
"
match
_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@null"
android:background=
"@null"
android:indeterminateOnly=
"false"
android:indeterminateOnly=
"false"
...
...
GoodMoney/app/src/main/res/layout/view_dialog_update.xml
View file @
1e4580a5
...
@@ -30,9 +30,7 @@
...
@@ -30,9 +30,7 @@
android:textColor=
"@color/color_333"
android:textColor=
"@color/color_333"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
<View
<View
style=
"@style/line_1"
/>
style=
"@style/line_1"
android:layout_above=
"@+id/dialog_ll_bottom"
/>
<include
<include
android:id=
"@+id/pb_du_updating"
android:id=
"@+id/pb_du_updating"
...
...
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