Merge pull request #39 from CaptainHuangsh/16-12-24-hours

16 12 24 hours
CaptainHuangsh · May 19, 2017 · 0866681 · 0866681
2 parents a86c978 + b2a6cc8
commit 0866681
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/app/src/main/java/com/example/owenh/alarmo/activity/WatchActivity.java b/app/src/main/java/com/example/owenh/alarmo/activity/WatchActivity.java
@@ -43,6 +43,8 @@ public class WatchActivity extends AutoLayoutActivity {
     //将字体文件保存在assets/fonts/目录下，创建Typeface对象
     Typeface typeFace;
     String textColor;
+    boolean is24Hours;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -74,18 +76,19 @@ public void init() {
         WATCH_STATUS = 1;
         PreferenceManager.setDefaultValues(this, R.xml.pref_settings, false);
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        textColor = preferences.getString("pref_text_color","#ff00ddff");
+        textColor = preferences.getString("pref_text_color", "#ff00ddff");
         typeFace = Typeface.createFromAsset(getAssets(), "fonts/digifaw.ttf");
+        is24Hours = preferences.getBoolean("hours_12_24", true);
         //字体
         mVTime.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 //                if (DoubleClick.check()) {
-                    if (mDay.getVisibility() == View.GONE) {
-                        mDay.setVisibility(View.VISIBLE);
-                    } else {
-                        mDay.setVisibility(View.GONE);
-                    }
+                if (mDay.getVisibility() == View.GONE) {
+                    mDay.setVisibility(View.VISIBLE);
+                } else {
+                    mDay.setVisibility(View.GONE);
+                }
 //                }
             }
         });
@@ -126,12 +129,16 @@ public void handleMessage(Message msg) {
             switch (msg.what) {
                 case MSG_KEY_1:
                     long sysTime = System.currentTimeMillis();
-                    CharSequence sysTimeStr = DateFormat.format("HH:mm", sysTime);
-//                    CharSequence sysTimeStr = DateFormat.format("hh:mm", sysTime);
-                    //12小时制
-                    CharSequence sysTimeStrsec = DateFormat.format("ss", sysTime);
+                    CharSequence sysTimeStr;
+                    if (is24Hours) {
+                        sysTimeStr = DateFormat.format("HH:mm", sysTime);
+                    } else {
+                        sysTimeStr = DateFormat.format("hh:mm", sysTime);
+                        //12小时制
+                    }
+                    CharSequence sysTimeStrSec = DateFormat.format("ss", sysTime);
                     mVTime.setText(sysTimeStr + "");
-                    mSec.setText(" " + sysTimeStrsec);
+                    mSec.setText(" " + sysTimeStrSec);
                     mDay.setText(mDateDay.StringData() + "");
                     mVTime.setTypeface(typeFace);
                     mSec.setTypeface(typeFace);
@@ -170,7 +177,7 @@ protected void onDestroy() {
     @Override
     public void onBackPressed() {
         if (!DoubleClick.check()) {
-            Toast.makeText(this,"再按一次退出",Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show();
         } else {
             finish();
         }

diff --git a/app/src/main/res/xml/pref_settings.xml b/app/src/main/res/xml/pref_settings.xml
@@ -24,5 +24,9 @@
         android:key="pref_advance_one"
         android:defaultValue="false"
         android:title="@string/pref_advance_one"/>
+    <CheckBoxPreference
+        android:key="hours_12_24"
+        android:defaultValue="true"
+        android:title="使用24小时制"/>
 
 </PreferenceScreen>