Skip to content

Y
YDL-Component-Medical
Commit 2786cc3c by 严久程
Options

Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

parents da8f5507 1591b992
Showing with 116 additions and 34 deletions
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -16,6 +16,7 @@ import com.umeng.analytics.MobclickAgent
import com.ydl.component.music.MusicPlayActivity
import com.ydl.component.mvp.DemoContract
import com.ydl.component.mvp.DemoPresenter
import com.ydl.confide.home.ConfideHomeActivity
import com.ydl.media.audio.PlayService
import com.ydl.ydl_router.manager.YDLRouterManager
import com.ydl.ydl_router.manager.YDLRouterParams
......@@ -90,6 +91,9 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
bt_to_tests.setOnClickListener {
startActivity(Intent(this, TestHomeActivity::class.java))
}
bt_to_confide.setOnClickListener {
startActivity(Intent(this, ConfideHomeActivity::class.java))
}
bt_to_muse.setOnClickListener {
YDLRouterManager.router(IYDLRouterConstant.ROUTER_MUSE,
YDLRouterParams().putExtra(IYDLRouterConstant.MUSIC_URL, "http://video.yidianling.com/2019/05/30/e6d4a71e8c895f2156a2ff37d93ca3a9.mp3")
......
app/src/main/res/layout/activity_main.xml
......@@ -68,57 +68,74 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:paddingLeft="40dp"
android:paddingTop="20dp"
android:paddingRight="40dp"
android:paddingBottom="20dp">
<Button
android:id="@+id/bt_to_other"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:text="Jump to Other" />
android:layout_marginRight="50dp"
android:layout_weight="1"
android:text="登录" />
<Button
android:id="@+id/bt_to_consultant"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:text="Jump to consultant" />
android:layout_weight="1"
android:text="咨询" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="40dp"
android:paddingRight="40dp"
android:paddingBottom="20dp">
<Button
android:id="@+id/bt_to_music"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:text="Jump to Musci" />
android:layout_marginRight="50dp"
android:layout_weight="1"
android:text="音乐" />
<Button
android:id="@+id/bt_to_muse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:text="Jump to 冥想" />
android:id="@+id/bt_to_muse"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="冥想" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingLeft="40dp"
android:paddingRight="40dp"
android:paddingBottom="20dp">
<Button
android:id="@+id/bt_to_fm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:text="Jump to FM" />
android:id="@+id/bt_to_fm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="50dp"
android:layout_weight="1"
android:text="电台" />
<Button
android:id="@+id/bt_to_confide"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="倾诉" />
</LinearLayout>
......@@ -126,14 +143,24 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="40dp"
android:paddingRight="40dp"
android:paddingBottom="20dp">
<Button
android:id="@+id/bt_to_tests"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="10dp"
android:text="Jump to Tests" />
android:layout_marginRight="50dp"
android:layout_weight="1"
android:text="测评" />
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="invisible" />
</LinearLayout>
......
m-audioim/build.gradle
......@@ -3,6 +3,13 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply from: "../maven_push.gradle"
apply plugin: 'plugin.resTools' // 资源重命名插件
// 配置资源重命名插件
resConfig {
new_prefix = 'audioim_' // 资源前缀
old_prefix = 'audio_home_' // 老前缀，可为''空字符串
}
kapt {
arguments {
......
m-confide/src/xlzx/res/values/colors.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="confide_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="confide_main_theme_light">#FFEC8C</color>
<!--主题亮色-->
<color name="confide_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色-->
<color name="confide_confirm_bg_color">#FFDD33</color>
<!--确认按钮字体颜色-->
<color name="confide_confirm_text_color">#242424</color>
<!--确认按钮提示字体颜色-->
<color name="confide_confirm_text_hint_color">#666666</color>
<!--筛选条件选择框字体颜色-->
<color name="confide_filter_content_text_color_en">#242424</color>
<color name="confide_filter_content_text_color_un">#555555</color>
<!--私聊按钮背景颜色-->
<color name="confide_chat_start_color">#ffd814</color>
<color name="confide_chat_end_color">#ffdb26</color>
</resources>
m-confide/src/ydl/res/values/colors.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="confide_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="confide_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="confide_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色-->
<color name="confide_confirm_bg_color">#1da1f2</color>
<!--确认按钮颜色-->
<color name="confide_confirm_text_color">#ffffff</color>
<!--确认提示颜色-->
<color name="confide_confirm_text_hint_color">#60ffffff</color>
<!--筛选条件选择框字体颜色-->
<color name="confide_filter_content_text_color_en">#1da1f2</color>
<color name="confide_filter_content_text_color_un">#242424</color>
<!--私聊按钮背景颜色-->
<color name="confide_chat_start_color">#23B2FA</color>
<color name="confide_chat_end_color">#1DA1F2</color>
</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