Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
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
杨凯
YDL-Component-Medical
Commits
d9b18b5a
Commit
d9b18b5a
authored
Feb 23, 2020
by
konghaorui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级组件版本号、补充user模块页面沉浸式
parent
9f789df6
Hide whitespace changes
Inline
Side-by-side
Showing
60 changed files
with
365 additions
and
108 deletions
+365
-108
config.gradle
config.gradle
+40
-40
FlutterCourseHomeFragment.kt
m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt
+3
-0
build.gradle
m-dynamic/build.gradle
+1
-1
home_test_item_view.xml
m-home/src/xlzx/res/layout/home_test_item_view.xml
+1
-1
YdlHomeFragment.kt
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
+1
-0
home_confide_expert_info_view.xml
m-home/src/ydl/res/layout/home_confide_expert_info_view.xml
+1
-1
home_consult_item_view.xml
m-home/src/ydl/res/layout/home_consult_item_view.xml
+1
-1
home_fragment.xml
m-home/src/ydl/res/layout/home_fragment.xml
+2
-2
home_test_item_view.xml
m-home/src/ydl/res/layout/home_test_item_view.xml
+1
-1
AndroidManifest.xml
m-user/src/main/AndroidManifest.xml
+47
-20
AboutUsActivity.java
m-user/src/main/java/com/yidianling/user/mine/AboutUsActivity.java
+8
-0
AccountHistoryActivity.java
m-user/src/main/java/com/yidianling/user/mine/AccountHistoryActivity.java
+8
-4
AccountSettingActivity.java
m-user/src/main/java/com/yidianling/user/mine/AccountSettingActivity.java
+8
-1
AddAccountActivity.kt
m-user/src/main/java/com/yidianling/user/mine/AddAccountActivity.kt
+7
-2
ChooseAccountActivity.kt
m-user/src/main/java/com/yidianling/user/mine/ChooseAccountActivity.kt
+8
-3
ContactCustomerServiceActivity.java
m-user/src/main/java/com/yidianling/user/mine/ContactCustomerServiceActivity.java
+9
-0
FeedBackActivity.kt
m-user/src/main/java/com/yidianling/user/mine/FeedBackActivity.kt
+4
-1
FeedBackSuccessActivity.kt
m-user/src/main/java/com/yidianling/user/mine/FeedBackSuccessActivity.kt
+5
-0
HelpActivity.java
m-user/src/main/java/com/yidianling/user/mine/HelpActivity.java
+9
-0
MyFeedBackActivity.kt
m-user/src/main/java/com/yidianling/user/mine/MyFeedBackActivity.kt
+4
-0
NotificationsSettingActivity.java
m-user/src/main/java/com/yidianling/user/mine/NotificationsSettingActivity.java
+9
-0
PersonalDesActivity.java
m-user/src/main/java/com/yidianling/user/mine/PersonalDesActivity.java
+6
-1
PersonalInfoActivity.java
m-user/src/main/java/com/yidianling/user/mine/PersonalInfoActivity.java
+6
-1
PhoneChangeActivity.java
m-user/src/main/java/com/yidianling/user/mine/PhoneChangeActivity.java
+7
-0
PwdCheckActivity.java
m-user/src/main/java/com/yidianling/user/mine/PwdCheckActivity.java
+7
-0
RechargeActivity.java
m-user/src/main/java/com/yidianling/user/mine/RechargeActivity.java
+6
-0
RechargeResultActivity.java
m-user/src/main/java/com/yidianling/user/mine/RechargeResultActivity.java
+8
-0
SetInfoActivity.java
m-user/src/main/java/com/yidianling/user/mine/SetInfoActivity.java
+8
-1
WithDrawActivity.kt
m-user/src/main/java/com/yidianling/user/mine/WithDrawActivity.kt
+4
-1
WithDrawSuccessActivity.kt
m-user/src/main/java/com/yidianling/user/mine/WithDrawSuccessActivity.kt
+5
-0
InputPassWordActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
+1
-0
SecretActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/SecretActivity.kt
+1
-4
VerificationCodeActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt
+1
-0
WithDrawTipsView.kt
m-user/src/main/java/com/yidianling/user/widget/WithDrawTipsView.kt
+85
-0
app_redpacket_tixing.png
m-user/src/main/res/drawable-xhdpi/app_redpacket_tixing.png
+0
-0
user_activity_check_password.xml
m-user/src/main/res/layout/user_activity_check_password.xml
+1
-0
user_activity_fill_info.xml
m-user/src/main/res/layout/user_activity_fill_info.xml
+1
-0
user_activity_finger_print_check.xml
m-user/src/main/res/layout/user_activity_finger_print_check.xml
+1
-0
user_activity_finger_print_set.xml
m-user/src/main/res/layout/user_activity_finger_print_set.xml
+1
-0
user_mine_activity_about_us.xml
m-user/src/main/res/layout/user_mine_activity_about_us.xml
+2
-1
user_mine_activity_account_history.xml
m-user/src/main/res/layout/user_mine_activity_account_history.xml
+3
-2
user_mine_activity_account_setting.xml
m-user/src/main/res/layout/user_mine_activity_account_setting.xml
+2
-1
user_mine_activity_add_account.xml
m-user/src/main/res/layout/user_mine_activity_add_account.xml
+2
-1
user_mine_activity_choose_account.xml
m-user/src/main/res/layout/user_mine_activity_choose_account.xml
+2
-1
user_mine_activity_contact_customer_service.xml
m-user/src/main/res/layout/user_mine_activity_contact_customer_service.xml
+2
-1
user_mine_activity_edit_account.xml
m-user/src/main/res/layout/user_mine_activity_edit_account.xml
+2
-1
user_mine_activity_feed_back.xml
m-user/src/main/res/layout/user_mine_activity_feed_back.xml
+1
-1
user_mine_activity_feed_back_success.xml
m-user/src/main/res/layout/user_mine_activity_feed_back_success.xml
+1
-1
user_mine_activity_mine_help.xml
m-user/src/main/res/layout/user_mine_activity_mine_help.xml
+2
-1
user_mine_activity_my_feed_back.xml
m-user/src/main/res/layout/user_mine_activity_my_feed_back.xml
+1
-1
user_mine_activity_notifications_setting.xml
m-user/src/main/res/layout/user_mine_activity_notifications_setting.xml
+2
-1
user_mine_activity_personal_des.xml
m-user/src/main/res/layout/user_mine_activity_personal_des.xml
+1
-1
user_mine_activity_personal_info.xml
m-user/src/main/res/layout/user_mine_activity_personal_info.xml
+2
-1
user_mine_activity_phonechange.xml
m-user/src/main/res/layout/user_mine_activity_phonechange.xml
+2
-1
user_mine_activity_pwdcheck.xml
m-user/src/main/res/layout/user_mine_activity_pwdcheck.xml
+2
-1
user_mine_activity_recharge.xml
m-user/src/main/res/layout/user_mine_activity_recharge.xml
+2
-1
user_mine_activity_recharge_result.xml
m-user/src/main/res/layout/user_mine_activity_recharge_result.xml
+2
-1
user_mine_activity_set_info.xml
m-user/src/main/res/layout/user_mine_activity_set_info.xml
+1
-0
user_mine_activity_with_draw.xml
m-user/src/main/res/layout/user_mine_activity_with_draw.xml
+3
-2
user_mine_activity_with_draw_success.xml
m-user/src/main/res/layout/user_mine_activity_with_draw_success.xml
+2
-1
No files found.
config.gradle
View file @
d9b18b5a
...
@@ -42,40 +42,40 @@ ext {
...
@@ -42,40 +42,40 @@ ext {
ydlPublishVersion
=
[
ydlPublishVersion
=
[
// -------------- 业务模块 --------------
// -------------- 业务模块 --------------
//第三步 若干
//第三步 若干
"m-confide"
:
"0.0.4
7.7
"
,
"m-confide"
:
"0.0.4
8.1
"
,
"m-consultant"
:
"0.0.5
7.4
"
,
"m-consultant"
:
"0.0.5
8.1
"
,
"m-fm"
:
"0.0.2
8
"
,
"m-fm"
:
"0.0.2
9.1
"
,
"m-user"
:
"0.0.5
8.2
"
,
"m-user"
:
"0.0.5
9.3
"
,
"m-home"
:
"0.0.
19.1
"
,
"m-home"
:
"0.0.
20.2
"
,
"m-im"
:
"0.0.1
4
.1"
,
"m-im"
:
"0.0.1
5
.1"
,
"m-dynamic"
:
"0.0.
6.1
"
,
"m-dynamic"
:
"0.0.
7.2
"
,
"m-muse"
:
"0.0.2
7
"
,
"m-muse"
:
"0.0.2
8.1
"
,
"m-tests"
:
"0.0.21"
,
"m-tests"
:
"0.0.2
3.
1"
,
"m-course"
:
"0.0.4
0
.1"
,
"m-course"
:
"0.0.4
1
.1"
,
//-------------- 业务模块 API 层 --------------
//-------------- 业务模块 API 层 --------------
"m-audioim-api"
:
"0.0.
5
"
,
"m-audioim-api"
:
"0.0.
6
"
,
"m-confide-api"
:
"0.0.
1
.1"
,
"m-confide-api"
:
"0.0.
2
.1"
,
"m-consultant-api"
:
"0.0.
4
"
,
"m-consultant-api"
:
"0.0.
5.2
"
,
"m-course-api"
:
"0.0.
2
"
,
"m-course-api"
:
"0.0.
3.6
"
,
"m-fm-api"
:
"0.0.
2
"
,
"m-fm-api"
:
"0.0.
3
"
,
"m-muse-api"
:
"0.0.1"
,
"m-muse-api"
:
"0.0.1"
,
"m-tests-api"
:
"0.0.
1
"
,
"m-tests-api"
:
"0.0.
2
"
,
"m-user-api"
:
"0.0.
9
"
,
"m-user-api"
:
"0.0.
10.15
"
,
"m-home-api"
:
"0.0.
3
"
,
"m-home-api"
:
"0.0.
4.1
"
,
"m-im-api"
:
"0.0.
8
"
,
"m-im-api"
:
"0.0.
12.17
"
,
"m-dynamic-api"
:
"0.0.
1
"
,
"m-dynamic-api"
:
"0.0.
3.7
"
,
//-------------- 功能组件 --------------
//-------------- 功能组件 --------------
//第一步
//第一步
"ydl-platform"
:
"0.0.3
8.2
"
,
"ydl-platform"
:
"0.0.3
9.1
"
,
//第二步 若干
//第二步 若干
"ydl-webview"
:
"0.0.3
7
.1"
,
"ydl-webview"
:
"0.0.3
8
.1"
,
"ydl-media"
:
"0.0.2
0
"
,
"ydl-media"
:
"0.0.2
1.1
"
,
"ydl-pay"
:
"0.0.1
7
"
,
"ydl-pay"
:
"0.0.1
8.1
"
,
"m-audioim"
:
"0.0.4
6
.5"
,
"m-audioim"
:
"0.0.4
7
.5"
,
"ydl-flutter-base"
:
"0.0.10"
,
"ydl-flutter-base"
:
"0.0.10"
,
//以下 几乎不会动
//以下 几乎不会动
...
@@ -101,27 +101,27 @@ ext {
...
@@ -101,27 +101,27 @@ ext {
"m-tests"
:
"0.0.18.1"
,
"m-tests"
:
"0.0.18.1"
,
"m-course"
:
"0.0.34.10"
,
"m-course"
:
"0.0.34.10"
,
//-------------- 业务模块 API 层 --------------
//-------------- 业务模块 API 层 --------------
"m-audioim-api"
:
"0.0.
5
"
,
"m-audioim-api"
:
"0.0.
6
"
,
"m-confide-api"
:
"0.0.
1
.1"
,
"m-confide-api"
:
"0.0.
2
.1"
,
"m-consultant-api"
:
"0.0.
4
"
,
"m-consultant-api"
:
"0.0.
5.2
"
,
"m-course-api"
:
"0.0.
2
"
,
"m-course-api"
:
"0.0.
3.6
"
,
"m-fm-api"
:
"0.0.
2
"
,
"m-fm-api"
:
"0.0.
3
"
,
"m-muse-api"
:
"0.0.1"
,
"m-muse-api"
:
"0.0.1"
,
"m-tests-api"
:
"0.0.
1
"
,
"m-tests-api"
:
"0.0.
2
"
,
"m-user-api"
:
"0.0.
9
"
,
"m-user-api"
:
"0.0.
10.15
"
,
"m-home-api"
:
"0.0.
3
"
,
"m-home-api"
:
"0.0.
4.1
"
,
"m-im-api"
:
"0.0.
8
"
,
"m-im-api"
:
"0.0.
12.17
"
,
"m-dynamic-api"
:
"0.0.
1
"
,
"m-dynamic-api"
:
"0.0.
3.7
"
,
//-------------- 功能组件 --------------
//-------------- 功能组件 --------------
//第一步
//第一步
"ydl-platform"
:
"0.0.3
8.2
"
,
"ydl-platform"
:
"0.0.3
9.1
"
,
//第二步 若干
//第二步 若干
"ydl-webview"
:
"0.0.3
7
.1"
,
"ydl-webview"
:
"0.0.3
8
.1"
,
"ydl-media"
:
"0.0.2
0
"
,
"ydl-media"
:
"0.0.2
1.1
"
,
"ydl-pay"
:
"0.0.1
7
"
,
"ydl-pay"
:
"0.0.1
8.1
"
,
"m-audioim"
:
"0.0.4
6
.5"
,
"m-audioim"
:
"0.0.4
7
.5"
,
"ydl-flutter-base"
:
"0.0.10"
,
"ydl-flutter-base"
:
"0.0.10"
,
//以下 几乎不会动
//以下 几乎不会动
...
...
m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt
View file @
d9b18b5a
...
@@ -4,6 +4,7 @@ import CoursePlugin
...
@@ -4,6 +4,7 @@ import CoursePlugin
import
android.annotation.SuppressLint
import
android.annotation.SuppressLint
import
android.os.Handler
import
android.os.Handler
import
android.text.TextUtils
import
android.text.TextUtils
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.alibaba.android.arouter.launcher.ARouter
import
com.alibaba.android.arouter.launcher.ARouter
import
com.channel.ydl_flutter_base.base.BaseFlutterFragment
import
com.channel.ydl_flutter_base.base.BaseFlutterFragment
import
com.google.gson.Gson
import
com.google.gson.Gson
...
@@ -29,6 +30,7 @@ import io.reactivex.schedulers.Schedulers
...
@@ -29,6 +30,7 @@ import io.reactivex.schedulers.Schedulers
import
java.text.SimpleDateFormat
import
java.text.SimpleDateFormat
import
java.util.*
import
java.util.*
/**
/**
* @author jiucheng
* @author jiucheng
* @描述:课程频道页(flutter)
* @描述:课程频道页(flutter)
...
@@ -36,6 +38,7 @@ import java.util.*
...
@@ -36,6 +38,7 @@ import java.util.*
* @Company 壹点灵
* @Company 壹点灵
* @date 2019/10/22
* @date 2019/10/22
*/
*/
@Route
(
path
=
"/course/course"
)
class
FlutterCourseHomeFragment
:
BaseFlutterFragment
()
{
class
FlutterCourseHomeFragment
:
BaseFlutterFragment
()
{
...
...
m-dynamic/build.gradle
View file @
d9b18b5a
...
@@ -88,7 +88,7 @@ dependencies {
...
@@ -88,7 +88,7 @@ dependencies {
implementation
'com.github.ksoichiro:android-observablescrollview:1.6.0'
implementation
'com.github.ksoichiro:android-observablescrollview:1.6.0'
implementation
'com.pnikosis:materialish-progress:1.7'
implementation
'com.pnikosis:materialish-progress:1.7'
implementation
'com.daimajia.numberprogressbar:library:1.4@aar'
implementation
'com.daimajia.numberprogressbar:library:1.4@aar'
implementation
'
com.github.faruktoptas:FancyShowCaseView:0.1.1
'
implementation
'
me.toptas.fancyshowcase:fancyshowcaseview:1.1.5
'
kapt
rootProject
.
ext
.
dependencies
[
"butterknife-compiler"
]
kapt
rootProject
.
ext
.
dependencies
[
"butterknife-compiler"
]
api
rootProject
.
ext
.
dependencies
[
"butterknife"
]
api
rootProject
.
ext
.
dependencies
[
"butterknife"
]
api
rootProject
.
ext
.
dependencies
[
"ydl-user-router"
]
api
rootProject
.
ext
.
dependencies
[
"ydl-user-router"
]
...
...
m-home/src/xlzx/res/layout/home_test_item_view.xml
View file @
d9b18b5a
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
android:visibility=
"gone"
android:visibility=
"gone"
android:layout_marginBottom=
"@dimen/platform_dp_12"
android:layout_marginBottom=
"@dimen/platform_dp_12"
android:id=
"@+id/view_test_line"
android:id=
"@+id/view_test_line"
style=
"@style/viewline"
style=
"@style/
platform_
viewline"
android:layout_marginLeft=
"82dp"
android:layout_marginLeft=
"82dp"
android:background=
"@color/platform_color_EBEBEB"
/>
android:background=
"@color/platform_color_EBEBEB"
/>
...
...
m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt
View file @
d9b18b5a
...
@@ -11,6 +11,7 @@ import android.text.TextUtils
...
@@ -11,6 +11,7 @@ import android.text.TextUtils
import
android.view.View
import
android.view.View
import
android.widget.LinearLayout
import
android.widget.LinearLayout
import
android.widget.RelativeLayout
import
android.widget.RelativeLayout
import
com.alibaba.android.arouter.facade.annotation.Route
import
android.widget.TextView
import
android.widget.TextView
import
com.ydl.webview.H5Params
import
com.ydl.webview.H5Params
import
com.ydl.webview.NewH5Activity
import
com.ydl.webview.NewH5Activity
...
...
m-home/src/ydl/res/layout/home_confide_expert_info_view.xml
View file @
d9b18b5a
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
<View
<View
android:id=
"@+id/view_line"
android:id=
"@+id/view_line"
style=
"@style/viewline"
style=
"@style/
platform_
viewline"
android:layout_below=
"@+id/tv_price"
android:layout_below=
"@+id/tv_price"
android:layout_marginLeft=
"15dp"
android:layout_marginLeft=
"15dp"
android:layout_marginRight=
"15dp"
android:layout_marginRight=
"15dp"
...
...
m-home/src/ydl/res/layout/home_consult_item_view.xml
View file @
d9b18b5a
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
<View
<View
android:id=
"@+id/view_line"
android:id=
"@+id/view_line"
style=
"@style/viewline"
style=
"@style/
platform_
viewline"
android:layout_below=
"@+id/tv_price"
android:layout_below=
"@+id/tv_price"
android:layout_marginLeft=
"15dp"
android:layout_marginLeft=
"15dp"
android:layout_marginRight=
"15dp"
android:layout_marginRight=
"15dp"
...
...
m-home/src/ydl/res/layout/home_fragment.xml
View file @
d9b18b5a
...
@@ -213,7 +213,7 @@
...
@@ -213,7 +213,7 @@
app:tabTextAppearance=
"@style/TabLayoutTextSize"
app:tabTextAppearance=
"@style/TabLayoutTextSize"
app:tabTextColor=
"#333"
/>
app:tabTextColor=
"#333"
/>
<View
style=
"@style/viewline"
/>
<View
style=
"@style/
platform_
viewline"
/>
</LinearLayout>
</LinearLayout>
<LinearLayout
<LinearLayout
...
@@ -237,7 +237,7 @@
...
@@ -237,7 +237,7 @@
app:tabTextAppearance=
"@style/TabLayoutTextSize"
app:tabTextAppearance=
"@style/TabLayoutTextSize"
app:tabTextColor=
"#333"
/>
app:tabTextColor=
"#333"
/>
<View
style=
"@style/viewline"
/>
<View
style=
"@style/
platform_
viewline"
/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
</FrameLayout>
</FrameLayout>
m-home/src/ydl/res/layout/home_test_item_view.xml
View file @
d9b18b5a
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
android:visibility=
"gone"
android:visibility=
"gone"
android:layout_marginBottom=
"@dimen/platform_dp_12"
android:layout_marginBottom=
"@dimen/platform_dp_12"
android:id=
"@+id/view_test_line"
android:id=
"@+id/view_test_line"
style=
"@style/viewline"
style=
"@style/
platform_
viewline"
android:layout_marginLeft=
"82dp"
android:layout_marginLeft=
"82dp"
android:background=
"@color/platform_color_EBEBEB"
/>
android:background=
"@color/platform_color_EBEBEB"
/>
...
...
m-user/src/main/AndroidManifest.xml
View file @
d9b18b5a
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<application>
<application>
<activity
<activity
android:name=
".ui.LoginActivity"
android:name=
".ui.LoginActivity"
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
".ui.CountryListActivity"
android:name=
".ui.CountryListActivity"
...
@@ -54,12 +55,15 @@
...
@@ -54,12 +55,15 @@
<activity
<activity
android:name=
".ui.login.RegisterAndLoginActivity"
android:name=
".ui.login.RegisterAndLoginActivity"
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
".ui.login.VerificationCodeActivity"
android:name=
".ui.login.VerificationCodeActivity"
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
".ui.login.InputPassWordActivity"
android:name=
".ui.login.InputPassWordActivity"
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
".ui.login.H5Activity"
android:name=
".ui.login.H5Activity"
...
@@ -67,17 +71,20 @@
...
@@ -67,17 +71,20 @@
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
".ui.AliAuthDemoActivity"
android:name=
".ui.AliAuthDemoActivity"
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.mobile.auth.gatewayauth.LoginAuthActivity"
android:name=
"com.mobile.auth.gatewayauth.LoginAuthActivity"
android:configChanges=
"orientation|keyboardHidden|screenSize"
android:configChanges=
"orientation|keyboardHidden|screenSize"
android:exported=
"false"
android:exported=
"false"
android:launchMode=
"singleTask"
android:launchMode=
"singleTask"
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.cmic.sso.sdk.activity.LoginAuthActivity"
android:name=
"com.cmic.sso.sdk.activity.LoginAuthActivity"
android:configChanges=
"orientation|keyboardHidden|screenSize"
android:configChanges=
"orientation|keyboardHidden|screenSize"
android:launchMode=
"singleTask"
android:launchMode=
"singleTask"
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
".wxapi.WXEntryActivity"
android:name=
".wxapi.WXEntryActivity"
...
@@ -92,69 +99,89 @@
...
@@ -92,69 +99,89 @@
<activity
<activity
android:name=
"com.yidianling.user.mine.AboutUsActivity"
android:name=
"com.yidianling.user.mine.AboutUsActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.AccountHistoryActivity"
android:name=
"com.yidianling.user.mine.AccountHistoryActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.AccountSettingActivity"
android:name=
"com.yidianling.user.mine.AccountSettingActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.ContactCustomerServiceActivity"
android:name=
"com.yidianling.user.mine.ContactCustomerServiceActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.FeedBackActivity"
android:name=
"com.yidianling.user.mine.FeedBackActivity"
android:screenOrientation=
"portrait"
android:screenOrientation=
"portrait"
android:windowSoftInputMode=
"adjustPan|stateUnspecified"
/>
android:windowSoftInputMode=
"adjustPan|stateUnspecified"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.MyFeedBackActivity"
android:name=
"com.yidianling.user.mine.MyFeedBackActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.FeedBackSuccessActivity"
android:name=
"com.yidianling.user.mine.FeedBackSuccessActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.HelpActivity"
android:name=
"com.yidianling.user.mine.HelpActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.NotificationsSettingActivity"
android:name=
"com.yidianling.user.mine.NotificationsSettingActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.PersonalDesActivity"
android:name=
"com.yidianling.user.mine.PersonalDesActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.PersonalInfoActivity"
android:name=
"com.yidianling.user.mine.PersonalInfoActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.RechargeActivity"
android:name=
"com.yidianling.user.mine.RechargeActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.SetInfoActivity"
android:name=
"com.yidianling.user.mine.SetInfoActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.WithDrawActivity"
android:name=
"com.yidianling.user.mine.WithDrawActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.WithDrawSuccessActivity"
android:name=
"com.yidianling.user.mine.WithDrawSuccessActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.ChooseAccountActivity"
android:name=
"com.yidianling.user.mine.ChooseAccountActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.EditAccountActivity"
android:name=
"com.yidianling.user.mine.EditAccountActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.AddAccountActivity"
android:name=
"com.yidianling.user.mine.AddAccountActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.RechargeResultActivity"
android:name=
"com.yidianling.user.mine.RechargeResultActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.PwdCheckActivity"
android:name=
"com.yidianling.user.mine.PwdCheckActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
<activity
<activity
android:name=
"com.yidianling.user.mine.PhoneChangeActivity"
android:name=
"com.yidianling.user.mine.PhoneChangeActivity"
android:screenOrientation=
"portrait"
/>
android:theme=
"@style/platform_NoTitleTheme"
android:screenOrientation=
"portrait"
/>
</application>
</application>
...
...
m-user/src/main/java/com/yidianling/user/mine/AboutUsActivity.java
View file @
d9b18b5a
...
@@ -9,6 +9,7 @@ import android.widget.TextView;
...
@@ -9,6 +9,7 @@ import android.widget.TextView;
import
com.ydl.webview.H5Params
;
import
com.ydl.webview.H5Params
;
import
com.ydl.webview.NewH5Activity
;
import
com.ydl.webview.NewH5Activity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.bean.VersionData
;
import
com.ydl.ydlcommon.bean.VersionData
;
import
com.ydl.ydlcommon.utils.ApkUpdateDialog
;
import
com.ydl.ydlcommon.utils.ApkUpdateDialog
;
import
com.ydl.ydlcommon.view.JumpTextView
;
import
com.ydl.ydlcommon.view.JumpTextView
;
...
@@ -19,6 +20,8 @@ import com.yidianling.user.mine.data.AppDataManager;
...
@@ -19,6 +20,8 @@ import com.yidianling.user.mine.data.AppDataManager;
import
com.yidianling.user.mine.utils.UpdateUtil
;
import
com.yidianling.user.mine.utils.UpdateUtil
;
import
com.yidianling.user.ui.login.H5Activity
;
import
com.yidianling.user.ui.login.H5Activity
;
import
org.jetbrains.annotations.NotNull
;
/**
/**
* 关于我们呢
* 关于我们呢
...
@@ -51,6 +54,11 @@ public class AboutUsActivity extends BaseActivity implements View.OnClickListen
...
@@ -51,6 +54,11 @@ public class AboutUsActivity extends BaseActivity implements View.OnClickListen
//版本
//版本
private
VersionData
version
;
private
VersionData
version
;
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
...
...
m-user/src/main/java/com/yidianling/user/mine/AccountHistoryActivity.java
View file @
d9b18b5a
...
@@ -11,6 +11,7 @@ import com.ydl.webview.H5Params;
...
@@ -11,6 +11,7 @@ import com.ydl.webview.H5Params;
import
com.ydl.webview.NewH5Activity
;
import
com.ydl.webview.NewH5Activity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.config.HttpConfig
;
import
com.ydl.ydlcommon.base.config.HttpConfig
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.utils.remind.ToastHelper
;
import
com.ydl.ydlcommon.utils.remind.ToastHelper
;
...
@@ -20,8 +21,8 @@ import com.yidianling.common.tools.ToastUtil;
...
@@ -20,8 +21,8 @@ import com.yidianling.common.tools.ToastUtil;
import
com.yidianling.user.R
;
import
com.yidianling.user.R
;
import
com.yidianling.user.UserConstants
;
import
com.yidianling.user.UserConstants
;
import
com.yidianling.user.UserHelper
;
import
com.yidianling.user.UserHelper
;
import
com.yidianling.user.bean.FundData
;
import
com.yidianling.user.api.utils.UserApiServiceUtils
;
import
com.yidianling.user.api.utils.UserApiServiceUtils
;
import
com.yidianling.user.bean.FundData
;
import
com.yidianling.user.mine.data.AppDataManager
;
import
com.yidianling.user.mine.data.AppDataManager
;
import
com.yidianling.user.mine.view.LoadMoreFooterView
;
import
com.yidianling.user.mine.view.LoadMoreFooterView
;
...
@@ -65,6 +66,12 @@ public class AccountHistoryActivity extends BaseActivity implements PtrHandler,
...
@@ -65,6 +66,12 @@ public class AccountHistoryActivity extends BaseActivity implements PtrHandler,
// @BindView(R.id.store_house_ptr_frame)
// @BindView(R.id.store_house_ptr_frame)
PtrFrameLayout
store_house_ptr_frame
;
PtrFrameLayout
store_house_ptr_frame
;
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
return
R
.
layout
.
user_mine_activity_account_history
;
return
R
.
layout
.
user_mine_activity_account_history
;
...
@@ -83,9 +90,6 @@ public class AccountHistoryActivity extends BaseActivity implements PtrHandler,
...
@@ -83,9 +90,6 @@ public class AccountHistoryActivity extends BaseActivity implements PtrHandler,
void
init
()
{
void
init
()
{
title_bar
.
setmRightText
(
"提现"
);
title_bar
.
setmRightText
(
"提现"
);
title_bar
.
setRightTextColor
(
getResources
().
getColor
(
R
.
color
.
user_main_theme
));
title_bar
.
setmLeftText
(
"返回"
);
title_bar
.
setLeftTextColor
(
getResources
().
getColor
(
R
.
color
.
user_main_theme
));
title_bar
.
setOnRightTextClick
(
new
TitleBar
.
OnTitleBarTextClick
()
{
title_bar
.
setOnRightTextClick
(
new
TitleBar
.
OnTitleBarTextClick
()
{
@Override
@Override
public
void
onClick
(
View
view
,
boolean
isActive
)
{
public
void
onClick
(
View
view
,
boolean
isActive
)
{
...
...
m-user/src/main/java/com/yidianling/user/mine/AccountSettingActivity.java
View file @
d9b18b5a
...
@@ -14,6 +14,7 @@ import com.ydl.audioim.YDLavManager;
...
@@ -14,6 +14,7 @@ import com.ydl.audioim.YDLavManager;
import
com.ydl.webview.H5Params
;
import
com.ydl.webview.H5Params
;
import
com.ydl.webview.NewH5Activity
;
import
com.ydl.webview.NewH5Activity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
import
com.ydl.ydlcommon.router.YdlCommonOut
;
import
com.ydl.ydlcommon.router.YdlCommonOut
;
...
@@ -29,6 +30,7 @@ import com.yidianling.user.LoginUtils;
...
@@ -29,6 +30,7 @@ import com.yidianling.user.LoginUtils;
import
com.yidianling.user.R
;
import
com.yidianling.user.R
;
import
com.yidianling.user.UserConstants
;
import
com.yidianling.user.UserConstants
;
import
com.yidianling.user.UserHelper
;
import
com.yidianling.user.UserHelper
;
import
com.yidianling.user.api.event.RefreshRecentContactListEvent
;
import
com.yidianling.user.event.UpdateBindStatusEvent
;
import
com.yidianling.user.event.UpdateBindStatusEvent
;
import
com.yidianling.user.http.LoginApiRequestUtil
;
import
com.yidianling.user.http.LoginApiRequestUtil
;
import
com.yidianling.user.http.UserHttp
;
import
com.yidianling.user.http.UserHttp
;
...
@@ -36,7 +38,6 @@ import com.yidianling.user.http.UserHttpImpl;
...
@@ -36,7 +38,6 @@ import com.yidianling.user.http.UserHttpImpl;
import
com.yidianling.user.http.request.BindQQ
;
import
com.yidianling.user.http.request.BindQQ
;
import
com.yidianling.user.http.request.BindWX
;
import
com.yidianling.user.http.request.BindWX
;
import
com.yidianling.user.http.request.UnBindThirdLoginParam
;
import
com.yidianling.user.http.request.UnBindThirdLoginParam
;
import
com.yidianling.user.api.event.RefreshRecentContactListEvent
;
import
com.yidianling.user.route.UserIn
;
import
com.yidianling.user.route.UserIn
;
import
com.yidianling.user.ui.login.RegisterAndLoginActivity
;
import
com.yidianling.user.ui.login.RegisterAndLoginActivity
;
import
com.yidianling.user.ui.login.VerificationCodeActivity
;
import
com.yidianling.user.ui.login.VerificationCodeActivity
;
...
@@ -67,6 +68,12 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
...
@@ -67,6 +68,12 @@ public class AccountSettingActivity extends BaseActivity implements View.OnClick
JumpTextView
jtv_qq
;
JumpTextView
jtv_qq
;
RoundCornerButton
rcb_exit
;
RoundCornerButton
rcb_exit
;
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
return
R
.
layout
.
user_mine_activity_account_setting
;
return
R
.
layout
.
user_mine_activity_account_setting
;
...
...
m-user/src/main/java/com/yidianling/user/mine/AddAccountActivity.kt
View file @
d9b18b5a
...
@@ -5,12 +5,13 @@ import android.content.Intent
...
@@ -5,12 +5,13 @@ import android.content.Intent
import
android.support.v4.app.Fragment
import
android.support.v4.app.Fragment
import
android.support.v4.view.ViewPager
import
android.support.v4.view.ViewPager
import
android.view.View
import
android.view.View
import
com.yidianling.user.mine.fragment.AddAliAccountFragment
import
com.yidianling.user.mine.fragment.AddBankAccountFragment
import
com.ydl.ydlcommon.adapter.FragmentWithTabPagerAdapter
import
com.ydl.ydlcommon.adapter.FragmentWithTabPagerAdapter
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.view.widgets.TopTabSelectLayout
import
com.ydl.ydlcommon.view.widgets.TopTabSelectLayout
import
com.yidianling.user.R
import
com.yidianling.user.R
import
com.yidianling.user.mine.fragment.AddAliAccountFragment
import
com.yidianling.user.mine.fragment.AddBankAccountFragment
import
kotlinx.android.synthetic.main.user_mine_activity_add_account.*
import
kotlinx.android.synthetic.main.user_mine_activity_add_account.*
/**
/**
...
@@ -25,6 +26,10 @@ class AddAccountActivity : BaseActivity() {
...
@@ -25,6 +26,10 @@ class AddAccountActivity : BaseActivity() {
}
}
}
}
override
fun
getStatusViewOptions
():
StatusBarOptions
{
return
StatusBarOptions
(
true
,
true
)
}
override
fun
layoutResId
():
Int
{
override
fun
layoutResId
():
Int
{
return
R
.
layout
.
user_mine_activity_add_account
return
R
.
layout
.
user_mine_activity_add_account
}
}
...
...
m-user/src/main/java/com/yidianling/user/mine/ChooseAccountActivity.kt
View file @
d9b18b5a
...
@@ -7,16 +7,17 @@ import android.content.Intent
...
@@ -7,16 +7,17 @@ import android.content.Intent
import
android.text.TextUtils
import
android.text.TextUtils
import
android.view.View
import
android.view.View
import
android.widget.AdapterView
import
android.widget.AdapterView
import
com.yidianling.user.mine.WithDrawActivity.Companion.INTENT_ACCOUNT_DATA
import
com.yidianling.user.mine.adapter.AccountListAdapter
import
com.yidianling.user.mine.bean.AccountBean
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
import
com.ydl.ydlcommon.utils.TransferCacheUtils
import
com.ydl.ydlcommon.utils.TransferCacheUtils
import
com.ydl.ydlcommon.view.ListNoCancelDialog
import
com.ydl.ydlcommon.view.ListNoCancelDialog
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.user.R
import
com.yidianling.user.R
import
com.yidianling.user.mine.WithDrawActivity.Companion.INTENT_ACCOUNT_DATA
import
com.yidianling.user.mine.adapter.AccountListAdapter
import
com.yidianling.user.mine.bean.AccountBean
import
com.yidianling.user.mine.bean.DefaultAccountCmd
import
com.yidianling.user.mine.bean.DefaultAccountCmd
import
com.yidianling.user.mine.data.AppDataManager
import
com.yidianling.user.mine.data.AppDataManager
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
...
@@ -30,6 +31,10 @@ class ChooseAccountActivity : BaseActivity() {
...
@@ -30,6 +31,10 @@ class ChooseAccountActivity : BaseActivity() {
private
var
adapter
:
AccountListAdapter
?
=
null
private
var
adapter
:
AccountListAdapter
?
=
null
private
var
dataLists
:
MutableList
<
AccountBean
>?
=
null
private
var
dataLists
:
MutableList
<
AccountBean
>?
=
null
override
fun
getStatusViewOptions
():
StatusBarOptions
{
return
StatusBarOptions
(
true
,
true
)
}
override
fun
layoutResId
():
Int
{
override
fun
layoutResId
():
Int
{
return
R
.
layout
.
user_mine_activity_choose_account
return
R
.
layout
.
user_mine_activity_choose_account
}
}
...
...
m-user/src/main/java/com/yidianling/user/mine/ContactCustomerServiceActivity.java
View file @
d9b18b5a
...
@@ -9,12 +9,15 @@ import android.widget.TextView;
...
@@ -9,12 +9,15 @@ import android.widget.TextView;
import
com.tbruyelle.rxpermissions2.RxPermissions
;
import
com.tbruyelle.rxpermissions2.RxPermissions
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.PlatformDataManager
;
import
com.ydl.ydlcommon.data.PlatformDataManager
;
import
com.ydl.ydlcommon.view.JumpTextView
;
import
com.ydl.ydlcommon.view.JumpTextView
;
import
com.ydl.ydlcommon.view.TitleBar
;
import
com.ydl.ydlcommon.view.TitleBar
;
import
com.ydl.ydlcommon.view.dialog.CommonDialog
;
import
com.ydl.ydlcommon.view.dialog.CommonDialog
;
import
com.yidianling.user.R
;
import
com.yidianling.user.R
;
import
org.jetbrains.annotations.NotNull
;
/**
/**
* 联系客服
* 联系客服
* Created by softrice on 15/12/1.
* Created by softrice on 15/12/1.
...
@@ -37,6 +40,12 @@ public class ContactCustomerServiceActivity extends BaseActivity {
...
@@ -37,6 +40,12 @@ public class ContactCustomerServiceActivity extends BaseActivity {
private
RxPermissions
rxPermissions
;
private
RxPermissions
rxPermissions
;
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
return
R
.
layout
.
user_mine_activity_contact_customer_service
;
return
R
.
layout
.
user_mine_activity_contact_customer_service
;
...
...
m-user/src/main/java/com/yidianling/user/mine/FeedBackActivity.kt
View file @
d9b18b5a
...
@@ -19,6 +19,7 @@ import com.luck.picture.lib.listener.OnResultCallbackListener
...
@@ -19,6 +19,7 @@ import com.luck.picture.lib.listener.OnResultCallbackListener
import
com.ydl.ydlcommon.actions.imagepicker.YDLImagePicker
import
com.ydl.ydlcommon.actions.imagepicker.YDLImagePicker
import
com.ydl.ydlcommon.adapter.custom.PublishImageAdapter
import
com.ydl.ydlcommon.adapter.custom.PublishImageAdapter
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.data.PlatformDataManager
import
com.ydl.ydlcommon.data.PlatformDataManager
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.ui.ParcelableImage
import
com.ydl.ydlcommon.ui.ParcelableImage
...
@@ -54,7 +55,9 @@ class FeedBackActivity : BaseActivity(), View.OnClickListener {
...
@@ -54,7 +55,9 @@ class FeedBackActivity : BaseActivity(), View.OnClickListener {
internal
var
work_time
=
if
(
PlatformDataManager
.
getRam
().
getGlobalInfo
()
==
null
)
"早8:30-凌晨2:00"
else
PlatformDataManager
.
getRam
().
getGlobalInfo
()
?.
info
?.
work_time
internal
var
work_time
=
if
(
PlatformDataManager
.
getRam
().
getGlobalInfo
()
==
null
)
"早8:30-凌晨2:00"
else
PlatformDataManager
.
getRam
().
getGlobalInfo
()
?.
info
?.
work_time
internal
var
tel
=
if
(
PlatformDataManager
.
getRam
().
getGlobalInfo
()
==
null
)
"400-765-1010'"
else
PlatformDataManager
.
getRam
().
getGlobalInfo
()
?.
info
?.
tel
internal
var
tel
=
if
(
PlatformDataManager
.
getRam
().
getGlobalInfo
()
==
null
)
"400-765-1010'"
else
PlatformDataManager
.
getRam
().
getGlobalInfo
()
?.
info
?.
tel
override
fun
getStatusViewOptions
():
StatusBarOptions
{
return
StatusBarOptions
(
true
,
true
)
}
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
setContentView
(
R
.
layout
.
user_mine_activity_feed_back
)
setContentView
(
R
.
layout
.
user_mine_activity_feed_back
)
...
...
m-user/src/main/java/com/yidianling/user/mine/FeedBackSuccessActivity.kt
View file @
d9b18b5a
package
com.yidianling.user.mine
package
com.yidianling.user.mine
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.yidianling.user.R
import
com.yidianling.user.R
import
com.yidianling.user.api.service.IAppService
import
com.yidianling.user.api.service.IAppService
...
@@ -14,6 +15,10 @@ import kotlinx.android.synthetic.main.user_mine_activity_feed_back_success.*
...
@@ -14,6 +15,10 @@ import kotlinx.android.synthetic.main.user_mine_activity_feed_back_success.*
* @date 2018/12/17
* @date 2018/12/17
*/
*/
class
FeedBackSuccessActivity
:
BaseActivity
()
{
class
FeedBackSuccessActivity
:
BaseActivity
()
{
override
fun
getStatusViewOptions
():
StatusBarOptions
{
return
StatusBarOptions
(
true
,
true
)
}
override
fun
layoutResId
():
Int
{
override
fun
layoutResId
():
Int
{
return
R
.
layout
.
user_mine_activity_feed_back_success
return
R
.
layout
.
user_mine_activity_feed_back_success
}
}
...
...
m-user/src/main/java/com/yidianling/user/mine/HelpActivity.java
View file @
d9b18b5a
...
@@ -4,10 +4,13 @@ import android.content.Intent;
...
@@ -4,10 +4,13 @@ import android.content.Intent;
import
android.view.View
;
import
android.view.View
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.view.JumpTextView
;
import
com.ydl.ydlcommon.view.JumpTextView
;
import
com.yidianling.user.R
;
import
com.yidianling.user.R
;
import
com.yidianling.user.mine.data.AppDataManager
;
import
com.yidianling.user.mine.data.AppDataManager
;
import
org.jetbrains.annotations.NotNull
;
/**
/**
* 帮助界面
* 帮助界面
*/
*/
...
@@ -26,6 +29,12 @@ public class HelpActivity extends BaseActivity implements View.OnClickListener {
...
@@ -26,6 +29,12 @@ public class HelpActivity extends BaseActivity implements View.OnClickListener {
return
R
.
layout
.
user_mine_activity_mine_help
;
return
R
.
layout
.
user_mine_activity_mine_help
;
}
}
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
void
initDataAndEvent
()
{
protected
void
initDataAndEvent
()
{
jtv_about_us
=
findViewById
(
R
.
id
.
jtv_about_us
);
jtv_about_us
=
findViewById
(
R
.
id
.
jtv_about_us
);
...
...
m-user/src/main/java/com/yidianling/user/mine/MyFeedBackActivity.kt
View file @
d9b18b5a
...
@@ -11,6 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
...
@@ -11,6 +11,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
import
com.ydl.ydl_image.config.SimpleImageOpConfiger
import
com.ydl.ydl_image.config.SimpleImageOpConfiger
import
com.ydl.ydl_image.manager.YDLImageCacheManager
import
com.ydl.ydl_image.manager.YDLImageCacheManager
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.user.R
import
com.yidianling.user.R
...
@@ -43,6 +44,9 @@ class MyFeedBackActivity : BaseActivity() {
...
@@ -43,6 +44,9 @@ class MyFeedBackActivity : BaseActivity() {
}
}
}
}
override
fun
getStatusViewOptions
():
StatusBarOptions
{
return
StatusBarOptions
(
true
,
true
)
}
override
fun
layoutResId
():
Int
{
override
fun
layoutResId
():
Int
{
return
R
.
layout
.
user_mine_activity_my_feed_back
return
R
.
layout
.
user_mine_activity_my_feed_back
}
}
...
...
m-user/src/main/java/com/yidianling/user/mine/NotificationsSettingActivity.java
View file @
d9b18b5a
...
@@ -14,11 +14,14 @@ import android.widget.ToggleButton;
...
@@ -14,11 +14,14 @@ import android.widget.ToggleButton;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.PlatformDataManager
;
import
com.ydl.ydlcommon.data.PlatformDataManager
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
import
com.yidianling.im.api.service.IImService
;
import
com.yidianling.im.api.service.IImService
;
import
com.yidianling.user.R
;
import
com.yidianling.user.R
;
import
org.jetbrains.annotations.NotNull
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Method
;
...
@@ -39,6 +42,12 @@ public class NotificationsSettingActivity extends BaseActivity {
...
@@ -39,6 +42,12 @@ public class NotificationsSettingActivity extends BaseActivity {
return
R
.
layout
.
user_mine_activity_notifications_setting
;
return
R
.
layout
.
user_mine_activity_notifications_setting
;
}
}
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
void
initDataAndEvent
()
{
protected
void
initDataAndEvent
()
{
tv_isopen
=
findViewById
(
R
.
id
.
tv_isopen
);
tv_isopen
=
findViewById
(
R
.
id
.
tv_isopen
);
...
...
m-user/src/main/java/com/yidianling/user/mine/PersonalDesActivity.java
View file @
d9b18b5a
...
@@ -7,6 +7,7 @@ import android.widget.RelativeLayout;
...
@@ -7,6 +7,7 @@ import android.widget.RelativeLayout;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
...
@@ -41,7 +42,11 @@ public class PersonalDesActivity extends BaseActivity {
...
@@ -41,7 +42,11 @@ public class PersonalDesActivity extends BaseActivity {
RelativeLayout
relaToolBar
;
RelativeLayout
relaToolBar
;
// @BindView(R.id.edit_des)
// @BindView(R.id.edit_des)
EditText
editDes
;
EditText
editDes
;
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
return
R
.
layout
.
user_mine_activity_personal_des
;
return
R
.
layout
.
user_mine_activity_personal_des
;
...
...
m-user/src/main/java/com/yidianling/user/mine/PersonalInfoActivity.java
View file @
d9b18b5a
...
@@ -24,6 +24,7 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
...
@@ -24,6 +24,7 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
import
com.ydl.ydl_image.module.GlideApp
;
import
com.ydl.ydl_image.module.GlideApp
;
import
com.ydl.ydl_image.transform.GlideCircleTransform
;
import
com.ydl.ydl_image.transform.GlideCircleTransform
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
import
com.ydl.ydlcommon.modular.ModularServiceManager
;
...
@@ -98,7 +99,11 @@ public class PersonalInfoActivity extends BaseActivity implements View.OnClickLi
...
@@ -98,7 +99,11 @@ public class PersonalInfoActivity extends BaseActivity implements View.OnClickLi
public
static
Intent
newIntent
(
Activity
activity
)
{
public
static
Intent
newIntent
(
Activity
activity
)
{
return
new
Intent
(
activity
,
PersonalInfoActivity
.
class
);
return
new
Intent
(
activity
,
PersonalInfoActivity
.
class
);
}
}
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
return
R
.
layout
.
user_mine_activity_personal_info
;
return
R
.
layout
.
user_mine_activity_personal_info
;
...
...
m-user/src/main/java/com/yidianling/user/mine/PhoneChangeActivity.java
View file @
d9b18b5a
...
@@ -10,6 +10,7 @@ import android.widget.EditText;
...
@@ -10,6 +10,7 @@ import android.widget.EditText;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.utils.ActivityManager
;
import
com.ydl.ydlcommon.utils.ActivityManager
;
...
@@ -57,6 +58,12 @@ public class PhoneChangeActivity extends BaseActivity implements View.OnClickLis
...
@@ -57,6 +58,12 @@ public class PhoneChangeActivity extends BaseActivity implements View.OnClickLis
return
R
.
layout
.
user_mine_activity_phonechange
;
return
R
.
layout
.
user_mine_activity_phonechange
;
}
}
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
void
initDataAndEvent
()
{
protected
void
initDataAndEvent
()
{
jtv_country
=
findViewById
(
R
.
id
.
jtv_country
);
jtv_country
=
findViewById
(
R
.
id
.
jtv_country
);
...
...
m-user/src/main/java/com/yidianling/user/mine/PwdCheckActivity.java
View file @
d9b18b5a
...
@@ -6,6 +6,7 @@ import android.text.TextUtils;
...
@@ -6,6 +6,7 @@ import android.text.TextUtils;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.utils.remind.ToastHelper
;
import
com.ydl.ydlcommon.utils.remind.ToastHelper
;
...
@@ -30,6 +31,12 @@ public class PwdCheckActivity extends BaseActivity {
...
@@ -30,6 +31,12 @@ public class PwdCheckActivity extends BaseActivity {
// @BindView(R.id.change_next)
// @BindView(R.id.change_next)
RoundCornerButton
change_next
;
RoundCornerButton
change_next
;
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
return
R
.
layout
.
user_mine_activity_pwdcheck
;
return
R
.
layout
.
user_mine_activity_pwdcheck
;
...
...
m-user/src/main/java/com/yidianling/user/mine/RechargeActivity.java
View file @
d9b18b5a
...
@@ -15,6 +15,7 @@ import android.widget.TextView;
...
@@ -15,6 +15,7 @@ import android.widget.TextView;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.alibaba.android.arouter.facade.annotation.Route
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
;
import
com.ydl.ydlcommon.utils.remind.ToastHelper
;
import
com.ydl.ydlcommon.utils.remind.ToastHelper
;
...
@@ -41,6 +42,11 @@ import io.reactivex.schedulers.Schedulers;
...
@@ -41,6 +42,11 @@ import io.reactivex.schedulers.Schedulers;
*/
*/
@Route
(
path
=
"/main/recharge"
)
@Route
(
path
=
"/main/recharge"
)
public
class
RechargeActivity
extends
BaseActivity
{
public
class
RechargeActivity
extends
BaseActivity
{
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
// @BindView(R.id.recharge_rgv)
// @BindView(R.id.recharge_rgv)
RechargeGridView
recharge_rgv
;
RechargeGridView
recharge_rgv
;
...
...
m-user/src/main/java/com/yidianling/user/mine/RechargeResultActivity.java
View file @
d9b18b5a
package
com
.
yidianling
.
user
.
mine
;
package
com
.
yidianling
.
user
.
mine
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.view.JumpTextView
;
import
com.ydl.ydlcommon.view.JumpTextView
;
import
com.yidianling.user.R
;
import
com.yidianling.user.R
;
import
org.jetbrains.annotations.NotNull
;
/**
/**
* 充值结果
* 充值结果
* Created by softrice on 16/1/18.
* Created by softrice on 16/1/18.
*/
*/
public
class
RechargeResultActivity
extends
BaseActivity
{
public
class
RechargeResultActivity
extends
BaseActivity
{
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
@Override
@Override
protected
int
layoutResId
()
{
protected
int
layoutResId
()
{
...
...
m-user/src/main/java/com/yidianling/user/mine/SetInfoActivity.java
View file @
d9b18b5a
...
@@ -6,18 +6,25 @@ import android.view.animation.Animation;
...
@@ -6,18 +6,25 @@ import android.view.animation.Animation;
import
android.view.animation.AnimationUtils
;
import
android.view.animation.AnimationUtils
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.base.BaseActivity
;
import
com.ydl.ydlcommon.bean.StatusBarOptions
;
import
com.ydl.ydlcommon.view.DeleteEditTextView
;
import
com.ydl.ydlcommon.view.DeleteEditTextView
;
import
com.ydl.ydlcommon.view.TitleBar
;
import
com.ydl.ydlcommon.view.TitleBar
;
import
com.yidianling.common.tools.ToastUtil
;
import
com.yidianling.common.tools.ToastUtil
;
import
com.yidianling.user.R
;
import
com.yidianling.user.R
;
import
org.jetbrains.annotations.NotNull
;
/**
/**
* 短信息填写
* 短信息填写
* Created by softrice on 15/9/29.
* Created by softrice on 15/9/29.
*/
*/
public
class
SetInfoActivity
extends
BaseActivity
{
public
class
SetInfoActivity
extends
BaseActivity
{
public
static
final
String
INPUT
=
"INPUT"
;
public
static
final
String
INPUT
=
"INPUT"
;
@NotNull
@Override
public
StatusBarOptions
getStatusViewOptions
()
{
return
new
StatusBarOptions
(
true
,
true
);
}
public
static
Intent
getIntent
(
String
input
)
{
public
static
Intent
getIntent
(
String
input
)
{
Intent
intent
=
new
Intent
();
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
INPUT
,
input
);
intent
.
putExtra
(
INPUT
,
input
);
...
...
m-user/src/main/java/com/yidianling/user/mine/WithDrawActivity.kt
View file @
d9b18b5a
...
@@ -8,6 +8,7 @@ import android.text.style.AbsoluteSizeSpan
...
@@ -8,6 +8,7 @@ import android.text.style.AbsoluteSizeSpan
import
android.view.View
import
android.view.View
import
com.ydl.ydl_image.module.GlideApp
import
com.ydl.ydl_image.module.GlideApp
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
import
com.ydl.ydlcommon.data.http.ThrowableConsumer
import
com.ydl.ydlcommon.modular.ModularServiceManager
import
com.ydl.ydlcommon.modular.ModularServiceManager
...
@@ -47,7 +48,9 @@ class WithDrawActivity : BaseActivity() {
...
@@ -47,7 +48,9 @@ class WithDrawActivity : BaseActivity() {
private
var
isMoneyComplete
=
false
//是否有输入金额
private
var
isMoneyComplete
=
false
//是否有输入金额
private
var
list
:
MutableList
<
AccountBean
>?
=
null
private
var
list
:
MutableList
<
AccountBean
>?
=
null
private
var
maxMoney
:
String
?
=
null
private
var
maxMoney
:
String
?
=
null
override
fun
getStatusViewOptions
():
StatusBarOptions
{
return
StatusBarOptions
(
true
,
true
)
}
companion
object
{
companion
object
{
private
const
val
CHOOSE_ACCOUNT_REQUEST_CODE
=
1102
private
const
val
CHOOSE_ACCOUNT_REQUEST_CODE
=
1102
private
const
val
ADD_ACCOUNT_REQUEST_CODE
=
1103
private
const
val
ADD_ACCOUNT_REQUEST_CODE
=
1103
...
...
m-user/src/main/java/com/yidianling/user/mine/WithDrawSuccessActivity.kt
View file @
d9b18b5a
...
@@ -4,12 +4,17 @@ import android.annotation.SuppressLint
...
@@ -4,12 +4,17 @@ import android.annotation.SuppressLint
import
android.app.Activity
import
android.app.Activity
import
android.content.Intent
import
android.content.Intent
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.yidianling.user.R
import
com.yidianling.user.R
import
kotlinx.android.synthetic.main.user_mine_activity_with_draw_success.*
import
kotlinx.android.synthetic.main.user_mine_activity_with_draw_success.*
class
WithDrawSuccessActivity
:
BaseActivity
()
{
class
WithDrawSuccessActivity
:
BaseActivity
()
{
override
fun
getStatusViewOptions
():
StatusBarOptions
{
return
StatusBarOptions
(
true
,
true
)
}
companion
object
{
companion
object
{
var
INTENT_REMARK
=
"intent_remark"
var
INTENT_REMARK
=
"intent_remark"
fun
start
(
activity
:
Activity
,
remark
:
String
)
{
fun
start
(
activity
:
Activity
,
remark
:
String
)
{
...
...
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
View file @
d9b18b5a
...
@@ -9,6 +9,7 @@ import android.text.method.PasswordTransformationMethod
...
@@ -9,6 +9,7 @@ import android.text.method.PasswordTransformationMethod
import
android.view.View
import
android.view.View
import
android.view.animation.AnimationUtils
import
android.view.animation.AnimationUtils
import
com.ydl.ydlcommon.base.BaseMvpActivity
import
com.ydl.ydlcommon.base.BaseMvpActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.StatusBarUtils
...
...
m-user/src/main/java/com/yidianling/user/ui/login/SecretActivity.kt
View file @
d9b18b5a
...
@@ -6,12 +6,9 @@ import android.os.Build
...
@@ -6,12 +6,9 @@ import android.os.Build
import
android.text.Html
import
android.text.Html
import
android.view.KeyEvent
import
android.view.KeyEvent
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseActivity
import
com.ydl.ydlcommon.base.BaseApp
import
com.ydl.ydlcommon.utils.SharedPreferencesEditor
import
com.ydl.ydlcommon.utils.SharedPreferencesEditor
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.yidianling.common.tools.RxAppTool
import
com.yidianling.user.R
import
com.yidianling.user.R
import
com.yidianling.user.UserHelper
import
com.yidianling.user.widget.SecretDialog
import
com.yidianling.user.widget.SecretDialog
import
kotlinx.android.synthetic.main.user_activity_secret.*
import
kotlinx.android.synthetic.main.user_activity_secret.*
...
@@ -38,7 +35,7 @@ class SecretActivity : BaseActivity() {
...
@@ -38,7 +35,7 @@ class SecretActivity : BaseActivity() {
context
.
startActivityForResult
(
intent
,
SECRET_PAGE_REQUEST_CODE
)
context
.
startActivityForResult
(
intent
,
SECRET_PAGE_REQUEST_CODE
)
}
}
}
}
override
fun
layoutResId
():
Int
{
override
fun
layoutResId
():
Int
{
return
R
.
layout
.
user_activity_secret
return
R
.
layout
.
user_activity_secret
}
}
...
...
m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt
View file @
d9b18b5a
...
@@ -8,6 +8,7 @@ import android.support.v4.content.ContextCompat
...
@@ -8,6 +8,7 @@ import android.support.v4.content.ContextCompat
import
android.text.TextUtils
import
android.text.TextUtils
import
android.view.View
import
android.view.View
import
com.ydl.ydlcommon.base.BaseMvpActivity
import
com.ydl.ydlcommon.base.BaseMvpActivity
import
com.ydl.ydlcommon.bean.StatusBarOptions
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.YDLCacheUtils
import
com.ydl.ydlcommon.utils.YDLCacheUtils
...
...
m-user/src/main/java/com/yidianling/user/widget/WithDrawTipsView.kt
0 → 100644
View file @
d9b18b5a
package
com.yidianling.user.widget
import
android.content.Context
import
android.graphics.Color
import
android.util.AttributeSet
import
android.view.Gravity
import
android.view.ViewGroup
import
android.widget.ImageView
import
android.widget.LinearLayout
import
android.widget.TextView
import
com.ydl.ydl_router.manager.YDLRouterManager
import
com.ydl.ydl_router.manager.YDLRouterParams
import
com.ydl.ydlcommon.router.IYDLRouterConstant
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.user.R
/**
* @author yuanWai
* @描述:提现申请通知提示View
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2019/1/25
*/
class
WithDrawTipsView
:
LinearLayout
{
private
var
dp14
:
Int
=
0
private
var
dp15
:
Int
=
0
private
var
dp85
:
Int
=
0
private
var
dp4
:
Int
=
0
private
var
dp12
:
Int
=
0
init
{
dp14
=
RxImageTool
.
dip2px
(
14f
)
dp15
=
RxImageTool
.
dip2px
(
15f
)
dp85
=
RxImageTool
.
dip2px
(
8.5f
)
dp4
=
RxImageTool
.
dip2px
(
4f
)
dp12
=
RxImageTool
.
dip2px
(
12f
)
}
constructor
(
context
:
Context
)
:
super
(
context
)
{
initView
()
}
constructor
(
context
:
Context
,
attributeSet
:
AttributeSet
)
:
super
(
context
,
attributeSet
)
{
initView
()
}
/**
* 界面初始化
*/
private
fun
initView
()
{
val
params
=
ViewGroup
.
LayoutParams
(
ViewGroup
.
LayoutParams
.
MATCH_PARENT
,
RxImageTool
.
dip2px
(
32f
))
layoutParams
=
params
setBackgroundResource
(
R
.
color
.
platform_color_FFEEE6
)
orientation
=
HORIZONTAL
removeAllViews
()
addImageView
()
addMsgView
()
setOnClickListener
{
YDLRouterManager
.
router
(
IYDLRouterConstant
.
ROUTER_H5_H5
,
YDLRouterParams
().
putExtra
(
IYDLRouterConstant
.
EXTRA_URL
,
"https://static.ydlcdn.com/v4/announce/app/html/index.html"
))
}
}
private
fun
addImageView
(){
val
image
=
ImageView
(
context
)
image
.
setImageResource
(
R
.
drawable
.
app_redpacket_tixing
)
val
imageParams
=
LinearLayout
.
LayoutParams
(
dp14
,
dp14
)
imageParams
.
setMargins
(
dp15
,
dp85
,
0
,
0
)
image
.
layoutParams
=
imageParams
addView
(
image
)
}
private
fun
addMsgView
(){
val
msgView
=
TextView
(
context
)
msgView
.
gravity
=
Gravity
.
CENTER_VERTICAL
msgView
.
text
=
"2月份提现时间提前通知"
msgView
.
setTextColor
(
Color
.
parseColor
(
"#ff821d"
))
msgView
.
textSize
=
12f
val
msgParams
=
LinearLayout
.
LayoutParams
(
ViewGroup
.
LayoutParams
.
WRAP_CONTENT
,
ViewGroup
.
LayoutParams
.
MATCH_PARENT
)
msgParams
.
setMargins
(
dp4
,
0
,
0
,
0
)
msgView
.
layoutParams
=
msgParams
addView
(
msgView
)
}
}
\ No newline at end of file
m-user/src/main/res/drawable-xhdpi/app_redpacket_tixing.png
0 → 100644
View file @
d9b18b5a
4.02 KB
m-user/src/main/res/layout/user_activity_check_password.xml
View file @
d9b18b5a
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:layout_height=
"50dp"
android:background=
"@color/platform_white"
app:pa_left_start_icon=
"@drawable/user_nav_close_green"
app:pa_left_start_icon=
"@drawable/user_nav_close_green"
app:pa_title_text=
"登录验证"
/>
app:pa_title_text=
"登录验证"
/>
...
...
m-user/src/main/res/layout/user_activity_fill_info.xml
View file @
d9b18b5a
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_text=
"退出"
app:pa_left_text=
"退出"
android:background=
"@color/platform_white"
app:pa_title_text=
"完善资料"
/>
app:pa_title_text=
"完善资料"
/>
<com.ydl.ydlcommon.view.CircleImageView
<com.ydl.ydlcommon.view.CircleImageView
...
...
m-user/src/main/res/layout/user_activity_finger_print_check.xml
View file @
d9b18b5a
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
<com.ydl.ydlcommon.view.TitleBar
<com.ydl.ydlcommon.view.TitleBar
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:background=
"@color/platform_white"
android:layout_height=
"50dp"
android:layout_height=
"50dp"
app:pa_title_text=
"欢迎回来"
>
app:pa_title_text=
"欢迎回来"
>
</com.ydl.ydlcommon.view.TitleBar>
</com.ydl.ydlcommon.view.TitleBar>
...
...
m-user/src/main/res/layout/user_activity_finger_print_set.xml
View file @
d9b18b5a
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:layout_height=
"50dp"
app:pa_title_text=
"开启指纹解锁"
app:pa_title_text=
"开启指纹解锁"
android:background=
"@color/platform_white"
app:pa_left_start_icon=
"@drawable/user_nav_close_green"
>
app:pa_left_start_icon=
"@drawable/user_nav_close_green"
>
</com.ydl.ydlcommon.view.TitleBar>
</com.ydl.ydlcommon.view.TitleBar>
...
...
m-user/src/main/res/layout/user_mine_activity_about_us.xml
View file @
d9b18b5a
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
android:id=
"@+id/tb_title"
android:id=
"@+id/tb_title"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"关于我们"
/>
app:pa_title_text=
"关于我们"
/>
<ImageView
<ImageView
...
...
m-user/src/main/res/layout/user_mine_activity_account_history.xml
View file @
d9b18b5a
...
@@ -9,9 +9,10 @@
...
@@ -9,9 +9,10 @@
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
a
pp:pa_left_start_icon=
"@drawable/platform_toolbar_back
"
a
ndroid:background=
"@color/white
"
app:pa_left_
text=
"返回
"
app:pa_left_
start_icon=
"@drawable/platform_common_back
"
app:pa_right_text=
"提现"
app:pa_right_text=
"提现"
app:pa_side_text_color=
"#3c3c3c"
app:pa_title_text=
"账户余额"
/>
app:pa_title_text=
"账户余额"
/>
...
...
m-user/src/main/res/layout/user_mine_activity_account_setting.xml
View file @
d9b18b5a
...
@@ -10,7 +10,8 @@
...
@@ -10,7 +10,8 @@
android:id=
"@+id/tb_title"
android:id=
"@+id/tb_title"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"设置"
/>
app:pa_title_text=
"设置"
/>
...
...
m-user/src/main/res/layout/user_mine_activity_add_account.xml
View file @
d9b18b5a
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"添加提现帐号"
/>
app:pa_title_text=
"添加提现帐号"
/>
<View
<View
...
...
m-user/src/main/res/layout/user_mine_activity_choose_account.xml
View file @
d9b18b5a
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"选择提现帐号"
/>
app:pa_title_text=
"选择提现帐号"
/>
<View
style=
"@style/platform_viewline"
/>
<View
style=
"@style/platform_viewline"
/>
...
...
m-user/src/main/res/layout/user_mine_activity_contact_customer_service.xml
View file @
d9b18b5a
...
@@ -10,7 +10,8 @@
...
@@ -10,7 +10,8 @@
android:id=
"@+id/tb_title"
android:id=
"@+id/tb_title"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"联系客服"
/>
app:pa_title_text=
"联系客服"
/>
<ImageView
<ImageView
...
...
m-user/src/main/res/layout/user_mine_activity_edit_account.xml
View file @
d9b18b5a
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"编辑提现帐号"
/>
app:pa_title_text=
"编辑提现帐号"
/>
<View
style=
"@style/platform_viewline"
/>
<View
style=
"@style/platform_viewline"
/>
...
...
m-user/src/main/res/layout/user_mine_activity_feed_back.xml
View file @
d9b18b5a
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
android:background=
"@color/white"
android:background=
"@color/white"
app:pa_left_start_icon=
"@drawable/platform_
toolbar
_back"
app:pa_left_start_icon=
"@drawable/platform_
common
_back"
app:pa_title_text=
"投诉与反馈"
/>
app:pa_title_text=
"投诉与反馈"
/>
<ScrollView
<ScrollView
...
...
m-user/src/main/res/layout/user_mine_activity_feed_back_success.xml
View file @
d9b18b5a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
android:background=
"@color/white"
android:background=
"@color/white"
app:pa_left_start_icon=
"@drawable/platform_
toolbar
_back"
app:pa_left_start_icon=
"@drawable/platform_
common
_back"
app:pa_title_text=
"投诉反馈成功"
/>
app:pa_title_text=
"投诉反馈成功"
/>
<ImageView
<ImageView
...
...
m-user/src/main/res/layout/user_mine_activity_mine_help.xml
View file @
d9b18b5a
...
@@ -9,7 +9,8 @@
...
@@ -9,7 +9,8 @@
<com.ydl.ydlcommon.view.TitleBar
<com.ydl.ydlcommon.view.TitleBar
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"帮助"
/>
app:pa_title_text=
"帮助"
/>
<ImageView
<ImageView
...
...
m-user/src/main/res/layout/user_mine_activity_my_feed_back.xml
View file @
d9b18b5a
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
android:background=
"@color/white"
android:background=
"@color/white"
app:pa_left_start_icon=
"@drawable/platform_
toolbar
_back"
app:pa_left_start_icon=
"@drawable/platform_
common
_back"
app:pa_right_text=
"投诉反馈"
app:pa_right_text=
"投诉反馈"
app:pa_title_text=
"我的反馈"
/>
app:pa_title_text=
"我的反馈"
/>
...
...
m-user/src/main/res/layout/user_mine_activity_notifications_setting.xml
View file @
d9b18b5a
...
@@ -9,7 +9,8 @@
...
@@ -9,7 +9,8 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"45dp"
android:layout_height=
"45dp"
app:pa_title_text=
"消息通知"
app:pa_title_text=
"消息通知"
app:pa_left_end_icon=
"@drawable/platform_toolbar_back"
/>
android:background=
"@color/platform_white"
app:pa_left_end_icon=
"@drawable/platform_common_back"
/>
<ImageView
<ImageView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
m-user/src/main/res/layout/user_mine_activity_personal_des.xml
View file @
d9b18b5a
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
android:paddingLeft=
"15dp"
android:paddingLeft=
"15dp"
android:paddingRight=
"20dp"
android:paddingRight=
"20dp"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:src=
"@drawable/platform_
toolbar
_back"
/>
android:src=
"@drawable/platform_
common
_back"
/>
<TextView
<TextView
android:id=
"@+id/tv_center_title"
android:id=
"@+id/tv_center_title"
...
...
m-user/src/main/res/layout/user_mine_activity_personal_info.xml
View file @
d9b18b5a
...
@@ -10,7 +10,8 @@
...
@@ -10,7 +10,8 @@
android:id=
"@+id/tb_title"
android:id=
"@+id/tb_title"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
android:background=
"@color/platform_white"
app:pa_left_start_icon=
"@drawable/platform_common_back"
app:pa_title_text=
"个人资料"
/>
app:pa_title_text=
"个人资料"
/>
<ImageView
<ImageView
...
...
m-user/src/main/res/layout/user_mine_activity_phonechange.xml
View file @
d9b18b5a
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
<com.ydl.ydlcommon.view.TitleBar
<com.ydl.ydlcommon.view.TitleBar
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"更换手机"
/>
app:pa_title_text=
"更换手机"
/>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
m-user/src/main/res/layout/user_mine_activity_pwdcheck.xml
View file @
d9b18b5a
...
@@ -7,7 +7,8 @@
...
@@ -7,7 +7,8 @@
<com.ydl.ydlcommon.view.TitleBar
<com.ydl.ydlcommon.view.TitleBar
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"更换手机"
/>
app:pa_title_text=
"更换手机"
/>
<ImageView
<ImageView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
m-user/src/main/res/layout/user_mine_activity_recharge.xml
View file @
d9b18b5a
...
@@ -8,7 +8,8 @@
...
@@ -8,7 +8,8 @@
<com.ydl.ydlcommon.view.TitleBar
<com.ydl.ydlcommon.view.TitleBar
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"充值"
/>
app:pa_title_text=
"充值"
/>
<ImageView
<ImageView
...
...
m-user/src/main/res/layout/user_mine_activity_recharge_result.xml
View file @
d9b18b5a
...
@@ -8,7 +8,8 @@
...
@@ -8,7 +8,8 @@
<com.ydl.ydlcommon.view.TitleBar
<com.ydl.ydlcommon.view.TitleBar
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"付款"
/>
app:pa_title_text=
"付款"
/>
<ImageView
<ImageView
...
...
m-user/src/main/res/layout/user_mine_activity_set_info.xml
View file @
d9b18b5a
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_text=
"取消"
app:pa_left_text=
"取消"
app:pa_right_text=
"保存"
app:pa_right_text=
"保存"
android:background=
"@color/platform_white"
app:pa_title_text=
"title"
/>
app:pa_title_text=
"title"
/>
...
...
m-user/src/main/res/layout/user_mine_activity_with_draw.xml
View file @
d9b18b5a
...
@@ -13,7 +13,8 @@
...
@@ -13,7 +13,8 @@
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_toolbar_back"
app:pa_left_start_icon=
"@drawable/platform_common_back"
android:background=
"@color/platform_white"
app:pa_title_text=
"提现申请"
/>
app:pa_title_text=
"提现申请"
/>
<View
<View
...
@@ -21,7 +22,7 @@
...
@@ -21,7 +22,7 @@
android:layout_height=
"1dp"
android:layout_height=
"1dp"
android:background=
"#e5e5e5"
/>
android:background=
"#e5e5e5"
/>
<com.
cxzapp.yidianling.view
.WithDrawTipsView
<com.
yidianling.user.widget
.WithDrawTipsView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"32dp"
android:layout_height=
"32dp"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
...
...
m-user/src/main/res/layout/user_mine_activity_with_draw_success.xml
View file @
d9b18b5a
...
@@ -12,8 +12,9 @@
...
@@ -12,8 +12,9 @@
<com.ydl.ydlcommon.view.TitleBar
<com.ydl.ydlcommon.view.TitleBar
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:background=
"@color/platform_white"
android:layout_height=
"@dimen/title_bar_height"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/platform_
toolbar
_back"
app:pa_left_start_icon=
"@drawable/platform_
common
_back"
app:pa_title_text=
"提现申请"
/>
app:pa_title_text=
"提现申请"
/>
<View
style=
"@style/platform_viewline"
/>
<View
style=
"@style/platform_viewline"
/>
...
...
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