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
3b8c928b
Commit
3b8c928b
authored
Oct 16, 2020
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
42806dbc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
18 deletions
+22
-18
AndroidManifest.xml
GoodMoney/app/src/main/AndroidManifest.xml
+14
-9
Constant.kt
.../app/src/main/java/com/mints/goodmoney/common/Constant.kt
+0
-4
AwardActivity.kt
...in/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
+5
-2
PanFragment.kt
.../main/java/com/mints/goodmoney/ui/fragment/PanFragment.kt
+2
-3
activity_main.xml
GoodMoney/app/src/main/res/layout/activity_main.xml
+1
-0
No files found.
GoodMoney/app/src/main/AndroidManifest.xml
View file @
3b8c928b
...
...
@@ -86,7 +86,11 @@
android:name=
"JPUSH_CHANNEL"
android:value=
"${JPUSH_CHANNEL}"
/>
<activity
android:name=
".ui.activitys.SplashActivity"
>
<activity
android:name=
".ui.activitys.SplashActivity"
android:configChanges=
"keyboard|orientation|screenSize"
android:screenOrientation=
"portrait"
android:windowSoftInputMode=
"adjustPan|stateHidden"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
...
...
@@ -113,14 +117,15 @@
<activity
android:name=
".ui.activitys.SettingsActivity"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activitys.AboutusActivity"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activitys.GuideActivity"
/>
<activity
android:name=
".ui.activitys.LiebaoGameActivity"
/>
<activity
android:name=
".ui.activitys.DrawcashActivity"
/>
<activity
android:name=
".ui.activitys.WaterActivity"
/>
<activity
android:name=
".ui.activitys.WalkActivity"
/>
<activity
android:name=
".ui.activitys.EraseActivity"
/>
<activity
android:name=
".ui.activitys.AboutusActivity"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activitys.GuideActivity"
/>
<activity
android:name=
".ui.activitys.LiebaoGameActivity"
/>
<activity
android:name=
".ui.activitys.DrawcashActivity"
/>
<activity
android:name=
".ui.activitys.WaterActivity"
/>
<activity
android:name=
".ui.activitys.WalkActivity"
/>
<activity
android:name=
".ui.activitys.EraseActivity"
/>
<service
android:name=
".service.UpdateService"
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/common/Constant.kt
View file @
3b8c928b
...
...
@@ -96,8 +96,6 @@ object Constant {
const
val
CARRIER_WALK
=
"WALK"
//走路
const
val
CARRIER_WALK_BUBBLE
=
"WALK_BUBBLE"
//走路汽泡
const
val
CARRIER_NEW_USER
=
"CARRIER_NEW_USER"
//新用户红包
const
val
CARRIER_FRIENDS
=
"CARRIER_FRIENDS"
//邀请好友
const
val
SHAREFRIEND_COMPLETE_1
=
"SHAREFRIEND_COMPLETE_1"
//邀请任务1
const
val
SHAREFRIEND_COMPLETE_2
=
"SHAREFRIEND_COMPLETE_2"
//邀请任务2
...
...
@@ -105,8 +103,6 @@ object Constant {
const
val
SHAREFRIEND_COMPLETE_4
=
"SHAREFRIEND_COMPLETE_4"
//邀请任务4
const
val
SHAREFRIEND_COMPLETE_5
=
"SHAREFRIEND_COMPLETE_5"
//邀请任务5
const
val
SHAREFRIEND_COMPLETE_6
=
"SHAREFRIEND_COMPLETE_6"
//邀请任务6
// 新邀请好友
const
val
CHALLENGE_SHAREFRIEND
=
"CHALLENGE_SHAREFRIEND"
//邀请好友
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
View file @
3b8c928b
...
...
@@ -64,7 +64,10 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
startTime
()
when
(
carrierType
)
{
Constant
.
CARRIER_HOMEVEDIO_SMALL
,
Constant
.
CHALLENGE_SHAREFRIEND
->
{
Constant
.
CARRIER_HOMEVEDIO_SMALL
,
Constant
.
CHALLENGE_SHAREFRIEND
,
Constant
.
SHAREFRIEND_COMPLETE_1
,
Constant
.
SHAREFRIEND_COMPLETE_2
,
Constant
.
SHAREFRIEND_COMPLETE_3
,
Constant
.
SHAREFRIEND_COMPLETE_4
,
Constant
.
SHAREFRIEND_COMPLETE_5
,
Constant
.
SHAREFRIEND_COMPLETE_6
->
{
val
vo
=
HashMap
<
String
,
Any
>()
vo
[
"carrierType"
]
=
carrierType
awardPresenter
.
reportAddCoinMsg
(
vo
)
...
...
@@ -145,7 +148,7 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
when
(
carrierType
)
{
// 只有看视频才能领金币
Constant
.
CARRIER_OFFLINE_DOUBLE
,
Constant
.
CARRIER_SIGNIN_HOMEPAGE_CARD
,
Constant
.
CARRIER_CHALLENGE_TURN
,
Constant
.
CARRIER_CHALLENGE_CARD
,
Constant
.
CARRIER_CHALLENGE_TURN
,
Constant
.
CARRIER_CHALLENGE_CARD
,
Constant
.
CARRIER_VERSUS_VIDEO
,
Constant
.
CARRIER_WALK_BUBBLE
->
{
// awardVedio()
finish
()
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/PanFragment.kt
View file @
3b8c928b
...
...
@@ -2,9 +2,7 @@ package com.mints.goodmoney.ui.fragment
import
android.os.Bundle
import
android.text.TextUtils
import
android.view.View.OnLongClickListener
import
android.webkit.WebChromeClient
import
com.github.lzyzsd.jsbridge.BridgeHandler
import
com.github.lzyzsd.jsbridge.CallBackFunction
import
com.github.lzyzsd.jsbridge.DefaultHandler
import
com.mints.goodmoney.BuildConfig
...
...
@@ -39,7 +37,6 @@ class PanFragment : BaseFragment(), PanView {
override
fun
initViewsAndEvents
()
{
panPresenter
.
attachView
(
this
)
}
override
fun
onHiddenChanged
(
hidden
:
Boolean
)
{
...
...
@@ -88,6 +85,8 @@ class PanFragment : BaseFragment(), PanView {
bundle
.
putString
(
Constant
.
MAIN_CARRIER_TYPE
,
carrierType
)
bundle
.
putString
(
Constant
.
MAIN_EXTRA_ID
,
turntableBean
.
key
)
readyGo
(
AwardActivity
::
class
.
java
,
bundle
)
androidCallJsReferse
()
}
}
blTurntableWebview
.
setDefaultHandler
(
object
:
DefaultHandler
()
{
...
...
GoodMoney/app/src/main/res/layout/activity_main.xml
View file @
3b8c928b
...
...
@@ -55,6 +55,7 @@
android:layout_height=
"match_parent"
android:layout_weight=
"1.0"
android:gravity=
"center"
android:visibility=
"gone"
android:orientation=
"vertical"
>
<ImageView
...
...
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