Skip to content

Y
YDL-Component-Medical
Commit d89b0bd5 by konghaorui
Options

修改倾诉模块资源信息、升级倾诉模块版本号

parent 377c2de6
Showing with 95 additions and 72 deletions
app/build.gradle
......@@ -169,6 +169,7 @@ dependencies {
api project(':m-user')
api project(':m-tests')
api project(':m-consultant')
api project(':m-confide')
api (project(':ydl-platform')){
transitive = true
}
......
build.gradle
......@@ -54,7 +54,7 @@ buildscript {
classpath 'com.tencent.bugly:symtabfileuploader:2.2.1'
//微信资源混淆
classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.16'
classpath 'com.ydl.plugins:modular:1.0.2'
classpath 'com.ydl.plugins:modular:1.0.3'
classpath 'com.ydl:notracepoint-gradle-plugin:0.0.3'
classpath 'com.github.better.restools:ResTools:1.0.1'
}
......
config.gradle
ext {
kotlin_version = '1.3.21'
dev_mode = false
dev_mode = true
ydl_app = [
appName : "心理咨询壹点灵",
......@@ -174,6 +174,7 @@ ext {
//功能组件
"ydl-platform" : 'com.ydl:ydl-platform:0.0.13@aar',
"ydl-webview" : 'com.ydl:ydl-webview:0.0.15@aar',
"ydl-media" : 'com.ydl:ydl-media:0.0.4@aar',
//业务组件
"ydl-m-user-api" : 'com.ydl:m-user-api:0.0.5',
......
m-audioim/build.gradle
......@@ -59,17 +59,19 @@ dependencies {
kapt "com.alibaba:arouter-compiler:$arouter_compiler"
api "com.alibaba:arouter-api:$arouter_api"
implementation ('com.ydl:ydl-av:1.1.8@aar'){
api ('com.ydl:ydl-av:1.1.8@aar'){
transitive = true
}
// implementation project(":ydl-webview")
// implementation project(":ydl-platform")
implementation 'com.ydl:ydl-webview:0.0.14@aar'
implementation('com.ydl:ydl-platform:0.0.12@aar') {
if (rootProject.ext.dev_mode){
//开发时使用
api project(':ydl-platform')
api project(':ydl-webview')
}else {
//发布时使用
api rootProject.ext.dependencies["ydl-webview"]
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
// exclude group: 'com.ydl', module: 'ydl-utils'
// exclude group: 'com.ydl', module: 'ydl-js'
// exclude group: 'com.ydl', module: 'ydl-pushagent'
}
}
}
m-audioim/gradle.properties
IS_PUBLISH=true
VERSION_NAME=0.0.1
\ No newline at end of file
VERSION_NAME=0.0.3
\ No newline at end of file
m-audioim/src/main/res/drawable/audio_home_head_background.xml
......@@ -3,6 +3,6 @@
<corners android:radius="63dp" />
<solid android:color="@color/color_30FFFFFF" />
<solid android:color="@color/platform_color_30FFFFFF" />
</shape>
\ No newline at end of file
m-audioim/src/main/res/drawable/audio_home_privacy_background.xml
......@@ -3,6 +3,6 @@
<corners android:radius="20dp" />
<solid android:color="@color/color_32D296" />
<solid android:color="@color/platform_color_32D296" />
</shape>
\ No newline at end of file
m-audioim/src/main/res/drawable/audio_home_toast_view_background.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp" />
<solid android:color="@color/color_20FFFFFF" />
<solid android:color="@color/platform_color_20FFFFFF" />
</shape>
\ No newline at end of file
m-audioim/src/main/res/layout/activity_audio_home.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/color_80353535">
android:background="@color/platform_color_80353535">
<TextView
android:id="@+id/tv_change_route"
......@@ -18,7 +18,7 @@
android:drawablePadding="6dp"
android:padding="5dp"
android:text="切换至传统电话"
android:textColor="@color/color_50FFFFFF"
android:textColor="@color/platform_color_50FFFFFF"
android:textSize="13sp"
android:visibility="visible" />
......@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="您的倾诉时间还有"
android:textColor="@color/color_30FFFFFF"
android:textColor="@color/platform_color_30FFFFFF"
android:textSize="12sp" />
<TextView
......@@ -128,7 +128,7 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:text="正在等待聆听者接受邀请…"
android:textColor="@color/color_70FFFFFF"
android:textColor="@color/platform_color_70FFFFFF"
android:textSize="12sp"
android:visibility="visible" />
......
m-audioim/src/main/res/layout/dialog_axb_confirm.xml
......@@ -20,7 +20,7 @@
android:layout_marginTop="7dp"
android:layout_marginRight="10dp"
android:padding="5dp"
android:src="@drawable/ic_close_24dp" />
android:src="@drawable/audio_home_ic_close_24dp" />
<ImageView
android:layout_width="wrap_content"
......@@ -34,7 +34,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="号码隐私保护"
android:textColor="@color/color_333333"
android:textColor="@color/platform_color_333333"
android:textSize="17sp"
android:textStyle="bold" />
......@@ -45,7 +45,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:text="您的真实号码全程保密，请安心呼叫"
android:textColor="@color/color_333333"
android:textColor="@color/platform_color_333333"
android:visibility="visible"
android:textSize="13sp" />
<TextView
......@@ -57,7 +57,7 @@
android:gravity="center"
android:layout_marginTop="15dp"
android:text="呼出号码与注册号码需为同一手机号"
android:textColor="@color/color_999999"
android:textColor="@color/platform_color_999999"
android:textSize="13sp" />
<TextView
......@@ -68,7 +68,7 @@
android:layout_gravity="center_horizontal"
android:gravity="center"
android:text="否则无法接通"
android:textColor="@color/color_999999"
android:textColor="@color/platform_color_999999"
android:textSize="13sp" />
......@@ -78,7 +78,7 @@
android:layout_marginTop="50dp"
android:gravity="bottom"
android:text="壹点灵全程保护您的隐私"
android:textColor="@color/color_999999"
android:textColor="@color/platform_color_999999"
android:textSize="10sp" />
<RelativeLayout
......
m-confide/build.gradle
......@@ -81,20 +81,22 @@ dependencies {
api "com.alibaba:arouter-api:$arouter_api"
// 注意此处的依赖方式：kotlin中使用和java中使用方式有不同
kapt "com.alibaba:arouter-compiler:$arouter_compiler"
implementation 'com.alibaba:fastjson:1.2.38'
// implementation project(":ydl-platform")
// api project(':m-audioim')
api ('com.ydl:m-audioim:0.0.1@aar'){
api rootProject.ext.dependencies["ydl-user-router"]
if (rootProject.ext.dev_mode){
//开发时使用
api project(':ydl-media')
api project(':ydl-platform')
api project(':m-audioim')
}else {
//发布时使用
api rootProject.ext.dependencies["ydl-media"]
api ('com.ydl:m-audioim:0.0.3@aar'){
transitive = true
}
implementation'com.ydl:router:1.0.0-SNAPSHOT@aar'
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
}
api 'com.ydl:ydl-media:0.0.1@aar'
}
}
m-confide/modular.gradle
......@@ -8,7 +8,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-confide-module-xlzx"
// 上报的业务模块 aar 包的版本号
version = "0.0.1"
version = "0.0.8"
}
ydl{
......@@ -16,7 +16,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-confide-module-ydl"
// 上报的业务模块 aar 包的版本号
version = "0.0.6"
version = "0.0.8"
}
}
......
m-confide/src/main/res/drawable/show_online_tv.xml
......@@ -3,7 +3,7 @@
<!-- 背景色 -->
<solid android:color="@color/white"/>
<!-- 边框色 -->
<stroke android:width="1dip" android:color="@color/default_button_bg" />
<stroke android:width="1dip" android:color="@color/platform_default_button_bg" />
//圆角
<corners android:radius="4dp" />
</shape>
\ No newline at end of file
m-confide/src/main/res/drawable/text_select_green_grey.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/google_green"/>
<item android:state_checked="false" android:color="@color/text_gray"/>
<item android:state_checked="true" android:color="@color/platform_google_green"/>
<item android:state_checked="false" android:color="@color/platform_text_gray"/>
</selector>
\ No newline at end of file
m-confide/src/main/res/layouts/confidehome/drawable/confidehome_common_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="#56CCF2"
android:endColor="#2F80ED"
android:angle="0" />
</shape>
\ No newline at end of file
m-confide/src/main/res/layouts/confidehome/drawable/confidehome_filter_btn_bg.xml
......@@ -4,7 +4,7 @@
<corners android:radius="20dp" />
<!--<stroke-->
<!--android:width="1dp"-->
<!--android:color="@color/main_theme_blue" />-->
<!--android:color="@color/platform_main_theme_blue" />-->
<gradient
android:startColor="#1DA1F2"
android:endColor="#42C1FF"
......
m-confide/src/main/res/layouts/confidehome/drawable/confidehome_filter_reset_btn_bg.xml
......@@ -4,7 +4,7 @@
<corners android:radius="20dp" />
<stroke
android:width="1px"
android:color="@color/main_theme_blue" />
android:color="@color/platform_main_theme_blue" />
<!--<solid android:color="@color/white"/>-->
</shape>
\ No newline at end of file
m-confide/src/main/res/layouts/confidehome/layout/confidehome_banner.xml
......@@ -11,14 +11,14 @@
android:layout_width="match_parent"
android:layout_height="145dp"
android:layout_marginBottom="30dp"
app:indicator_different_width="14dp"
app:indicator_drawable_selected="@drawable/confidehome_bg_sound_selected"
app:indicator_drawable_unselected="@drawable/confidehome_bg_sound_unselect"
app:indicator_height="5dp"
app:indicator_margin="3dp"
app:is_auto_play="false"
app:is_selected_same_unselected="false"
app:is_show_inside="false" />
app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/confidehome_bg_sound_selected"
app:pa_indicator_drawable_unselected="@drawable/confidehome_bg_sound_unselect"
app:pa_indicator_height="5dp"
app:pa_indicator_margin="3dp"
app:pa_is_auto_play="false"
app:pa_is_selected_same_unselected="false"
app:pa_is_show_inside="false" />
<View
android:layout_width="match_parent"
......
m-confide/src/main/res/layouts/confidehome/layout/confidehome_banner_view.xml
......@@ -17,11 +17,11 @@
android:layout_height="match_parent"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
app:indicator_different_width="14dp"
app:indicator_drawable_selected="@drawable/confidehome_bg_sound_selected"
app:indicator_drawable_unselected="@drawable/confidehome_bg_sound_unselect"
app:indicator_height="4dp"
app:is_selected_same_unselected="false"
app:is_show_inside="false" />
app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/confidehome_bg_sound_selected"
app:pa_indicator_drawable_unselected="@drawable/confidehome_bg_sound_unselect"
app:pa_indicator_height="4dp"
app:pa_is_selected_same_unselected="false"
app:pa_is_show_inside="false" />
</FrameLayout>
</merge>
\ No newline at end of file
m-confide/src/main/res/layouts/confidehome/layout/confidehome_footer.xml
......@@ -10,7 +10,7 @@
android:drawablePadding="5dp"
android:layout_centerInParent="true"
android:text="更多情感恋爱专家"
android:drawableRight="@drawable/common_more"
android:drawableRight="@drawable/confidehome_more"
android:textColor="#666666"
android:textSize="15dp"/>
</merge>
\ No newline at end of file
m-confide/src/main/res/layouts/confidehome/layout/confidehome_good_popup_window.xml
......@@ -48,8 +48,8 @@
android:layout_marginTop="8dp"
android:layout_marginLeft="15dp"
android:background="@drawable/confidehome_filter_reset_btn_bg"
android:text="@string/reset"
android:textColor="@color/main_theme_blue"
android:text="@string/platform_reset"
android:textColor="@color/platform_main_theme_blue"
android:textSize="@dimen/dp_18" />
<Button
......@@ -63,7 +63,7 @@
android:layout_marginTop="8dp"
android:background="@drawable/confidehome_filter_btn_bg"
android:gravity="center"
android:text="@string/confirm"
android:text="@string/platform_confirm"
android:textColor="@color/white"
android:textSize="@dimen/dp_18" />
</LinearLayout>
......
m-confide/src/main/res/layouts/confidehome/layout/confidehome_home_activity.xml
......@@ -35,7 +35,7 @@
android:gravity="center_vertical"
android:maxLines="1"
android:text="不知道选择哪位咨询师？试试"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="14dp" />
<TextView
......@@ -47,7 +47,7 @@
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:text="一键倾诉"
android:textColor="@color/color_242424"
android:textColor="@color/platform_color_242424"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
......
m-confide/src/main/res/layouts/confidehome/layout/confidehome_item_header.xml
......@@ -19,7 +19,7 @@
android:layout_marginLeft="5dp"
android:textSize="18sp"
android:layout_weight="1"
android:textColor="@color/color_666666"
android:textColor="@color/platform_color_666666"
tools:text="最近倾诉"/>
<TextView
......
m-confide/src/main/res/layouts/confidehome/layout/confidehome_playing_float_btn.xml
......@@ -27,7 +27,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="@color/divide_color"/>
android:background="@color/platform_divide_color"/>
<ImageView
android:id="@+id/play_state"
......@@ -47,7 +47,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="@color/divide_color"
android:background="@color/platform_divide_color"
android:visibility="gone"/>
<ImageView
......
m-confide/src/main/res/layouts/confidehome/layout/confidehome_recent_view.xml
......@@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15dp"
android:textColor="@color/color_black_333333"
android:textColor="@color/platform_color_black_333333"
tools:text="黄蓉"/>
<ImageView
android:id="@+id/img_sex"
......@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_10"
android:textColor="@color/color_grey_999999"
android:textColor="@color/platform_color_grey_999999"
tools:text="7月13日 你向TA倾诉过"/>
<TextView
android:id="@+id/tv_again"
......
m-confide/src/main/res/layouts/confidehome/layout/confidehome_sexage_popup_window.xml
......@@ -113,8 +113,8 @@
android:layout_marginTop="8dp"
android:layout_weight="1"
android:background="@drawable/confidehome_filter_reset_btn_bg"
android:text="@string/reset"
android:textColor="@color/main_theme_blue"
android:text="@string/platform_reset"
android:textColor="@color/platform_main_theme_blue"
android:textSize="@dimen/dp_18" />
<Button
......@@ -127,7 +127,7 @@
android:layout_marginTop="8dp"
android:layout_weight="1"
android:background="@drawable/confidehome_filter_btn_bg"
android:text="@string/confirm"
android:text="@string/platform_confirm"
android:textColor="@color/white"
android:textSize="@dimen/dp_18" />
</LinearLayout>
......
m-confide/src/main/res/layouts/confidehome/layout/confidehome_title_bar.xml
......@@ -8,7 +8,7 @@
android:id="@+id/v_bg"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/common_bg"/>
android:background="@drawable/confidehome_common_bg"/>
<LinearLayout
android:id="@+id/ll_bar_root"
android:orientation="horizontal"
......@@ -21,7 +21,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/common_back"/>
android:background="@drawable/confidehome_back"/>
<TextView
android:id="@+id/tv_title"
android:layout_width="0px"
......@@ -38,6 +38,6 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/common_mine"/>
android:background="@drawable/confidehome_mine"/>
</LinearLayout>
</FrameLayout>
m-confide/src/main/res/values/dimens.xml
......@@ -97,4 +97,5 @@
<dimen name="dp_99">99dp</dimen>
<dimen name="dp_115">115dp</dimen>
<dimen name="dp_127">127dp</dimen>
<dimen name="head_size_big">72dp</dimen>
</resources>
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