Parcourir la source

1.添加腾讯IM

王鹏鹏 il y a 2 ans
Parent
commit
6fb6345be8

+ 1 - 0
.idea/misc.xml

@@ -65,6 +65,7 @@
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/layout_play_with_blue_porpoise.xml" value="0.136" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/layout_play_with_blue_porpoises.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/home/src/main/res/layout/layout_professional_evaluations.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_im_chat.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast_button.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_room.xml" value="0.219" />

+ 2 - 3
livebroadcast/src/main/AndroidManifest.xml

@@ -16,13 +16,12 @@
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-    <application
-        android:networkSecurityConfig="@xml/network_security_config">
+    <application android:networkSecurityConfig="@xml/network_security_config">
         <activity
             android:name=".activity.detail.LiveBroadcastActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
-            android:windowSoftInputMode="adjustResize|adjustPan" />
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activity.list.LiveBroadcastListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

+ 1 - 1
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/detail/LiveBroadcastActivity.kt

@@ -44,7 +44,7 @@ class LiveBroadcastActivity :
         //初始化直播
         initPlayer()
         //初始化IM
-//        initIm()
+        initIm()
     }
 
     @SuppressLint("ClickableViewAccessibility")

+ 9 - 5
livebroadcast/src/main/manifest/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.yingyang.livebroadcast">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -13,25 +14,28 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
-    <application android:networkSecurityConfig="@xml/network_security_config">
-    <activity
-            android:name=".activity.video.VideoPlayerActivity"
+    <application android:networkSecurityConfig="@xml/network_security_config"
+        tools:targetApi="n">
+        <activity
+            android:name=".activity.detail.LiveBroadcastActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
-            android:windowSoftInputMode="adjustResize|adjustPan" />
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".activity.list.LiveBroadcastListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
         <activity
-            android:name=".activity.detail.LiveBroadcastActivity"
+            android:name=".activity.video.VideoPlayerActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
         <service
             android:name=".service.KeepAliveService"
             android:enabled="true"

+ 7 - 0
livebroadcast/src/main/res/drawable/bg_im_chat.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_20px" />
+    <solid android:color="@color/color_FF4A4B65" />
+</shape>

+ 26 - 8
livebroadcast/src/main/res/layout/activity_live_broadcast.xml

@@ -49,41 +49,59 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_38px"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <com.tencent.rtmp.ui.TXCloudVideoView
             android:id="@+id/play_tx_cloud_view"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/divider_606px"
+            android:layout_height="0dp"
             android:layout_marginStart="@dimen/divider_58px"
             android:layout_marginEnd="@dimen/divider_58px"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/chatLayout"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <LinearLayout
+            android:id="@+id/chatLayout"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_height="@dimen/divider_80px"
             android:layout_marginStart="@dimen/divider_58px"
             android:layout_marginEnd="@dimen/divider_58px"
             android:layout_marginBottom="@dimen/divider_20px"
+            android:background="@drawable/bg_im_chat"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@+id/play_tx_cloud_view">
+            app:layout_constraintStart_toStartOf="parent">
 
             <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/editChat"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
+                android:background="@null"
+                android:gravity="center_vertical"
                 android:hint="@string/welcome_to_ask_questions"
+                android:paddingStart="@dimen/divider_41px"
+                android:paddingEnd="@dimen/divider_41px"
                 android:textColor="@android:color/white"
+                android:textColorHint="@android:color/white"
                 android:textSize="@dimen/divider_28px" />
 
+            <androidx.appcompat.widget.AppCompatButton
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:gravity="center"
+                android:paddingStart="@dimen/divider_41px"
+                android:paddingEnd="@dimen/divider_41px"
+                android:text="@string/send_message"
+                android:textColor="@color/color_FF4A76FF"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
+
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 0
livebroadcast/src/main/res/values/colors.xml

@@ -8,4 +8,5 @@
     <color name="color_FF2B70FF" tools:ignore="ResourceName">#FF2B70FF</color>
     <color name="color_FF152148" tools:ignore="ResourceName">#FF152148</color>
     <color name="color_FF0B193B" tools:ignore="ResourceName">#FF0B193B</color>
+    <color name="color_FF4A4B65" tools:ignore="ResourceName">#FF4A4B65</color>
 </resources>

+ 4 - 5
livebroadcast/src/main/res/values/strings.xml

@@ -3,10 +3,9 @@
     <string name="back_pager" tools:ignore="MissingTranslation,ResourceName">返回</string>
     <string name="live_broadcast" tools:ignore="MissingTranslation,ResourceName">直播</string>
     <string name="app_working" tools:ignore="MissingTranslation,ResourceName">正在运行中</string>
-    <string name="appointment_hall" tools:ignore="ResourceName">预约大厅</string>
-    <string name="live_playback" tools:ignore="ResourceName">直播回放</string>
-    <string name="welcome_to_ask_questions" tools:ignore="ResourceName">欢迎您提问题</string>
+    <string name="appointment_hall" tools:ignore="MissingTranslation,ResourceName">预约大厅</string>
+    <string name="live_playback" tools:ignore="MissingTranslation,ResourceName">直播回放</string>
+    <string name="welcome_to_ask_questions" tools:ignore="MissingTranslation,ResourceName">欢迎您提问题</string>
     <string name="live_streaming" tools:ignore="MissingTranslation,ResourceName">直播</string>
-
-
+    <string name="send_message" tools:ignore="MissingTranslation,ResourceName">发送</string>
 </resources>