Skip to content

Y
YDL-Component-Medical
Commit 6afdceff by 刘鹏
Options

Merge branch 'feat/lp/lp_confide_7' into 'd/v_confide_2.0' 

feat: 一键登录、拨打页优化

See merge request app_android_lib/YDL-Component!95
parents b537cadc 57c52bca
Showing with 62 additions and 55 deletions
config.gradle
...@@ -5,10 +5,10 @@ ext { ...@@ -5,10 +5,10 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.96", "m-confide" : "0.0.49.98",
"m-consultant" : "0.0.60.27", "m-consultant" : "0.0.60.27",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.25", "m-user" : "0.0.62.26",
"m-home" : "0.0.23.74", "m-home" : "0.0.23.74",
"m-im" : "0.0.21.48", "m-im" : "0.0.21.48",
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
...@@ -41,7 +41,7 @@ ext { ...@@ -41,7 +41,7 @@ ext {
"ydl-webview" : "0.0.38.80", "ydl-webview" : "0.0.38.80",
"ydl-media" : "0.0.21.45", "ydl-media" : "0.0.21.45",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.01", "m-audioim" : "0.0.49.30.03",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
...@@ -90,10 +90,10 @@ ext { ...@@ -90,10 +90,10 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.96", "m-confide" : "0.0.49.98",
"m-consultant" : "0.0.60.27", "m-consultant" : "0.0.60.27",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.25", "m-user" : "0.0.62.26",
"m-home" : "0.0.23.74", "m-home" : "0.0.23.74",
"m-im" : "0.0.21.48", "m-im" : "0.0.21.48",
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
...@@ -124,7 +124,7 @@ ext { ...@@ -124,7 +124,7 @@ ext {
"ydl-webview" : "0.0.38.80", "ydl-webview" : "0.0.38.80",
"ydl-media" : "0.0.21.45", "ydl-media" : "0.0.21.45",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.01", "m-audioim" : "0.0.49.30.03",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
......
m-audioim/src/main/res/drawable/audio_border_white_kefu.xml → m-audioim/src/main/res/drawable/audioim_border_white_kefu.xml
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
<corners android:radius="@dimen/platform_dp_14" /> <corners android:radius="@dimen/platform_dp_14" />
<solid android:color="@color/transparent" /> <solid android:color="@color/transparent" />
<stroke <stroke
android:color="#ffffff"
android:width="0.5dp" android:width="0.5dp"
> android:color="#ffffff">
</stroke> </stroke>
</shape> </shape>
\ No newline at end of file
m-audioim/src/main/res/layout/audioim_activity_audio_home.xml
...@@ -5,26 +5,37 @@ ...@@ -5,26 +5,37 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/audiohome_background"> android:background="@drawable/audiohome_background">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="44dp"
android:layout_marginRight="@dimen/platform_dp_15"
android:background="@drawable/audioim_border_white_kefu"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:src="@drawable/audioim_kefu" />
<TextView <TextView
android:id="@+id/jump_kefu"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="13sp" android:layout_marginLeft="3dp"
android:textColor="@color/white" android:layout_marginTop="5dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="5dp"
android:text="联系客服" android:text="联系客服"
android:id="@+id/jump_kefu" android:textColor="@color/white"
android:drawableLeft="@drawable/audioim_kefu" android:textSize="13sp" />
android:layout_alignParentRight="true" </LinearLayout>
android:layout_marginTop="44dp"
android:layout_marginRight="@dimen/platform_dp_15"
android:drawablePadding="@dimen/platform_dp_3"
android:background="@drawable/audio_border_white_kefu"
android:paddingTop="@dimen/platform_dp_5"
android:paddingBottom="@dimen/platform_dp_5"
android:paddingStart="@dimen/platform_dp_8"
android:paddingEnd="@dimen/platform_dp_8"
>
</TextView>
<RelativeLayout <RelativeLayout
...@@ -52,8 +63,8 @@ ...@@ -52,8 +63,8 @@
android:layout_height="120dp" android:layout_height="120dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/audioim_head_place_hold_pic" android:src="@drawable/audioim_head_place_hold_pic" />
/>
<TextView <TextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -77,9 +88,9 @@ ...@@ -77,9 +88,9 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLines="2" android:maxLines="2"
android:text="正在等待聆听者接受邀请…"
android:textColor="@color/platform_color_70FFFFFF" android:textColor="@color/platform_color_70FFFFFF"
android:textSize="12sp" android:textSize="12sp" />
android:text="正在等待聆听者接受邀请…" />
</RelativeLayout> </RelativeLayout>
<!-- 倾诉剩余时间--> <!-- 倾诉剩余时间-->
...@@ -90,6 +101,7 @@ ...@@ -90,6 +101,7 @@
android:layout_below="@+id/rl_head" android:layout_below="@+id/rl_head"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
<TextView <TextView
android:id="@+id/tv_notes" android:id="@+id/tv_notes"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -142,9 +154,7 @@ ...@@ -142,9 +154,7 @@
android:gravity="center" android:gravity="center"
android:maxLines="2" android:maxLines="2"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="15sp" android:textSize="15sp" />
/>
<TextView <TextView
...@@ -171,23 +181,23 @@ ...@@ -171,23 +181,23 @@
android:textSize="12sp" android:textSize="12sp"
android:visibility="gone" android:visibility="gone"
tools:visibility="gone" /> tools:visibility="gone" />
<LinearLayout <LinearLayout
android:id="@+id/ll_changeRoute"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_above="@id/ll_three_icon" android:layout_above="@id/ll_three_icon"
android:gravity="center" android:layout_centerHorizontal="true"
android:orientation="vertical"
android:id="@+id/ll_changeRoute"
android:layout_marginBottom="@dimen/platform_dp_88" android:layout_marginBottom="@dimen/platform_dp_88"
> android:gravity="center"
android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/iv_change_route"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/iv_change_route" android:src="@drawable/iv_change_route"></ImageView>
android:id="@+id/iv_change_route"
>
</ImageView>
<TextView <TextView
android:id="@+id/tv_change_time_counter" android:id="@+id/tv_change_time_counter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -211,11 +221,10 @@ ...@@ -211,11 +221,10 @@
<LinearLayout <LinearLayout
android:id="@+id/rl_mute_on_off" android:id="@+id/rl_mute_on_off"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="1"
android:gravity="center" android:gravity="center"
> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/iv_mute_on_off" android:id="@+id/iv_mute_on_off"
...@@ -239,14 +248,15 @@ ...@@ -239,14 +248,15 @@
<LinearLayout <LinearLayout
android:id="@+id/rl_hang_up" android:id="@+id/rl_hang_up"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical">
android:layout_height="wrap_content">
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:id="@+id/iv_hang_up" android:id="@+id/iv_hang_up"
android:layout_width="66dp" android:layout_width="66dp"
...@@ -255,6 +265,7 @@ ...@@ -255,6 +265,7 @@
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:src="@drawable/audioim_img_hang_up_unuse" android:src="@drawable/audioim_img_hang_up_unuse"
android:visibility="visible" /> android:visibility="visible" />
<com.ydl.ydlcommon.view.ProgressView <com.ydl.ydlcommon.view.ProgressView
android:id="@+id/progress_view" android:id="@+id/progress_view"
android:layout_width="70dp" android:layout_width="70dp"
...@@ -262,6 +273,7 @@ ...@@ -262,6 +273,7 @@
app:pa_progressBackColor="#45E6AB" app:pa_progressBackColor="#45E6AB"
app:pa_progressWidth="4dp" /> app:pa_progressWidth="4dp" />
</FrameLayout> </FrameLayout>
<TextView <TextView
android:id="@+id/audio_hangup_text" android:id="@+id/audio_hangup_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -277,11 +289,10 @@ ...@@ -277,11 +289,10 @@
<!-- 免提按钮--> <!-- 免提按钮-->
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_weight="1"
android:gravity="center" android:gravity="center"
> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/iv_hands_free" android:id="@+id/iv_hands_free"
......
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
...@@ -395,13 +395,13 @@ object OneKeyLoginHelp { ...@@ -395,13 +395,13 @@ object OneKeyLoginHelp {
.setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi") .setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi")
.setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2")) .setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2"))
.setCheckboxHidden(checkBoxHidden) // 设置是否同意协议的checkbox隐藏 .setCheckboxHidden(checkBoxHidden) // 设置是否同意协议的checkbox隐藏
.setCheckBoxHeight(24) .setCheckBoxHeight(22)
.setCheckBoxWidth(24) .setCheckBoxWidth(24)
.setCheckedImgPath("user_login_protocol_selected_new") .setCheckedImgPath("user_login_protocol_selected_dialog")
.setUncheckedImgPath("user_login_protocol_unselected_new") .setUncheckedImgPath("user_login_protocol_unselected_dialog")
.setPrivacyBefore(mPrivacyBeforeText) .setPrivacyBefore(mPrivacyBeforeText)
.setPrivacyMargin(35) .setPrivacyMargin(35)
.setProtocolGravity(Gravity.CENTER_VERTICAL) .setProtocolGravity(Gravity.FILL_VERTICAL)
.setDialogHeight(dialogHeight) .setDialogHeight(dialogHeight)
.setDialogBottom(true) .setDialogBottom(true)
.setScreenOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) // 设置竖屏 .setScreenOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) // 设置竖屏
......
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