Merge branch 'feature/改bug_5_26' of…

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

build.gradle

@@ -19,14 +19,14 @@ buildscript {
         google()
 
         //壹点灵android maven私服 开发版
-        maven{
+        maven {
             url 'http://nexus.yidianling.com/repository/AndroidRepository/'
             credentials {
                 username "admin"
                 password "fjoi#1+#@"
             }
         }
-        maven{
+        maven {
             url 'http://nexus.yidianling.com/repository/AndroidReleases/'
             credentials {
                 username "admin"
@@ -35,7 +35,7 @@ buildscript {
         }
         //Umeng sdk maven 地址
         maven { url 'https://dl.bintray.com/umsdk/release' }
-        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
 
         maven {
             url 'https://dl.bintray.com/zouyuhan/maven'
@@ -67,14 +67,14 @@ buildscript {
 allprojects {
     repositories {
         //壹点灵android maven私服 开发版
-        maven{
+        maven {
             url 'http://nexus.yidianling.com/repository/AndroidRepository/'
             credentials {
                 username "admin"
                 password "fjoi#1+#@"
             }
         }
-        maven{
+        maven {
             url 'http://nexus.yidianling.com/repository/AndroidReleases/'
             credentials {
                 username "admin"
@@ -83,7 +83,7 @@ allprojects {
         }
         //Umeng sdk maven 地址
         maven { url 'https://dl.bintray.com/umsdk/release' }
-        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
 //        maven { url'http://developer.huawei.com/repo/' }
         maven { url "https://jitpack.io" }
         maven {
@@ -94,6 +94,7 @@ allprojects {
         }
         google()
         jcenter()
+        maven { url 'https://maven.aliyun.com/repository/releases' }
     }
 }
 

m-home/src/xlzx/java/com/yidianling/home/ui/widget/HomeModuleCategoryView.kt

@@ -244,11 +244,11 @@ class HomeModuleCategoryView : FrameLayout {
         if (i > 3) {
             multiple = 2
             imageParams.topMargin =
-                imageEightViewWidth + dp8 + textViewHeight + dp8 + RxImageTool.dip2px(1f) - dp3 - dp1 - dp1
+                imageEightViewWidth + dp8 + textViewHeight + dp8 + RxImageTool.dip2px(1f) - dp3 - dp1 - dp1 - dp1 - dp1
             imageParams.leftMargin = dp15 + margin * (i - 3) + (i - 4) * (imageEightViewWidth + margin)
         } else {
             multiple = 1
-            imageParams.topMargin = (dp8 + dp3 - dp6)
+            imageParams.topMargin = (dp8 + dp3 - dp6 - dp1 - dp1)
             imageParams.leftMargin = dp15 + margin * (i + 1) + i * (imageEightViewWidth + margin)
         }
         imageView.layoutParams = imageParams
@@ -264,13 +264,13 @@ class HomeModuleCategoryView : FrameLayout {
         val textView = TextView(context)
         textView.setTextColor(Color.parseColor("#666666"))
 
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 11f)
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
         textView.gravity = Gravity.CENTER_HORIZONTAL
         if (index > 3) {
-            textParams.topMargin = 2 * (imageEightViewWidth + dp8) + textViewHeight + dp8 - dp3 - dp3 - dp1 - dp1
+            textParams.topMargin = 2 * (imageEightViewWidth + dp8) + textViewHeight + dp8 - dp3 - dp3 - dp1 - dp1 - dp1 - dp1
             textParams.leftMargin = dp15 + textViewWidth * (index - 4)
         } else {
-            textParams.topMargin = imageEightViewWidth + (dp8 + dp3 - dp6) + dp8 - dp3
+            textParams.topMargin = imageEightViewWidth + (dp8 + dp3 - dp6) + dp8 - dp3 - dp1 - dp1
             textParams.leftMargin = dp15 + textViewWidth * (index)
         }
         textView.layoutParams = textParams

m-home/src/xlzx/res/layout/home_confide_view.xml

@@ -14,7 +14,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:clipChildren="false"

m-home/src/xlzx/res/layout/home_layout_home_module_input.xml

@@ -44,7 +44,7 @@
         <ImageView
             android:id="@+id/iv_search_icon"
             android:layout_marginLeft="18dp"
-            android:layout_marginRight="11dp"
+            android:layout_marginRight="8dp"
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:scaleType="centerCrop"

m-home/src/xlzx/res/layout/home_test_view.xml

@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/platform_dp_8"
         android:layout_marginRight="@dimen/platform_dp_8"
-        android:layout_marginTop="@dimen/platform_dp_10"
+        android:layout_marginTop="@dimen/platform_dp_6"
         android:orientation="vertical"
         android:background="@drawable/home_view_shadow_bg"/>
 

m-im/src/main/java/com/yidianling/avchatkit/controll/AVChatController.java

@@ -107,6 +107,8 @@ public class AVChatController {
         AVChatManager.getInstance().enableRtc(AVPrivatizationConfig.getServerAddresses(context));
         AVChatManager.getInstance().setParameters(avChatConfigs.getAvChatParameters());
         AVChatManager.getInstance().setParameter(AVChatParameters.KEY_VIDEO_FRAME_FILTER, true);
+        AVChatManager.getInstance().setParameter(AVChatParameters.KEY_SERVER_AUDIO_RECORD, true);
+        AVChatManager.getInstance().setParameter(AVChatParameters.KEY_SERVER_VIDEO_RECORD, true);
 
         if (mVideoCapturer == null) {
             mVideoCapturer = AVChatVideoCapturerFactory.createCameraCapturer(true);
@@ -156,6 +158,9 @@ public class AVChatController {
         AVChatManager.getInstance().enableRtc(AVPrivatizationConfig.getServerAddresses(context));
         AVChatManager.getInstance().setParameters(avChatConfigs.getAvChatParameters());
         AVChatManager.getInstance().setParameter(AVChatParameters.KEY_VIDEO_FRAME_FILTER, true);
+        AVChatManager.getInstance().setParameter(AVChatParameters.KEY_SERVER_AUDIO_RECORD, true);
+        AVChatManager.getInstance().setParameter(AVChatParameters.KEY_SERVER_VIDEO_RECORD, true);
+
         if (mVideoCapturer == null) {
             mVideoCapturer = AVChatVideoCapturerFactory.createCameraCapturer(true);
             AVChatManager.getInstance().setupVideoCapturer(mVideoCapturer);