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
08c903d8
Commit
08c903d8
authored
Dec 23, 2019
by
konghaorui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 title bar 样式
parent
404096c7
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
22 additions
and
32 deletions
+22
-32
MainActivity.kt
app/src/main/java/com/ydl/component/MainActivity.kt
+5
-3
DemoGlobalConfig.java
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
+0
-1
config.gradle
config.gradle
+2
-2
activity_course_commeny.xml
m-course/src/main/res/layout/activity_course_commeny.xml
+1
-1
activity_course_poster.xml
m-course/src/main/res/layout/activity_course_poster.xml
+1
-1
activity_course_reply_list.xml
m-course/src/main/res/layout/activity_course_reply_list.xml
+1
-1
activity_course_search.xml
m-course/src/main/res/layout/activity_course_search.xml
+1
-1
course_layout_title_bar.xml
m-course/src/main/res/layout/course_layout_title_bar.xml
+1
-1
course_toolbar_back.png
m-course/src/xlzx/res/drawable-xhdpi/course_toolbar_back.png
+0
-0
course_toolbar_back.png
m-course/src/ydl/res/drawable-xhdpi/course_toolbar_back.png
+0
-0
TrendsListFragment.kt
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
+0
-14
dynamic_toolbar_back.png
m-dynamic/src/main/res/drawable-xhdpi/dynamic_toolbar_back.png
+0
-0
dynamic_activity_mytrends.xml
m-dynamic/src/main/res/layout/dynamic_activity_mytrends.xml
+1
-1
dynamic_activity_trends_reply_info.xml
m-dynamic/src/main/res/layout/dynamic_activity_trends_reply_info.xml
+1
-1
tests_ic_back.png
m-tests/src/main/res/drawable-xhdpi/tests_ic_back.png
+0
-0
user_activity_get_identifying_code.xml
m-user/src/main/res/layout/user_activity_get_identifying_code.xml
+2
-1
user_activity_input_phone.xml
m-user/src/main/res/layout/user_activity_input_phone.xml
+2
-1
user_activity_me_privacy.xml
m-user/src/main/res/layout/user_activity_me_privacy.xml
+2
-1
TitleBar.java
ydl-platform/src/main/java/com/ydl/ydlcommon/view/TitleBar.java
+1
-1
NewH5Activity.java
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
+1
-1
No files found.
app/src/main/java/com/ydl/component/MainActivity.kt
View file @
08c903d8
package
com.ydl.component
//import com.ydl.confide.home.ConfideHomeActivity
import
android.Manifest
import
android.annotation.SuppressLint
import
android.content.ComponentName
...
...
@@ -10,7 +11,6 @@ import android.net.Uri
import
android.os.IBinder
import
android.provider.Settings
import
android.util.Log
import
android.widget.LinearLayout
import
com.alibaba.android.arouter.launcher.ARouter
import
com.tbruyelle.rxpermissions2.RxPermissions
import
com.umeng.analytics.MobclickAgent
...
...
@@ -18,7 +18,6 @@ import com.ydl.component.home.HomeActivity
import
com.ydl.component.music.FragmentContainerActivity
import
com.ydl.component.mvp.DemoContract
import
com.ydl.component.mvp.DemoPresenter
//import com.ydl.confide.home.ConfideHomeActivity
import
com.ydl.media.audio.PlayService
import
com.ydl.ydl_router.manager.YDLRouterManager
import
com.ydl.ydl_router.manager.YDLRouterParams
...
...
@@ -28,6 +27,7 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.consultant.ExpertSearchActivity.Companion.HOT_SEARCH_DOCTOR_NAME
import
com.yidianling.consultant.api.IConsultantService
import
com.yidianling.dynamic.activity.MyTrendsActivity
import
com.yidianling.fm.api.service.IFMService
import
com.yidianling.tests.home.NewTestHomeActivity
import
kotlinx.android.synthetic.main.activity_main.*
...
...
@@ -99,7 +99,9 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
FragmentContainerActivity
.
start
(
this
,
"NewMultiMessageFragment"
)
}
bt_to_dynamic
.
setOnClickListener
{
FragmentContainerActivity
.
start
(
this
,
"TrendsHomeFragment"
)
// FragmentContainerActivity.start(this,"TrendsHomeFragment")
val
intentm
=
Intent
(
this
,
MyTrendsActivity
::
class
.
java
)
startActivity
(
intentm
)
}
bt_to_tests
.
setOnClickListener
{
startActivity
(
Intent
(
this
,
NewTestHomeActivity
::
class
.
java
))
...
...
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
View file @
08c903d8
...
...
@@ -31,7 +31,6 @@ public final class DemoGlobalConfig implements IConfigModule {
@Override
public
void
applyOptions
(
@NotNull
Context
context
,
@NotNull
GlobalConfig
.
Builder
builder
)
{
builder
.
setFrom
(
"ydl"
.
equals
(
BuildConfig
.
FLAVOR
)
?
YDLConstants
.
FROM_YDL
:
YDLConstants
.
FROM_XLZX
)
.
addUrl
(
"github"
,
APP_DOMAIN
)
.
setEnv
(
appEnv
)
...
...
config.gradle
View file @
08c903d8
...
...
@@ -71,7 +71,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.29.
3
"
,
"ydl-platform"
:
"0.0.29.
4
"
,
//第二步 若干
"ydl-webview"
:
"0.0.28.12"
,
...
...
@@ -116,7 +116,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.29.
3
"
,
"ydl-platform"
:
"0.0.29.
4
"
,
//第二步 若干
"ydl-webview"
:
"0.0.28.9"
,
...
...
m-course/src/main/res/layout/activity_course_commeny.xml
View file @
08c903d8
...
...
@@ -13,7 +13,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"19dp"
android:src=
"@drawable/
course_toolbar
_back"
android:src=
"@drawable/
platform_common
_back"
app:layout_constraintBottom_toBottomOf=
"@+id/tv_title"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/tv_title"
/>
...
...
m-course/src/main/res/layout/activity_course_poster.xml
View file @
08c903d8
...
...
@@ -12,7 +12,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingLeft=
"15dp"
android:src=
"@drawable/
course_toolbar
_back"
android:src=
"@drawable/
platform_common
_back"
app:layout_constraintBottom_toBottomOf=
"@+id/tv_title"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/tv_title"
/>
...
...
m-course/src/main/res/layout/activity_course_reply_list.xml
View file @
08c903d8
...
...
@@ -10,7 +10,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
app:pa_title_text=
"课后笔记"
app:pa_left_start_icon=
"@drawable/
course_toolbar
_back"
/>
app:pa_left_start_icon=
"@drawable/
platform_common
_back"
/>
<android.support.v7.widget.RecyclerView
...
...
m-course/src/main/res/layout/activity_course_search.xml
View file @
08c903d8
...
...
@@ -19,7 +19,7 @@
android:id=
"@+id/activity_course_back_btn"
android:layout_width=
"13dp"
android:layout_height=
"22dp"
android:src=
"@drawable/
course_toolbar
_back"
android:src=
"@drawable/
platform_common
_back"
android:visibility=
"gone"
/>
<com.yidianling.course.widget.SearchBarView
...
...
m-course/src/main/res/layout/course_layout_title_bar.xml
View file @
08c903d8
...
...
@@ -12,7 +12,7 @@
android:layout_centerVertical=
"true"
android:paddingLeft=
"15dp"
android:paddingRight=
"10dp"
android:src=
"@drawable/
course_toolbar
_back"
/>
android:src=
"@drawable/
platform_common
_back"
/>
<TextView
android:id=
"@+id/tv_title"
...
...
m-course/src/xlzx/res/drawable-xhdpi/course_toolbar_back.png
deleted
100644 → 0
View file @
404096c7
1.21 KB
m-course/src/ydl/res/drawable-xhdpi/course_toolbar_back.png
deleted
100644 → 0
View file @
404096c7
3.02 KB
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
View file @
08c903d8
...
...
@@ -7,7 +7,6 @@ import android.animation.ObjectAnimator
import
android.content.Intent
import
android.os.Bundle
import
android.os.Handler
import
android.support.design.widget.CoordinatorLayout
import
android.support.v4.view.animation.FastOutLinearInInterpolator
import
android.support.v4.widget.SwipeRefreshLayout
import
android.support.v7.widget.LinearLayoutManager
...
...
@@ -17,14 +16,12 @@ import android.view.LayoutInflater
import
android.view.View
import
android.widget.ImageView
import
android.widget.LinearLayout
import
android.widget.RelativeLayout
import
android.widget.TextView
import
com.ydl.webview.H5Params
import
com.ydl.webview.NewH5Activity
import
com.ydl.ydlcommon.utils.BuryPointUtils
import
com.ydl.ydlcommon.utils.SharedPreferencesEditor
import
com.ydl.ydlcommon.view.WrapContentLinearLayoutManager
import
com.ydl.ydlcommon.view.widgets.MultiSwipeRefreshLayout
import
com.yidianling.common.tools.LogUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.dynamic.DynamicConstants
...
...
@@ -54,17 +51,6 @@ import java.util.*
class
TrendsListFragment
:
BaseLazyFragment
(),
ITrendsListView
,
SwipeRefreshLayout
.
OnRefreshListener
{
internal
var
trends_rcv
:
RecyclerView
?
=
null
internal
var
trends_lastr_swl
:
MultiSwipeRefreshLayout
?
=
null
internal
var
trend_list_no_datas_rel
:
RelativeLayout
?
=
null
// @BindView(R2.id.trend_last_more_pro_lin)
// LinearLayout loadingDataLin;
internal
var
cdl
:
CoordinatorLayout
?
=
null
private
val
REQUEST_CODE
=
1001
private
val
eachPageDataNum
=
20
...
...
m-dynamic/src/main/res/drawable-xhdpi/dynamic_toolbar_back.png
deleted
100644 → 0
View file @
404096c7
3.02 KB
m-dynamic/src/main/res/layout/dynamic_activity_mytrends.xml
View file @
08c903d8
...
...
@@ -43,7 +43,7 @@
android:gravity=
"center_vertical"
android:paddingRight=
"10dp"
android:visibility=
"gone"
android:src=
"@drawable/
dynamic_more12x
"
/>
android:src=
"@drawable/
platform_common_more
"
/>
</RelativeLayout>
...
...
m-dynamic/src/main/res/layout/dynamic_activity_trends_reply_info.xml
View file @
08c903d8
...
...
@@ -44,7 +44,7 @@
android:gravity=
"center_vertical"
android:paddingRight=
"10dp"
android:visibility=
"gone"
android:src=
"@drawable/
dynamic_more12x
"
/>
android:src=
"@drawable/
platform_common_more
"
/>
<ImageView
android:layout_width=
"match_parent"
...
...
m-tests/src/main/res/drawable-xhdpi/tests_ic_back.png
deleted
100644 → 0
View file @
404096c7
2.94 KB
m-user/src/main/res/layout/user_activity_get_identifying_code.xml
View file @
08c903d8
...
...
@@ -10,7 +10,8 @@
android:id=
"@+id/tb_title"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/user_toolbar_back"
android:background=
"@color/platform_white"
app:pa_left_start_icon=
"@drawable/platform_common_back"
app:pa_title_text=
"手机号"
/>
<TextView
...
...
m-user/src/main/res/layout/user_activity_input_phone.xml
View file @
08c903d8
...
...
@@ -7,9 +7,10 @@
android:orientation=
"vertical"
>
<com.ydl.ydlcommon.view.TitleBar
android:background=
"@color/platform_white"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/title_bar_height"
app:pa_left_start_icon=
"@drawable/
user_toolbar
_back"
app:pa_left_start_icon=
"@drawable/
platform_common
_back"
app:pa_title_text=
"填写手机号"
/>
<TextView
...
...
m-user/src/main/res/layout/user_activity_me_privacy.xml
View file @
08c903d8
...
...
@@ -9,7 +9,8 @@
<com.ydl.ydlcommon.view.TitleBar
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
app:pa_left_start_icon=
"@drawable/user_toolbar_back"
android:background=
"@color/platform_white"
app:pa_left_start_icon=
"@drawable/platform_common_back"
app:pa_title_text=
"隐私安全"
>
</com.ydl.ydlcommon.view.TitleBar>
...
...
ydl-platform/src/main/java/com/ydl/ydlcommon/view/TitleBar.java
View file @
08c903d8
...
...
@@ -266,7 +266,7 @@ public class TitleBar extends RelativeLayout {
if
(
mLeftStartIconColor
!=
0xffffff
&&
mLeftStartIcon
==
null
)
{
//动态设置返回图标颜色
Resources
resources
=
this
.
getResources
();
Bitmap
bmp
=
BitmapFactory
.
decodeResource
(
resources
,
R
.
drawable
.
platform_
toolbar
_back
);
Bitmap
bmp
=
BitmapFactory
.
decodeResource
(
resources
,
R
.
drawable
.
platform_
common
_back
);
Bitmap
colorBmp
=
BitmapUtils
.
tintBitmap
(
bmp
,
mLeftStartIconColor
);
return
new
BitmapDrawable
(
resources
,
colorBmp
);
}
else
{
...
...
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
View file @
08c903d8
...
...
@@ -763,7 +763,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
tb_title
.
setImageVis
(
1
);
}
}
else
{
tb_title
.
setImage
(
getResources
().
getDrawable
(
YDLConstants
.
FROM_YDL
.
equals
(
appFrom
)
?
R
.
drawable
.
platform_toolbar_back
:
R
.
drawable
.
platform_toolbar_back_yellow
));
tb_title
.
setImage
(
getResources
().
getDrawable
(
R
.
drawable
.
platform_common_back
));
tb_title
.
setmLeftText
(
""
);
tb_title
.
setImageListener
(
v
->
{
if
(
h5Params
.
getShowUrlTitle
())
{
...
...
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