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
fb7ca523
Commit
fb7ca523
authored
Jul 11, 2023
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
d6f4d297
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
29 deletions
+24
-29
TrackPresenter.java
.../com/mints/wisdomclean/mvp/presenters/TrackPresenter.java
+0
-2
SplashActivity.kt
...java/com/mints/wisdomclean/ui/activitys/SplashActivity.kt
+2
-1
SplashAdActivity.kt
...va/com/mints/wisdomclean/ui/activitys/SplashAdActivity.kt
+2
-1
MyFragment.kt
...main/java/com/mints/wisdomclean/ui/fragment/MyFragment.kt
+15
-15
fragment_main_my.xml
video/app/src/main/res/layout/fragment_main_my.xml
+5
-10
No files found.
video/app/src/main/java/com/mints/wisdomclean/mvp/presenters/TrackPresenter.java
View file @
fb7ca523
...
...
@@ -70,8 +70,6 @@ public class TrackPresenter extends BaseTrackPresenter {
});
}
public
void
saveTerminalInfo
()
{
HashMap
<
String
,
Object
>
vo
=
new
HashMap
<>();
DeviceInfo
deviceInfo
=
DeviceInfo
.
Companion
.
getInstance
();
...
...
video/app/src/main/java/com/mints/wisdomclean/ui/activitys/SplashActivity.kt
View file @
fb7ca523
...
...
@@ -143,7 +143,8 @@ class SplashActivity : BaseActivity() {
* 跳转到主页面
*/
private
fun
goToMainActivity
()
{
if
(
UserManager
.
getInstance
().
newFlag
&&
!
UserManager
.
getInstance
().
vipFlag
)
{
// if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
if
(!
UserManager
.
getInstance
().
vipFlag
)
{
// 匹配用户 且 不是vip
val
bundle
=
Bundle
()
bundle
.
putBoolean
(
VipActivity
.
IS_GUIDE
,
true
)
...
...
video/app/src/main/java/com/mints/wisdomclean/ui/activitys/SplashAdActivity.kt
View file @
fb7ca523
...
...
@@ -95,7 +95,8 @@ class SplashAdActivity : BaseActivity() {
* 跳转到主页面
*/
private
fun
goToMainActivity
()
{
if
(
UserManager
.
getInstance
().
newFlag
&&!
UserManager
.
getInstance
().
vipFlag
)
{
// if (UserManager.getInstance().newFlag&&!UserManager.getInstance().vipFlag) {
if
(!
UserManager
.
getInstance
().
vipFlag
)
{
// 匹配用户 且 不是vip
val
bundle
=
Bundle
()
bundle
.
putBoolean
(
VipActivity
.
IS_GUIDE
,
true
)
...
...
video/app/src/main/java/com/mints/wisdomclean/ui/fragment/MyFragment.kt
View file @
fb7ca523
...
...
@@ -108,21 +108,21 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
private
fun
loginStatus
(
consumer
:
UserBean
)
{
// 1-匹配用户
if
(
consumer
.
activiteFlag
==
0
)
{
// 未匹配
ll_my_vip
.
visibility
=
View
.
GONE
ll_my_payrecord
.
visibility
=
View
.
GONE
ll_contactus
.
visibility
=
View
.
GONE
line_my_payrecord
.
visibility
=
View
.
GONE
line_my_contactus
.
visibility
=
View
.
GONE
}
else
{
// 匹配
ll_my_vip
.
visibility
=
View
.
VISIBLE
ll_my_payrecord
.
visibility
=
View
.
VISIBLE
ll_contactus
.
visibility
=
View
.
VISIBLE
line_my_payrecord
.
visibility
=
View
.
VISIBLE
line_my_contactus
.
visibility
=
View
.
VISIBLE
}
//
if (consumer.activiteFlag == 0) {
//
// 未匹配
//
ll_my_vip.visibility = View.GONE
//
ll_my_payrecord.visibility = View.GONE
//
ll_contactus.visibility = View.GONE
//
line_my_payrecord.visibility = View.GONE
//
line_my_contactus.visibility = View.GONE
//
} else {
//
// 匹配
//
ll_my_vip.visibility = View.VISIBLE
//
ll_my_payrecord.visibility = View.VISIBLE
//
ll_contactus.visibility = View.VISIBLE
//
line_my_payrecord.visibility = View.VISIBLE
//
line_my_contactus.visibility = View.VISIBLE
//
}
// 2-登录
if
(
userManager
.
userIsLogin
())
{
...
...
video/app/src/main/res/layout/fragment_main_my.xml
View file @
fb7ca523
...
...
@@ -64,8 +64,7 @@
android:layout_marginBottom=
"20dp"
android:background=
"@mipmap/bg_my_vip"
android:orientation=
"vertical"
android:paddingLeft=
"24dp"
android:visibility=
"gone"
>
android:paddingLeft=
"24dp"
>
<TextView
android:id=
"@+id/tv_my_vip"
...
...
@@ -174,8 +173,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
android:paddingStart=
"20dp"
android:paddingEnd=
"20dp"
android:visibility=
"gone"
>
android:paddingEnd=
"20dp"
>
<TextView
android:layout_width=
"0dp"
...
...
@@ -197,8 +195,7 @@
android:id=
"@+id/line_my_payrecord"
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/my_color_gray"
android:visibility=
"gone"
/>
android:background=
"@color/my_color_gray"
/>
<LinearLayout
android:id=
"@+id/ll_contactus"
...
...
@@ -207,8 +204,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
android:paddingStart=
"20dp"
android:paddingEnd=
"20dp"
android:visibility=
"gone"
>
android:paddingEnd=
"20dp"
>
<TextView
android:id=
"@+id/tv_contact"
...
...
@@ -230,8 +226,7 @@
android:id=
"@+id/line_my_contactus"
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/my_color_gray"
android:visibility=
"gone"
/>
android:background=
"@color/my_color_gray"
/>
<LinearLayout
android:id=
"@+id/ll_my_setting"
...
...
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