Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_vedio
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_vedio
Commits
5d609ef7
Commit
5d609ef7
authored
Aug 14, 2023
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
个人中心添加信息流
parent
55fbb175
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
946 additions
and
13 deletions
+946
-13
build.gradle
video/app/build.gradle
+4
-2
MyExpressManager.kt
...n/java/com/mints/helivideo/ad/express/MyExpressManager.kt
+892
-0
MobileLoginActivity.kt
...a/com/mints/helivideo/ui/activitys/MobileLoginActivity.kt
+3
-8
MyFragment.kt
...c/main/java/com/mints/helivideo/ui/fragment/MyFragment.kt
+38
-1
activity_mobile_login.xml
video/app/src/main/res/layout/activity_mobile_login.xml
+1
-1
fragment_main_my.xml
video/app/src/main/res/layout/fragment_main_my.xml
+7
-1
gradle.properties
video/gradle.properties
+1
-0
No files found.
video/app/build.gradle
View file @
5d609ef7
...
@@ -12,8 +12,8 @@ android {
...
@@ -12,8 +12,8 @@ android {
applicationId
"com.mints.helivideo"
applicationId
"com.mints.helivideo"
minSdkVersion
rootProject
.
ext
.
androidMinSdkVersion
minSdkVersion
rootProject
.
ext
.
androidMinSdkVersion
targetSdkVersion
rootProject
.
ext
.
androidTargetSdkVersion
targetSdkVersion
rootProject
.
ext
.
androidTargetSdkVersion
versionCode
9
versionCode
10
versionName
"1.0.
8
"
versionName
"1.0.
9
"
flavorDimensions
"default"
flavorDimensions
"default"
// dex突破65535的限制
// dex突破65535的限制
...
@@ -66,6 +66,7 @@ android {
...
@@ -66,6 +66,7 @@ android {
buildConfigField
"String"
,
"GROMORE_VIDEO_CODE"
,
GROMORE_VIDEO_CODE
buildConfigField
"String"
,
"GROMORE_VIDEO_CODE"
,
GROMORE_VIDEO_CODE
buildConfigField
"String"
,
"GROMORE_DRAW_CODE"
,
GROMORE_DRAW_CODE
buildConfigField
"String"
,
"GROMORE_DRAW_CODE"
,
GROMORE_DRAW_CODE
buildConfigField
"String"
,
"GROMORE_EXPRESS_CODE"
,
GROMORE_EXPRESS_CODE
buildConfigField
"String"
,
"GROMORE_EXPRESS_CODE"
,
GROMORE_EXPRESS_CODE
buildConfigField
"String"
,
"GROMORE_MYEXPRESS_CODE"
,
GROMORE_MYEXPRESS_CODE
buildConfigField
"String"
,
"GROMORE_BANNER_CODE"
,
GROMORE_BANNER_CODE
buildConfigField
"String"
,
"GROMORE_BANNER_CODE"
,
GROMORE_BANNER_CODE
buildConfigField
"String"
,
"RELEASE_TALKING_DATA_KEY"
,
RELEASE_TALKING_DATA_KEY
buildConfigField
"String"
,
"RELEASE_TALKING_DATA_KEY"
,
RELEASE_TALKING_DATA_KEY
buildConfigField
"String"
,
"WEIXIN_APP_PAY_ID"
,
WEIXIN_APP_PAY_ID
buildConfigField
"String"
,
"WEIXIN_APP_PAY_ID"
,
WEIXIN_APP_PAY_ID
...
@@ -89,6 +90,7 @@ android {
...
@@ -89,6 +90,7 @@ android {
buildConfigField
"String"
,
"GROMORE_VIDEO_CODE"
,
GROMORE_VIDEO_CODE
buildConfigField
"String"
,
"GROMORE_VIDEO_CODE"
,
GROMORE_VIDEO_CODE
buildConfigField
"String"
,
"GROMORE_DRAW_CODE"
,
GROMORE_DRAW_CODE
buildConfigField
"String"
,
"GROMORE_DRAW_CODE"
,
GROMORE_DRAW_CODE
buildConfigField
"String"
,
"GROMORE_EXPRESS_CODE"
,
GROMORE_EXPRESS_CODE
buildConfigField
"String"
,
"GROMORE_EXPRESS_CODE"
,
GROMORE_EXPRESS_CODE
buildConfigField
"String"
,
"GROMORE_MYEXPRESS_CODE"
,
GROMORE_MYEXPRESS_CODE
buildConfigField
"String"
,
"GROMORE_BANNER_CODE"
,
GROMORE_BANNER_CODE
buildConfigField
"String"
,
"GROMORE_BANNER_CODE"
,
GROMORE_BANNER_CODE
buildConfigField
"String"
,
"RELEASE_TALKING_DATA_KEY"
,
RELEASE_TALKING_DATA_KEY
buildConfigField
"String"
,
"RELEASE_TALKING_DATA_KEY"
,
RELEASE_TALKING_DATA_KEY
buildConfigField
"String"
,
"WEIXIN_APP_PAY_ID"
,
WEIXIN_APP_PAY_ID
buildConfigField
"String"
,
"WEIXIN_APP_PAY_ID"
,
WEIXIN_APP_PAY_ID
...
...
video/app/src/main/java/com/mints/helivideo/ad/express/MyExpressManager.kt
0 → 100644
View file @
5d609ef7
This diff is collapsed.
Click to expand it.
video/app/src/main/java/com/mints/helivideo/ui/activitys/MobileLoginActivity.kt
View file @
5d609ef7
...
@@ -138,7 +138,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
...
@@ -138,7 +138,7 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
if
(
isFinishing
)
return
if
(
isFinishing
)
return
// false-登录 true-绑定手机号
// false-登录 true-绑定手机号
showToast
(
"
登录
成功"
)
showToast
(
"
绑定
成功"
)
hideLoading
()
hideLoading
()
...
@@ -158,13 +158,8 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
...
@@ -158,13 +158,8 @@ class MobileLoginActivity : BaseActivity(), LoginView, View.OnClickListener {
}
}
private
fun
initView
()
{
private
fun
initView
()
{
if
(
TextUtils
.
equals
(
enterType
,
"vip"
))
{
tv_title
.
text
=
"绑定手机号"
tv_title
.
text
=
"绑定手机号"
tvLoginNext
.
text
=
"立即绑定"
tvLoginNext
.
text
=
"绑定手机号"
}
else
{
tv_title
.
text
=
"手机号登录"
tvLoginNext
.
text
=
"立即登录"
}
iv_left_icon
.
visibility
=
View
.
VISIBLE
iv_left_icon
.
visibility
=
View
.
VISIBLE
iv_left_icon
.
setImageResource
(
R
.
mipmap
.
ic_arrow_back
)
iv_left_icon
.
setImageResource
(
R
.
mipmap
.
ic_arrow_back
)
...
...
video/app/src/main/java/com/mints/helivideo/ui/fragment/MyFragment.kt
View file @
5d609ef7
...
@@ -6,12 +6,16 @@ import android.os.Handler
...
@@ -6,12 +6,16 @@ import android.os.Handler
import
android.os.Looper
import
android.os.Looper
import
android.text.TextUtils
import
android.text.TextUtils
import
android.view.View
import
android.view.View
import
android.widget.FrameLayout
import
com.daimajia.androidanimations.library.Techniques
import
com.daimajia.androidanimations.library.Techniques
import
com.daimajia.androidanimations.library.YoYo
import
com.daimajia.androidanimations.library.YoYo
import
com.mints.helivideo.R
import
com.mints.helivideo.R
import
com.mints.helivideo.ad.AdManager
import
com.mints.helivideo.ad.AdManager
import
com.mints.helivideo.ad.AdStatusListener
import
com.mints.helivideo.ad.AdStatusListener
import
com.mints.helivideo.ad.NoPreAdManager
import
com.mints.helivideo.ad.NoPreAdManager
import
com.mints.helivideo.ad.express.ExpressAdCallback
import
com.mints.helivideo.ad.express.ExpressManager
import
com.mints.helivideo.ad.express.MyExpressManager
import
com.mints.helivideo.common.AppConfig
import
com.mints.helivideo.common.AppConfig
import
com.mints.helivideo.common.Constant
import
com.mints.helivideo.common.Constant
import
com.mints.helivideo.manager.UserManager
import
com.mints.helivideo.manager.UserManager
...
@@ -27,6 +31,7 @@ import com.mints.helivideo.ui.widgets.NineContinueDialog
...
@@ -27,6 +31,7 @@ import com.mints.helivideo.ui.widgets.NineContinueDialog
import
com.mints.helivideo.utils.AppPreferencesManager
import
com.mints.helivideo.utils.AppPreferencesManager
import
com.mints.helivideo.utils.SpanUtils
import
com.mints.helivideo.utils.SpanUtils
import
com.mints.helivideo.utils.TimeRender
import
com.mints.helivideo.utils.TimeRender
import
com.mints.helivideo.utils.UIUtils
import
com.mints.helivideo.utils.rxutil.CommonRxTask
import
com.mints.helivideo.utils.rxutil.CommonRxTask
import
com.mints.helivideo.utils.rxutil.RxjavaUtil
import
com.mints.helivideo.utils.rxutil.RxjavaUtil
import
com.mints.library.utils.nodoubleclick.AntiShake
import
com.mints.library.utils.nodoubleclick.AntiShake
...
@@ -84,6 +89,11 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
...
@@ -84,6 +89,11 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
if
(
AppConfig
.
fragmentClickFlag
==
Constant
.
FRAGMENT_CLICK_THREE
)
{
if
(
AppConfig
.
fragmentClickFlag
==
Constant
.
FRAGMENT_CLICK_THREE
)
{
if
(
AntiShake
.
check
(
ll_my_record
?.
id
))
return
if
(
AntiShake
.
check
(
ll_my_record
?.
id
))
return
if
(
userManager
.
vipFlag
){
MyExpressManager
.
instance
.
preLoadAd
()
showAd
()
}
if
(!
TextUtils
.
isEmpty
(
userManager
?.
userID
))
{
if
(!
TextUtils
.
isEmpty
(
userManager
?.
userID
))
{
myPresenter
.
showTurn
()
myPresenter
.
showTurn
()
myPresenter
.
getMyInfo
()
myPresenter
.
getMyInfo
()
...
@@ -156,7 +166,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
...
@@ -156,7 +166,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
iv_my_bind
.
visibility
=
View
.
GONE
iv_my_bind
.
visibility
=
View
.
GONE
}
else
{
}
else
{
// 未登录
// 未登录
tv_my_account
.
text
=
"
登录/注册
"
tv_my_account
.
text
=
"
绑定手机号
"
iv_my_bind
.
visibility
=
View
.
VISIBLE
iv_my_bind
.
visibility
=
View
.
VISIBLE
}
}
...
@@ -380,4 +390,31 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
...
@@ -380,4 +390,31 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
}
}
//----9宫格逻辑--结束--//
//----9宫格逻辑--结束--//
private
fun
showAd
()
{
MyExpressManager
.
instance
.
getAdView
(
object
:
ExpressAdCallback
{
override
fun
loadSuccess
(
adView
:
FrameLayout
?)
{
adView
?.
let
{
UIUtils
.
removeFromParent
(
it
)
fl_ad
.
removeAllViews
()
fl_ad
.
addView
(
it
)
}
MyExpressManager
.
instance
.
preLoadAd
()
}
override
fun
renderSuccess
(
adView
:
FrameLayout
?):
Boolean
{
adView
?.
let
{
UIUtils
.
removeFromParent
(
it
)
fl_ad
.
removeAllViews
()
fl_ad
.
addView
(
it
)
}
MyExpressManager
.
instance
.
preLoadAd
()
return
false
}
override
fun
loadFail
()
{
}
})
}
}
}
\ No newline at end of file
video/app/src/main/res/layout/activity_mobile_login.xml
View file @
5d609ef7
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
android:layout_marginRight=
"40dp"
android:layout_marginRight=
"40dp"
android:background=
"@drawable/shape_red"
android:background=
"@drawable/shape_red"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"
立即登录
"
android:text=
"
绑定手机号
"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"20sp"
/>
android:textSize=
"20sp"
/>
...
...
video/app/src/main/res/layout/fragment_main_my.xml
View file @
5d609ef7
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_gravity=
"center_vertical"
android:layout_marginStart=
"10dp"
android:layout_marginStart=
"10dp"
android:text=
"
登录/注册
"
android:text=
"
绑定手机号
"
android:textColor=
"#000000"
android:textColor=
"#000000"
android:textSize=
"20sp"
android:textSize=
"20sp"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
...
@@ -306,6 +306,12 @@
...
@@ -306,6 +306,12 @@
</LinearLayout>
</LinearLayout>
</FrameLayout>
</FrameLayout>
<com.mints.helivideo.ui.widgets.RoundRectLayout
android:id=
"@+id/fl_ad"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@drawable/shape_bg_write"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</ScrollView>
...
...
video/gradle.properties
View file @
5d609ef7
...
@@ -50,5 +50,6 @@ GROMORE_APP_ID="5412556"
...
@@ -50,5 +50,6 @@ GROMORE_APP_ID="5412556"
GROMORE_SPLASH_CODE="102398740"
GROMORE_SPLASH_CODE="102398740"
GROMORE_VIDEO_CODE
=
"102398300"
GROMORE_VIDEO_CODE
=
"102398300"
GROMORE_EXPRESS_CODE="102405261"
GROMORE_EXPRESS_CODE="102405261"
GROMORE_MYEXPRESS_CODE
=
"102413160"
GROMORE_DRAW_CODE="102405069"
GROMORE_DRAW_CODE="102405069"
GROMORE_BANNER_CODE
=
"102405532"
GROMORE_BANNER_CODE
=
"102405532"
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