From a780f0b8d0ccec90d359c0c554f07d5afde9554c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 28 六月 2022 17:05:31 +0800
Subject: [PATCH] 代码同步
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml | 131 +++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 78 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml
index 8866342..0306a53 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
@@ -9,39 +8,34 @@
<RelativeLayout
android:id="@+id/rl_lp_topView"
android:layout_width="match_parent"
- android:background="@color/lpsdk_app_bg"
- android:layout_height="44dp">
+ android:layout_height="44dp"
+ android:background="@color/lpsdk_app_bg">
<TextView
android:id="@+id/tv_lp_title"
android:layout_width="match_parent"
android:layout_height="25dp"
- android:layout_marginTop="10dp"
android:layout_marginLeft="50dp"
+ android:layout_marginTop="10dp"
android:layout_marginRight="50dp"
android:gravity="center"
- android:textColor="@color/lpsdk_textColor"
- android:textSize="18sp"
android:text="瀹ゅ唴鏈�"
- ></TextView>
+ android:textColor="@color/lpsdk_textColor"
+ android:textSize="18sp"/>
</RelativeLayout>
- <!-- <org.linphone.mediastream.video.display.GL2JNIView-->
- <!-- android:id="@+id/video_rendering"-->
- <!-- android:layout_width="match_parent"-->
- <!-- android:layout_height="match_parent"/>-->
<LinearLayout
android:id="@+id/ll_video_lp_rendering"
android:layout_width="wrap_content"
android:layout_height="210dp"
android:background="@android:color/black">
+
<TextureView
android:id="@+id/video_lp_rendering"
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
+ android:layout_height="match_parent" />
</LinearLayout>
-
<LinearLayout
@@ -51,16 +45,17 @@
<RelativeLayout
android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
<ImageView
android:id="@+id/iv_lp_screenshot"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:background="@drawable/btn_click_lp_screenshot">
+ android:background="@drawable/btn_click_lp_screenshot"
+ android:scaleType="fitCenter">
</ImageView>
@@ -68,25 +63,24 @@
<RelativeLayout
android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
<ImageView
android:id="@+id/iv_lp_unlock"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:background="@drawable/btn_click_lp_unlock">
- </ImageView>
+ android:background="@drawable/btn_click_lp_unlock"
+ android:scaleType="fitCenter" />
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/lpsdk_app_line"
- ></View>
+ android:background="@color/lpsdk_app_line" />
<RelativeLayout
android:layout_width="match_parent"
@@ -95,57 +89,39 @@
<TextureView
android:id="@+id/video_lp_rendering2"
android:layout_width="1dp"
- android:layout_height="1dp"/>
+ android:layout_height="1dp" />
-<!-- <TextView-->
-<!-- android:id="@+id/tv_lp_calltime"-->
-<!-- android:layout_width="wrap_content"-->
-<!-- android:layout_centerHorizontal="true"-->
-<!-- android:text="00:00"-->
-<!-- android:textColor="@android:color/white"-->
-<!-- android:textSize="14sp"-->
-<!-- android:gravity="center_vertical"-->
-<!-- android:paddingLeft="38dp"-->
-<!-- android:paddingRight="38dp"-->
-<!-- android:layout_marginTop="38dp"-->
-<!-- android:background="@drawable/lp_calltime_shape"-->
-<!-- android:visibility="gone"-->
-<!-- android:layout_height="40dp">-->
-
-<!-- </TextView>-->
<Chronometer
android:id="@+id/timer_lp_calltime"
android:layout_width="wrap_content"
+ android:layout_height="40dp"
android:layout_centerHorizontal="true"
+ android:layout_marginTop="38dp"
+ android:background="@drawable/lp_calltime_shape"
android:format="%s"
- android:textColor="@android:color/white"
- android:textSize="14sp"
android:gravity="center_vertical"
android:paddingLeft="38dp"
android:paddingRight="38dp"
- android:layout_marginTop="38dp"
- android:background="@drawable/lp_calltime_shape"
- android:visibility="gone"
- android:layout_height="40dp">
+ android:textColor="@android:color/white"
+ android:textSize="14sp"
+ android:visibility="gone">
</Chronometer>
<TextView
android:id="@+id/tv_lp_calltime"
android:layout_width="wrap_content"
+ android:layout_height="40dp"
android:layout_centerHorizontal="true"
- android:textColor="@android:color/white"
- android:textSize="14sp"
+ android:layout_marginTop="38dp"
+ android:background="@drawable/lp_calltime_shape_gray"
android:gravity="center_vertical"
android:paddingLeft="38dp"
android:paddingRight="38dp"
android:text="@string/lp_callingStr"
- android:layout_marginTop="38dp"
- android:background="@drawable/lp_calltime_shape_gray"
- android:visibility="visible"
- android:layout_height="40dp">
- </TextView>
-
+ android:textColor="@android:color/white"
+ android:textSize="14sp"
+ android:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
@@ -155,54 +131,53 @@
<RelativeLayout
android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
<ImageView
android:id="@+id/iv_lp_hangUp"
android:layout_width="66dp"
android:layout_height="66dp"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_esvideo_on_hangup"
android:layout_centerHorizontal="true"
- ></ImageView>
+ android:scaleType="fitCenter"
+ android:src="@drawable/ic_esvideo_on_hangup" />
+
<TextView
android:id="@+id/tv_lp_hangUp"
android:layout_width="match_parent"
android:layout_height="20dp"
- android:text="@string/lp_refuseStr"
- android:gravity="center"
- android:textColor="@color/lpsdk_textColor"
- android:textSize="14sp"
android:layout_alignParentBottom="true"
- ></TextView>
-
+ android:gravity="center"
+ android:text="@string/lp_refuseStr"
+ android:textColor="@color/lpsdk_textColor"
+ android:textSize="14sp" />
+
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_lp_answerView"
android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
<ImageView
android:id="@+id/iv_lp_answer"
android:layout_width="66dp"
android:layout_height="66dp"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_esvideo_on_answer"
android:layout_centerHorizontal="true"
- ></ImageView>
+ android:scaleType="fitCenter"
+ android:src="@drawable/ic_esvideo_on_answer" />
+
<TextView
android:id="@+id/tv_lp_answer"
android:layout_width="match_parent"
android:layout_height="20dp"
- android:text="@string/lp_answerStr"
- android:gravity="center"
- android:textColor="@color/lpsdk_textColor"
- android:textSize="14sp"
android:layout_alignParentBottom="true"
- ></TextView>
+ android:gravity="center"
+ android:text="@string/lp_answerStr"
+ android:textColor="@color/lpsdk_textColor"
+ android:textSize="14sp" />
</RelativeLayout>
-
</LinearLayout>
</RelativeLayout>
--
Gitblit v1.8.0