Skip to content

Y
YDL-Component-Medical
Commit 494c0d63 by konghaorui
Options

新增资源文件前缀

parent ae6cc69a
Showing with 521 additions and 512 deletions
app/build.gradle
......@@ -158,9 +158,17 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
kapt rootProject.ext.dependencies["dagger2-compiler"]
implementation project(':m-consultant')
// api 'com.ydl:m-user-module-ydl:0.0.6'
// api 'com.ydl:ydl-webview:0.0.3@aar'
// api 'com.ydl:m-user-api:0.0.4'
//
// api('com.ydl:ydl-platform:0.0.5@aar') {
// transitive = true
// }
api project(':m-user')
implementation project(':ydl-platform')
implementation project(':ydl-webview')
// implementation project(':ydl-webview')
implementation rootProject.ext.dependencies["retrofit-url-manager"]
kapt 'com.alibaba:arouter-compiler:1.2.2'
}
......
app/src/main/AndroidManifest.xml
......@@ -19,12 +19,12 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
tools:replace="android:allowBackup, android:icon, android:label"
android:theme="@style/CommonTheme"
android:theme="@style/platform_CommonTheme"
tools:ignore="GoogleAppIndexingWarning">
<!--<activity android:name="com.yidianling.user.ui.login.RegisterAndLoginActivity"-->
<!--<activity android:name=".MainActivity"/>-->
<activity android:name=".MainActivity"
android:theme="@style/NoTitleTheme"
android:theme="@style/platform_NoTitleTheme"
>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
......
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -52,7 +52,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
bt_to_consultant.setOnClickListener {
ARouter.getInstance()
.build("/consult/hot_search")
.withString(HOT_SEARCH_DOCTOR_NAME, this.resources?.getString(R.string.search_hint))
.withString(HOT_SEARCH_DOCTOR_NAME, this.resources?.getString(R.string.platform_search_hint))
.navigation()
}
}
......@@ -72,7 +72,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
} else if (permission.shouldShowRequestPermissionRationale) {
requestPermission()
} else {
ToastUtil.toastLong(this, getString(R.string.need_storage_permission_hint))
ToastUtil.toastLong(this, getString(R.string.platform_need_storage_permission_hint))
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
val uri = Uri.fromParts("package", packageName, null)
intent.data = uri
......
app/src/main/res/layout/activity_main.xml
......@@ -19,9 +19,9 @@
android:paddingLeft="30dp"
android:textSize="14dp"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textColor="@color/platform_white"
android:text="Multiple Base Url Request Test"
android:background="@color/google_blue"
android:background="@color/platform_google_blue"
android:layout_width="match_parent"
android:layout_height="50dp"/>
......@@ -62,9 +62,9 @@
android:paddingLeft="30dp"
android:textSize="14dp"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textColor="@color/platform_white"
android:text="Component Module Test"
android:background="@color/google_blue"
android:background="@color/platform_google_blue"
android:layout_width="match_parent"
android:layout_height="50dp"/>
<LinearLayout
......
app/src/main/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<color name="text_user" tools:ignore="MissingDefaultResource">#5195cb</color>
<color name="black" tools:ignore="MissingDefaultResource">#FF000000</color>
</resources>
m-consultant/src/main/AndroidManifest.xml
......@@ -7,12 +7,12 @@
android:name=".ExpertSearchActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/NoTitleTheme"/>
android:theme="@style/platform_NoTitleTheme"/>
<activity
android:name=".HotSearchActivity"
android:screenOrientation="portrait"
android:theme="@style/NoTitleTheme"/>
android:theme="@style/platform_NoTitleTheme"/>
</application>
</manifest>
\ No newline at end of file
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
......@@ -862,7 +862,7 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
tv_reload.visibility = View.GONE
tv_reload_hint.text = msg
ll_network_error.visibility = View.VISIBLE
iv_exception.setImageResource(R.drawable.ico_img_zixun_empty)
iv_exception.setImageResource(R.drawable.platform_ico_img_zixun_empty)
rvExperts.visibility = View.GONE
dismissProgressDialog()
......@@ -1419,17 +1419,17 @@ class ExpertSearchActivity : BaseMvpActivity<IExpertSearchView, ExpertSearchPres
when (status) {
FILTER_STATUS_NORMAL -> {
tv.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
tv.setTextColor(ContextCompat.getColor(this, R.color.colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_grey_500_18dp, 0)
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
}
FILTER_STATUS_FILTERED -> {
tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(this, R.color.main_theme))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down_grey_500_18dp, 0)
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.platform_ic_arrow_drop_down_grey_500_18dp, 0)
}
FILTER_STATUS_OPEN -> {
tv.typeface = Typeface.DEFAULT_BOLD
tv.setTextColor(ContextCompat.getColor(this, R.color.colorTextDefault))
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_colorTextDefault))
tv.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_arrow_drop_down, 0)
}
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
......@@ -206,7 +206,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
val view = LayoutInflater.from(context).inflate(R.layout.expert_search_products_item, holder.ll_tags, false)
if (1 == item.isPackage){
view.tvTitle.text = "单次"
view.tvTitle.setTextColor(context.resources.getColor(R.color.color_1DA1F2))
view.tvTitle.setTextColor(context.resources.getColor(R.color.platform_color_1DA1F2))
view.tvTitle.background = context.resources.getDrawable(R.drawable.expert_search_single)
view.tvContent.text = item.name
holder.ll_products.addView(view)
......@@ -228,7 +228,7 @@ class ExpertSearchAdapter(private val context: Context, private val expertSearch
holder.tvHint.text = context.getString(R.string.loading)
} else {
holder.pbLoading.visibility = View.GONE
holder.tvHint.text = context.getString(R.string.no_more)
holder.tvHint.text = context.getString(R.string.platform_no_more)
}
}
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/RegionRecyclerViewAdapter.kt
......@@ -37,7 +37,7 @@ class RegionRecyclerViewAdapter(val context: Context, val regionList: ArrayList<
//未选中状态
holder.itemView.tvRegionName.setTypeface(Typeface.DEFAULT)
// holder.itemView.tvRegionName.setBackgroundColor(Color.rgb(245, 245, 245))
holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.default_text_color))
holder.itemView.tvRegionName.setTextColor(context.resources.getColor(R.color.platform_default_text_color))
holder.itemView.view_select.visibility = View.INVISIBLE
}
}
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/SubRecyclerViewAdapter.kt
......@@ -35,7 +35,7 @@ class SubRecyclerViewAdapter(val context: Context, val subList: ArrayList<SubIte
} else {
//未选中状态
holder.itemView.tvConsultTypeName.setTypeface(Typeface.DEFAULT)
holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.default_text_color))
holder.itemView.tvConsultTypeName.setTextColor(ContextCompat.getColor(context,R.color.platform_default_text_color))
// holder.itemView.ivCheckCircle.visibility = View.INVISIBLE
}
}
......
m-consultant/src/main/res/drawable/bg_radius_gray_2.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="2dp"></corners>
<solid android:color="@color/color_FAFAFA" />
<stroke android:width="1dp" android:color="@color/color_FAFAFA"/>
<solid android:color="@color/platform_color_FAFAFA" />
<stroke android:width="1dp" android:color="@color/platform_color_FAFAFA"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_gray_6.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp"></corners>
<solid android:color="@color/color_F7F7F7" />
<stroke android:width="1dp" android:color="@color/color_E0E0E0"/>
<solid android:color="@color/platform_color_F7F7F7" />
<stroke android:width="1dp" android:color="@color/platform_color_E0E0E0"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_line_gray_05.xml
......@@ -3,7 +3,7 @@
android:shape="rectangle">
<corners android:radius="4dp"></corners>
<solid android:color="@color/white" />
<solid android:color="@color/platform_white" />
<stroke android:width="0.5dp" android:color="#10000000"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_line_gray_1.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="1dp"></corners>
<solid android:color="@color/white" />
<stroke android:width="0.5dp" android:color="@color/color_E0E0E0"/>
<solid android:color="@color/platform_white" />
<stroke android:width="0.5dp" android:color="@color/platform_color_E0E0E0"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_line_gray_16.xml
......@@ -4,5 +4,5 @@
tools:ignore="MissingDefaultResource">
<corners android:radius="16dp" />
<solid android:color="@color/color_F7F7F7" />
<solid android:color="@color/platform_color_F7F7F7" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/bg_radius_line_green_5.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/white" />
<solid android:color="@color/platform_white" />
<stroke
android:width="1dp"
android:color="@color/main_theme" />
......
m-consultant/src/main/res/drawable/bg_search_filter_selector.xml
......@@ -11,7 +11,7 @@
</item>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="@color/color_F7F7F7" />
<solid android:color="@color/platform_color_F7F7F7" />
<corners
android:radius="4dp"/>
</shape>
......
m-consultant/src/main/res/drawable/bg_search_filter_selector_radius11.xml
......@@ -11,7 +11,7 @@
</item>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="@color/color_F7F7F7" />
<solid android:color="@color/platform_color_F7F7F7" />
<corners
android:radius="11dp"/>
</shape>
......
m-consultant/src/main/res/drawable/expert_search_chat.xml
......@@ -4,5 +4,5 @@
android:angle="180"
android:startColor="#FFDB14"
android:endColor="#FFDB26"/>
<corners android:radius="@dimen/dp_13"/>
<corners android:radius="@dimen/platform_dp_13"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/drawable/expert_search_menu.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFF5E8"/>
<corners android:radius="@dimen/dp_1"/>
<corners android:radius="@dimen/platform_dp_1"/>
</shape>
\ No newline at end of file
m-consultant/src/main/res/layout/activity_hot_search.xml
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/platform_white">
<LinearLayout
android:id="@+id/clContainer"
......@@ -71,7 +71,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="12dp"
android:scaleType="centerCrop"
android:src="@drawable/delete"
android:src="@drawable/platform_delete"
android:visibility="invisible" />
<TextView
......@@ -92,8 +92,8 @@
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@+id/rl_search"
android:layout_marginTop="@dimen/dp_6"
android:background="@color/color_E0E0E0" />
android:layout_marginTop="@dimen/platform_dp_6"
android:background="@color/platform_color_E0E0E0" />
<LinearLayout
android:id="@+id/ll_search_history"
......@@ -202,11 +202,11 @@
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_below="@+id/llHotExpert"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_28"
app:cardCornerRadius="@dimen/dp_4"
android:layout_marginLeft="@dimen/platform_dp_15"
android:layout_marginTop="@dimen/platform_dp_28"
android:layout_marginRight="@dimen/platform_dp_15"
android:layout_marginBottom="@dimen/platform_dp_28"
app:cardCornerRadius="@dimen/platform_dp_4"
app:cardElevation="0px">
<com.ydl.ydlcommon.view.banner.Banner
......@@ -215,12 +215,12 @@
android:layout_height="80dp"
android:scaleType="centerCrop"
android:tag="overScroll"
app:indicator_different_width="14dp"
app:indicator_drawable_selected="@drawable/banner_indicator_select"
app:indicator_drawable_unselected="@drawable/banner_indicator_unselect"
app:indicator_height="5dp"
app:indicator_margin="1.25dp"
app:is_selected_same_unselected="false" />
app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/banner_indicator_select"
app:pa_indicator_drawable_unselected="@drawable/banner_indicator_unselect"
app:pa_indicator_height="5dp"
app:pa_indicator_margin="1.25dp"
app:pa_is_selected_same_unselected="false" />
</android.support.v7.widget.CardView>
</LinearLayout>
......
m-consultant/src/main/res/layout/expert_search_feedbackrate.xml
......@@ -3,7 +3,7 @@
android:id="@+id/imgRate"
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"
android:layout_marginRight="@dimen/dp_2"
android:layout_marginRight="@dimen/platform_dp_2"
android:scaleType="fitXY"
android:background="@drawable/expert_search_full_star">
......
m-consultant/src/main/res/layout/expert_search_products_item.xml
......@@ -4,31 +4,31 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_7">
android:layout_marginTop="@dimen/platform_dp_7">
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/expert_search_single"
android:textColor="@color/color_1DA1F2"
android:textColor="@color/platform_color_1DA1F2"
android:layout_gravity="center_vertical"
android:paddingRight="@dimen/dp_3"
android:paddingLeft="@dimen/dp_3"
android:paddingRight="@dimen/platform_dp_3"
android:paddingLeft="@dimen/platform_dp_3"
android:paddingTop="@dimen/dp_0.5"
android:paddingBottom="@dimen/dp_0.5"
android:textSize="@dimen/dp_9"
android:textSize="@dimen/platform_dp_9"
tools:text="单次"/>
<TextView
android:id="@+id/tvContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_6"
android:layout_marginLeft="@dimen/platform_dp_6"
android:layout_gravity="center_vertical"
android:lines="1"
android:ellipsize="end"
android:textColor="@color/color_666666"
android:textColor="@color/platform_color_666666"
android:textSize="@dimen/dp_11"
tools:text="职业发展，个人成长主题倾诉"
android:layout_marginStart="@dimen/dp_6"
android:layout_marginStart="@dimen/platform_dp_6"
tools:ignore="SpUsage" />
</LinearLayout>
\ No newline at end of file
m-consultant/src/main/res/layout/item_consult_type.xml
......@@ -14,7 +14,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/color_black_333333"
android:textColor="@color/platform_color_black_333333"
android:textSize="14sp"
tools:text="咨询方式" />
......
m-consultant/src/main/res/layout/item_empty.xml
......@@ -18,8 +18,8 @@
android:layout_marginTop="16dp"
android:gravity="center"
android:orientation="vertical"
android:text="@string/no_search_result"
android:textColor="@color/text_gray"
android:text="@string/platform_no_search_result"
android:textColor="@color/platform_text_gray"
android:textSize="@dimen/sp_14" />
<Button
......@@ -31,7 +31,7 @@
android:background="@drawable/bg_radius_line_green_5"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/search_by_category"
android:text="@string/platform_search_by_category"
android:textColor="@color/main_theme" />
</LinearLayout>
m-consultant/src/main/res/layout/item_hot_search.xml
......@@ -11,11 +11,11 @@
android:gravity="center"
android:maxEms="9"
android:paddingLeft="@dimen/dp_16"
android:paddingTop="@dimen/dp_7"
android:paddingTop="@dimen/platform_dp_7"
android:paddingRight="@dimen/dp_16"
android:paddingBottom="@dimen/dp_7"
android:paddingBottom="@dimen/platform_dp_7"
android:singleLine="true"
android:textColor="#242424"
android:textSize="@dimen/dp_14"
android:textSize="@dimen/platform_dp_14"
tools:text="自闭症电视都是范德萨" />
m-consultant/src/main/res/layout/item_price_range.xml
......@@ -9,7 +9,7 @@
>
<LinearLayout
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/platform_dp_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
......
m-consultant/src/main/res/layout/item_region.xml
......@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="@color/white">
android:background="@color/platform_white">
<View
android:id="@+id/view_select"
android:layout_width="4dp"
......@@ -18,7 +18,7 @@
android:layout_height="40dp"
android:gravity="center"
android:text="地区"
android:textColor="@color/default_text_color"
android:textColor="@color/platform_default_text_color"
android:textSize="14sp" />
</LinearLayout>
m-consultant/src/main/res/layout/item_sort.xml
......@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:gravity="center"
android:textSize="@dimen/dp_15"
android:textSize="@dimen/platform_dp_15"
tools:text="智能排序" />
<ImageView
......
m-consultant/src/main/res/layout/item_tag.xml
......@@ -8,7 +8,7 @@
android:gravity="center"
android:paddingLeft="4dp"
android:layout_marginRight="6dp"
android:textColor="@color/color_999999"
android:textColor="@color/platform_color_999999"
android:paddingRight="4dp"
android:textSize="10dp"
tools:text="恋爱情感" />
\ No newline at end of file
m-consultant/src/main/res/layout/layout_search_content.xml
......@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@color/white"
android:background="@color/platform_white"
>
<com.yidianling.consultant.ui.view.DisInterceptNestedScrollView
......@@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:orientation="horizontal">
<com.ydl.ydlcommon.view.DrawableRightTextView
......@@ -29,10 +29,10 @@
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
android:textColor="@color/color_242424"
android:drawableEnd="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:text="@string/theme"/>
android:textColor="@color/platform_color_242424"
android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:text="@string/platform_theme"/>
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/tvArea"
......@@ -40,10 +40,10 @@
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
android:textColor="@color/color_242424"
android:drawableEnd="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:text="@string/area"/>
android:textColor="@color/platform_color_242424"
android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:text="@string/platform_area"/>
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/tvSort"
......@@ -51,10 +51,10 @@
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
android:textColor="@color/color_242424"
android:drawableEnd="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:text="@string/sort"/>
android:textColor="@color/platform_color_242424"
android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:text="@string/platform_sort"/>
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/tvFilter"
......@@ -62,10 +62,10 @@
android:layout_width="0dp"
android:layout_weight="1"
android:width="0dp"
android:textColor="@color/color_242424"
android:drawableEnd="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/ic_arrow_drop_down_grey_500_18dp"
android:text="@string/filter"/>
android:textColor="@color/platform_color_242424"
android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:text="@string/platform_filter"/>
</LinearLayout>
<LinearLayout
......@@ -80,7 +80,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/line"/>
android:background="@color/platform_line"/>
</LinearLayout>
</com.yidianling.consultant.ui.view.DisInterceptNestedScrollView>
......@@ -93,7 +93,7 @@
android:id="@+id/viewSep2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/divide_color"
android:background="@color/platform_divide_color"
/>
<android.support.v4.widget.SwipeRefreshLayout
......@@ -105,7 +105,7 @@
android:id="@+id/rvExperts"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/platform_white"
android:overScrollMode="never"/>
</android.support.v4.widget.SwipeRefreshLayout>
......@@ -121,7 +121,7 @@
android:layout_width="match_parent"
android:layout_height="400dp"
android:orientation="vertical"
android:background="@color/white"
android:background="@color/platform_white"
android:gravity="center_horizontal"
android:visibility="gone"
>
......@@ -144,10 +144,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:background="@drawable/bg_blue_but"
android:paddingLeft="@dimen/dp_32"
android:paddingTop="@dimen/dp_8"
android:paddingRight="@dimen/dp_32"
android:paddingBottom="@dimen/dp_8"
android:paddingLeft="@dimen/platform_dp_32"
android:paddingTop="@dimen/platform_dp_8"
android:paddingRight="@dimen/platform_dp_32"
android:paddingBottom="@dimen/platform_dp_8"
android:text="重新加载"
android:textColor="@color/main_theme"/>
</LinearLayout>
......@@ -160,7 +160,7 @@
android:layout_alignParentBottom="true"
android:layout_marginRight="20dp"
android:layout_marginBottom="20dp"
android:background="@color/transparent"
android:background="@color/platform_transparent"
android:padding="0dp"
android:src="@drawable/ico_totop"
android:visibility="gone"
......
m-consultant/src/main/res/layout/layout_search_head_bg.xml
......@@ -4,7 +4,7 @@
android:id="@+id/search_head_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:clipChildren="false"
android:clipToPadding="false"
app:layout_collapseMode="parallax"
......@@ -27,13 +27,13 @@
android:layout_width="match_parent"
android:layout_height="99dp"
android:scaleType="centerCrop"
app:indicator_different_width="14dp"
app:indicator_drawable_selected="@drawable/banner_indicator_select"
app:indicator_drawable_unselected="@drawable/banner_indicator_unselect"
app:indicator_height="5dp"
app:indicator_margin="1.25dp"
app:is_selected_same_unselected="false"
app:is_show_indicator="false" />
app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/banner_indicator_select"
app:pa_indicator_drawable_unselected="@drawable/banner_indicator_unselect"
app:pa_indicator_height="5dp"
app:pa_indicator_margin="1.25dp"
app:pa_is_selected_same_unselected="false"
app:pa_is_show_indicator="false" />
</android.support.v7.widget.CardView>
</com.yidianling.consultant.ui.view.DisInterceptNestedScrollView>
\ No newline at end of file
m-consultant/src/main/res/layout/layout_search_toolbar.xml
......@@ -43,7 +43,7 @@
android:gravity="center_vertical"
android:hint="搜索心理问题或咨询师姓名"
android:maxLines="1"
android:textColor="@color/color_999999"
android:textColor="@color/platform_color_999999"
android:textSize="12dp" />
......@@ -59,7 +59,7 @@
android:gravity="center"
android:paddingTop="7dp"
android:text="客服"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="9sp" />
<TextView
......@@ -72,6 +72,6 @@
android:gravity="center"
android:paddingTop="7dp"
android:text="咨询指南"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="9sp" />
</LinearLayout>
m-consultant/src/main/res/layout/ui_filter_popup.xml
......@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/platform_white"
android:orientation="vertical">
<ScrollView
......@@ -11,23 +11,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/white"
android:background="@color/platform_white"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginTop="@dimen/platform_dp_20"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginLeft="@dimen/platform_dp_5"
android:layout_marginTop="@dimen/platform_dp_20"
android:text="显示方式"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/dp_16"
android:textStyle="bold"
android:visibility="gone" />
......@@ -42,10 +42,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginLeft="@dimen/platform_dp_5"
android:layout_marginTop="@dimen/platform_dp_28"
android:text="咨询方式"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/dp_16"
android:textStyle="bold" />
......@@ -58,10 +58,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginLeft="@dimen/platform_dp_5"
android:layout_marginTop="@dimen/platform_dp_28"
android:text="服务均价"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/dp_16"
android:textStyle="bold" />
......@@ -74,10 +74,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginLeft="@dimen/platform_dp_5"
android:layout_marginTop="@dimen/platform_dp_28"
android:text="年龄选择"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/dp_16"
android:textStyle="bold" />
......@@ -90,10 +90,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginLeft="@dimen/platform_dp_5"
android:layout_marginTop="@dimen/platform_dp_28"
android:text="资质选择"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/dp_16"
android:textStyle="bold" />
......@@ -108,10 +108,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginLeft="@dimen/platform_dp_5"
android:layout_marginTop="@dimen/platform_dp_28"
android:text="其他选择"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="@dimen/dp_16"
android:textStyle="bold" />
......@@ -134,7 +134,7 @@
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:layout_marginTop="10dp"
android:background="@color/white"
android:background="@color/platform_white"
android:orientation="horizontal">
<TextView
......@@ -144,8 +144,8 @@
android:layout_weight="1"
android:background="@drawable/bg_radius_gray_6"
android:gravity="center"
android:text="@string/reset"
android:textColor="@color/color_999999"
android:text="@string/platform_reset"
android:textColor="@color/platform_color_999999"
android:textSize="16sp" />
<TextView
......@@ -158,7 +158,7 @@
android:background="@drawable/bg_radius_5_light"
android:gravity="center"
android:hint="暂无匹配咨询师"
android:textColorHint="@color/color_E0E0E0"
android:textColorHint="@color/platform_color_E0E0E0"
android:textColor="@color/confirm_text_color"
android:textSize="16sp" />
</LinearLayout>
......
m-consultant/src/main/res/layout/ui_region_popup_window.xml
......@@ -8,7 +8,7 @@
android:id="@+id/rvRegion"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/platform_white"
android:layout_weight="1"
android:paddingTop="10dp"
android:overScrollMode="never"/>
......@@ -17,7 +17,7 @@
android:id="@+id/rvSub"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@color/color_F7F7F7"
android:background="@color/platform_color_F7F7F7"
android:layout_weight="2"
android:paddingTop="10dp"
android:overScrollMode="never"/>
......
m-consultant/src/main/res/layout/ui_sort_popup_window.xml
......@@ -3,7 +3,7 @@
android:id="@+id/rvSortItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:overScrollMode="never"
android:paddingTop="10dp"
android:paddingBottom="10dp"/>
......
m-consultant/src/main/res/layout/ui_subject_popup_window.xml
......@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:orientation="vertical">
<TextView
......@@ -10,10 +10,10 @@
android:layout_height="wrap_content"
android:text="服务类型"
android:textSize="@dimen/dp_16"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/platform_dp_24"
android:layout_marginLeft="@dimen/platform_dp_15"
android:layout_marginBottom="7dp"/>
<android.support.v7.widget.RecyclerView
......@@ -34,7 +34,7 @@
android:layout_marginTop="19dp"
android:background="@drawable/bg_radius_5_dark"
android:gravity="center"
android:text="@string/confirm"
android:text="@string/platform_confirm"
android:textSize="17dp"
android:textColor="@color/confirm_text_color" />
......
m-user/build.gradle
......@@ -70,8 +70,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.41"
compileOnly 'com.ydl:m-user-api:0.0.4'
api'com.ydl:router:1.0.0-SNAPSHOT@aar'
// api 'com.ydl:ydl-webview:0.0.2@aar'
// api('com.ydl:ydl-platform:0.0.4@aar') {
// api 'com.ydl:ydl-webview:0.0.3@aar'
// api('com.ydl:ydl-platform:0.0.5@aar') {
// transitive = true
// }
api project(':ydl-webview')
......
m-user/modular.gradle
......@@ -8,7 +8,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-user-module-xlzx"
// 上报的业务模块 aar 包的版本号
version = "0.0.5"
version = "0.0.6"
}
ydl{
......@@ -16,7 +16,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-user-module-ydl"
// 上报的业务模块 aar 包的版本号
version = "0.0.5"
version = "0.0.6"
}
}
......
m-user/src/main/java/com/yidianling/user/GlideImageLoader.java
......@@ -25,8 +25,8 @@ public class GlideImageLoader implements ImageLoader {
private void showImage(Activity activity, String path, ImageView imageView, int width, int height){
SimpleImageOpConfiger sp = new SimpleImageOpConfiger();
sp.loadingPic = R.drawable.default_img;
sp.errorPic = R.drawable.default_img;
sp.loadingPic = R.drawable.platform_default_img;
sp.errorPic = R.drawable.platform_default_img;
sp.scaleType = ISimpleImageOpConfig.CENTER_CROP;
sp.isCacheOnDisk = false;
YDLImageCacheManager.showImage(activity,path,imageView,width, height,sp);
......
m-user/src/main/java/com/yidianling/user/safePrivate/FingerPrintCheckActivity.kt
......@@ -103,7 +103,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
if (error_num < 1) {
CommonDialog(mContext)
.setMessage(FingerPrintUtil.errorLogin)
.setMessageColor(R.color.price_color)
.setMessageColor(R.color.platform_price_color)
.setRightClick("确定") {
//跳转登录
RegisterAndLoginActivity.start(this)
......@@ -119,7 +119,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
CommonDialog(mContext)
.setImageCenter(R.drawable.lock_ico_zhiwen)
.setMessage(FingerPrintUtil.errorMoreMessage)
.setMessageColor(R.color.price_color)
.setMessageColor(R.color.platform_price_color)
.setRightClick("取消") {
//停止指纹监听
FingerPrintUtil.instance().cancelFingerListener()
......@@ -158,7 +158,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
override fun onAuthenticationFailed() {
if (dia != null) {
dia.setMessage(FingerPrintUtil.errorMessage).setMessageColor(R.color.price_color)
dia.setMessage(FingerPrintUtil.errorMessage).setMessageColor(R.color.platform_price_color)
//设置抖动动画
dia.setMessageShake(true)
}
......@@ -172,7 +172,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
}
CommonDialog(mContext)
.setMessage(FingerPrintUtil.errorLogin)
.setMessageColor(R.color.price_color)
.setMessageColor(R.color.platform_price_color)
.setRightClick("确定") {
//跳转登录
//跳转登录
......@@ -185,7 +185,7 @@ class FingerPrintCheckActivity : BaseActivity(), View.OnClickListener {
override fun onAuthenticationError() {
if (dia != null) {
dia.setMessage(FingerPrintUtil.errorMoreMessage).setMessageColor(R.color.price_color)
dia.setMessage(FingerPrintUtil.errorMoreMessage).setMessageColor(R.color.platform_price_color)
}
}
......
m-user/src/main/java/com/yidianling/user/safePrivate/HandUnlockCheckActivity.kt
......@@ -202,7 +202,7 @@ class HandUnlockCheckActivity : BaseActivity(), android.view.View.OnClickListene
//判断系统指纹是否被禁用
if (!FingerPrintUtil.getFingerPrintIsAviable()) {
if (dia != null) {
dia.setMessage(FingerPrintUtil.errorMoreMessage).setMessageColor(R.color.price_color)
dia.setMessage(FingerPrintUtil.errorMoreMessage).setMessageColor(R.color.platform_price_color)
}
return
}
......@@ -239,7 +239,7 @@ class HandUnlockCheckActivity : BaseActivity(), android.view.View.OnClickListene
override fun onAuthenticationFailed() {
if (dia != null) {
dia.setMessage(FingerPrintUtil.errorMessage).setMessageColor(R.color.price_color)
dia.setMessage(FingerPrintUtil.errorMessage).setMessageColor(R.color.platform_price_color)
//设置抖动动画
dia.setMessageShake(true)
}
......
m-user/src/main/java/com/yidianling/user/safePrivate/SetFingerPrintActivity.kt
......@@ -69,7 +69,7 @@ class SetFingerPrintActivity : BaseActivity(), View.OnClickListener {
//判断系统指纹是否可用
if (!FingerPrintUtil.getFingerPrintIsAviable()) {
if (dia != null) {
dia.setMessage(FingerPrintUtil.errorMoreMessage).setMessageColor(R.color.price_color)
dia.setMessage(FingerPrintUtil.errorMoreMessage).setMessageColor(R.color.platform_price_color)
FingerPrintUtil.instance().cancelFingerListener()
}
......@@ -89,7 +89,7 @@ class SetFingerPrintActivity : BaseActivity(), View.OnClickListener {
override fun onAuthenticationFailed() {
if (dia != null) {
dia.setMessage(FingerPrintUtil.errorMessage).setMessageColor(R.color.price_color)
dia.setMessage(FingerPrintUtil.errorMessage).setMessageColor(R.color.platform_price_color)
//设置抖动动画
dia.setMessageShake(true)
}
......
m-user/src/main/java/com/yidianling/user/safePrivate/SetHandUnLockActivity.kt
......@@ -63,7 +63,7 @@ class SetHandUnLockActivity : BaseActivity() {
override fun onStart() {
if (first_pass != null) {
tipText?.setText("")
tipText?.setTextColor(ContextCompat.getColor(this@SetHandUnLockActivity, R.color.tag_text))
tipText?.setTextColor(ContextCompat.getColor(this@SetHandUnLockActivity, R.color.platform_tag_text))
}
}
......@@ -78,7 +78,7 @@ class SetHandUnLockActivity : BaseActivity() {
lock9?.setSuccessPass(password)
tipText?.visibility = View.VISIBLE
tipText?.setText("再次绘制图案进行确认")
tipText?.setTextColor(ContextCompat.getColor(this@SetHandUnLockActivity, R.color.tag_text))
tipText?.setTextColor(ContextCompat.getColor(this@SetHandUnLockActivity, R.color.platform_tag_text))
titleBar?.setRightTextVisiable(View.VISIBLE)
first_pass = password
tip_bar?.setPath(password)
......@@ -103,7 +103,7 @@ class SetHandUnLockActivity : BaseActivity() {
} else {
//与上次密码不一致，请重新绘制
tipText?.text = "与上次输入不一致，请重新绘制"
tipText?.setTextColor(ContextCompat.getColor(this@SetHandUnLockActivity, R.color.price_color))
tipText?.setTextColor(ContextCompat.getColor(this@SetHandUnLockActivity, R.color.platform_price_color))
}
}
}
......
m-user/src/main/java/com/yidianling/user/ui/CountryListActivity.java
......@@ -52,7 +52,7 @@ public class CountryListActivity extends BaseActivity {
mListView = findViewById(R.id.country_lv);
iv_close = findViewById(R.id.iv_close);
iv_close.setOnClickListener(view -> {
overridePendingTransition(0, R.anim.slide_out_to_bottom);
overridePendingTransition(0, R.anim.platform_slide_out_to_bottom);
finish();
});
init();
......@@ -131,7 +131,7 @@ public class CountryListActivity extends BaseActivity {
i.putExtra("name", c.getName());
i.putExtra("en_name", c.getEn_name());
setResult(45, i);
overridePendingTransition(0, R.anim.slide_out_to_bottom);
overridePendingTransition(0, R.anim.platform_slide_out_to_bottom);
finish();
});
return view;
......
m-user/src/main/java/com/yidianling/user/ui/FillInfoActivity.java
......@@ -184,7 +184,7 @@ public class FillInfoActivity extends BaseActivity implements View.OnClickListen
ActivityManager.Companion.finishActivity(LoginActivity.class);
finish();
}
ToastHelper.Companion.show(R.string.register_success);
ToastHelper.Companion.show(R.string.platform_register_success);
LogHelper.Companion.getInstance().writeLogSync("完善资料页退出");
})
.setRightClick("继续", (view1 -> {
......@@ -356,7 +356,7 @@ public class FillInfoActivity extends BaseActivity implements View.OnClickListen
ActivityManager.Companion.finishActivity(LoginActivity.class);
finish();
}
ToastHelper.Companion.show(R.string.register_success);
ToastHelper.Companion.show(R.string.platform_register_success);
LogHelper.Companion.getInstance().writeLogSync("完善资料成功");
}, new ThrowableConsumer() {
......
m-user/src/main/java/com/yidianling/user/ui/login/H5Activity.java
......@@ -32,13 +32,13 @@ public class H5Activity extends Activity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_h5);
StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.white);
StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.platform_white);
WebView web_view = findViewById(R.id.web_view);
ImageView iv_pop = findViewById(R.id.iv_pop);
iv_pop.setOnClickListener(view -> {
finish();
overridePendingTransition(0, R.anim.slide_out_to_bottom);
overridePendingTransition(0, R.anim.platform_slide_out_to_bottom);
});
web_view.setWebViewClient(new WebViewClient() {
//覆盖shouldOverrideUrlLoading 方法
......@@ -76,7 +76,7 @@ public class H5Activity extends Activity {
@Override
public void onBackPressed() {
finish();
overridePendingTransition(0, R.anim.slide_out_to_bottom);
overridePendingTransition(0, R.anim.platform_slide_out_to_bottom);
}
/**
......
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
......@@ -96,7 +96,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
}
private fun setWindowStatusBarColor() {
StatusBarUtils.setWindowStatusBarColor(this, R.color.color_075b66)
StatusBarUtils.setWindowStatusBarColor(this, R.color.platform_color_075b66)
}
private fun initView() {
......
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
......@@ -128,7 +128,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
private fun setWindowStatusBarColor() {
StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.color_075b66)
StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.platform_color_075b66)
}
private fun requestPermission() {
......@@ -148,7 +148,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
}
else -> {
// 用户拒绝了该权限，而且选中『不再询问』
ToastUtil.toastLong(this, getString(R.string.need_storage_permission_hint))
ToastUtil.toastLong(this, getString(R.string.platform_need_storage_permission_hint))
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
val uri = Uri.fromParts("package", packageName, null)
intent.data = uri
......@@ -264,7 +264,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
override fun onClick(widget: View) {
if (!isUmengLoginState) {
H5Activity.start(this@RegisterAndLoginActivity, false)
overridePendingTransition(R.anim.slide_in_from_bottom, R.anim.slide_null)
overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
}
}
}, 3, 9, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
......@@ -278,7 +278,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
override fun onClick(widget: View) {
if (!isUmengLoginState) {
H5Activity.start(this@RegisterAndLoginActivity, true)
overridePendingTransition(R.anim.slide_in_from_bottom, R.anim.slide_null)
overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
}
}
}, 10, str.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
......@@ -371,7 +371,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
val intent = Intent(this, CountryListActivity::class.java)
intent.putExtra("userCountryCode", countryCode)
startActivityForResult(intent, REQUEST_CODE_COUNTRY)
overridePendingTransition(R.anim.slide_in_from_bottom, R.anim.slide_null)
overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
}
//下一步
iv_next.setOnClickListener {
......
m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt
......@@ -113,7 +113,7 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
}
private fun setWindowStatusBarColor() {
StatusBarUtils.setWindowStatusBarColor(this, R.color.color_075b66)
StatusBarUtils.setWindowStatusBarColor(this, R.color.platform_color_075b66)
}
private fun getIntentData() {
......@@ -307,7 +307,7 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
@SuppressLint("SetTextI18n")
override fun startCountdown(remainTime: Int) {
tv_countdown_time.isEnabled = false
tv_countdown_time.setTextColor(ContextCompat.getColor(this, R.color.white))
tv_countdown_time.setTextColor(ContextCompat.getColor(this, R.color.platform_white))
msgCodeDispoable = Observable.interval(0, 1, TimeUnit.SECONDS)
.subscribeOn(Schedulers.computation())
......@@ -323,7 +323,7 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
}, {
tv_countdown_time.isEnabled = true
tv_countdown_time.text = "重新发送"
tv_countdown_time.setTextColor(ContextCompat.getColor(this, R.color.color_2EB0FF))
tv_countdown_time.setTextColor(ContextCompat.getColor(this, R.color.platform_color_2EB0FF))
})
}
......
m-user/src/main/java/com/yidianling/user/widget/PrivacyDialog.kt
......@@ -65,7 +65,7 @@ class PrivacyDialog : Dialog {
override fun onClick(widget: View) {
H5Activity.start(activity, true)
activity!!.overridePendingTransition(R.anim.slide_in_from_bottom, R.anim.slide_null)
activity!!.overridePendingTransition(R.anim.platform_slide_in_from_bottom, R.anim.slide_null)
}
}, index, index + 9, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
......
m-user/src/main/res/drawable/bg__choose_country_radius.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"></corners>
<solid android:color="@color/color_f3f3f3" />
<stroke android:width="1dp" android:color="@color/color_f3f3f3"/>
<solid android:color="@color/platform_color_f3f3f3" />
<stroke android:width="1dp" android:color="@color/platform_color_f3f3f3"/>
</shape>
\ No newline at end of file
m-user/src/main/res/drawable/bg_radius_transparent.xml
......@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp" />
<solid android:color="@color/color_33000000" />
<solid android:color="@color/platform_color_33000000" />
</shape>
\ No newline at end of file
m-user/src/main/res/drawable/country_list_item_select.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/color_1DA1F2"
<item android:color="@color/platform_color_1DA1F2"
android:state_pressed="true"/>
<item android:color="@color/black_deep"
<item android:color="@color/platform_black_deep"
android:state_pressed="false"/>
</selector>
m-user/src/main/res/drawable/user_privacy_agree_background.xml
......@@ -3,7 +3,7 @@
<corners android:radius="20dp" />
<gradient
android:endColor="@color/color_1DA1F2"
android:startColor="@color/color_42C1FF" />
android:endColor="@color/platform_color_1DA1F2"
android:startColor="@color/platform_color_42C1FF" />
</shape>
\ No newline at end of file
m-user/src/main/res/drawable/user_privacy_disagree_background.xml
......@@ -3,8 +3,8 @@
<stroke
android:width="1dp"
android:color="@color/color_999999" />
android:color="@color/platform_color_999999" />
<corners android:radius="20dp" />
<solid android:color="@color/white" />
<solid android:color="@color/platform_white" />
</shape>
\ No newline at end of file
m-user/src/main/res/layout/activity_ali_auth_demo.xml
......@@ -45,7 +45,7 @@
android:layout_margin="10dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:background="@color/gray7"
android:background="@color/platform_gray7"
android:text="获取登录Token" />
<Button
......@@ -55,7 +55,7 @@
android:layout_gravity="center"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@color/gray7"
android:background="@color/platform_gray7"
android:text="获取认证token" />
</LinearLayout>
</LinearLayout>
......
m-user/src/main/res/layout/activity_check_password.xml
......@@ -16,8 +16,8 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
app:left_start_icon="@drawable/nav_close_green"
app:title_text="登录验证"/>
app:pa_left_start_icon="@drawable/nav_close_green"
app:pa_title_text="登录验证"/>
<TextView
android:id="@+id/text_phoneNumber"
......@@ -30,12 +30,12 @@
android:id="@+id/edit_pass"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/white"
android:background="@color/platform_white"
android:hint="输入登录密码"
android:inputType="textPassword"
android:maxLines="1"
android:paddingLeft="10dp"
android:textColorHint="@color/place_holder_color" />
android:textColorHint="@color/platform_place_holder_color" />
<TextView
android:id="@+id/btn_next"
......@@ -47,7 +47,7 @@
android:background="@drawable/bg_radius_green_20"
android:gravity="center"
android:text="下一步"
android:textColor="@color/white" />
android:textColor="@color/platform_white" />
</LinearLayout>
<ProgressBar
......
m-user/src/main/res/layout/activity_country_list.xml
......@@ -20,7 +20,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:text="选择国家/地区"
android:textColor="@color/color_444444"
android:textColor="@color/platform_color_444444"
android:textSize="28sp"
android:textStyle="bold" />
......
m-user/src/main/res/layout/activity_fill_info.xml
......@@ -10,8 +10,8 @@
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:left_text="退出"
app:title_text="完善资料" />
app:pa_left_text="退出"
app:pa_title_text="完善资料" />
<com.ydl.ydlcommon.view.CircleImageView
android:id="@+id/sdv_head"
......@@ -25,53 +25,53 @@
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:layout_marginTop="36dp"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<TextView
android:id="@+id/tv_sex"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:gravity="center"
android:hint="@string/please_select_gender"
android:padding="@dimen/default_dis_size_huge"
android:hint="@string/platform_please_select_gender"
android:padding="@dimen/platform_default_dis_size_huge"
android:textColorHint="#777777" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<EditText
android:id="@+id/et_nick"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:gravity="center"
android:hint="@string/nickname_hint"
android:hint="@string/platform_nickname_hint"
android:maxLength="10"
android:padding="@dimen/default_dis_size_huge"
android:padding="@dimen/platform_default_dis_size_huge"
android:singleLine="true"
android:textColorHint="#777777" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<com.ydl.ydlcommon.view.RoundCornerButton
android:id="@+id/rcb_submit"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size_big"
android:layout_marginRight="@dimen/default_dis_size_big"
android:layout_marginTop="@dimen/default_dis_size_huge"
android:text="@string/finish"
android:textColor="@color/white"
android:textSize="@dimen/default_text_size_big"
app:round_btn_active_bg="@color/white"
app:round_btn_bg="@color/main_theme"
app:round_btn_radio_size="5dp" />
android:layout_marginLeft="@dimen/platform_default_dis_size_big"
android:layout_marginRight="@dimen/platform_default_dis_size_big"
android:layout_marginTop="@dimen/platform_default_dis_size_huge"
android:text="@string/platform_finish"
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/main_theme"
app:pa_round_btn_radio_size="5dp" />
</LinearLayout>
\ No newline at end of file
m-user/src/main/res/layout/activity_finger_print_check.xml
......@@ -10,7 +10,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
app:title_text="欢迎回来">
app:pa_title_text="欢迎回来">
</com.ydl.ydlcommon.view.TitleBar>
<com.ydl.ydlcommon.view.CircleImageView
......@@ -19,7 +19,7 @@
android:layout_height="80dp"
android:layout_below="@id/title_bar"
android:layout_marginTop="30dp"
tools:src="@drawable/head_place_hold_pic"
tools:src="@drawable/platform_head_place_hold_pic"
android:layout_centerHorizontal="true"/>
<TextView
......
m-user/src/main/res/layout/activity_finger_print_set.xml
......@@ -10,8 +10,8 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
app:title_text="开启指纹解锁"
app:left_start_icon="@drawable/nav_close_green">
app:pa_title_text="开启指纹解锁"
app:pa_left_start_icon="@drawable/nav_close_green">
</com.ydl.ydlcommon.view.TitleBar>
<TextView
......
m-user/src/main/res/layout/activity_get_identifying_code.xml
......@@ -10,48 +10,48 @@
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:left_start_icon="@drawable/toolbar_back"
app:title_text="手机号" />
app:pa_left_start_icon="@drawable/toolbar_back"
app:pa_title_text="手机号" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_dis_size_large"
android:layout_marginTop="@dimen/platform_default_dis_size_large"
android:gravity="center"
android:text="已发送短信验证码至"
android:textSize="@dimen/default_text_size_small" />
android:textSize="@dimen/platform_default_text_size_small" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_dis_size_large"
android:layout_marginTop="@dimen/platform_default_dis_size_large"
android:gravity="center"
android:textColor="#FF8A00"
android:textSize="@dimen/default_text_size_big"
android:textSize="@dimen/platform_default_text_size_big"
tools:text="159 571 87971" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_dis_size_huge"
android:layout_marginTop="@dimen/platform_default_dis_size_huge"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:orientation="horizontal">
<TextView
android:layout_width="100dp"
android:layout_height="wrap_content"
android:padding="@dimen/default_dis_size"
android:padding="@dimen/platform_default_dis_size"
android:text="验证码" />
<EditText
......@@ -59,18 +59,18 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/white"
android:background="@color/platform_white"
android:hint="请输入"
android:inputType="number"
android:padding="@dimen/default_dis_size"
android:textColorHint="@color/gray7" />
android:padding="@dimen/platform_default_dis_size"
android:textColorHint="@color/platform_gray7" />
<TextView
android:id="@+id/tv_get_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:padding="@dimen/default_dis_size"
android:padding="@dimen/platform_default_dis_size"
android:text="重新发送"
android:textColor="@color/main_theme" />
</LinearLayout>
......@@ -78,61 +78,61 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<LinearLayout
android:id="@+id/lin_login_pass"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:orientation="horizontal">
<TextView
android:layout_width="100dp"
android:layout_height="wrap_content"
android:padding="@dimen/default_dis_size"
android:padding="@dimen/platform_default_dis_size"
android:text="登录密码" />
<EditText
android:id="@+id/et_password"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/platform_white"
android:hint="请设置"
android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
android:padding="@dimen/default_dis_size"
android:textColorHint="@color/gray7" />
android:padding="@dimen/platform_default_dis_size"
android:textColorHint="@color/platform_gray7" />
</LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<TextView
android:id="@+id/text_pass_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/default_dis_size"
android:layout_margin="@dimen/platform_default_dis_size"
android:text="密码6~16个字符，数字或英文字母的组合"
android:textColor="#A6A6A6"
android:textSize="@dimen/default_text_size_small" />
android:textSize="@dimen/platform_default_text_size_small" />
<com.ydl.ydlcommon.view.RoundCornerButton
android:id="@+id/rcb_submit"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginRight="@dimen/default_dis_size"
android:layout_marginTop="@dimen/default_dis_size_huge"
android:layout_marginLeft="@dimen/platform_default_dis_size"
android:layout_marginRight="@dimen/platform_default_dis_size"
android:layout_marginTop="@dimen/platform_default_dis_size_huge"
android:text="提交"
android:textColor="@color/white"
android:textSize="@dimen/default_text_size_big"
app:round_btn_active_bg="@color/white"
app:round_btn_bg="@color/main_theme"
app:round_btn_radio_size="5dp" />
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/main_theme"
app:pa_round_btn_radio_size="5dp" />
</LinearLayout>
......
m-user/src/main/res/layout/activity_hand_unlock.xml
......@@ -11,7 +11,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
app:title_text="欢迎回来">
app:pa_title_text="欢迎回来">
</com.ydl.ydlcommon.view.TitleBar>
......@@ -22,7 +22,7 @@
android:layout_below="@id/title_bar"
android:layout_marginTop="30dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/head_place_hold_pic"
android:src="@drawable/platform_head_place_hold_pic"
android:layout_centerHorizontal="true"/>
<TextView
......@@ -31,7 +31,7 @@
android:layout_height="30dp"
android:gravity="center"
android:layout_marginTop="20dp"
android:textColor="@color/price_color"
android:textColor="@color/platform_price_color"
tools:text="请绘制手势"/>
<!--设置动画-->
......@@ -41,15 +41,15 @@
android:layout_width="300dp"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"
app:lock9_nodeSrc="@drawable/lock_btn_shoushi"
app:lock9_nodeOnSrc="@drawable/lock_btn_shoushi_pre"
app:lock9_padding="20dp"
app:lock9_spacing="40dp"
app:lock9_lineColor="@color/main_theme"
app:lock9_lineWidth="5dp"
app:lock9_autoLink="false"
app:lock9_enableVibrate="true"
app:lock9_vibrateTime="20">
app:pa_lock9_nodeSrc="@drawable/lock_btn_shoushi"
app:pa_lock9_nodeOnSrc="@drawable/lock_btn_shoushi_pre"
app:pa_lock9_padding="20dp"
app:pa_lock9_spacing="40dp"
app:pa_lock9_lineColor="@color/main_theme"
app:pa_lock9_lineWidth="5dp"
app:pa_lock9_autoLink="false"
app:pa_lock9_enableVibrate="true"
app:pa_lock9_vibrateTime="20">
</com.ydl.ydlcommon.view.shoushi.Lock9View>
<LinearLayout
......
m-user/src/main/res/layout/activity_hand_unlock_set.xml
......@@ -11,9 +11,9 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
app:title_text="设置手势解锁"
app:left_start_icon="@drawable/nav_close_green"
app:right_text="重设">
app:pa_title_text="设置手势解锁"
app:pa_left_start_icon="@drawable/nav_close_green"
app:pa_right_text="重设">
</com.ydl.ydlcommon.view.TitleBar>
......@@ -40,15 +40,15 @@
android:id="@+id/lock9View"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:lock9_nodeSrc="@drawable/lock_btn_shoushi"
app:lock9_nodeOnSrc="@drawable/lock_btn_shoushi_pre"
app:lock9_padding="28dp"
app:lock9_spacing="28dp"
app:lock9_lineColor="@color/main_theme"
app:lock9_lineWidth="5dp"
app:lock9_autoLink="false"
app:lock9_enableVibrate="true"
app:lock9_vibrateTime="20">
app:pa_lock9_nodeSrc="@drawable/lock_btn_shoushi"
app:pa_lock9_nodeOnSrc="@drawable/lock_btn_shoushi_pre"
app:pa_lock9_padding="28dp"
app:pa_lock9_spacing="28dp"
app:pa_lock9_lineColor="@color/main_theme"
app:pa_lock9_lineWidth="5dp"
app:pa_lock9_autoLink="false"
app:pa_lock9_enableVibrate="true"
app:pa_lock9_vibrateTime="20">
</com.ydl.ydlcommon.view.shoushi.Lock9View>>
......
m-user/src/main/res/layout/activity_input_password.xml
......@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/input_password"
android:layout_marginLeft="28dp"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginTop="@dimen/platform_dp_4"
android:text="当前手机号"
android:textColor="#fdfdfe"
android:textSize="13sp" />
......@@ -109,7 +109,7 @@
<FrameLayout
android:layout_width="40dp"
android:layout_height="26dp"
android:background="@drawable/bg_radius_f3_10"
android:background="@drawable/platform_bg_radius_f3_10"
android:gravity="center_vertical">
<ImageView
......
m-user/src/main/res/layout/activity_input_phone.xml
......@@ -9,8 +9,8 @@
<com.ydl.ydlcommon.view.TitleBar
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:left_start_icon="@drawable/toolbar_back"
app:title_text="填写手机号"/>
app:pa_left_start_icon="@drawable/toolbar_back"
app:pa_title_text="填写手机号"/>
<TextView
android:id="@+id/tv_free_packet_hint"
......@@ -30,54 +30,54 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:layout_marginTop="@dimen/default_dis_size_huge"
android:background="@color/divide_color"/>
android:layout_marginTop="@dimen/platform_default_dis_size_huge"
android:background="@color/platform_divide_color"/>
<com.ydl.ydlcommon.view.JumpTextView
android:id="@+id/jtv_country"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ffffff"
app:jump_tv_icon="@drawable/icon_country"
app:jump_tv_left_icon_hight="20dp"
app:jump_tv_left_icon_width="20dp"/>
app:pa_jump_tv_icon="@drawable/platform_icon_country"
app:pa_jump_tv_left_icon_hight="20dp"
app:pa_jump_tv_left_icon_width="20dp"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color"/>
android:background="@color/platform_divide_color"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:layout_marginTop="@dimen/default_dis_size_huge"
android:background="@color/divide_color"/>
android:layout_marginTop="@dimen/platform_default_dis_size_huge"
android:background="@color/platform_divide_color"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/default_dis_size"
android:padding="@dimen/platform_default_dis_size"
android:text="手机号"/>
<com.ydl.ydlcommon.view.DeleteEditTextView
android:id="@+id/detv_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:inputType="number"
android:padding="@dimen/default_dis_size" />
android:padding="@dimen/platform_default_dis_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color"/>
android:background="@color/platform_divide_color"/>
<LinearLayout
android:id="@+id/ll_protocol"
......@@ -88,25 +88,25 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size"
android:paddingBottom="@dimen/default_dis_size_micro"
android:paddingTop="@dimen/default_dis_size_micro"
android:layout_marginLeft="@dimen/platform_default_dis_size"
android:paddingBottom="@dimen/platform_default_dis_size_micro"
android:paddingTop="@dimen/platform_default_dis_size_micro"
android:text="已阅读并同意"
android:textColor="#A1A1A1"
android:textSize="@dimen/default_text_size_small"/>
android:textSize="@dimen/platform_default_text_size_small"/>
<TextView
android:id="@+id/tv_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size_micro"
android:layout_marginStart="@dimen/default_dis_size_micro"
android:layout_marginLeft="@dimen/platform_default_dis_size_micro"
android:layout_marginStart="@dimen/platform_default_dis_size_micro"
android:background="?android:attr/selectableItemBackground"
android:paddingBottom="@dimen/default_dis_size_micro"
android:paddingTop="@dimen/default_dis_size_micro"
android:text="@string/user_protocol"
android:paddingBottom="@dimen/platform_default_dis_size_micro"
android:paddingTop="@dimen/platform_default_dis_size_micro"
android:text="@string/platform_user_protocol"
android:textColor="@color/main_theme"
android:textSize="@dimen/default_text_size_small"/>
android:textSize="@dimen/platform_default_text_size_small"/>
</LinearLayout>
<com.ydl.ydlcommon.view.RoundCornerButton
......@@ -114,14 +114,14 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size_big"
android:layout_marginRight="@dimen/default_dis_size_big"
android:layout_marginTop="@dimen/default_dis_size_large"
android:text="@string/next_step"
android:textColor="@color/white"
android:textSize="@dimen/default_text_size_big"
app:round_btn_active_bg="@color/white"
app:round_btn_bg="@color/main_theme"
app:round_btn_radio_size="5dp"/>
android:layout_marginLeft="@dimen/platform_default_dis_size_big"
android:layout_marginRight="@dimen/platform_default_dis_size_big"
android:layout_marginTop="@dimen/platform_default_dis_size_large"
android:text="@string/platform_next_step"
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/main_theme"
app:pa_round_btn_radio_size="5dp"/>
</LinearLayout>
\ No newline at end of file
m-user/src/main/res/layout/activity_login.xml
......@@ -15,28 +15,28 @@
android:id="@+id/tb_title"
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
app:left_text="取消"
app:title_text="登录" />
app:pa_left_text="取消"
app:pa_title_text="登录" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:layout_marginTop="@dimen/default_dis_size_huge"
android:background="@color/divide_color" />
android:layout_marginTop="@dimen/platform_default_dis_size_huge"
android:background="@color/platform_divide_color" />
<com.ydl.ydlcommon.view.JumpTextView
android:id="@+id/jtv_country"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="@color/white"
app:jump_tv_icon="@drawable/icon_country"
app:jump_tv_left_text="中国 +0086"
app:jump_tv_left_icon_width="20dp"
app:jump_tv_left_icon_hight="20dp"/>
android:background="@color/platform_white"
app:pa_jump_tv_icon="@drawable/platform_icon_country"
app:pa_jump_tv_left_text="中国 +0086"
app:pa_jump_tv_left_icon_width="20dp"
app:pa_jump_tv_left_icon_hight="20dp"/>
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<android.support.v4.widget.Space
android:layout_width="match_parent"
android:layout_height="10dp" />
......@@ -44,58 +44,58 @@
android:id="@+id/detv_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:drawableLeft="@drawable/phone"
android:drawablePadding="@dimen/default_dis_size_small"
android:drawablePadding="@dimen/platform_default_dis_size_small"
android:hint="手机号"
android:inputType="number"
android:paddingTop="@dimen/default_dis_size_big"
android:paddingRight="@dimen/default_dis_size_big"
android:paddingBottom="@dimen/default_dis_size_big"
android:paddingTop="@dimen/platform_default_dis_size_big"
android:paddingRight="@dimen/platform_default_dis_size_big"
android:paddingBottom="@dimen/platform_default_dis_size_big"
android:paddingLeft="17dp"
android:text=""
android:textColorHint="@color/default_text_color_hint" />
android:textColorHint="@color/platform_default_text_color_hint" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<com.ydl.ydlcommon.view.DeleteEditTextView
android:id="@+id/detv_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/platform_white"
android:drawableLeft="@drawable/lock"
android:drawablePadding="@dimen/default_dis_size_small"
android:drawablePadding="@dimen/platform_default_dis_size_small"
android:hint="密码"
android:inputType="textPassword"
android:paddingTop="@dimen/default_dis_size_big"
android:paddingRight="@dimen/default_dis_size_big"
android:paddingBottom="@dimen/default_dis_size_big"
android:paddingTop="@dimen/platform_default_dis_size_big"
android:paddingRight="@dimen/platform_default_dis_size_big"
android:paddingBottom="@dimen/platform_default_dis_size_big"
android:paddingLeft="17dp"
android:text=""
android:textColorHint="@color/default_text_color_hint" />
android:textColorHint="@color/platform_default_text_color_hint" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:background="@color/platform_divide_color" />
<com.ydl.ydlcommon.view.RoundCornerButton
android:id="@+id/rcb_login"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size_big"
android:layout_marginRight="@dimen/default_dis_size_big"
android:layout_marginTop="@dimen/default_dis_size_huge"
android:layout_marginLeft="@dimen/platform_default_dis_size_big"
android:layout_marginRight="@dimen/platform_default_dis_size_big"
android:layout_marginTop="@dimen/platform_default_dis_size_huge"
android:text="登录"
android:textColor="@color/white"
android:textSize="@dimen/default_text_size_big"
app:round_btn_active_bg="@color/white"
app:round_btn_bg="@color/main_theme"
app:round_btn_radio_size="5dp" />
android:textColor="@color/platform_white"
android:textSize="@dimen/platform_default_text_size_big"
app:pa_round_btn_active_bg="@color/platform_white"
app:pa_round_btn_bg="@color/main_theme"
app:pa_round_btn_radio_size="5dp" />
</LinearLayout>
<RelativeLayout
......@@ -111,10 +111,10 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:paddingBottom="@dimen/default_dis_size"
android:paddingLeft="@dimen/default_dis_size"
android:paddingRight="@dimen/default_dis_size_big"
android:paddingTop="@dimen/default_dis_size_huge"
android:paddingBottom="@dimen/platform_default_dis_size"
android:paddingLeft="@dimen/platform_default_dis_size"
android:paddingRight="@dimen/platform_default_dis_size_big"
android:paddingTop="@dimen/platform_default_dis_size_huge"
android:text="新手注册"
android:textColor="@color/main_theme"
android:textSize="17sp"/>
......@@ -124,10 +124,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:paddingBottom="@dimen/default_dis_size"
android:paddingLeft="@dimen/default_dis_size"
android:paddingRight="@dimen/default_dis_size_big"
android:paddingTop="@dimen/default_dis_size_huge"
android:paddingBottom="@dimen/platform_default_dis_size"
android:paddingLeft="@dimen/platform_default_dis_size"
android:paddingRight="@dimen/platform_default_dis_size_big"
android:paddingTop="@dimen/platform_default_dis_size_huge"
android:text="短信快捷登录"
android:textColor="@color/main_theme"
android:textSize="17sp" />
......
m-user/src/main/res/layout/activity_me_privacy.xml
......@@ -9,8 +9,8 @@
<com.ydl.ydlcommon.view.TitleBar
android:layout_width="match_parent"
android:layout_height="50dp"
app:left_start_icon="@drawable/toolbar_back"
app:title_text="隐私安全">
app:pa_left_start_icon="@drawable/toolbar_back"
app:pa_title_text="隐私安全">
</com.ydl.ydlcommon.view.TitleBar>
......@@ -23,8 +23,8 @@
android:visibility="gone"
tools:visibility="visible"
android:text="指纹密码仅对本机有效"
android:textColor="@color/gray7"
android:background="@color/f5f5f5"/>
android:textColor="@color/platform_gray7"
android:background="@color/platform_f5f5f5"/>
<RelativeLayout
android:id="@+id/rela_finger"
......@@ -53,7 +53,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/f5f5f5"/>
android:background="@color/platform_f5f5f5"/>
<RelativeLayout
android:background="#ffffff"
......@@ -79,13 +79,13 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/f5f5f5"/>
android:background="@color/platform_f5f5f5"/>
<LinearLayout
android:id="@+id/lin_update"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:background="@color/platform_white"
android:paddingLeft="15dp"
android:paddingRight="15dp"
tools:visibility="visible"
......
m-user/src/main/res/layout/activity_register_and_login.xml
......@@ -137,7 +137,7 @@
android:inputType="phone"
android:lines="1"
android:maxLength="13"
android:textColorHint="@color/color_c6c3c3"
android:textColorHint="@color/platform_color_c6c3c3"
android:textSize="24sp" />
<ImageView
......
m-user/src/main/res/layout/activity_verification_code.xml
......@@ -48,7 +48,7 @@
android:layout_marginRight="23dp"
android:foreground="?android:attr/selectableItemBackground"
android:padding="5dp"
android:textColor="@color/white"
android:textColor="@color/platform_white"
android:textSize="11dp"
tools:text="发送验证码"
tools:visibility="visible" />
......@@ -61,7 +61,7 @@
android:layout_marginLeft="28dp"
android:layout_marginTop="15dp"
android:text="输入验证码"
android:textColor="@color/white"
android:textColor="@color/platform_white"
android:textSize="28sp"
android:textStyle="bold" />
......@@ -73,7 +73,7 @@
android:layout_marginLeft="28dp"
android:layout_marginTop="4dp"
android:text="短信已发送至 "
android:textColor="@color/white"
android:textColor="@color/platform_white"
android:textSize="14dp" />
<TextView
......
m-user/src/main/res/layout/dialog_privacy.xml
......@@ -25,7 +25,7 @@
android:layout_height="100dp"
android:gravity="center"
android:text="用户隐私保护政策"
android:textColor="@color/white"
android:textColor="@color/platform_white"
android:textSize="21sp" />
<ScrollView
......@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:lineSpacingExtra="4dp"
android:textColor="@color/color_444444"
android:textColor="@color/platform_color_444444"
android:textSize="12sp"
tools:text="为响应为为响应为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规为响应国家为响应国家相关法律法规为响应国家相关法律法规相关法律法规为响应国家相关法律法规，我们在近期更新了《壹点灵隐私政策》文件以确保用户充分理解政策，请您在使用前务必仔细阅读。
点击下方“同意”按钮即可使用壹点灵提供的服务，使用过程中我们会竭尽全力保护您的隐私安全，未经您的授权，壹点灵不会向任何第三方提供您的信息。" />
......@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:gravity="end"
android:textColor="@color/color_444444"
android:textColor="@color/platform_color_444444"
android:textSize="12sp"
tools:text="更新日期：2018年11月11日" />
</LinearLayout>
......@@ -76,7 +76,7 @@
android:background="@drawable/user_privacy_disagree_background"
android:gravity="center"
android:text="不同意"
android:textColor="@color/color_999999"
android:textColor="@color/platform_color_999999"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -91,7 +91,7 @@
android:background="@drawable/user_privacy_agree_background"
android:gravity="center"
android:text="同意"
android:textColor="@color/white"
android:textColor="@color/platform_white"
android:textStyle="bold" />
</RelativeLayout>
......
m-user/src/main/res/layout/item_country_phone_code.xml
......@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:drawablePadding="@dimen/default_dis_size_small"
android:drawablePadding="@dimen/platform_default_dis_size_small"
android:text="中国"
android:textColor="@drawable/country_list_item_select"
android:textSize="18dp" />
......
ydl-platform/gradle.properties
IS_PUBLISH=true
VERSION_NAME=0.0.4
\ No newline at end of file
VERSION_NAME=0.0.5
\ No newline at end of file
ydl-platform/src/main/AndroidManifest.xml
......@@ -11,27 +11,11 @@
<application>
<activity
android:name="com.ydl.ydlcommon.actions.pay.PayActivity"
android:screenOrientation="portrait" />
<activity
android:name="com.ydl.ydlcommon.actions.imagepicker.ImagePickerActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
<service android:name="com.ydl.ydlcommon.actions.player.service.HMusicPlayService"
android:enabled="true"/>
<receiver android:name="com.ydl.ydlcommon.actions.player.notifycation.MusicPlayerReceiver"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="harvie_play" />
<action android:name="harvie_pause" />
<action android:name="harvie_detail" />
<action android:name="harvie_stop" />
</intent-filter>
</receiver>
<!--监听系统下载完成的广播-->
<receiver android:name="com.ydl.ydlcommon.utils.receiver.DownloadReceiver">
<intent-filter>
......
ydl-platform/src/main/java/com/ydl/ydlcommon/actions/imagepicker/YdlImageLoader.java
......@@ -30,8 +30,8 @@ public class YdlImageLoader implements ImageLoader {
private void showImage(Activity activity, String path, ImageView imageView, int width, int height){
GlideApp.with(activity) //配置上下文
.load(Uri.fromFile(new File(path))) //设置图片路径(fix #8,文件名包含%符号 无法识别和显示)
.error(R.drawable.default_img) //设置错误图片
.placeholder(R.drawable.default_img) //设置占位图片
.error(R.drawable.platform_default_img) //设置错误图片
.placeholder(R.drawable.platform_default_img) //设置占位图片
.diskCacheStrategy(DiskCacheStrategy.ALL)//缓存全尺寸
.into(imageView);
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/ThrowableConsumer.kt
......@@ -42,7 +42,7 @@ abstract class ThrowableConsumer: Consumer<Throwable> {
if (RxNetTool.isConnected(BaseApp.getApp())) {
accept(ThrowableUtil.getMessage(t))
}else{
accept(BaseApp.getApp().getString(R.string.network_error))
accept(BaseApp.getApp().getString(R.string.platform_network_error))
}
}
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/ThrowableUtil.kt
......@@ -18,14 +18,14 @@ internal object ThrowableUtil {
@JvmStatic
fun getMessage(t: Throwable?): String {
return when (t) {
is IOException -> BaseApp.getApp().getString(R.string.data_error)
is HttpException -> BaseApp.getApp().getString(R.string.httperror)
is JsonParseException -> BaseApp.getApp().getString(R.string.httperror)
is ConnectException -> BaseApp.getApp().getString(R.string.network_error)
is SocketTimeoutException -> BaseApp.getApp().getString(R.string.timeout)
is IOException -> BaseApp.getApp().getString(R.string.platform_data_error)
is HttpException -> BaseApp.getApp().getString(R.string.platform_httperror)
is JsonParseException -> BaseApp.getApp().getString(R.string.platform_httperror)
is ConnectException -> BaseApp.getApp().getString(R.string.platform_network_error)
is SocketTimeoutException -> BaseApp.getApp().getString(R.string.platform_timeout)
is ApiThrowable -> t.message ?: ""
is CustomThrowable -> t.message ?: ""
else -> BaseApp.getApp().getString(R.string.loadfailed)
else -> BaseApp.getApp().getString(R.string.platform_loadfailed)
}
}
}
\ No newline at end of file
ydl-platform/src/main/java/com/ydl/ydlcommon/mvp/lce/view/YDLStateView.kt
......@@ -31,7 +31,7 @@ class YDLStateView(context: Context?, attrs: AttributeSet?) : RelativeLayout(con
private fun initView() {
View.inflate(context, R.layout.platform_logo_loading_view, this)
GlideApp.with(this).load(R.drawable.loading_logo).into(logo_loading_gif)
GlideApp.with(this).load(R.drawable.platform_loading_logo).into(logo_loading_gif)
reset_btn.setOnClickListener {
mListener?.onDataResetClick()
......
ydl-platform/src/main/java/com/ydl/ydlcommon/ui/LogoLoadingView.kt
......@@ -29,7 +29,7 @@ class LogoLoadingView(context: Context?, attrs: AttributeSet?): RelativeLayout(c
private fun initView() {
View.inflate(context, R.layout.platform_logo_loading_view,this)
GlideApp.with(this).load(R.drawable.loading_logo).into(logo_loading_gif)
GlideApp.with(this).load(R.drawable.platform_loading_logo).into(logo_loading_gif)
reset_btn.setOnClickListener {
mListener?.onDataResetClick()
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/ApkUpdateDialog.kt
......@@ -97,11 +97,11 @@ class ApkUpdateDialog : Dialog{
override fun onStart() {
super.onStart()
val padding = context.resources.getDimensionPixelSize(R.dimen.default_dis_size_big)
val padding = context.resources.getDimensionPixelSize(R.dimen.platform_default_dis_size_big)
window.setLayout(
RxDeviceTool.getScreenWidth(context) - padding, ViewGroup.LayoutParams.WRAP_CONTENT
)
window.setBackgroundDrawableResource(R.color.transparent)
window.setBackgroundDrawableResource(R.color.platform_transparent)
setCancelable(isCancleAble)
setCanceledOnTouchOutside(false)
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/MoonUtil.java
......@@ -19,8 +19,6 @@ import android.widget.TextView;
import com.ydl.ydlcommon.utils.emoji.EmojiManager;
import com.ydl.ydlcommon.utils.emoji.ImageSpanAlignCenter;
import com.ydl.ydlcommon.R;
import com.ydl.ydlcommon.utils.emoji.EmojiManager;
import com.ydl.ydlcommon.utils.emoji.ImageSpanAlignCenter;
import java.util.ArrayList;
import java.util.regex.Matcher;
......@@ -47,13 +45,13 @@ public class MoonUtil {
public static void SetTrendContent(Context context,TextView textView, String value,String topic,String allContent,int align){
// viewSetText(textView, mSpannableString);
SpannableString spantopic = new SpannableString(topic);
spantopic.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.text_user)), 0, topic.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spantopic.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.platform_text_user)), 0, topic.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.setText(spantopic);
SpannableString mSpannableString = makeSpannableStringTags(context, value, DEF_SCALE, align);
textView.append(mSpannableString);
if(!"".equals(allContent)&&allContent!=null){
SpannableString spanallContent = new SpannableString(allContent);
spanallContent.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.text_user)), 0, allContent.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spanallContent.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.platform_text_user)), 0, allContent.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.append(spanallContent);
}
// textView.setMovementMethod(LinkMovementMethod.getInstance());
......@@ -71,19 +69,19 @@ public class MoonUtil {
// LogUtil.d("username: "+username+ " reply username: "+reply_username);
if(!"".equals(reply_username)&&reply_username!=null){
SpannableString spantuser = new SpannableString(username);
spantuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.default_text_color)), 0, username.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spantuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.platform_default_text_color)), 0, username.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.setText(spantuser);
textView.append("回复");
String reply_user_name=reply_username+"：";
SpannableString spantreplyuser = new SpannableString(reply_user_name);
spantreplyuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.default_text_color)), 0, reply_user_name.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spantreplyuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.platform_default_text_color)), 0, reply_user_name.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.append(spantreplyuser);
SpannableString mSpannableString = makeSpannableStringTags2(context, value, 0.45f, align);
textView.append(mSpannableString);
}else {
String usernamed=username+"：";
SpannableString spantuser = new SpannableString(usernamed);
spantuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.default_text_color)), 0, usernamed.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spantuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.platform_default_text_color)), 0, usernamed.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.setText(spantuser);
SpannableString mSpannableString = makeSpannableStringTags2(context, value, 0.45f, align);
textView.append(mSpannableString);
......@@ -97,14 +95,14 @@ public class MoonUtil {
textView.setText("回复");
String reply_user_name=reply_username+"：";
SpannableString spantreplyuser = new SpannableString(reply_user_name);
spantreplyuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.text_user)), 0, reply_user_name.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spantreplyuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.platform_text_user)), 0, reply_user_name.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.append(spantreplyuser);
SpannableString mSpannableString = makeSpannableStringTags2(context, value, 0.45f, align);
textView.append(mSpannableString);
}else {
String usernamed=username+"：";
SpannableString spantuser = new SpannableString(usernamed);
spantuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.text_user)), 0, usernamed.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spantuser.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.platform_text_user)), 0, usernamed.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.setText(spantuser);
SpannableString mSpannableString = makeSpannableStringTags2(context, value, 0.45f, align);
textView.append(mSpannableString);
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/StatusBarUtils.kt
......@@ -63,8 +63,8 @@ class StatusBarUtils {
//====================来源 GitHub: https://github.com/laobie/StatusBarUtil====================
val DEFAULT_STATUS_BAR_ALPHA = 112
private val FAKE_STATUS_BAR_VIEW_ID = R.id.statusbarutil_fake_status_bar_view
private val FAKE_TRANSLUCENT_VIEW_ID = R.id.statusbarutil_translucent_view
private val FAKE_STATUS_BAR_VIEW_ID = R.id.platform_statusbarutil_fake_status_bar_view
private val FAKE_TRANSLUCENT_VIEW_ID = R.id.platform_statusbarutil_translucent_view
private val TAG_KEY_HAVE_SET_OFFSET = -123
/**
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/remind/HttpErrorUtils.kt
package com.ydl.ydlcommon.utils.remind
import android.content.Context
import android.widget.Toast
import com.google.gson.JsonParseException
import com.ydl.ydlcommon.R
import com.yidianling.common.tools.LogUtil
......@@ -26,11 +25,11 @@ class HttpErrorUtils private constructor() {
t.printStackTrace()
if (t is SocketTimeoutException || t is UnknownHostException || t is HttpException) {
if (context != null) {
ToastUtil.toastShort(context.getString(R.string.network_error))
ToastUtil.toastShort(context.getString(R.string.platform_network_error))
}
} else if (t is JsonParseException) {
if (context != null) {
ToastUtil.toastShort(context.getString(R.string.gson_parse_error))
ToastUtil.toastShort(context.getString(R.string.platform_gson_parse_error))
}
} else {
// ToastUtil.toastShort(context, t.getMessage());
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/BaseViewHolder.java
......@@ -20,7 +20,6 @@ import com.ydl.ydl_image.config.SimpleImageOpConfiger;
import com.ydl.ydl_image.manager.YDLImageCacheManager;
import com.ydl.ydlcommon.view.widgets.RoundImageView;
import com.ydl.ydlcommon.R;
import com.ydl.ydlcommon.view.widgets.RoundImageView;
public class BaseViewHolder extends RecyclerView.ViewHolder {
......@@ -126,7 +125,7 @@ public class BaseViewHolder extends RecyclerView.ViewHolder {
ImageView iv = getView(viewId);
if (iv != null && !TextUtils.isEmpty(url)) {
SimpleImageOpConfiger op = new SimpleImageOpConfiger();
op.errorPic = R.drawable.default_img;
op.errorPic = R.drawable.platform_default_img;
op.scaleType = ISimpleImageOpConfig.FIT_CENTER;
YDLImageCacheManager.showImage(mContext, url, iv, op);
}
......@@ -137,8 +136,8 @@ public class BaseViewHolder extends RecyclerView.ViewHolder {
ImageView iv = getView(viewId);
if (iv != null) {
SimpleImageOpConfiger op = new SimpleImageOpConfiger();
op.errorPic = R.drawable.head_place_hold_pic;
op.loadingPic = R.drawable.head_place_hold_pic;
op.errorPic = R.drawable.platform_head_place_hold_pic;
op.loadingPic = R.drawable.platform_head_place_hold_pic;
op.transform = 0;
if (!TextUtils.isEmpty(url)) {
if (url.startsWith("http:")) {
......@@ -155,7 +154,7 @@ public class BaseViewHolder extends RecyclerView.ViewHolder {
RoundImageView iv = getView(viewId);
if (iv != null) {
SimpleImageOpConfiger op = new SimpleImageOpConfiger();
op.errorPic = R.drawable.default_img;
op.errorPic = R.drawable.platform_default_img;
YDLImageCacheManager.showImage(mContext, url, iv, op);
}
return this;
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/DeleteEditTextView.java
......@@ -49,7 +49,7 @@ public class DeleteEditTextView extends EditText {
void initRootView() {
mCloseAreaSize = RxImageTool.dp2px(30);
int padding = getResources().getDimensionPixelSize(R.dimen.default_dis_size_small);
int padding = getResources().getDimensionPixelSize(R.dimen.platform_default_dis_size_small);
setCompoundDrawablePadding(padding);
setEditTextDrawable();
......@@ -80,7 +80,7 @@ public class DeleteEditTextView extends EditText {
if (getText().length() == 0 || !isFocused()) {
setCompoundDrawablesWithIntrinsicBounds(getCompoundDrawables()[0], null, null, null);
} else {
setCompoundDrawablesWithIntrinsicBounds(getCompoundDrawables()[0], null, getContext().getResources().getDrawable(R.drawable.delete), null);
setCompoundDrawablesWithIntrinsicBounds(getCompoundDrawables()[0], null, getContext().getResources().getDrawable(R.drawable.platform_delete), null);
}
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/FootViewLoadMore.kt
......@@ -25,7 +25,7 @@ class FootViewLoadMore : RelativeLayout{
private var loadErrorStr = "加载错误，请重试"
constructor(context: Context) : super(context){
View.inflate(context, R.layout.view_footview_loadmore,this)
View.inflate(context, R.layout.platform_view_footview_loadmore,this)
initView()
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/FootViewMore.kt
......@@ -20,7 +20,7 @@ class FootViewMore : RelativeLayout {
var text_more: TextView? = null
constructor(context: Context) : super(context) {
View.inflate(context, R.layout.view_foot_view_more, this)
View.inflate(context, R.layout.platform_view_foot_view_more, this)
initView()
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/JumpTextView.kt
......@@ -9,7 +9,7 @@ import android.view.Gravity
import android.view.View
import android.widget.FrameLayout
import com.ydl.ydlcommon.R
import kotlinx.android.synthetic.main.ui_jump_text_view.view.*
import kotlinx.android.synthetic.main.platform_ui_jump_text_view.view.*
/**
* 右侧带箭头，高度最低60dp，左侧可以设置图标，左侧文字，右侧文字，文字颜色
......@@ -72,7 +72,7 @@ class JumpTextView : FrameLayout {
}
constructor(context: Context) : super(context) {
View.inflate(context, R.layout.ui_jump_text_view, this)
View.inflate(context, R.layout.platform_ui_jump_text_view, this)
initRootView(null, 0)
......@@ -80,7 +80,7 @@ class JumpTextView : FrameLayout {
}
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
View.inflate(context, R.layout.ui_jump_text_view, this)
View.inflate(context, R.layout.platform_ui_jump_text_view, this)
initRootView(attrs, 0)
......@@ -88,7 +88,7 @@ class JumpTextView : FrameLayout {
}
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
View.inflate(context, R.layout.ui_jump_text_view, this)
View.inflate(context, R.layout.platform_ui_jump_text_view, this)
initRootView(attrs, defStyleAttr)
setupViews()
......@@ -112,7 +112,7 @@ class JumpTextView : FrameLayout {
if (hideArrow) {
arrowRes = 0
} else {
arrowRes = R.drawable.mine_next
arrowRes = R.drawable.platform_mine_next
}
tv_right_text!!.setCompoundDrawablesWithIntrinsicBounds(0, 0, arrowRes, 0)
......@@ -128,48 +128,48 @@ class JumpTextView : FrameLayout {
internal fun initRootView(attrs: AttributeSet?, defStyleAttr: Int) {
val a = context.obtainStyledAttributes(
attrs, R.styleable.JumpTextView, defStyleAttr, 0)
attrs, R.styleable.Platform_JumpTextView, defStyleAttr, 0)
mLeftTextContent = a.getString(R.styleable.JumpTextView_jump_tv_left_text)
mLeftTextColor = a.getColor(R.styleable.JumpTextView_jump_tv_left_color,
resources.getColor(R.color.default_text_color))
mLeftTextSize = a.getDimensionPixelSize(R.styleable.JumpTextView_jump_tv_left_size,
resources.getDimensionPixelSize(R.dimen.default_text_size))
mLeftTextContent = a.getString(R.styleable.Platform_JumpTextView_pa_jump_tv_left_text)
mLeftTextColor = a.getColor(R.styleable.Platform_JumpTextView_pa_jump_tv_left_color,
resources.getColor(R.color.platform_default_text_color))
mLeftTextSize = a.getDimensionPixelSize(R.styleable.Platform_JumpTextView_pa_jump_tv_left_size,
resources.getDimensionPixelSize(R.dimen.platform_default_text_size))
mRightTextContent = a.getString(R.styleable.JumpTextView_jump_tv_right_text)
mRightTextColor = a.getColor(R.styleable.JumpTextView_jump_tv_right_color,
resources.getColor(R.color.default_text_color))
mRightTextSize = a.getDimensionPixelSize(R.styleable.JumpTextView_jump_tv_right_size,
resources.getDimensionPixelSize(R.dimen.default_text_size))
mRightTextContent = a.getString(R.styleable.Platform_JumpTextView_pa_jump_tv_right_text)
mRightTextColor = a.getColor(R.styleable.Platform_JumpTextView_pa_jump_tv_right_color,
resources.getColor(R.color.platform_default_text_color))
mRightTextSize = a.getDimensionPixelSize(R.styleable.Platform_JumpTextView_pa_jump_tv_right_size,
resources.getDimensionPixelSize(R.dimen.platform_default_text_size))
mIconDrawable = a.getDrawable(R.styleable.JumpTextView_jump_tv_icon)
mIconDrawable = a.getDrawable(R.styleable.Platform_JumpTextView_pa_jump_tv_icon)
mLeftIconWidth = a.getDimensionPixelSize(R.styleable.JumpTextView_jump_tv_left_icon_width,
mLeftIconWidth = a.getDimensionPixelSize(R.styleable.Platform_JumpTextView_pa_jump_tv_left_icon_width,
-1)
mLeftIconHeight = a.getDimensionPixelSize(R.styleable.JumpTextView_jump_tv_left_icon_hight,
mLeftIconHeight = a.getDimensionPixelSize(R.styleable.Platform_JumpTextView_pa_jump_tv_left_icon_hight,
-1)
maxLine = a.getInteger(R.styleable.JumpTextView_jump_tv_max_line, -1)
maxLine = a.getInteger(R.styleable.Platform_JumpTextView_pa_jump_tv_max_line, -1)
hideArrow = a.getBoolean(R.styleable.JumpTextView_jump_tv_hide_arrow, false)
isClickEnable = a.getBoolean(R.styleable.JumpTextView_jump_tv_can_click, !hideArrow)
hideArrow = a.getBoolean(R.styleable.Platform_JumpTextView_pa_jump_tv_hide_arrow, false)
isClickEnable = a.getBoolean(R.styleable.Platform_JumpTextView_pa_jump_tv_can_click, !hideArrow)
rightMaxLength = a.getInt(R.styleable.JumpTextView_jump_tv_right_max_length, rightMaxLength)
rightMaxLength = a.getInt(R.styleable.Platform_JumpTextView_pa_jump_tv_right_max_length, rightMaxLength)
leftTextWidth = a.getDimensionPixelSize(R.styleable.JumpTextView_jump_tv_left_width, -1)
rightGravity = a.getInteger(R.styleable.JumpTextView_jump_tv_right_gravity, 2)
leftTextWidth = a.getDimensionPixelSize(R.styleable.Platform_JumpTextView_pa_jump_tv_left_width, -1)
rightGravity = a.getInteger(R.styleable.Platform_JumpTextView_pa_jump_tv_right_gravity, 2)
isRedDotShow = a.getBoolean(R.styleable.JumpTextView_jump_tv_left_red_dot, false)
isRedDotShow = a.getBoolean(R.styleable.Platform_JumpTextView_pa_jump_tv_left_red_dot, false)
a.recycle()
minimumHeight = resources.getDimensionPixelSize(R.dimen.jump_text_view_min_height)
minimumHeight = resources.getDimensionPixelSize(R.dimen.platform_jump_text_view_min_height)
//setBackgroundColor(Color.WHITE);
if (hideArrow) {
arrowRes = 0
} else {
arrowRes = R.drawable.mine_next
arrowRes = R.drawable.platform_mine_next
}
setWillNotDraw(false)
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/ListNoCancelDialog.java
......@@ -76,7 +76,7 @@ public class ListNoCancelDialog extends Dialog {
LayoutInflater inflater = (LayoutInflater) context
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
// instantiate the dialog with the custom Theme
final ListNoCancelDialog dialog = new ListNoCancelDialog(context, R.style.normaldialog_style);
final ListNoCancelDialog dialog = new ListNoCancelDialog(context, R.style.platform_normaldialog_style);
View layout;
layout = inflater.inflate(R.layout.platform_dialog_list_no_cancle_layout, null);
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/LoopViewPager.java
......@@ -140,9 +140,9 @@ public class LoopViewPager extends RelativeLayout {
imageView.setLayoutParams(new ViewGroup.LayoutParams(size, size));
tips[i] = imageView;
if (i == 0) {
tips[i].setBackgroundResource(R.drawable.tip_select);
tips[i].setBackgroundResource(R.drawable.platform_tip_select);
} else {
tips[i].setBackgroundResource(R.drawable.tip_unselect);
tips[i].setBackgroundResource(R.drawable.platform_tip_unselect);
}
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
......@@ -185,9 +185,9 @@ public class LoopViewPager extends RelativeLayout {
private void setImageBackground(int selectItems) {
for (int i = 0; i < tips.length; i++) {
if (i == selectItems) {
tips[i].setBackgroundResource(R.drawable.tip_select);
tips[i].setBackgroundResource(R.drawable.platform_tip_select);
} else {
tips[i].setBackgroundResource(R.drawable.tip_unselect);
tips[i].setBackgroundResource(R.drawable.platform_tip_unselect);
}
}
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/MoreClickView.kt
......@@ -12,7 +12,7 @@ import com.ydl.ydlcommon.R
import com.ydl.ydlcommon.data.PlatformDataManager
import com.ydl.ydlcommon.router.YdlCommonRouterManager
import com.ydl.ydlcommon.view.dialog.CommonDialog
import kotlinx.android.synthetic.main.ui_new_more.view.*
import kotlinx.android.synthetic.main.platform_ui_new_more.view.*
/**
* Created by Wi1ls on 2016/10/17;
......@@ -26,7 +26,7 @@ class MoreClickView @JvmOverloads constructor(private val mContext: Context, att
private val tel = if (PlatformDataManager.getRam().getGlobalInfo() == null) "400-114-1010'" else PlatformDataManager.getRam().getGlobalInfo()?.info?.tel
init {
View.inflate(mContext, R.layout.ui_new_more, this)
View.inflate(mContext, R.layout.platform_ui_new_more, this)
init()
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/MyToggleButton.java
......@@ -117,10 +117,10 @@ public class MyToggleButton extends View{
}
private void initColor() {
onColor = getResources().getColor(R.color.google_green);
offColor = getResources().getColor(R.color.gray7);
offBorderColor = getResources().getColor(R.color.gray7);
spotColor = getResources().getColor(R.color.white);
onColor = getResources().getColor(R.color.platform_google_green);
offColor = getResources().getColor(R.color.platform_gray7);
offBorderColor = getResources().getColor(R.color.platform_gray7);
spotColor = getResources().getColor(R.color.platform_white);
//因为开始为关闭状态，所以这里边框背景色初始化为关闭状态颜色
borderColor = offColor;
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/NoBindPhoneDialog.java
......@@ -21,7 +21,7 @@ public class NoBindPhoneDialog extends Dialog {
private OnBindPhoneListener listener;
public NoBindPhoneDialog(@NonNull Context context, OnBindPhoneListener listener) {
super(context, R.style.normaldialog_style);
super(context, R.style.platform_normaldialog_style);
this.context = context;
this.listener = listener;
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/ProgressView.java
......@@ -69,12 +69,12 @@ public class ProgressView extends View {
}
private void init(AttributeSet attrs, int defStyleAttr) {
TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ProgressView, defStyleAttr, 0);
progressColor = typedArray.getColor(R.styleable.ProgressView_progressColor, Color.GREEN);
progressBackColor = typedArray.getColor(R.styleable.ProgressView_progressBackColor, Color.WHITE);
progressWidth = typedArray.getDimensionPixelSize(R.styleable.ProgressView_progressWidth, 20);
textSize = typedArray.getDimensionPixelSize(R.styleable.ProgressView_textSize, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 20, getResources().getDisplayMetrics()));
textColor = typedArray.getColor(R.styleable.ProgressView_textColor, Color.BLACK);
TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.Platform_ProgressView, defStyleAttr, 0);
progressColor = typedArray.getColor(R.styleable.Platform_ProgressView_pa_progressColor, Color.GREEN);
progressBackColor = typedArray.getColor(R.styleable.Platform_ProgressView_pa_progressBackColor, Color.WHITE);
progressWidth = typedArray.getDimensionPixelSize(R.styleable.Platform_ProgressView_pa_progressWidth, 20);
textSize = typedArray.getDimensionPixelSize(R.styleable.Platform_ProgressView_pa_textSize, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 20, getResources().getDisplayMetrics()));
textColor = typedArray.getColor(R.styleable.Platform_ProgressView_pa_textColor, Color.BLACK);
mTextPaint = new TextPaint();
mTextPaint.setAntiAlias(true);
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/RoundCornerButton.java
......@@ -143,18 +143,18 @@ public class RoundCornerButton extends android.support.v7.widget.AppCompatButton
shapeUtil = new DrawCircleShapeUtil(this);
final TypedArray a = getContext().obtainStyledAttributes(
attrs, R.styleable.RoundCornerButton, defStyleAttr, 0);
attrs, R.styleable.Platform_RoundCornerButton, defStyleAttr, 0);
mEnableTextColor = getCurrentTextColor();
mDisableTextColor = a.getColor(R.styleable.RoundCornerButton_round_btn_disable_text_color, mEnableTextColor);
mStrokeColor = a.getColor(R.styleable.RoundCornerButton_round_stroke_color, 0);
mStrokeWidth = a.getDimensionPixelSize(R.styleable.RoundCornerButton_round_stroke_width, 0);
mDisableTextColor = a.getColor(R.styleable.Platform_RoundCornerButton_pa_round_btn_disable_text_color, mEnableTextColor);
mStrokeColor = a.getColor(R.styleable.Platform_RoundCornerButton_pa_round_stroke_color, 0);
mStrokeWidth = a.getDimensionPixelSize(R.styleable.Platform_RoundCornerButton_pa_round_stroke_width, 0);
mBg.setColor(mDefaultColor = a.getColor(R.styleable.RoundCornerButton_round_btn_bg, 0x00ffffff));
shapeUtil.setPaintColor(a.getColor(R.styleable.RoundCornerButton_round_btn_active_bg, mDefaultColor));
mDisableBg.setColor(a.getColor(R.styleable.RoundCornerButton_round_btn_disable_bg, mDefaultColor));
mBg.setColor(mDefaultColor = a.getColor(R.styleable.Platform_RoundCornerButton_pa_round_btn_bg, 0x00ffffff));
shapeUtil.setPaintColor(a.getColor(R.styleable.Platform_RoundCornerButton_pa_round_btn_active_bg, mDefaultColor));
mDisableBg.setColor(a.getColor(R.styleable.Platform_RoundCornerButton_pa_round_btn_disable_bg, mDefaultColor));
int mRadioSize = a.getDimensionPixelSize(R.styleable.RoundCornerButton_round_btn_radio_size, 0);
int mRadioSize = a.getDimensionPixelSize(R.styleable.Platform_RoundCornerButton_pa_round_btn_radio_size, 0);
mBg.setShape(GradientDrawable.RECTANGLE);
mBg.setCornerRadius(mRadioSize);
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/TagView.kt
......@@ -10,9 +10,9 @@ import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.TextView
import com.ydl.ydlcommon.R
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxImageTool
import com.ydl.ydlcommon.R
/**
......@@ -37,7 +37,7 @@ class TagView : LinearLayout {
//默认字体颜色
private var defaultTextColor = "#444444"
//默认字体背景
private var defaultTextBg = R.drawable.tag_bg
private var defaultTextBg = R.drawable.platform_tag_bg
init {
tagViewMaxWidth = RxDeviceTool.getScreenWidth(context) - RxImageTool.dip2px(159f)
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/TitleBar.java
......@@ -46,7 +46,7 @@ public class TitleBar extends RelativeLayout {
public TitleBar(Context context) {
super(context);
View v = LayoutInflater.from(context).inflate(R.layout.ui_title_bar, this);
View v = LayoutInflater.from(context).inflate(R.layout.platform_ui_title_bar, this);
image = (ImageView) v.findViewById(R.id.image);
tv_left_text = (TextView) v.findViewById(R.id.tv_left_text);
tv_center_title = (TextView) findViewById(R.id.tv_center_title);
......@@ -60,7 +60,7 @@ public class TitleBar extends RelativeLayout {
public TitleBar(Context context, AttributeSet attrs) {
super(context, attrs);
View v = LayoutInflater.from(context).inflate(R.layout.ui_title_bar, this);
View v = LayoutInflater.from(context).inflate(R.layout.platform_ui_title_bar, this);
image = (ImageView) v.findViewById(R.id.image);
tv_left_text = (TextView) v.findViewById(R.id.tv_left_text);
tv_center_title = (TextView) findViewById(R.id.tv_center_title);
......@@ -74,7 +74,7 @@ public class TitleBar extends RelativeLayout {
public TitleBar(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
View v = LayoutInflater.from(context).inflate(R.layout.ui_title_bar, this);
View v = LayoutInflater.from(context).inflate(R.layout.platform_ui_title_bar, this);
image = (ImageView) v.findViewById(R.id.image);
tv_left_text = (TextView) v.findViewById(R.id.tv_left_text);
tv_center_title = (TextView) findViewById(R.id.tv_center_title);
......@@ -189,23 +189,23 @@ public class TitleBar extends RelativeLayout {
void initRoot(AttributeSet attrs, int defStyleAttr) {
final TypedArray a = getContext().obtainStyledAttributes(
attrs, R.styleable.TitleBar, defStyleAttr, 0);
attrs, R.styleable.Platform_TitleBar, defStyleAttr, 0);
mLeftText = a.getString(R.styleable.TitleBar_left_text);
mLeftStartIcon = a.getDrawable(R.styleable.TitleBar_left_start_icon);
mLeftEndIcon = a.getDrawable(R.styleable.TitleBar_left_end_icon);
mRight = a.getDrawable(R.styleable.TitleBar_right_iv);
mLeftText = a.getString(R.styleable.Platform_TitleBar_pa_left_text);
mLeftStartIcon = a.getDrawable(R.styleable.Platform_TitleBar_pa_left_start_icon);
mLeftEndIcon = a.getDrawable(R.styleable.Platform_TitleBar_pa_left_end_icon);
mRight = a.getDrawable(R.styleable.Platform_TitleBar_pa_right_iv);
mTitle = a.getString(R.styleable.TitleBar_title_text);
mTitle = a.getString(R.styleable.Platform_TitleBar_pa_title_text);
mRightText = a.getString(R.styleable.TitleBar_right_text);
mRightStartIcon = a.getDrawable(R.styleable.TitleBar_right_start_icon);
mRightEndIcon = a.getDrawable(R.styleable.TitleBar_right_end_icon);
mRightText = a.getString(R.styleable.Platform_TitleBar_pa_right_text);
mRightStartIcon = a.getDrawable(R.styleable.Platform_TitleBar_pa_right_start_icon);
mRightEndIcon = a.getDrawable(R.styleable.Platform_TitleBar_pa_right_end_icon);
mTextColor = a.getColor(R.styleable.TitleBar_title_bar_text_color, 0xff3c3c3c);
mSideTextColor = a.getColor(R.styleable.TitleBar_side_text_color, 0xff3c3c3c);
mTextColor = a.getColor(R.styleable.Platform_TitleBar_pa_title_bar_text_color, 0xff3c3c3c);
mSideTextColor = a.getColor(R.styleable.Platform_TitleBar_pa_side_text_color, 0xff3c3c3c);
//底部线颜色
buttom_color = a.getColor(R.styleable.TitleBar_bm_line_color, getResources().getColor(R.color.divide_color));
buttom_color = a.getColor(R.styleable.Platform_TitleBar_pa_bm_line_color, getResources().getColor(R.color.platform_divide_color));
a.recycle();
setGravity(Gravity.CENTER_VERTICAL);
}
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/banner/Banner.java
......@@ -48,8 +48,8 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
private boolean isAutoPlay = BannerConfig.IS_AUTO_PLAY;
private boolean isScroll = BannerConfig.IS_SCROLL;
private boolean isSelectedSameUnSelected = true;
private int mIndicatorSelectedResId = R.drawable.gray_radius;
private int mIndicatorUnselectedResId = R.drawable.white_radius;
private int mIndicatorSelectedResId = R.drawable.platform_gray_radius;
private int mIndicatorUnselectedResId = R.drawable.platform_white_radius;
private int mLayoutResId = R.layout.platform_banner;
private int titleHeight;
private int titleBackground;
......@@ -132,26 +132,26 @@ public class Banner extends FrameLayout implements OnPageChangeListener {
if (attrs == null) {
return;
}
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.Banner);
mIndicatorWidth = typedArray.getDimensionPixelSize(R.styleable.Banner_indicator_width, indicatorSize);
mIndicatorDifferentWidth = typedArray.getDimensionPixelSize(R.styleable.Banner_indicator_different_width, mIndicatorDifferentWidth);
mIndicatorHeight = typedArray.getDimensionPixelSize(R.styleable.Banner_indicator_height, indicatorSize);
isSelectedSameUnSelected = typedArray.getBoolean(R.styleable.Banner_is_selected_same_unselected, isSelectedSameUnSelected);
mIndicatorMargin = typedArray.getDimensionPixelSize(R.styleable.Banner_indicator_margin, BannerConfig.PADDING_SIZE);
mIndicatorSelectedResId = typedArray.getResourceId(R.styleable.Banner_indicator_drawable_selected, R.drawable.gray_radius);
mIndicatorUnselectedResId = typedArray.getResourceId(R.styleable.Banner_indicator_drawable_unselected, R.drawable.white_radius);
scaleType = typedArray.getInt(R.styleable.Banner_image_scale_type, scaleType);
delayTime = typedArray.getInt(R.styleable.Banner_delay_time, BannerConfig.TIME);
scrollTime = typedArray.getInt(R.styleable.Banner_scroll_time, BannerConfig.DURATION);
isAutoPlay = typedArray.getBoolean(R.styleable.Banner_is_auto_play, BannerConfig.IS_AUTO_PLAY);
isShowIndicator = typedArray.getBoolean(R.styleable.Banner_is_show_indicator, true);
isShowInside = typedArray.getBoolean(R.styleable.Banner_is_show_inside, true);
titleBackground = typedArray.getColor(R.styleable.Banner_title_background, BannerConfig.TITLE_BACKGROUND);
titleHeight = typedArray.getDimensionPixelSize(R.styleable.Banner_title_height, BannerConfig.TITLE_HEIGHT);
titleTextColor = typedArray.getColor(R.styleable.Banner_title_textcolor, BannerConfig.TITLE_TEXT_COLOR);
titleTextSize = typedArray.getDimensionPixelSize(R.styleable.Banner_title_textsize, BannerConfig.TITLE_TEXT_SIZE);
mLayoutResId = typedArray.getResourceId(R.styleable.Banner_banner_layout, mLayoutResId);
bannerBackgroundImage = typedArray.getResourceId(R.styleable.Banner_banner_default_image, R.drawable.no_banner);
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.Platform_Banner);
mIndicatorWidth = typedArray.getDimensionPixelSize(R.styleable.Platform_Banner_pa_indicator_width, indicatorSize);
mIndicatorDifferentWidth = typedArray.getDimensionPixelSize(R.styleable.Platform_Banner_pa_indicator_different_width, mIndicatorDifferentWidth);
mIndicatorHeight = typedArray.getDimensionPixelSize(R.styleable.Platform_Banner_pa_indicator_height, indicatorSize);
isSelectedSameUnSelected = typedArray.getBoolean(R.styleable.Platform_Banner_pa_is_selected_same_unselected, isSelectedSameUnSelected);
mIndicatorMargin = typedArray.getDimensionPixelSize(R.styleable.Platform_Banner_pa_indicator_margin, BannerConfig.PADDING_SIZE);
mIndicatorSelectedResId = typedArray.getResourceId(R.styleable.Platform_Banner_pa_indicator_drawable_selected, R.drawable.platform_gray_radius);
mIndicatorUnselectedResId = typedArray.getResourceId(R.styleable.Platform_Banner_pa_indicator_drawable_unselected, R.drawable.platform_white_radius);
scaleType = typedArray.getInt(R.styleable.Platform_Banner_pa_image_scale_type, scaleType);
delayTime = typedArray.getInt(R.styleable.Platform_Banner_pa_delay_time, BannerConfig.TIME);
scrollTime = typedArray.getInt(R.styleable.Platform_Banner_pa_scroll_time, BannerConfig.DURATION);
isAutoPlay = typedArray.getBoolean(R.styleable.Platform_Banner_pa_is_auto_play, BannerConfig.IS_AUTO_PLAY);
isShowIndicator = typedArray.getBoolean(R.styleable.Platform_Banner_pa_is_show_indicator, true);
isShowInside = typedArray.getBoolean(R.styleable.Platform_Banner_pa_is_show_inside, true);
titleBackground = typedArray.getColor(R.styleable.Platform_Banner_pa_title_background, BannerConfig.TITLE_BACKGROUND);
titleHeight = typedArray.getDimensionPixelSize(R.styleable.Platform_Banner_pa_title_height, BannerConfig.TITLE_HEIGHT);
titleTextColor = typedArray.getColor(R.styleable.Platform_Banner_pa_title_textcolor, BannerConfig.TITLE_TEXT_COLOR);
titleTextSize = typedArray.getDimensionPixelSize(R.styleable.Platform_Banner_pa_title_textsize, BannerConfig.TITLE_TEXT_SIZE);
mLayoutResId = typedArray.getResourceId(R.styleable.Platform_Banner_pa_banner_layout, mLayoutResId);
bannerBackgroundImage = typedArray.getResourceId(R.styleable.Platform_Banner_pa_banner_default_image, R.drawable.platform_no_banner);
typedArray.recycle();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment