兼容中兴8寸横屏设备

app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
         android:name="com.wdkl.app.ncs.application.Application"
         android:theme="@style/MyAppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
-        <meta-data
+        <!--<meta-data
             android:name="com.enation.javashop.imagepluin.cache.MyGlideModule"
             android:value="GlideModule" />
         <meta-data
@@ -34,7 +34,7 @@
             android:value="240"/>
         <meta-data
             android:name="design_height_in_dp"
-            android:value="240"/>
+            android:value="240"/>-->
 
 <!--        <activity android:name="com.wdkl.ncs.android.component.home.activity.HomeActivity">
             <intent-filter>

common/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     /**
      * UI适配
      */
-    compile 'me.jessyan:autosize:1.1.1'
+    //compile 'me.jessyan:autosize:1.1.1'
 
     /**
      *  圆形ImageView

home/src/main/code/com/wdkl/ncs/android/component/home/activity/HomeActivity.kt

@@ -8,6 +8,7 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.net.ConnectivityManager
+import android.os.Build
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.provider.Settings
@@ -312,6 +313,25 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
             inited = true
             activity_register_layout.visibility = View.GONE
             watch_activity_home_linyout.visibility = View.VISIBLE
+            if ("YUNPAI_H6".equals(Build.MODEL)) {
+                //中兴8寸机
+                watch_activity_home_linyout.setBackgroundResource(R.drawable.main_bg_1280x800)
+                btn_callout.setBackgroundResource(R.drawable.round_button_100dp)
+                btn_callout.textSize = 36f
+            } else if ("KT8001_2C".equals(Build.MODEL, true)) {
+                //卡尔8寸竖屏
+                watch_activity_home_linyout.setBackgroundResource(R.drawable.main_bg_800x1280)
+                btn_callout.setBackgroundResource(R.drawable.round_button_80dp)
+                btn_callout.textSize = 24f
+            } else if ("rk3288".equals(Build.MODEL, true)) {
+                watch_activity_home_linyout.setBackgroundResource(R.drawable.main_bg_1920x1080)
+                btn_callout.setBackgroundResource(R.drawable.round_button_100dp)
+                btn_callout.textSize = 36f
+            } else {
+                watch_activity_home_linyout.setBackgroundResource(R.drawable.main_bg)
+                btn_callout.setBackgroundResource(R.drawable.round_button_80dp)
+                btn_callout.textSize = 28f
+            }
 
 
             initSDK()

home/src/main/code/com/wdkl/ncs/android/component/home/fragment/SkyCallFragment.kt

@@ -1,5 +1,6 @@
 package com.wdkl.ncs.android.component.home.fragment
 
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.SystemClock
@@ -53,7 +54,11 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
     private var callSuccess: Boolean = false
 
     override fun getLayId(): Int {
-        return R.layout.sky_voice_call_layout
+        if ("YUNPAI_H6".equals(Build.MODEL, true) || "rk3288".equals(Build.MODEL, true)) {
+            return R.layout.sky_voice_call_layout_land
+        } else {
+            return R.layout.sky_voice_call_layout
+        }
     }
 
     override fun init() {

home/src/main/res/drawable/round_button_100dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#0081ff"/>
+    <size android:width="100dp" android:height="100dp"/>
+</shape>

home/src/main/res/drawable/round_button_80dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#0081ff"/>
+    <size android:width="80dp" android:height="80dp"/>
+</shape>

home/src/main/res/layout/activity_home.xml

@@ -9,38 +9,34 @@
             android:id="@+id/frame_visit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="20dp"/>
+            android:layout_marginTop="40dp" />
 
-       <include
-          android:id="@+id/activity_register_layout"
-          layout="@layout/activity_register" />
+        <include
+            android:id="@+id/activity_register_layout"
+            layout="@layout/activity_register" />
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/watch_activity_home_linyout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:background="@drawable/main_bg"
+            android:gravity="center_horizontal"
             android:visibility="gone">
 
             <Button
                 android:id="@+id/btn_callout"
-                android:layout_marginTop="180dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:background="@drawable/round_button"
-                android:textColor="@drawable/selector_button_text_color"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="60dp"
                 android:text="探视"
-                android:textSize="24sp" />
+                android:textColor="@drawable/selector_button_text_color" />
 
-        </LinearLayout>
+        </RelativeLayout>
 
         <TextView
             android:id="@+id/tv_rtc_status"
-            android:layout_width="10dp"
-            android:layout_height="10dp"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
             android:layout_marginLeft="5dp"
             android:layout_marginTop="5dp"
             android:layout_alignParentLeft="true"
@@ -52,6 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_alignParentTop="true"
+            android:textSize="32sp"
             android:textColor="#2F9DF1"/>
 
         <TextClock
@@ -60,6 +57,7 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="5dp"
+            android:textSize="32sp"
             android:format12Hour="HH:mm"
             android:format24Hour="HH:mm"
             android:textColor="#2F9DF1"/>
@@ -71,6 +69,7 @@
             android:textColor="@color/black"
             android:layout_marginRight="8dp"
             android:layout_marginBottom="8dp"
+            android:textSize="18sp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"/>
 

home/src/main/res/layout/activity_register.xml

@@ -5,80 +5,88 @@
     android:layout_height="match_parent"
     android:padding="10dp"
     android:orientation="vertical">
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:textSize="20dp"
-            android:text="服务器IP: "/>
-        <TextView
-            android:id="@+id/tv_server_ip"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:textSize="20dp"
-            android:text=""/>
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:textSize="20dp"
-            android:text="识别码: "/>
-        <TextView
-            android:id="@+id/tv_device_imei"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:textSize="20dp"
-            android:text=""/>
+            android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center_horizontal"
-            android:textColor="@color/color_red"
-            android:textSize="20dp"
-            android:text=""/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:text="服务器IP: "
+                android:textSize="24sp" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_gravity="center_horizontal"
-            android:orientation="vertical">
-            <Button
-                android:id="@+id/btn_system_setting0"
-                android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/tv_server_ip"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/javashop_btn_balck_line_bg"
-                android:text="系统设置" />
-            <Button
-                android:id="@+id/btn_server_config"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="40dp"
+                android:text=""
+                android:textSize="24sp" />
+
+            <TextView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/javashop_btn_balck_line_bg"
-                android:text="服务器配置" />
-            <Button
-                android:id="@+id/btn_restart_app"
+                android:layout_marginTop="20dp"
+                android:text="识别码: "
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/tv_device_imei"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:text=""
+                android:textSize="24sp" />
+
+            <TextView
+                android:id="@+id/tv_status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:gravity="center_horizontal"
+                android:text=""
+                android:textColor="@color/color_red"
+                android:textSize="24sp" />
+
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 android:layout_marginTop="10dp"
-                android:background="@drawable/javashop_btn_balck_line_bg"
-                android:text="重启" />
-        </LinearLayout>
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/btn_system_setting0"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/javashop_btn_balck_line_bg"
+                    android:text="系统设置" />
 
-    </LinearLayout>
+                <Button
+                    android:id="@+id/btn_server_config"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/javashop_btn_balck_line_bg"
+                    android:text="服务器配置" />
+
+                <Button
+                    android:id="@+id/btn_restart_app"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/javashop_btn_balck_line_bg"
+                    android:text="重启" />
+            </LinearLayout>
+
+        </LinearLayout>
     </ScrollView>
 </LinearLayout>
 </layout>

home/src/main/res/layout/sky_voice_call_layout.xml

@@ -15,8 +15,8 @@
         <!--小窗视频画面-->
         <FrameLayout
             android:id="@+id/pip_video_frame"
-            android:layout_width="80dp"
-            android:layout_height="100dp"
+            android:layout_width="140dp"
+            android:layout_height="180dp"
             android:layout_gravity="top|end"
             android:layout_marginHorizontal="10dp"
             android:layout_marginTop="10dp"
@@ -51,7 +51,7 @@
                     android:gravity="center"
                     android:text="正在呼叫..."
                     android:textColor="@color/white"
-                    android:textSize="20sp" />
+                    android:textSize="28sp" />
 
                 <TextView
                     android:id="@+id/sky_voice_call_timeout"
@@ -61,7 +61,7 @@
                     android:gravity="center"
                     android:text="倒计时: 00"
                     android:textColor="@color/white"
-                    android:textSize="16sp" />
+                    android:textSize="24sp" />
             </LinearLayout>
 
             <!--呼出-->
@@ -83,12 +83,12 @@
                     android:gravity="center"
                     android:text="00:00"
                     android:textColor="@color/white"
-                    android:textSize="16sp" />
+                    android:textSize="24sp" />
 
                 <ImageView
                     android:id="@+id/sky_voice_call_hangup"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
                     android:layout_marginTop="20dp"
                     android:src="@drawable/selector_call_hangup" />
             </LinearLayout>

home/src/main/res/layout/sky_voice_call_layout_land.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/gray_deep">
+        <!--全屏视频画面-->
+        <FrameLayout
+            android:id="@+id/fullscreen_video_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:visibility="gone"/>
+
+        <!--小窗视频画面-->
+        <FrameLayout
+            android:id="@+id/pip_video_frame"
+            android:layout_width="200dp"
+            android:layout_height="240dp"
+            android:layout_gravity="top|end"
+            android:layout_marginHorizontal="10dp"
+            android:layout_marginTop="10dp"
+            android:visibility="gone"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <!--语音呼叫layout-->
+            <LinearLayout
+                android:id="@+id/ll_voice_call"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <!--<ImageView
+                    android:id="@+id/sky_voice_call_head_img"
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
+                    android:layout_marginTop="80dp"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/ic_nurse" />-->
+
+                <TextView
+                    android:id="@+id/sky_voice_call_calling_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center"
+                    android:text="正在呼叫..."
+                    android:textColor="@color/white"
+                    android:textSize="32sp" />
+
+                <TextView
+                    android:id="@+id/sky_voice_call_timeout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center"
+                    android:text="倒计时: 00"
+                    android:textColor="@color/white"
+                    android:textSize="28sp" />
+            </LinearLayout>
+
+            <!--呼出-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_outgoing"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="visible">
+
+                <Chronometer
+                    android:id="@+id/sky_voice_call_timer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="00:00"
+                    android:textColor="@color/white"
+                    android:textSize="24sp" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_hangup"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_marginTop="20dp"
+                    android:src="@drawable/selector_call_hangup" />
+            </LinearLayout>
+
+            <!--来电-->
+            <LinearLayout
+                android:id="@+id/sky_voice_call_incoming"
+                android:layout_width="match_parent"
+                android:layout_height="140dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="80dp"
+                android:gravity="bottom"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_reject"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_hangup" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <ImageView
+                    android:id="@+id/sky_voice_call_ring_pickup_audio"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:src="@drawable/selector_call_answer" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="2" />
+            </LinearLayout>
+        </RelativeLayout>
+    </FrameLayout>
+</layout>