Browse Source

时间显示格式改成显示到分

weizhengliang 1 year ago
parent
commit
229ca50e97

+ 4 - 4
android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -128,7 +128,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
     private var broadcastChannelId: String = ""
     private var broadcastChannelId: String = ""
     private var playing = false
     private var playing = false
 
 
-    private val timeHandler = MyHandler(this)
+    /*private val timeHandler = MyHandler(this)
     private var timeThread: TimeThread? = null
     private var timeThread: TimeThread? = null
     private val TIME_WHAT = 1000
     private val TIME_WHAT = 1000
 
 
@@ -176,7 +176,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
                 }
                 }
             }
             }
         }
         }
-    }
+    }*/
 
 
     private var sleepCountdown = false
     private var sleepCountdown = false
     private val updateHandler: Handler = object : Handler(Looper.getMainLooper()) {
     private val updateHandler: Handler = object : Handler(Looper.getMainLooper()) {
@@ -223,8 +223,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
         //日期时间格式: 默认yyyy-MM-dd HH:mm EEEE
         //日期时间格式: 默认yyyy-MM-dd HH:mm EEEE
         //监利第二人民医院:MM月dd日 HH:mm:ss
         //监利第二人民医院:MM月dd日 HH:mm:ss
 
 
-        timeThread = TimeThread()
-        timeThread?.start()
+        //timeThread = TimeThread()
+        //timeThread?.start()
 
 
         //获取mac地址
         //获取mac地址
         if ("rk3128".equals(Build.MODEL)) {
         if ("rk3128".equals(Build.MODEL)) {

+ 13 - 2
android_bed/src/main/h7_3128/res/layout/view_title_layout.xml

@@ -27,7 +27,18 @@
         android:textSize="@dimen/font_size_20" />
         android:textSize="@dimen/font_size_20" />
 
 
     <!--日期时间-->
     <!--日期时间-->
-    <LinearLayout
+    <TextClock
+        android:id="@+id/time_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:format12Hour="MM月dd日 HH:mm"
+        android:format24Hour="MM月dd日 HH:mm"
+        android:textColor="@color/main_color"
+        android:textSize="@dimen/font_size_20" />
+
+    <!--<LinearLayout
         android:layout_width="300dp"
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_centerInParent="true"
@@ -41,7 +52,7 @@
             android:gravity="center"
             android:gravity="center"
             android:textColor="@color/main_color"
             android:textColor="@color/main_color"
             android:textSize="@dimen/font_size_20" />
             android:textSize="@dimen/font_size_20" />
-    </LinearLayout>
+    </LinearLayout>-->
 
 
     <!--设备号-->
     <!--设备号-->
     <TextView
     <TextView