Jelajahi Sumber

还原上条修改

weizhengliang 3 tahun lalu
induk
melakukan
8930cc102d

+ 6 - 6
app/src/main/java/com/wdkl/callingmainnurse/ui/activity/MainFragmentActivity.java

@@ -153,8 +153,8 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
     @Bind(R.id.activity_main_layout_tv_version)
     TextView tvVersion;
 
-    //@Bind(R.id.activity_main_layout_tv_current_time)
-    //TextView tvCurrentTime;
+    @Bind(R.id.activity_main_layout_tv_current_time)
+    TextView tvCurrentTime;
     @Bind(R.id.activity_main_layout_tv_sip_state)
     TextView tvSipState;
 
@@ -220,9 +220,9 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                         try {
                             //检测网络状态
                             //checkNetWorkStatus();
-                            //tvCurrentTime.setText(TimeUtil.getInstance().getDataTime());
+                            tvCurrentTime.setText(TimeUtil.getInstance().getDataTime());
                         } catch (NullPointerException e) {
-                            //LogUtil.e("tvCurrentTime: ", tvCurrentTime + "");
+                            LogUtil.e("tvCurrentTime: ", tvCurrentTime + "");
                         }
                         break;
                 }
@@ -320,8 +320,8 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
         Constants.CALL_STATE = Constants.STANDBY;
 
         //初始化时间
-        //timeThread = new TimeThread();
-        //timeThread.start();
+        timeThread = new TimeThread();
+        timeThread.start();
 
         appCheckUpdate();
     }

+ 2 - 11
app/src/main/res/layout/activity_fragment.xml

@@ -45,23 +45,14 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-            <!--<TextView
+            <TextView
                 android:id="@+id/activity_main_layout_tv_current_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="&#45;&#45;"
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_size_15px" />-->
-
-            <TextClock
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_15px"
-                android:format12Hour="yyyy-MM-dd HH:mm:ss EEEE"
-                android:format24Hour="yyyy-MM-dd HH:mm:ss EEEE" />
+                android:textSize="@dimen/text_size_15px" />
         </LinearLayout>
 
         <LinearLayout