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
bb38ab0f
Commit
bb38ab0f
authored
Dec 03, 2020
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录方式,添加banner,解决冲突
parent
3c5b8251
Changes
28
Show whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
878 additions
and
161 deletions
+878
-161
build.gradle
GoodMoney/app/build.gradle
+2
-2
AndroidManifest.xml
GoodMoney/app/src/main/AndroidManifest.xml
+7
-15
BannerManager.kt
.../main/java/com/mints/goodmoney/ad/banner/BannerManager.kt
+84
-0
TtCsjAdManager.java
...main/java/com/mints/goodmoney/manager/TtCsjAdManager.java
+5
-2
LoginPresenter.kt
...java/com/mints/goodmoney/mvp/presenters/LoginPresenter.kt
+1
-0
LoginView.kt
.../src/main/java/com/mints/goodmoney/mvp/views/LoginView.kt
+1
-0
GsonConverterFactory.java
...in/java/com/mints/goodmoney/net/GsonConverterFactory.java
+2
-5
LoanService.java
...pp/src/main/java/com/mints/goodmoney/net/LoanService.java
+0
-24
AwardActivity.kt
...in/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
+1
-1
BindMobileActivity.kt
...va/com/mints/goodmoney/ui/activitys/BindMobileActivity.kt
+146
-0
DrawcashActivity.kt
...java/com/mints/goodmoney/ui/activitys/DrawcashActivity.kt
+4
-6
DrawcashRecordActivity.kt
...om/mints/goodmoney/ui/activitys/DrawcashRecordActivity.kt
+1
-1
GuideActivity.kt
...in/java/com/mints/goodmoney/ui/activitys/GuideActivity.kt
+1
-1
MobileLoginActivity.kt
...a/com/mints/goodmoney/ui/activitys/MobileLoginActivity.kt
+159
-0
SettingsActivity.kt
...java/com/mints/goodmoney/ui/activitys/SettingsActivity.kt
+6
-3
SplashYlhActivity.kt
...ava/com/mints/goodmoney/ui/activitys/SplashYlhActivity.kt
+1
-1
WxLoginActivity.kt
.../java/com/mints/goodmoney/ui/activitys/WxLoginActivity.kt
+197
-0
DrawcashRecordAdapter.kt
...a/com/mints/goodmoney/ui/adapter/DrawcashRecordAdapter.kt
+1
-1
FriendsFragment.kt
...n/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt
+0
-1
MoneyFragment.kt
...ain/java/com/mints/goodmoney/ui/fragment/MoneyFragment.kt
+2
-2
MyFragment.kt
...c/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
+15
-5
ShareDialog.kt
...c/main/java/com/mints/goodmoney/ui/widgets/ShareDialog.kt
+16
-13
shape_green.xml
GoodMoney/app/src/main/res/drawable/shape_green.xml
+10
-0
activity_bind_mobile.xml
GoodMoney/app/src/main/res/layout/activity_bind_mobile.xml
+2
-78
activity_mobile_login.xml
GoodMoney/app/src/main/res/layout/activity_mobile_login.xml
+127
-0
activity_wx_login.xml
GoodMoney/app/src/main/res/layout/activity_wx_login.xml
+81
-0
fragment_main_my.xml
GoodMoney/app/src/main/res/layout/fragment_main_my.xml
+6
-0
ic_wx_white_login.png
...Money/app/src/main/res/mipmap-xhdpi/ic_wx_white_login.png
+0
-0
No files found.
GoodMoney/app/build.gradle
View file @
bb38ab0f
...
@@ -9,8 +9,8 @@ android {
...
@@ -9,8 +9,8 @@ android {
applicationId
"com.mints.goodmoney"
applicationId
"com.mints.goodmoney"
minSdkVersion
rootProject
.
ext
.
androidMinSdkVersion
minSdkVersion
rootProject
.
ext
.
androidMinSdkVersion
targetSdkVersion
rootProject
.
ext
.
androidTargetSdkVersion
targetSdkVersion
rootProject
.
ext
.
androidTargetSdkVersion
versionCode
4
versionCode
5
versionName
"1.0.
3
"
versionName
"1.0.
4
"
flavorDimensions
"default"
flavorDimensions
"default"
// dex突破65535的限制
// dex突破65535的限制
...
...
GoodMoney/app/src/main/AndroidManifest.xml
View file @
bb38ab0f
...
@@ -122,7 +122,13 @@
...
@@ -122,7 +122,13 @@
android:name=
"com.mints.library.base.BaseWebActivity"
android:name=
"com.mints.library.base.BaseWebActivity"
android:theme=
"@style/AppTheme.NoneTranslucent"
/>
android:theme=
"@style/AppTheme.NoneTranslucent"
/>
<activity
<activity
android:name=
".ui.activitys.LoginActivity"
android:name=
".ui.activitys.BindMobileActivity"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activitys.MobileLoginActivity"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
".ui.activitys.WxLoginActivity"
android:configChanges=
"orientation|screenSize|keyboardHidden"
android:configChanges=
"orientation|screenSize|keyboardHidden"
android:launchMode=
"singleTop"
/>
android:launchMode=
"singleTop"
/>
<activity
<activity
...
@@ -248,20 +254,6 @@
...
@@ -248,20 +254,6 @@
</provider>
</provider>
<!-- 优量汇广告 -->
<!-- <provider-->
<!-- android:name="com.qq.e.comm.GDTFileProvider"-->
<!-- android:authorities="${applicationId}.gdt.fileprovider"-->
<!-- android:exported="false"-->
<!-- android:grantUriPermissions="true"-->
<!-- >-->
<!-- <meta-data-->
<!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
<!-- android:resource="@xml/gdt_file_path"-->
<!-- />-->
<!-- </provider>-->
<!-- 鱼丸盒子广告 -->
<!-- 鱼丸盒子广告 -->
<provider
<provider
android:name=
"com.component.dly.xzzq_ywsdk.YwFileProvider"
android:name=
"com.component.dly.xzzq_ywsdk.YwFileProvider"
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/banner/BannerManager.kt
0 → 100644
View file @
bb38ab0f
package
com.mints.goodmoney.ad.banner
import
android.view.View
import
android.widget.FrameLayout
import
com.bytedance.sdk.openadsdk.AdSlot
import
com.bytedance.sdk.openadsdk.TTAdNative
import
com.bytedance.sdk.openadsdk.TTNativeExpressAd
import
com.mints.goodmoney.MintsApplication
import
com.mints.goodmoney.manager.TtCsjAdManager
/**
* banner管理
*/
object
BannerManager
{
private
var
adNative
:
TTAdNative
?
=
null
private
var
mTTAd
:
TTNativeExpressAd
?
=
null
fun
init
()
{
adNative
=
TtCsjAdManager
.
get
().
createAdNative
(
MintsApplication
.
getContext
())
}
/**
* 获取穿山甲banner
*/
fun
getTtBanner
(
codeId
:
String
,
frameLayout
:
FrameLayout
?,
viewWidth
:
Float
,
viewHeight
:
Float
)
{
adNative
?.
let
{
val
adSlot
=
AdSlot
.
Builder
()
.
setCodeId
(
codeId
)
//广告位id
.
setSupportDeepLink
(
true
)
.
setAdCount
(
1
)
//请求广告数量为1到3条
.
setExpressViewAcceptedSize
(
viewWidth
,
viewHeight
)
//期望模板广告view的size,单位dp
.
setImageAcceptedSize
(
640
,
320
)
//这个参数设置即可,不影响模板广告的size
.
build
()
it
.
loadBannerExpressAd
(
adSlot
,
object
:
TTAdNative
.
NativeExpressAdListener
{
override
fun
onNativeExpressAdLoad
(
ads
:
MutableList
<
TTNativeExpressAd
>?)
{
if
(
ads
==
null
||
ads
!!
.
size
==
0
)
return
mTTAd
=
ads
[
0
]
bindAdListener
(
frameLayout
)
mTTAd
?.
render
()
}
override
fun
onError
(
code
:
Int
,
msg
:
String
)
{
frameLayout
?.
removeAllViews
()
}
})
}
}
private
fun
bindAdListener
(
frameLayout
:
FrameLayout
?)
{
mTTAd
?.
let
{
it
.
setExpressInteractionListener
(
object
:
TTNativeExpressAd
.
ExpressAdInteractionListener
{
override
fun
onAdClicked
(
p0
:
View
?,
p1
:
Int
)
{
}
override
fun
onAdShow
(
p0
:
View
?,
p1
:
Int
)
{
}
override
fun
onRenderSuccess
(
view
:
View
,
p1
:
Float
,
p2
:
Float
)
{
frameLayout
?.
let
{
it
.
removeAllViews
()
it
.
addView
(
view
)
}
}
override
fun
onRenderFail
(
p0
:
View
?,
p1
:
String
?,
p2
:
Int
)
{
}
})
}
}
fun
onDestroy
()
{
mTTAd
?.
let
{
it
.
setExpressInteractionListener
(
null
)
it
.
destroy
()
mTTAd
=
null
}
adNative
=
null
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TtCsjAdManager.java
View file @
bb38ab0f
...
@@ -16,6 +16,9 @@ public class TtCsjAdManager {
...
@@ -16,6 +16,9 @@ public class TtCsjAdManager {
public
static
final
String
TT_AD_APPID
=
"5113521"
;
public
static
final
String
TT_AD_APPID
=
"5113521"
;
public
static
final
String
TT_AD_NAME
=
Constant
.
MINTS_APP_NAME
;
public
static
final
String
TT_AD_NAME
=
Constant
.
MINTS_APP_NAME
;
/*banner*/
public
static
final
String
TT_AD_BANNER_MY
=
"945653342"
;
// 个人中心
/*激励视频*/
/*激励视频*/
public
static
final
String
TT_AD_VEDIO_MAIN_DEV
=
"945561938"
;
// 开发使用
public
static
final
String
TT_AD_VEDIO_MAIN_DEV
=
"945561938"
;
// 开发使用
public
static
final
String
TT_AD_VEDIO_DRINK
=
"945562032"
;
//喝水打卡
public
static
final
String
TT_AD_VEDIO_DRINK
=
"945562032"
;
//喝水打卡
...
@@ -60,7 +63,7 @@ public class TtCsjAdManager {
...
@@ -60,7 +63,7 @@ public class TtCsjAdManager {
}
}
}
}
public
static
String
getVersion
(){
public
static
String
getVersion
()
{
return
TTAdSdk
.
getAdManager
().
getSDKVersion
();
return
TTAdSdk
.
getAdManager
().
getSDKVersion
();
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/LoginPresenter.kt
View file @
bb38ab0f
...
@@ -49,6 +49,7 @@ class LoginPresenter : BasePresenter<LoginView>() {
...
@@ -49,6 +49,7 @@ class LoginPresenter : BasePresenter<LoginView>() {
val
message
:
String
=
baseResponse
.
getMessage
()
val
message
:
String
=
baseResponse
.
getMessage
()
when
(
code
)
{
when
(
code
)
{
200
->
{
200
->
{
}
}
else
->
{
else
->
{
view
.
showToast
(
message
)
view
.
showToast
(
message
)
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/views/LoginView.kt
View file @
bb38ab0f
...
@@ -5,4 +5,5 @@ interface LoginView : BaseView {
...
@@ -5,4 +5,5 @@ interface LoginView : BaseView {
* 登录成功
* 登录成功
*/
*/
fun
loginSuc
()
fun
loginSuc
()
fun
sendCodeSuc
()
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/net/GsonConverterFactory.java
View file @
bb38ab0f
...
@@ -4,12 +4,10 @@ import android.app.Activity;
...
@@ -4,12 +4,10 @@ import android.app.Activity;
import
android.content.Intent
;
import
android.content.Intent
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.mints.goodmoney.MintsApplication
;
import
com.mints.goodmoney.common.Constant
;
import
com.mints.goodmoney.common.Constant
;
import
com.mints.goodmoney.manager.UserManager
;
import
com.mints.goodmoney.manager.UserManager
;
import
com.mints.goodmoney.mvp.model.BaseResponse
;
import
com.mints.goodmoney.mvp.model.BaseResponse
;
import
com.mints.goodmoney.ui.activitys.LoginActivity
;
import
com.mints.goodmoney.ui.activitys.WxLoginActivity
;
import
com.mints.goodmoney.utils.DeviceUuidFactory
;
import
com.mints.goodmoney.utils.ForegroundOrBackground
;
import
com.mints.goodmoney.utils.ForegroundOrBackground
;
import
com.mints.library.utils.TLog
;
import
com.mints.library.utils.TLog
;
...
@@ -20,7 +18,6 @@ import java.io.Writer;
...
@@ -20,7 +18,6 @@ import java.io.Writer;
import
java.lang.annotation.Annotation
;
import
java.lang.annotation.Annotation
;
import
java.lang.reflect.Type
;
import
java.lang.reflect.Type
;
import
java.nio.charset.Charset
;
import
java.nio.charset.Charset
;
import
java.util.HashMap
;
import
okhttp3.MediaType
;
import
okhttp3.MediaType
;
import
okhttp3.RequestBody
;
import
okhttp3.RequestBody
;
...
@@ -106,7 +103,7 @@ public class GsonConverterFactory extends Converter.Factory {
...
@@ -106,7 +103,7 @@ public class GsonConverterFactory extends Converter.Factory {
Activity
forwardActivity
=
ForegroundOrBackground
.
getApp_activity
();
Activity
forwardActivity
=
ForegroundOrBackground
.
getApp_activity
();
if
(
forwardActivity
!=
null
)
{
if
(
forwardActivity
!=
null
)
{
if
(!
forwardActivity
.
isFinishing
())
{
if
(!
forwardActivity
.
isFinishing
())
{
forwardActivity
.
startActivity
(
new
Intent
(
forwardActivity
,
LoginActivity
.
class
));
forwardActivity
.
startActivity
(
new
Intent
(
forwardActivity
,
Wx
LoginActivity
.
class
));
}
}
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/net/LoanService.java
View file @
bb38ab0f
...
@@ -171,14 +171,6 @@ public interface LoanService {
...
@@ -171,14 +171,6 @@ public interface LoanService {
@POST
(
"api/getCoinMsg"
)
@POST
(
"api/getCoinMsg"
)
Observable
<
BaseResponse
<
JsonObject
>>
getCoinMsg
();
Observable
<
BaseResponse
<
JsonObject
>>
getCoinMsg
();
/**
* 穿山甲回调确认
*
* @return
*/
@POST
(
"api/checkCoinRecordByTid"
)
Observable
<
BaseResponse
<
Object
>>
checkCoinRecordByTid
(
@Body
Map
<
String
,
Object
>
vo
);
/**
/**
* 调用事件
* 调用事件
*
*
...
@@ -243,22 +235,6 @@ public interface LoanService {
...
@@ -243,22 +235,6 @@ public interface LoanService {
@POST
(
"api/getCoinRecords"
)
@POST
(
"api/getCoinRecords"
)
Observable
<
BaseResponse
<
GoldRecordBean
>>
getCoinRecords
();
Observable
<
BaseResponse
<
GoldRecordBean
>>
getCoinRecords
();
/**
* 世界人民排行信息
*
* @return
*/
@POST
(
"api/getLeaders"
)
Observable
<
BaseResponse
<
FriendsTaskBean
.
FriendsBean
>>
getLeaders
();
/**
* 好友任务信息
*
* @return
*/
@POST
(
"api/getFriendsMsg"
)
Observable
<
BaseResponse
<
FriendsTaskBean
>>
getFriendsMsg
();
/*
/*
* 首页获取喝水打卡信息
* 首页获取喝水打卡信息
*
*
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
View file @
bb38ab0f
...
@@ -259,7 +259,7 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
...
@@ -259,7 +259,7 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
awardVedio
()
awardVedio
()
}
}
Constant
.
CARRIER_NEW_VISITOR
->
{
Constant
.
CARRIER_NEW_VISITOR
->
{
readyGoThenKill
(
LoginActivity
::
class
.
java
)
readyGoThenKill
(
Wx
LoginActivity
::
class
.
java
)
}
}
else
->
{
else
->
{
finish
()
finish
()
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/BindMobileActivity.kt
0 → 100644
View file @
bb38ab0f
package
com.mints.goodmoney.ui.activitys
import
android.Manifest
import
android.os.Bundle
import
android.text.TextUtils
import
android.view.View
import
com.mints.goodmoney.R
import
com.mints.goodmoney.common.Constant
import
com.mints.goodmoney.manager.UserManager
import
com.mints.goodmoney.manager.YwhzManager
import
com.mints.goodmoney.mvp.presenters.LoginPresenter
import
com.mints.goodmoney.mvp.views.LoginView
import
com.mints.goodmoney.ui.activitys.base.BaseActivity
import
com.mints.goodmoney.utils.BackInputUtil
import
com.mints.goodmoney.utils.LogUtil
import
com.mints.library.utils.nodoubleclick.AntiShake
import
com.tbruyelle.rxpermissions.RxPermissions
import
kotlinx.android.synthetic.main.activity_bind_mobile.*
import
kotlinx.android.synthetic.main.header_layout.*
/**
* 描述:绑定手机号
* 作者:孟崔广
* 时间:2020/9/22 13:55
*/
class
BindMobileActivity
:
BaseActivity
()
,
LoginView
,
View
.
OnClickListener
{
private
val
loginPresenter
by
lazy
{
LoginPresenter
()
}
private
var
mobile
:
String
?
=
null
override
fun
initViewsAndEvents
()
{
loginPresenter
.
attachView
(
this
)
initView
()
initListener
()
}
override
fun
getContentViewLayoutID
()
=
R
.
layout
.
activity_bind_mobile
override
fun
isApplyKitKatTranslucency
()
=
false
override
fun
onDestroy
()
{
super
.
onDestroy
()
loginPresenter
.
detachView
()
}
override
fun
onClick
(
v
:
View
?)
{
if
(
AntiShake
.
check
(
v
?.
id
))
return
when
(
v
?.
id
)
{
R
.
id
.
iv_left_icon
->
{
finish
()
}
R
.
id
.
tvLoginSendcode
->
{
var
mobile
=
etLoginMobile
.
getText
().
toString
().
trim
()
if
(
mobile
.
length
<
13
)
{
showToast
(
"请输入手机号"
)
return
}
sendCodeThread
()
mobile
=
mobile
.
replace
(
" "
.
toRegex
(),
""
)
loginPresenter
.
sendMobileCode
(
mobile
)
}
R
.
id
.
tvLoginNext
->
{
var
mobile
=
etLoginMobile
.
getText
().
toString
().
trim
()
if
(
mobile
.
length
<
13
)
{
showToast
(
"请输入手机号"
)
return
}
var
code
=
etLoginCode
.
getText
().
toString
().
trim
()
if
(
code
.
length
<
4
)
{
showToast
(
"请输入验证码"
)
return
}
RxPermissions
(
this
@BindMobileActivity
)
.
request
(
Manifest
.
permission
.
READ_PHONE_STATE
)
.
subscribe
{
granted
:
Boolean
->
if
(
granted
)
{
mobile
=
mobile
.
replace
(
" "
.
toRegex
(),
""
)
loginPresenter
.
bindingMobile
(
mobile
,
code
)
}
else
{
showMissingPermissionDialog
(
"设备"
)
}
}
}
}
}
override
fun
loginSuc
()
{
showToast
(
"绑定成功"
)
progressDialog
?.
dismiss
()
finish
()
}
override
fun
sendCodeSuc
()
{
}
private
fun
initView
()
{
tv_title
.
text
=
"绑定手机号"
iv_left_icon
.
visibility
=
View
.
VISIBLE
iv_left_icon
.
setImageResource
(
R
.
mipmap
.
ic_arrow_back
)
BackInputUtil
.
phoneNumAddSpace
(
etLoginMobile
)
mobile
=
UserManager
.
getInstance
().
mobile
if
(!
TextUtils
.
isEmpty
(
mobile
))
{
etLoginMobile
.
setText
(
mobile
)
etLoginMobile
.
setSelection
(
mobile
!!
.
length
+
2
)
}
}
private
fun
initListener
()
{
iv_left_icon
.
setOnClickListener
(
this
)
tvLoginSendcode
.
setOnClickListener
(
this
)
tvLoginNext
.
setOnClickListener
(
this
)
}
var
num
=
0
var
run
:
Runnable
?
=
null
fun
sendCodeThread
()
{
num
=
60
tvLoginSendcode
?.
let
{
it
.
setEnabled
(
false
)
it
.
setText
(
"($num)重新获取"
)
run
=
object
:
Runnable
{
override
fun
run
()
{
num
--
if
(
num
==
0
)
{
it
.
setText
(
"重新获取"
)
it
.
setEnabled
(
true
)
}
else
{
it
.
setText
(
"($num)重新获取"
)
it
.
postDelayed
(
this
,
1000
)
}
}
}
it
.
postDelayed
(
run
,
1000
)
}
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/DrawcashActivity.kt
View file @
bb38ab0f
...
@@ -2,6 +2,7 @@ package com.mints.goodmoney.ui.activitys
...
@@ -2,6 +2,7 @@ package com.mints.goodmoney.ui.activitys
import
android.os.Bundle
import
android.os.Bundle
import
android.text.TextUtils
import
android.text.TextUtils
import
android.text.style.ClickableSpan
import
android.view.View
import
android.view.View
import
androidx.recyclerview.widget.GridLayoutManager
import
androidx.recyclerview.widget.GridLayoutManager
import
cn.sharesdk.framework.ShareSDK
import
cn.sharesdk.framework.ShareSDK
...
@@ -84,7 +85,7 @@ class DrawcashActivity : BaseActivity(),
...
@@ -84,7 +85,7 @@ class DrawcashActivity : BaseActivity(),
R
.
id
.
tv_right_subtitle
->
{
R
.
id
.
tv_right_subtitle
->
{
// 是否登录
// 是否登录
if
(!
userManager
.
userIsLogin
())
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
return
return
}
}
...
@@ -118,15 +119,13 @@ class DrawcashActivity : BaseActivity(),
...
@@ -118,15 +119,13 @@ class DrawcashActivity : BaseActivity(),
// 是否登录
// 是否登录
if
(!
userManager
.
userIsLogin
())
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
return
return
}
}
// 是否绑定手机号
// 是否绑定手机号
if
(
TextUtils
.
isEmpty
(
userManager
.
mobile
))
{
if
(
TextUtils
.
isEmpty
(
userManager
.
mobile
))
{
val
bundle
=
Bundle
()
readyGo
(
BindMobileActivity
::
class
.
java
)
bundle
.
putBoolean
(
Constant
.
LOGIN_FLAG
,
true
)
readyGo
(
LoginActivity
::
class
.
java
,
bundle
)
return
return
}
}
...
@@ -144,7 +143,6 @@ class DrawcashActivity : BaseActivity(),
...
@@ -144,7 +143,6 @@ class DrawcashActivity : BaseActivity(),
override
fun
getUserTaskMsgSuc
(
data
:
DrawcashBean
)
{
override
fun
getUserTaskMsgSuc
(
data
:
DrawcashBean
)
{
userConfig
=
data
userConfig
=
data
tvDrawcashExplain
.
text
=
data
.
drawcashRule
tvDrawcashExplain
.
text
=
data
.
drawcashRule
tvDrawcashHint
.
text
=
data
.
drawcashHint
tvDrawcashHint
.
text
=
data
.
drawcashHint
tvDrawcashGold
.
text
=
CommonUtils
.
formatString
(
data
.
coin
.
toString
())
tvDrawcashGold
.
text
=
CommonUtils
.
formatString
(
data
.
coin
.
toString
())
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/DrawcashRecordActivity.kt
View file @
bb38ab0f
...
@@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.activity_drawcash_record.*
...
@@ -16,7 +16,7 @@ import kotlinx.android.synthetic.main.activity_drawcash_record.*
import
kotlinx.android.synthetic.main.header_layout.*
import
kotlinx.android.synthetic.main.header_layout.*
/**
/**
* 描述:提现
几率
* 描述:提现
记录
* 作者:孟崔广
* 作者:孟崔广
* 时间:2020/10/15 15:48
* 时间:2020/10/15 15:48
* 邮箱:mengcga@163.com
* 邮箱:mengcga@163.com
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/GuideActivity.kt
View file @
bb38ab0f
...
@@ -47,7 +47,7 @@ class GuideActivity : BaseActivity() {
...
@@ -47,7 +47,7 @@ class GuideActivity : BaseActivity() {
val
channel
=
CommonUtils
.
getAppMetaData
(
MintsApplication
.
getContext
(),
"CHANNEL_NAME"
)
val
channel
=
CommonUtils
.
getAppMetaData
(
MintsApplication
.
getContext
(),
"CHANNEL_NAME"
)
if
(
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
)
&&
!
UserManager
.
getInstance
().
userIsLogin
())
{
if
(
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
)
&&
!
UserManager
.
getInstance
().
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
}
else
{
}
else
{
readyGoThenKill
(
MainActivity
::
class
.
java
)
readyGoThenKill
(
MainActivity
::
class
.
java
)
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MobileLoginActivity.kt
0 → 100644
View file @
bb38ab0f
package
com.mints.goodmoney.ui.activitys
import
android.Manifest
import
android.text.TextUtils
import
android.view.View
import
com.mints.goodmoney.R
import
com.mints.goodmoney.manager.UserManager
import
com.mints.goodmoney.manager.YwhzManager
import
com.mints.goodmoney.mvp.presenters.LoginPresenter
import
com.mints.goodmoney.mvp.views.LoginView
import
com.mints.goodmoney.ui.activitys.base.BaseActivity
import
com.mints.goodmoney.utils.BackInputUtil
import
com.mints.goodmoney.utils.LogUtil
import
com.mints.library.utils.nodoubleclick.AntiShake
import
com.tbruyelle.rxpermissions.RxPermissions
import
kotlinx.android.synthetic.main.activity_bind_mobile.*
import
kotlinx.android.synthetic.main.header_layout.*
/**
* 描述:手机号登录
* 作者:孟崔广
* 时间:2020/12/2 14:21
*/
class
MobileLoginActivity
:
BaseActivity
()
,
LoginView
,
View
.
OnClickListener
{
private
val
loginPresenter
by
lazy
{
LoginPresenter
()
}
private
var
mobile
:
String
?
=
null
override
fun
initViewsAndEvents
()
{
loginPresenter
.
attachView
(
this
)
initView
()
initListener
()
}
override
fun
getContentViewLayoutID
()
=
R
.
layout
.
activity_mobile_login
override
fun
isApplyKitKatTranslucency
()
=
false
override
fun
onDestroy
()
{
super
.
onDestroy
()
loginPresenter
.
detachView
()
}
override
fun
onClick
(
v
:
View
?)
{
if
(
AntiShake
.
check
(
v
?.
id
))
return
when
(
v
?.
id
)
{
R
.
id
.
iv_left_icon
->
{
finish
()
}
R
.
id
.
tvLoginSendcode
->
{
var
mobile
=
etLoginMobile
.
getText
().
toString
().
trim
()
if
(
mobile
.
length
<
13
)
{
showToast
(
"请输入手机号"
)
return
}
// sendCodeThread()
mobile
=
mobile
.
replace
(
" "
.
toRegex
(),
""
)
loginPresenter
.
sendMobileCode
(
mobile
)
}
R
.
id
.
tvLoginNext
->
{
var
mobile
=
etLoginMobile
.
getText
().
toString
().
trim
()
if
(
mobile
.
length
<
13
)
{
showToast
(
"请输入手机号"
)
return
}
var
code
=
etLoginCode
.
getText
().
toString
().
trim
()
if
(
code
.
length
<
4
)
{
showToast
(
"请输入验证码"
)
return
}
RxPermissions
(
this
@MobileLoginActivity
)
.
request
(
Manifest
.
permission
.
READ_PHONE_STATE
)
.
subscribe
{
granted
:
Boolean
->
if
(
granted
)
{
mobile
=
mobile
.
replace
(
" "
.
toRegex
(),
""
)
// 登录
loginPresenter
.
login
(
mobile
,
code
)
}
else
{
showMissingPermissionDialog
(
"设备"
)
}
}
}
}
}
override
fun
loginSuc
()
{
try
{
// 登录成功初始化鱼玩盒子userid
YwhzManager
.
init
(
baseApplication
)
}
catch
(
e
:
Exception
)
{
}
// false-登录 true-绑定手机号
showToast
(
"登录成功"
)
progressDialog
?.
dismiss
()
readyGo
(
MainActivity
::
class
.
java
)
}
override
fun
sendCodeSuc
()
{
if
(!
isFinishing
())
{
sendCodeThread
()
}
}
private
fun
initView
()
{
tv_title
.
text
=
"手机号登录"
iv_left_icon
.
visibility
=
View
.
VISIBLE
iv_left_icon
.
setImageResource
(
R
.
mipmap
.
ic_arrow_back
)
BackInputUtil
.
phoneNumAddSpace
(
etLoginMobile
)
mobile
=
UserManager
.
getInstance
().
mobile
if
(!
TextUtils
.
isEmpty
(
mobile
))
{
etLoginMobile
.
setText
(
mobile
)
etLoginMobile
.
setSelection
(
mobile
!!
.
length
+
2
)
}
}
private
fun
initListener
()
{
iv_left_icon
.
setOnClickListener
(
this
)
tvLoginSendcode
.
setOnClickListener
(
this
)
tvLoginNext
.
setOnClickListener
(
this
)
}
var
num
=
0
var
run
:
Runnable
?
=
null
fun
sendCodeThread
()
{
num
=
60
tvLoginSendcode
?.
let
{
it
.
setEnabled
(
false
)
it
.
setText
(
"($num)重新获取"
)
run
=
object
:
Runnable
{
override
fun
run
()
{
num
--
LogUtil
.
d
(
"login"
,
"login num:"
+
num
)
if
(
num
==
0
)
{
it
.
setText
(
"重新获取"
)
it
.
setEnabled
(
true
)
}
else
{
it
.
setText
(
"($num)重新获取"
)
it
.
postDelayed
(
this
,
1000
)
}
}
}
it
.
postDelayed
(
run
,
1000
)
}
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SettingsActivity.kt
View file @
bb38ab0f
...
@@ -152,10 +152,13 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
...
@@ -152,10 +152,13 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
override
fun
onClick
(
v
:
View
?)
{
override
fun
onClick
(
v
:
View
?)
{
when
(
v
?.
id
)
{
when
(
v
?.
id
)
{
R
.
id
.
item_phone
->
{
R
.
id
.
item_phone
->
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
WxLoginActivity
::
class
.
java
)
return
}
if
(
userManager
.
mobile
.
isEmpty
())
{
if
(
userManager
.
mobile
.
isEmpty
())
{
val
bundle
=
Bundle
()
readyGo
(
BindMobileActivity
::
class
.
java
)
bundle
.
putBoolean
(
Constant
.
LOGIN_FLAG
,
true
)
readyGo
(
LoginActivity
::
class
.
java
,
bundle
)
}
}
}
}
// R.id.item_wechat -> {
// R.id.item_wechat -> {
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SplashYlhActivity.kt
View file @
bb38ab0f
...
@@ -198,7 +198,7 @@ class SplashYlhActivity : BaseActivity(), SplashADListener {
...
@@ -198,7 +198,7 @@ class SplashYlhActivity : BaseActivity(), SplashADListener {
}
else
{
}
else
{
val
channel
=
CommonUtils
.
getAppMetaData
(
MintsApplication
.
getContext
(),
"CHANNEL_NAME"
)
val
channel
=
CommonUtils
.
getAppMetaData
(
MintsApplication
.
getContext
(),
"CHANNEL_NAME"
)
if
(
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
)
&&
!
UserManager
.
getInstance
().
userIsLogin
())
{
if
(
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
)
&&
!
UserManager
.
getInstance
().
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
}
else
{
}
else
{
readyGoThenKill
(
MainActivity
::
class
.
java
)
readyGoThenKill
(
MainActivity
::
class
.
java
)
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/LoginActivity.kt
→
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/
Wx
LoginActivity.kt
View file @
bb38ab0f
...
@@ -2,7 +2,9 @@ package com.mints.goodmoney.ui.activitys
...
@@ -2,7 +2,9 @@ package com.mints.goodmoney.ui.activitys
import
android.Manifest
import
android.Manifest
import
android.os.Bundle
import
android.os.Bundle
import
android.text.TextPaint
import
android.text.TextUtils
import
android.text.TextUtils
import
android.text.style.ClickableSpan
import
android.view.KeyEvent
import
android.view.KeyEvent
import
android.view.View
import
android.view.View
import
cn.sharesdk.framework.ShareSDK
import
cn.sharesdk.framework.ShareSDK
...
@@ -12,43 +14,41 @@ import com.mints.goodmoney.R
...
@@ -12,43 +14,41 @@ import com.mints.goodmoney.R
import
com.mints.goodmoney.common.Constant
import
com.mints.goodmoney.common.Constant
import
com.mints.goodmoney.login.LoginApi
import
com.mints.goodmoney.login.LoginApi
import
com.mints.goodmoney.login.OnLoginListener
import
com.mints.goodmoney.login.OnLoginListener
import
com.mints.goodmoney.manager.UserManager
import
com.mints.goodmoney.manager.YwhzManager
import
com.mints.goodmoney.manager.YwhzManager
import
com.mints.goodmoney.mvp.model.WXInfo
import
com.mints.goodmoney.mvp.model.WXInfo
import
com.mints.goodmoney.mvp.presenters.LoginPresenter
import
com.mints.goodmoney.mvp.presenters.LoginPresenter
import
com.mints.goodmoney.mvp.views.LoginView
import
com.mints.goodmoney.mvp.views.LoginView
import
com.mints.goodmoney.ui.activitys.base.BaseActivity
import
com.mints.goodmoney.ui.activitys.base.BaseActivity
import
com.mints.goodmoney.utils.BackInputUtil
import
com.mints.goodmoney.utils.SpanUtils
import
com.mints.goodmoney.utils.LogUtil
import
com.mints.library.utils.CommonUtils
import
com.mints.library.utils.CommonUtils
import
com.mints.library.utils.json.JsonUtil
import
com.mints.library.utils.json.JsonUtil
import
com.mints.library.utils.nodoubleclick.AntiShake
import
com.mints.library.utils.nodoubleclick.AntiShake
import
com.tbruyelle.rxpermissions.RxPermissions
import
com.tbruyelle.rxpermissions.RxPermissions
import
kotlinx.android.synthetic.main.activity_login.*
import
kotlinx.android.synthetic.main.activity_
wx_
login.*
import
java.util.*
import
java.util.*
/**
/**
* 描述:登录
* 描述:
微信
登录
* 作者:孟崔广
* 作者:孟崔广
* 时间:2020/
9/22 13:55
* 时间:2020/
12/2 13:50
*/
*/
class
LoginActivity
:
BaseActivity
()
class
Wx
LoginActivity
:
BaseActivity
()
,
LoginView
,
View
.
OnClickListener
,
OnLoginListener
{
,
LoginView
,
View
.
OnClickListener
,
OnLoginListener
{
private
val
loginPresenter
by
lazy
{
LoginPresenter
()
}
private
val
loginPresenter
by
lazy
{
LoginPresenter
()
}
private
val
loginApi
by
lazy
{
LoginApi
()
}
private
val
loginApi
by
lazy
{
LoginApi
()
}
private
var
mobile
:
String
?
=
null
private
var
channel
:
String
=
""
private
var
wxInfo
:
WXInfo
?
=
null
private
var
wxInfo
:
WXInfo
?
=
null
private
var
loginFlag
:
Boolean
=
false
// false-登录 true-绑定手机号
private
var
channel
:
String
=
""
override
fun
getBundleExtras
(
extras
:
Bundle
?)
{
override
fun
getContentViewLayoutID
()
=
R
.
layout
.
activity_wx_login
super
.
getBundleExtras
(
extras
)
extras
?.
let
{
override
fun
toggleOverridePendingTransition
()
=
true
loginFlag
=
it
.
getBoolean
(
Constant
.
LOGIN_FLAG
,
false
)
}
override
fun
getOverridePendingTransitionMode
()
=
TransitionMode
.
BOTTOM
}
override
fun
isApplyKitKatTranslucency
()
=
false
override
fun
initViewsAndEvents
()
{
override
fun
initViewsAndEvents
()
{
loginPresenter
.
attachView
(
this
)
loginPresenter
.
attachView
(
this
)
...
@@ -57,33 +57,14 @@ class LoginActivity : BaseActivity()
...
@@ -57,33 +57,14 @@ class LoginActivity : BaseActivity()
initListener
()
initListener
()
}
}
override
fun
getContentViewLayoutID
()
=
R
.
layout
.
activity_login
override
fun
toggleOverridePendingTransition
()
=
true
override
fun
getOverridePendingTransitionMode
()
=
TransitionMode
.
BOTTOM
override
fun
isApplyKitKatTranslucency
()
=
false
override
fun
onDestroy
()
{
override
fun
onDestroy
()
{
super
.
onDestroy
()
super
.
onDestroy
()
loginApi
.
setOnLoginListener
(
null
)
loginApi
.
setOnLoginListener
(
null
)
loginPresenter
.
detachView
()
loginPresenter
.
detachView
()
}
}
override
fun
finish
()
{
super
.
finish
()
//关闭窗体动画显示
overridePendingTransition
(
0
,
R
.
anim
.
push_bottom_out
)
}
override
fun
onKeyDown
(
keyCode
:
Int
,
event
:
KeyEvent
):
Boolean
{
override
fun
onKeyDown
(
keyCode
:
Int
,
event
:
KeyEvent
):
Boolean
{
return
if
(
keyCode
==
KeyEvent
.
KEYCODE_BACK
)
{
return
if
(
keyCode
==
KeyEvent
.
KEYCODE_BACK
)
{
if
(!
loginFlag
)
{
finish
()
return
true
}
if
(!
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
))
{
if
(!
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
))
{
finish
()
finish
()
}
}
...
@@ -91,63 +72,25 @@ class LoginActivity : BaseActivity()
...
@@ -91,63 +72,25 @@ class LoginActivity : BaseActivity()
}
else
super
.
onKeyDown
(
keyCode
,
event
)
}
else
super
.
onKeyDown
(
keyCode
,
event
)
}
}
override
fun
finish
()
{
super
.
finish
()
//关闭窗体动画显示
overridePendingTransition
(
0
,
R
.
anim
.
push_bottom_out
)
}
override
fun
onClick
(
v
:
View
?)
{
override
fun
onClick
(
v
:
View
?)
{
if
(
AntiShake
.
check
(
v
?.
id
))
return
if
(
AntiShake
.
check
(
v
?.
id
))
return
when
(
v
?.
id
)
{
when
(
v
?.
id
)
{
R
.
id
.
ivLoginBack
->
{
R
.
id
.
ivLoginBack
->
{
if
(!
loginFlag
)
{
finish
()
return
}
if
(!
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
))
{
if
(!
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
))
{
finish
()
finish
()
}
}
}
}
R
.
id
.
tvLoginSendcode
->
{
R
.
id
.
tvLoginMobile
->
{
var
mobile
=
etLoginMobile
.
getText
().
toString
().
trim
()
readyGo
(
MobileLoginActivity
::
class
.
java
)
if
(
mobile
.
length
<
13
)
{
showToast
(
"请输入手机号"
)
return
}
sendCodeThread
()
mobile
=
mobile
.
replace
(
" "
.
toRegex
(),
""
)
loginPresenter
.
sendMobileCode
(
mobile
)
}
R
.
id
.
tvLoginNext
->
{
var
mobile
=
etLoginMobile
.
getText
().
toString
().
trim
()
if
(
mobile
.
length
<
13
)
{
showToast
(
"请输入手机号"
)
return
}
var
code
=
etLoginCode
.
getText
().
toString
().
trim
()
if
(
code
.
length
<
4
)
{
showToast
(
"请输入验证码"
)
return
}
RxPermissions
(
this
@LoginActivity
)
.
request
(
Manifest
.
permission
.
READ_PHONE_STATE
)
.
subscribe
{
granted
:
Boolean
->
if
(
granted
)
{
mobile
=
mobile
.
replace
(
" "
.
toRegex
(),
""
)
if
(
loginFlag
)
{
loginPresenter
.
bindingMobile
(
mobile
,
code
)
}
else
{
// 登录
loginPresenter
.
login
(
mobile
,
code
)
}
}
else
{
showMissingPermissionDialog
(
"设备"
)
}
}
}
}
R
.
id
.
rlLoginWx
->
{
R
.
id
.
tvLoginWx
->
{
val
wechat
=
ShareSDK
.
getPlatform
(
Wechat
.
NAME
)
val
wechat
=
ShareSDK
.
getPlatform
(
Wechat
.
NAME
)
if
(!
wechat
.
isClientValid
)
{
if
(!
wechat
.
isClientValid
)
{
showToast
(
"请先安装微信"
)
showToast
(
"请先安装微信"
)
...
@@ -158,26 +101,14 @@ class LoginActivity : BaseActivity()
...
@@ -158,26 +101,14 @@ class LoginActivity : BaseActivity()
.
request
(
Manifest
.
permission
.
READ_PHONE_STATE
)
.
request
(
Manifest
.
permission
.
READ_PHONE_STATE
)
.
subscribe
{
granted
:
Boolean
->
.
subscribe
{
granted
:
Boolean
->
if
(
granted
)
{
if
(
granted
)
{
loginApi
.
setOnLoginListener
(
this
@LoginActivity
)
loginApi
.
setOnLoginListener
(
this
@
Wx
LoginActivity
)
loginApi
.
setPlatform
(
Wechat
.
NAME
)
loginApi
.
setPlatform
(
Wechat
.
NAME
)
loginApi
.
login
(
this
@LoginActivity
)
loginApi
.
login
(
this
@
Wx
LoginActivity
)
}
else
{
}
else
{
showMissingPermissionDialog
(
"设备"
)
showMissingPermissionDialog
(
"设备"
)
}
}
}
}
}
}
R
.
id
.
tvLoginAgreement
->
{
val
bundle
=
Bundle
()
bundle
.
putString
(
WebActivity
.
WEB_TITLE
,
getString
(
R
.
string
.
register_name
))
bundle
.
putString
(
WebActivity
.
WEB_URL
,
Constant
.
REGISTER_URL
)
readyGo
(
WebActivity
::
class
.
java
,
bundle
)
}
R
.
id
.
tvLoginPolicy
->
{
val
bundle
=
Bundle
()
bundle
.
putString
(
WebActivity
.
WEB_TITLE
,
getString
(
R
.
string
.
privacy_name
))
bundle
.
putString
(
WebActivity
.
WEB_URL
,
Constant
.
PRIVACY_URL
)
readyGo
(
WebActivity
::
class
.
java
,
bundle
)
}
}
}
}
}
...
@@ -188,25 +119,18 @@ class LoginActivity : BaseActivity()
...
@@ -188,25 +119,18 @@ class LoginActivity : BaseActivity()
}
catch
(
e
:
Exception
)
{
}
catch
(
e
:
Exception
)
{
}
}
// false-登录 true-绑定手机号
if
(
loginFlag
)
{
showToast
(
"绑定成功"
)
}
else
{
showToast
(
"登录成功"
)
showToast
(
"登录成功"
)
}
progressDialog
?.
dismiss
()
if
(
progressDialog
!=
null
)
{
progressDialog
.
dismiss
()
}
if
(
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
))
{
if
(
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
))
{
readyGo
(
MainActivity
::
class
.
java
)
readyGo
(
MainActivity
::
class
.
java
)
}
}
finish
()
finish
()
}
}
override
fun
sendCodeSuc
()
{
}
override
fun
onLogin
(
platform
:
String
?,
res
:
HashMap
<
String
,
Any
>):
Boolean
{
override
fun
onLogin
(
platform
:
String
?,
res
:
HashMap
<
String
,
Any
>):
Boolean
{
try
{
try
{
wxInfo
=
WXInfo
()
wxInfo
=
WXInfo
()
...
@@ -231,58 +155,43 @@ class LoginActivity : BaseActivity()
...
@@ -231,58 +155,43 @@ class LoginActivity : BaseActivity()
}
}
private
fun
initView
()
{
private
fun
initView
()
{
if
(
TextUtils
.
equals
(
channel
,
Constant
.
CHANNEL_SHARE
))
{
tvLoginWx
.
visibility
=
View
.
GONE
}
else
{
tvLoginWx
.
visibility
=
View
.
VISIBLE
}
// false-登录 true-绑定手机号
SpanUtils
.
with
(
tvLoginAgreement
)
if
(
loginFlag
)
{
.
append
(
"《用户注册协议》"
).
setClickSpan
(
object
:
ClickableSpan
()
{
tvLoginWx
.
visibility
=
View
.
GONE
override
fun
onClick
(
widget
:
View
)
{
tvLoginNext
.
text
=
"绑定手机号"
val
bundle
=
Bundle
()
bundle
.
putString
(
WebActivity
.
WEB_TITLE
,
getString
(
R
.
string
.
register_name
))
bundle
.
putString
(
WebActivity
.
WEB_URL
,
Constant
.
REGISTER_URL
)
readyGo
(
WebActivity
::
class
.
java
,
bundle
)
}
}
BackInputUtil
.
phoneNumAddSpace
(
etLoginMobile
)
override
fun
updateDrawState
(
ds
:
TextPaint
)
{
mobile
=
UserManager
.
getInstance
().
mobile
ds
.
setColor
(
resources
.
getColor
(
R
.
color
.
main_mints
))
if
(!
TextUtils
.
isEmpty
(
mobile
))
{
ds
.
setUnderlineText
(
false
)
etLoginMobile
.
setText
(
mobile
)
etLoginMobile
.
setSelection
(
mobile
!!
.
length
+
2
)
}
}
})
.
append
(
"、"
)
.
append
(
"《用户隐私协议》"
).
setClickSpan
(
object
:
ClickableSpan
()
{
override
fun
onClick
(
widget
:
View
)
{
val
bundle
=
Bundle
()
bundle
.
putString
(
WebActivity
.
WEB_TITLE
,
getString
(
R
.
string
.
privacy_name
))
bundle
.
putString
(
WebActivity
.
WEB_URL
,
Constant
.
PRIVACY_URL
)
readyGo
(
WebActivity
::
class
.
java
,
bundle
)
}
}
private
fun
initListener
()
{
override
fun
updateDrawState
(
ds
:
TextPaint
)
{
ivLoginBack
.
setOnClickListener
(
this
)
ds
.
setColor
(
resources
.
getColor
(
R
.
color
.
main_mints
))
tvLoginSendcode
.
setOnClickListener
(
this
)
ds
.
setUnderlineText
(
false
)
tvLoginNext
.
setOnClickListener
(
this
)
tvLoginAgreement
.
setOnClickListener
(
this
)
tvLoginPolicy
.
setOnClickListener
(
this
)
tvLoginWx
.
setOnClickListener
(
this
)
}
}
})
.
append
(
"与您的利益切身相关。请您注册前务必仔细阅读!点击登录即表示您同意并愿意遵守好赚钱协议"
)
.
create
()
var
num
=
0
var
run
:
Runnable
?
=
null
fun
sendCodeThread
()
{
num
=
60
tvLoginSendcode
?.
let
{
it
.
setEnabled
(
false
)
it
.
setText
(
"($num)重新获取"
)
run
=
object
:
Runnable
{
override
fun
run
()
{
num
--
LogUtil
.
d
(
"login"
,
"login num:"
+
num
)
if
(
num
==
0
)
{
it
.
setText
(
"重新获取"
)
it
.
setEnabled
(
true
)
}
else
{
it
.
setText
(
"($num)重新获取"
)
it
.
postDelayed
(
this
,
1000
)
}
}
}
it
.
postDelayed
(
run
,
1000
)
}
}
private
fun
initListener
()
{
ivLoginBack
.
setOnClickListener
(
this
)
tvLoginMobile
.
setOnClickListener
(
this
)
rlLoginWx
.
setOnClickListener
(
this
)
}
}
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/DrawcashRecordAdapter.kt
View file @
bb38ab0f
...
@@ -72,7 +72,7 @@ class DrawcashRecordAdapter(context: Context, invitedData: MutableList<DrawcashR
...
@@ -72,7 +72,7 @@ class DrawcashRecordAdapter(context: Context, invitedData: MutableList<DrawcashR
viewHolder
.
tv_drawcashrecord_status
.
text
=
"已提现"
viewHolder
.
tv_drawcashrecord_status
.
text
=
"已提现"
viewHolder
.
tv_drawcashrecord_status
.
setTextColor
(
ContextCompat
.
getColor
(
mContext
,
R
.
color
.
main_nor_color
))
viewHolder
.
tv_drawcashrecord_status
.
setTextColor
(
ContextCompat
.
getColor
(
mContext
,
R
.
color
.
main_nor_color
))
}
}
3
->
{
3
,
4
->
{
viewHolder
.
tv_drawcashrecord_status
.
text
=
"提现失败"
viewHolder
.
tv_drawcashrecord_status
.
text
=
"提现失败"
viewHolder
.
tv_drawcashrecord_status
.
setTextColor
(
ContextCompat
.
getColor
(
mContext
,
R
.
color
.
tv_message_recente_money
))
viewHolder
.
tv_drawcashrecord_status
.
setTextColor
(
ContextCompat
.
getColor
(
mContext
,
R
.
color
.
tv_message_recente_money
))
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt
View file @
bb38ab0f
...
@@ -22,7 +22,6 @@ import com.mints.goodmoney.mvp.presenters.FriendsPresenter
...
@@ -22,7 +22,6 @@ import com.mints.goodmoney.mvp.presenters.FriendsPresenter
import
com.mints.goodmoney.mvp.views.FriendsView
import
com.mints.goodmoney.mvp.views.FriendsView
import
com.mints.goodmoney.ui.activitys.DrawcashActivity
import
com.mints.goodmoney.ui.activitys.DrawcashActivity
import
com.mints.goodmoney.ui.activitys.FriendsActivity
import
com.mints.goodmoney.ui.activitys.FriendsActivity
import
com.mints.goodmoney.ui.activitys.LoginActivity
import
com.mints.goodmoney.ui.adapter.FriendsPagerAdapter
import
com.mints.goodmoney.ui.adapter.FriendsPagerAdapter
import
com.mints.goodmoney.ui.adapter.InvitedAdapter
import
com.mints.goodmoney.ui.adapter.InvitedAdapter
import
com.mints.goodmoney.ui.fragment.base.BaseFragment
import
com.mints.goodmoney.ui.fragment.base.BaseFragment
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MoneyFragment.kt
View file @
bb38ab0f
...
@@ -5,7 +5,7 @@ import androidx.viewpager.widget.ViewPager
...
@@ -5,7 +5,7 @@ import androidx.viewpager.widget.ViewPager
import
com.androidkun.xtablayout.XTabLayout
import
com.androidkun.xtablayout.XTabLayout
import
com.mints.goodmoney.R
import
com.mints.goodmoney.R
import
com.mints.goodmoney.manager.UserManager
import
com.mints.goodmoney.manager.UserManager
import
com.mints.goodmoney.ui.activitys.LoginActivity
import
com.mints.goodmoney.ui.activitys.
Wx
LoginActivity
import
com.mints.goodmoney.ui.adapter.MessageFragAdapter
import
com.mints.goodmoney.ui.adapter.MessageFragAdapter
import
com.mints.goodmoney.ui.fragment.base.BaseFragment
import
com.mints.goodmoney.ui.fragment.base.BaseFragment
import
kotlinx.android.synthetic.main.fragment_main_money.*
import
kotlinx.android.synthetic.main.fragment_main_money.*
...
@@ -83,7 +83,7 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
...
@@ -83,7 +83,7 @@ class MoneyFragment : BaseFragment(), XTabLayout.OnTabSelectedListener {
override
fun
onTabSelected
(
tab
:
XTabLayout
.
Tab
)
{
override
fun
onTabSelected
(
tab
:
XTabLayout
.
Tab
)
{
if
(
tab
.
position
==
2
)
{
if
(
tab
.
position
==
2
)
{
if
(!
UserManager
.
getInstance
().
userIsLogin
())
{
if
(!
UserManager
.
getInstance
().
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
vpFragmentMoney
.
currentItem
=
if
(
curPosition
==
2
)
0
else
curPosition
vpFragmentMoney
.
currentItem
=
if
(
curPosition
==
2
)
0
else
curPosition
return
return
}
}
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @
bb38ab0f
...
@@ -17,6 +17,7 @@ import cn.sharesdk.wechat.friends.Wechat
...
@@ -17,6 +17,7 @@ import cn.sharesdk.wechat.friends.Wechat
import
com.component.dly.xzzq_ywsdk.YwSDK_WebActivity.Companion.open
import
com.component.dly.xzzq_ywsdk.YwSDK_WebActivity.Companion.open
import
com.mints.goodmoney.BuildConfig
import
com.mints.goodmoney.BuildConfig
import
com.mints.goodmoney.R
import
com.mints.goodmoney.R
import
com.mints.goodmoney.ad.banner.BannerManager
import
com.mints.goodmoney.ad.video.VedioAdingManager
import
com.mints.goodmoney.ad.video.VedioAdingManager
import
com.mints.goodmoney.common.AppConfig
import
com.mints.goodmoney.common.AppConfig
import
com.mints.goodmoney.common.Constant
import
com.mints.goodmoney.common.Constant
...
@@ -89,6 +90,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -89,6 +90,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
myPresenter
.
attachView
(
this
)
myPresenter
.
attachView
(
this
)
srl_my
.
setOnRefreshListener
(
this
)
srl_my
.
setOnRefreshListener
(
this
)
BannerManager
.
init
()
vedioAdingManager
=
VedioAdingManager
.
getInstance
(
activity
)
vedioAdingManager
=
VedioAdingManager
.
getInstance
(
activity
)
initView
()
initView
()
...
@@ -151,16 +153,23 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -151,16 +153,23 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
override
fun
onResume
()
{
override
fun
onResume
()
{
super
.
onResume
()
super
.
onResume
()
if
(
AppConfig
.
fragmentClickFlag
==
Constant
.
FRAGMENT_CLICK_MY
)
{
if
(
AppConfig
.
fragmentClickFlag
==
Constant
.
FRAGMENT_CLICK_MY
)
{
if
(!
TextUtils
.
isEmpty
(
userManager
.
userID
))
{
if
(!
TextUtils
.
isEmpty
(
userManager
.
userID
))
{
myPresenter
.
getAutoUserHallBaseMsg
()
myPresenter
.
getAutoUserHallBaseMsg
()
}
else
{
}
else
{
// 游客登录
// 游客登录
myPresenter
.
userLogin
()
myPresenter
.
userLogin
()
}
}
// 防止banner刷新太快
if
(
AntiShake
.
check
(
fl_my_banner
?.
id
))
return
BannerManager
.
getTtBanner
(
TtCsjAdManager
.
TT_AD_BANNER_MY
,
fl_my_banner
,
560f
,
160f
)
}
}
}
}
override
fun
onDestroyView
()
{
override
fun
onDestroyView
()
{
fl_my_banner
?.
removeAllViews
()
item_clock_signview
.
onDestory
()
item_clock_signview
.
onDestory
()
super
.
onDestroyView
()
super
.
onDestroyView
()
}
}
...
@@ -168,6 +177,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -168,6 +177,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
override
fun
onDestroy
()
{
override
fun
onDestroy
()
{
super
.
onDestroy
()
super
.
onDestroy
()
BxmManager
.
onDestory
()
BxmManager
.
onDestory
()
BannerManager
.
onDestroy
()
myPresenter
.
detachView
()
myPresenter
.
detachView
()
}
}
...
@@ -440,7 +450,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -440,7 +450,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
when
(
taskBean
.
otherConfig
.
status
)
{
when
(
taskBean
.
otherConfig
.
status
)
{
0
->
{
0
->
{
if
(!
userManager
.
userIsLogin
())
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
return
return
}
}
...
@@ -473,7 +483,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -473,7 +483,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
}
}
2
->
{
2
->
{
if
(!
userManager
.
userIsLogin
())
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
}
}
if
(!
ps
.
getBoolean
(
Constant
.
FIRST_SHARE_MY
,
false
))
{
if
(!
ps
.
getBoolean
(
Constant
.
FIRST_SHARE_MY
,
false
))
{
...
@@ -536,7 +546,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -536,7 +546,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
// 试玩平台
// 试玩平台
MainMyAdapter
.
TO_YWHZ
->
{
MainMyAdapter
.
TO_YWHZ
->
{
if
(!
userManager
.
userIsLogin
())
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
return
return
}
}
...
@@ -563,7 +573,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -563,7 +573,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
when
(
v
?.
id
)
{
when
(
v
?.
id
)
{
R
.
id
.
ll_my_login
->
{
R
.
id
.
ll_my_login
->
{
if
(!
userManager
.
userIsLogin
())
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
}
}
}
}
R
.
id
.
iv_right_icon2
->
{
R
.
id
.
iv_right_icon2
->
{
...
@@ -576,7 +586,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
...
@@ -576,7 +586,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
}
}
R
.
id
.
item_title_id
->
{
R
.
id
.
item_title_id
->
{
if
(!
userManager
.
userIsLogin
())
{
if
(!
userManager
.
userIsLogin
())
{
readyGo
(
LoginActivity
::
class
.
java
)
readyGo
(
Wx
LoginActivity
::
class
.
java
)
}
}
}
}
R
.
id
.
iv_right_icon
->
{
R
.
id
.
iv_right_icon
->
{
...
...
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/ShareDialog.kt
View file @
bb38ab0f
...
@@ -13,9 +13,10 @@ import android.widget.RelativeLayout
...
@@ -13,9 +13,10 @@ import android.widget.RelativeLayout
import
android.widget.TextView
import
android.widget.TextView
import
androidx.core.content.ContextCompat
import
androidx.core.content.ContextCompat
import
cn.sharesdk.framework.Platform
import
cn.sharesdk.framework.Platform
import
cn.sharesdk.framework.Platform.ShareParams
import
cn.sharesdk.framework.ShareSDK
import
cn.sharesdk.framework.ShareSDK
import
cn.sharesdk.wechat.favorite.WechatFavorite
import
cn.sharesdk.wechat.friends.Wechat
import
cn.sharesdk.wechat.friends.Wechat
import
cn.sharesdk.wechat.moments.WechatMoments
import
com.mints.goodmoney.MintsApplication
import
com.mints.goodmoney.MintsApplication
import
com.mints.goodmoney.R
import
com.mints.goodmoney.R
import
com.mints.goodmoney.common.Constant
import
com.mints.goodmoney.common.Constant
...
@@ -34,6 +35,9 @@ class ShareDialog(context: Context) :
...
@@ -34,6 +35,9 @@ class ShareDialog(context: Context) :
private
val
rlView
:
RelativeLayout
private
val
rlView
:
RelativeLayout
private
val
tvDialogShareNext
:
TextView
private
val
tvDialogShareNext
:
TextView
private
val
wechat
by
lazy
{
ShareSDK
.
getPlatform
(
Wechat
.
NAME
)
}
private
val
wechatMoments
by
lazy
{
ShareSDK
.
getPlatform
(
WechatMoments
.
NAME
)
}
init
{
init
{
setContentView
(
R
.
layout
.
dialog_share
)
setContentView
(
R
.
layout
.
dialog_share
)
// 设置window属性
// 设置window属性
...
@@ -84,15 +88,14 @@ class ShareDialog(context: Context) :
...
@@ -84,15 +88,14 @@ class ShareDialog(context: Context) :
rlView
.
buildDrawingCache
()
rlView
.
buildDrawingCache
()
val
bitmap
:
Bitmap
=
rlView
.
drawingCache
val
bitmap
:
Bitmap
=
rlView
.
drawingCache
val
wechatSp
=
Platform
.
ShareParams
()
val
wechatSp
=
ShareParams
()
wechatSp
.
shareType
=
Platform
.
SHARE_IMAGE
wechatSp
.
shareType
=
Platform
.
SHARE_IMAGE
wechatSp
.
title
=
Constant
.
SHARE_TITLE
wechatSp
.
title
=
Constant
.
SHARE_TITLE
wechatSp
.
text
=
Constant
.
SHARE_CONTENT
wechatSp
.
text
=
Constant
.
SHARE_CONTENT
wechatSp
.
imageData
=
bitmap
wechatSp
.
imageData
=
bitmap
wechatSp
.
url
=
Constant
.
SHARE_URL
wechatSp
.
url
=
Constant
.
SHARE_URL
val
wechat
=
ShareSDK
.
getPlatform
(
Wechat
.
NAME
)
if
(
wechat
.
isClientValid
)
{
if
(
wechat
.
isClientValid
)
{
// 执行图文分享
wechat
.
share
(
wechatSp
)
wechat
.
share
(
wechatSp
)
}
else
{
}
else
{
ToastUtil
.
show
(
MintsApplication
.
getContext
(),
"请先安装微信"
)
ToastUtil
.
show
(
MintsApplication
.
getContext
(),
"请先安装微信"
)
...
@@ -100,16 +103,16 @@ class ShareDialog(context: Context) :
...
@@ -100,16 +103,16 @@ class ShareDialog(context: Context) :
}
}
private
fun
shareWechatFavoite
()
{
private
fun
shareWechatFavoite
()
{
val
wechatSp
=
Platform
.
ShareParams
()
rlView
.
isDrawingCacheEnabled
=
true
rlView
.
drawingCacheQuality
=
View
.
DRAWING_CACHE_QUALITY_HIGH
rlView
.
buildDrawingCache
()
val
bitmap
:
Bitmap
=
rlView
.
drawingCache
val
wechatSp
=
ShareParams
()
wechatSp
.
shareType
=
Platform
.
SHARE_IMAGE
wechatSp
.
shareType
=
Platform
.
SHARE_IMAGE
wechatSp
.
title
=
Constant
.
SHARE_TITLE
wechatSp
.
imageData
=
bitmap
wechatSp
.
text
=
Constant
.
SHARE_CONTENT
if
(
wechatMoments
.
isClientValid
)
{
wechatSp
.
imageData
=
ImageUtil
.
drawableToBitmap
(
ContextCompat
.
getDrawable
(
context
,
R
.
mipmap
.
bg_eat
))
wechatMoments
.
share
(
wechatSp
)
wechatSp
.
url
=
Constant
.
SHARE_URL
val
wechat
=
ShareSDK
.
getPlatform
(
WechatFavorite
.
NAME
)
if
(
wechat
.
isClientValid
)
{
// 执行图文分享
wechat
.
share
(
wechatSp
)
}
else
{
}
else
{
ToastUtil
.
show
(
MintsApplication
.
getContext
(),
"请先安装微信"
)
ToastUtil
.
show
(
MintsApplication
.
getContext
(),
"请先安装微信"
)
}
}
...
...
GoodMoney/app/src/main/res/drawable/shape_green.xml
0 → 100644
View file @
bb38ab0f
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<!-- 填充的颜色 -->
<solid
android:color=
"@color/loan_green"
/>
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners
android:radius=
"30dip"
/>
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/activity_
login
.xml
→
GoodMoney/app/src/main/res/layout/activity_
bind_mobile
.xml
View file @
bb38ab0f
...
@@ -5,16 +5,7 @@
...
@@ -5,16 +5,7 @@
android:background=
"@color/white"
android:background=
"@color/white"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<ImageView
<include
layout=
"@layout/header_layout"
/>
android:id=
"@+id/ivLoginBack"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingLeft=
"25dp"
android:paddingTop=
"40dp"
android:paddingRight=
"25dp"
android:paddingBottom=
"10dp"
android:scaleType=
"center"
android:src=
"@mipmap/ic_activity_quit"
/>
<com.mints.goodmoney.ui.widgets.ElasticScrollView
<com.mints.goodmoney.ui.widgets.ElasticScrollView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -132,77 +123,10 @@
...
@@ -132,77 +123,10 @@
android:layout_marginRight=
"40dp"
android:layout_marginRight=
"40dp"
android:background=
"@drawable/shape_main"
android:background=
"@drawable/shape_main"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
立即登录
"
android:text=
"
绑定手机号
"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"15dp"
android:orientation=
"vertical"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"30dp"
android:layout_marginRight=
"30dp"
android:paddingTop=
"15dp"
android:paddingBottom=
"6dp"
android:text=
"《用户注册协议》、《用户隐私协议》与您的利益切身相关。请您注册前务必仔细阅读!点击按钮即表示您同意并愿意遵守好赚钱"
android:textColor=
"@color/product_hint_text"
android:textSize=
"12sp"
/>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/tvLoginAgreement"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingLeft=
"4dp"
android:paddingRight=
"2dp"
android:text=
"《用户注册协议》"
android:textColor=
"@color/main_mints"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tvLoginPolicy"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingLeft=
"2dp"
android:paddingRight=
"2dp"
android:text=
"《用户隐私协议》"
android:textColor=
"@color/main_mints"
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
>
<TextView
android:id=
"@+id/tvLoginWx"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"60dp"
android:layout_marginBottom=
"50dp"
android:drawableTop=
"@mipmap/ic_wx_login"
android:drawablePadding=
"8dp"
android:text=
"微信一键登录"
android:textColor=
"@color/black"
android:textSize=
"14sp"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</com.mints.goodmoney.ui.widgets.ElasticScrollView>
</com.mints.goodmoney.ui.widgets.ElasticScrollView>
...
...
GoodMoney/app/src/main/res/layout/activity_mobile_login.xml
0 → 100644
View file @
bb38ab0f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/white"
android:orientation=
"vertical"
>
<include
layout=
"@layout/header_layout"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"20dp"
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"30dp"
android:layout_marginTop=
"30dp"
android:layout_marginRight=
"30dp"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"手机号:"
/>
<com.mints.goodmoney.ui.widgets.ClearEditText
android:id=
"@+id/etLoginMobile"
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:layout_marginLeft=
"20dp"
android:layout_marginRight=
"30dp"
android:background=
"@null"
android:gravity=
"center_vertical"
android:hint=
"请输入手机号"
android:inputType=
"number"
android:maxLength=
"13"
android:maxLines=
"1"
android:textColor=
"@color/product_text"
android:textColorHint=
"@color/main_nor_color"
android:textSize=
"12sp"
/>
</LinearLayout>
<View
style=
"@style/line_3"
android:layout_marginLeft=
"30dp"
android:layout_marginRight=
"30dp"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"30dp"
android:layout_marginTop=
"10dp"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"验证码:"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:layout_marginLeft=
"20dp"
android:layout_marginRight=
"30dp"
>
<com.mints.goodmoney.ui.widgets.ClearEditText
android:id=
"@+id/etLoginCode"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_centerVertical=
"true"
android:layout_marginRight=
"120dp"
android:background=
"@null"
android:hint=
"请输入验证码"
android:inputType=
"number"
android:maxLength=
"4"
android:maxLines=
"1"
android:textColor=
"@color/product_text"
android:textColorHint=
"@color/main_nor_color"
android:textSize=
"12sp"
/>
<TextView
android:id=
"@+id/tvLoginSendcode"
android:layout_width=
"100dp"
android:layout_height=
"30dp"
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:gravity=
"center"
android:text=
"发送验证码"
android:textColor=
"@color/main_mints"
android:textSize=
"12sp"
/>
</RelativeLayout>
</LinearLayout>
<View
style=
"@style/line_3"
android:layout_marginLeft=
"30dp"
android:layout_marginRight=
"30dp"
/>
<TextView
android:id=
"@+id/tvLoginNext"
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:layout_gravity=
"center_horizontal"
android:layout_marginLeft=
"40dp"
android:layout_marginTop=
"30dp"
android:layout_marginRight=
"40dp"
android:background=
"@drawable/shape_main"
android:gravity=
"center"
android:text=
"立即登录"
android:textColor=
"@color/white"
android:textSize=
"14sp"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"20dp"
android:layout_marginTop=
"20dp"
android:layout_marginRight=
"20dp"
android:text=
"你需要先用微信登录,在【个人中心】-【设置】中绑定手机号码,才能使用手机号登录"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/activity_wx_login.xml
0 → 100644
View file @
bb38ab0f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/white"
android:orientation=
"vertical"
>
<ImageView
android:id=
"@+id/ivLoginBack"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingLeft=
"25dp"
android:paddingTop=
"40dp"
android:paddingRight=
"25dp"
android:paddingBottom=
"10dp"
android:scaleType=
"center"
android:src=
"@mipmap/ic_activity_quit"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<ImageView
android:layout_width=
"70dp"
android:layout_height=
"70dp"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"50dp"
android:src=
"@mipmap/ic_launcher"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_marginBottom=
"30dp"
android:orientation=
"vertical"
>
<RelativeLayout
android:id=
"@+id/rlLoginWx"
android:layout_width=
"match_parent"
android:layout_height=
"52dp"
android:layout_gravity=
"center_horizontal"
android:layout_marginLeft=
"40dp"
android:layout_marginTop=
"230dp"
android:layout_marginRight=
"40dp"
android:background=
"@drawable/shape_green"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerInParent=
"true"
android:drawableLeft=
"@mipmap/ic_wx_white_login"
android:drawablePadding=
"10dp"
android:gravity=
"center_vertical"
android:text=
"微信登录"
android:textColor=
"@color/white"
android:textSize=
"14sp"
/>
</RelativeLayout>
<TextView
android:id=
"@+id/tvLoginMobile"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
android:padding=
"24dp"
android:text=
"其他登录方式"
android:textColor=
"@color/gray"
android:textSize=
"14sp"
/>
<TextView
android:id=
"@+id/tvLoginAgreement"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"30dp"
android:layout_marginRight=
"30dp"
android:layout_gravity=
"center_horizontal"
android:textColor=
"@color/product_hint_text"
android:textSize=
"12sp"
/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/fragment_main_my.xml
View file @
bb38ab0f
...
@@ -35,6 +35,12 @@
...
@@ -35,6 +35,12 @@
<include
layout=
"@layout/item_fragment_main_my_clock"
/>
<include
layout=
"@layout/item_fragment_main_my_clock"
/>
<FrameLayout
android:id=
"@+id/fl_my_banner"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
/>
<include
<include
android:id=
"@+id/divider_hot"
android:id=
"@+id/divider_hot"
layout=
"@layout/item_divider_gray"
layout=
"@layout/item_divider_gray"
...
...
GoodMoney/app/src/main/res/mipmap-xhdpi/ic_wx_white_login.png
0 → 100644
View file @
bb38ab0f
1.5 KB
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