weizhengliang 3 년 전
부모
커밋
b081ea5b67

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

@@ -10,5 +10,6 @@
     <color name="color_gray">#e4e6e5</color>
     <color name="color_red">#ea3a3d</color>
     <color name="color_pop_header">#878a8a</color>
+    <color name="gray_deep">#5c5c5c</color>
 
 </resources>

+ 2 - 2
nursehome/src/main/res/layout/activity_nurse_home.xml

@@ -35,8 +35,8 @@
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
                     android:layout_centerVertical="true"
-                    android:format12Hour="yyyy-MM-dd HH:mm:ss EEEE"
-                    android:format24Hour="yyyy-MM-dd HH:mm:ss EEEE"
+                    android:format12Hour="yyyy-MM-dd HH:mm EEEE"
+                    android:format24Hour="yyyy-MM-dd HH:mm EEEE"
                     android:timeZone="GMT+8"
                     android:textColor="#2F9DF1"
                     android:textSize="22sp" />

+ 1 - 1
nursehome/src/main/res/layout/sky_voice_call_layout.xml

@@ -3,7 +3,7 @@
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/background_dark">
+        android:background="@color/gray_deep">
         <!--全屏视频画面-->
         <FrameLayout
             android:id="@+id/fullscreen_video_frame"

+ 2 - 2
webrtc/src/main/java/com/wdkl/core/socket/MyWebSocket.java

@@ -39,7 +39,7 @@ public class MyWebSocket extends WebSocketClient {
         Log.e("dds_error", "onClose:" + reason + "remote:" + remote);
         if (connectFlag) {
             try {
-                Thread.sleep(3000);
+                Thread.sleep(1500);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -54,7 +54,7 @@ public class MyWebSocket extends WebSocketClient {
     public void onError(Exception ex) {
         Log.e("dds_error", "onError:" + ex.toString());
         //this.iEvent.logout("onError");
-        //connectFlag = false;
+        connectFlag = false;
         this.iEvent.onError();
     }