保存

clanaid · Jun 3, 2015 · 5ed7fa7 · 5ed7fa7
1 parent 6b69798
commit 5ed7fa7
Show file tree

Hide file tree

Showing 42 changed files with 239 additions and 161 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -13,9 +13,10 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.NoTitleBar" >
-        <activity android:name="com.bailv.smartdormitory.MainActivity" >
+        android:label="@string/app_name" >
+        <activity
+            android:name="com.bailv.smartdormitory.MainActivity"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -13,9 +13,10 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.NoTitleBar" >
-        <activity android:name="com.bailv.smartdormitory.MainActivity" >
+        android:label="@string/app_name" >
+        <activity
+            android:name="com.bailv.smartdormitory.MainActivity"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/bin/R.txt b/bin/R.txt
@@ -92,60 +92,63 @@ int id air_power 0x7f050009
 int id air_temp_down 0x7f050010
 int id air_temp_up 0x7f050011
 int id fullscreen 0x7f050003
-int id humidity_progress 0x7f05002f
-int id humidity_value 0x7f050030
+int id hometitle 0x7f050018
+int id humidity_progress 0x7f050031
+int id humidity_value 0x7f050032
 int id item_background 0x7f050015
 int id item_icon 0x7f050016
 int id item_text 0x7f050017
 int id left 0x7f050000
-int id light_type 0x7f050018
-int id light_value 0x7f050019
+int id light_type 0x7f050019
+int id light_value 0x7f05001a
 int id margin 0x7f050002
 int id none 0x7f050004
-int id platooninsert_onle_image_1 0x7f050022
-int id platooninsert_onle_image_2 0x7f050024
-int id platooninsert_onle_image_3 0x7f050026
-int id platooninsert_only_1 0x7f050021
-int id platooninsert_only_2 0x7f050023
-int id platooninsert_only_3 0x7f050025
-int id platooninsert_two_1 0x7f050028
-int id platooninsert_two_2 0x7f05002a
-int id platooninsert_two_3 0x7f05002c
-int id platooninsert_two_image_1 0x7f050027
-int id platooninsert_two_image_2 0x7f050029
-int id platooninsert_two_image_3 0x7f05002b
-int id pm_type 0x7f05001a
-int id pm_value 0x7f05001b
-int id rain_img 0x7f05001c
-int id rain_value 0x7f05001d
-int id rfid_user_img 0x7f050034
-int id rfid_user_name 0x7f050035
+int id platooninsert_onle_image_1 0x7f050024
+int id platooninsert_onle_image_2 0x7f050026
+int id platooninsert_onle_image_3 0x7f050028
+int id platooninsert_only_1 0x7f050023
+int id platooninsert_only_2 0x7f050025
+int id platooninsert_only_3 0x7f050027
+int id platooninsert_two_1 0x7f05002a
+int id platooninsert_two_2 0x7f05002c
+int id platooninsert_two_3 0x7f05002e
+int id platooninsert_two_image_1 0x7f050029
+int id platooninsert_two_image_2 0x7f05002b
+int id platooninsert_two_image_3 0x7f05002d
+int id pm_type 0x7f05001b
+int id pm_value 0x7f05001c
+int id rain_img 0x7f05001d
+int id rain_value 0x7f05001e
+int id rfid_user_img 0x7f050036
+int id rfid_user_name 0x7f050037
 int id right 0x7f050001
+int id safetitle 0x7f05001f
 int id selected_view 0x7f050005
-int id slidingmen_gridview 0x7f05001e
-int id slidingmenu_fragment 0x7f05001f
-int id slidingmenumain 0x7f050020
-int id temp_progress 0x7f05002d
-int id temp_value 0x7f05002e
+int id slidingmen_gridview 0x7f050020
+int id slidingmenu_fragment 0x7f050021
+int id slidingmenumain 0x7f050022
+int id temp_progress 0x7f05002f
+int id temp_value 0x7f050030
 int id title 0x7f050006
-int id title_menu_button 0x7f050031
-int id title_name 0x7f050032
-int id title_time 0x7f050033
+int id title_menu_button 0x7f050033
+int id title_name 0x7f050034
+int id title_time 0x7f050035
 int integer num_cols 0x7f070000
 int layout air_control 0x7f030000
 int layout content_fragment 0x7f030001
 int layout content_view 0x7f030002
 int layout gridview_item 0x7f030003
 int layout home_fragment 0x7f030004
-int layout safe_fragment 0x7f030005
-int layout slidingmenu_gridview 0x7f030006
-int layout slidingmenu_view 0x7f030007
-int layout slidingmenumain 0x7f030008
-int layout switch_six 0x7f030009
-int layout temp_humidity_progress 0x7f03000a
-int layout title 0x7f03000b
-int layout toast_open_dor 0x7f03000c
-int layout window 0x7f03000d
+int layout mode_fragment 0x7f030005
+int layout safe_fragment 0x7f030006
+int layout slidingmenu_gridview 0x7f030007
+int layout slidingmenu_view 0x7f030008
+int layout slidingmenumain 0x7f030009
+int layout switch_six 0x7f03000a
+int layout temp_humidity_progress 0x7f03000b
+int layout title 0x7f03000c
+int layout toast_open_dor 0x7f03000d
+int layout window 0x7f03000e
 int string app_name 0x7f080000
 int style AppBaseTheme 0x7f090000
 int style AppTheme 0x7f090001

diff --git a/bin/SmartDormitory.apk b/bin/SmartDormitory.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/bailv/smartdormitory/AirFragment.class b/bin/classes/com/bailv/smartdormitory/AirFragment.class
diff --git a/bin/classes/com/bailv/smartdormitory/HomeFragment.class b/bin/classes/com/bailv/smartdormitory/HomeFragment.class
diff --git a/bin/classes/com/bailv/smartdormitory/MainActivity$2.class b/bin/classes/com/bailv/smartdormitory/MainActivity$2.class
diff --git a/bin/classes/com/bailv/smartdormitory/MainActivity$3.class b/bin/classes/com/bailv/smartdormitory/MainActivity$3.class
diff --git a/bin/classes/com/bailv/smartdormitory/MainActivity.class b/bin/classes/com/bailv/smartdormitory/MainActivity.class
diff --git a/bin/classes/com/bailv/smartdormitory/ModeFragment.class b/bin/classes/com/bailv/smartdormitory/ModeFragment.class
diff --git a/bin/classes/com/bailv/smartdormitory/PlatooninsertFragment.class b/bin/classes/com/bailv/smartdormitory/PlatooninsertFragment.class
diff --git a/bin/classes/com/bailv/smartdormitory/R$id.class b/bin/classes/com/bailv/smartdormitory/R$id.class
diff --git a/bin/classes/com/bailv/smartdormitory/R$integer.class b/bin/classes/com/bailv/smartdormitory/R$integer.class
diff --git a/bin/classes/com/bailv/smartdormitory/R$layout.class b/bin/classes/com/bailv/smartdormitory/R$layout.class
diff --git a/bin/classes/com/bailv/smartdormitory/R$string.class b/bin/classes/com/bailv/smartdormitory/R$string.class
diff --git a/bin/classes/com/bailv/smartdormitory/R$style.class b/bin/classes/com/bailv/smartdormitory/R$style.class
diff --git a/bin/classes/com/bailv/smartdormitory/R$styleable.class b/bin/classes/com/bailv/smartdormitory/R$styleable.class
diff --git a/bin/classes/com/bailv/smartdormitory/SafeFragment.class b/bin/classes/com/bailv/smartdormitory/SafeFragment.class
diff --git a/bin/classes/com/bailv/smartdormitory/SerialService$LocalBinder.class b/bin/classes/com/bailv/smartdormitory/SerialService$LocalBinder.class
diff --git a/bin/classes/com/bailv/smartdormitory/SerialService.class b/bin/classes/com/bailv/smartdormitory/SerialService.class
diff --git a/bin/classes/com/bailv/smartdormitory/SlidingMenuFragment.class b/bin/classes/com/bailv/smartdormitory/SlidingMenuFragment.class
diff --git a/bin/classes/com/bailv/util/ArmHardware.class b/bin/classes/com/bailv/util/ArmHardware.class
diff --git a/bin/classes/com/bailv/util/SerialThread.class b/bin/classes/com/bailv/util/SerialThread.class
diff --git a/bin/classes/com/bailv/util/ToastShow.class b/bin/classes/com/bailv/util/ToastShow.class
diff --git a/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class b/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
diff --git a/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class b/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
diff --git a/bin/dexedLibs/eventbus-1ee9ad30b25251597eb76ce11db1fc64.jar b/bin/dexedLibs/eventbus-1ee9ad30b25251597eb76ce11db1fc64.jar
diff --git a/bin/dexedLibs/library-2662f62588fee1bfcef75db7a2350120.jar b/bin/dexedLibs/library-2662f62588fee1bfcef75db7a2350120.jar
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/bailv/smartdormitory/R.java b/gen/com/bailv/smartdormitory/R.java
@@ -271,45 +271,47 @@ public static final class id {
         public static final int air_temp_down=0x7f050010;
         public static final int air_temp_up=0x7f050011;
         public static final int fullscreen=0x7f050003;
-        public static final int humidity_progress=0x7f05002f;
-        public static final int humidity_value=0x7f050030;
+        public static final int hometitle=0x7f050018;
+        public static final int humidity_progress=0x7f050031;
+        public static final int humidity_value=0x7f050032;
         public static final int item_background=0x7f050015;
         public static final int item_icon=0x7f050016;
         public static final int item_text=0x7f050017;
         public static final int left=0x7f050000;
-        public static final int light_type=0x7f050018;
-        public static final int light_value=0x7f050019;
+        public static final int light_type=0x7f050019;
+        public static final int light_value=0x7f05001a;
         public static final int margin=0x7f050002;
         public static final int none=0x7f050004;
-        public static final int platooninsert_onle_image_1=0x7f050022;
-        public static final int platooninsert_onle_image_2=0x7f050024;
-        public static final int platooninsert_onle_image_3=0x7f050026;
-        public static final int platooninsert_only_1=0x7f050021;
-        public static final int platooninsert_only_2=0x7f050023;
-        public static final int platooninsert_only_3=0x7f050025;
-        public static final int platooninsert_two_1=0x7f050028;
-        public static final int platooninsert_two_2=0x7f05002a;
-        public static final int platooninsert_two_3=0x7f05002c;
-        public static final int platooninsert_two_image_1=0x7f050027;
-        public static final int platooninsert_two_image_2=0x7f050029;
-        public static final int platooninsert_two_image_3=0x7f05002b;
-        public static final int pm_type=0x7f05001a;
-        public static final int pm_value=0x7f05001b;
-        public static final int rain_img=0x7f05001c;
-        public static final int rain_value=0x7f05001d;
-        public static final int rfid_user_img=0x7f050034;
-        public static final int rfid_user_name=0x7f050035;
+        public static final int platooninsert_onle_image_1=0x7f050024;
+        public static final int platooninsert_onle_image_2=0x7f050026;
+        public static final int platooninsert_onle_image_3=0x7f050028;
+        public static final int platooninsert_only_1=0x7f050023;
+        public static final int platooninsert_only_2=0x7f050025;
+        public static final int platooninsert_only_3=0x7f050027;
+        public static final int platooninsert_two_1=0x7f05002a;
+        public static final int platooninsert_two_2=0x7f05002c;
+        public static final int platooninsert_two_3=0x7f05002e;
+        public static final int platooninsert_two_image_1=0x7f050029;
+        public static final int platooninsert_two_image_2=0x7f05002b;
+        public static final int platooninsert_two_image_3=0x7f05002d;
+        public static final int pm_type=0x7f05001b;
+        public static final int pm_value=0x7f05001c;
+        public static final int rain_img=0x7f05001d;
+        public static final int rain_value=0x7f05001e;
+        public static final int rfid_user_img=0x7f050036;
+        public static final int rfid_user_name=0x7f050037;
         public static final int right=0x7f050001;
+        public static final int safetitle=0x7f05001f;
         public static final int selected_view=0x7f050005;
-        public static final int slidingmen_gridview=0x7f05001e;
-        public static final int slidingmenu_fragment=0x7f05001f;
-        public static final int slidingmenumain=0x7f050020;
-        public static final int temp_progress=0x7f05002d;
-        public static final int temp_value=0x7f05002e;
+        public static final int slidingmen_gridview=0x7f050020;
+        public static final int slidingmenu_fragment=0x7f050021;
+        public static final int slidingmenumain=0x7f050022;
+        public static final int temp_progress=0x7f05002f;
+        public static final int temp_value=0x7f050030;
         public static final int title=0x7f050006;
-        public static final int title_menu_button=0x7f050031;
-        public static final int title_name=0x7f050032;
-        public static final int title_time=0x7f050033;
+        public static final int title_menu_button=0x7f050033;
+        public static final int title_name=0x7f050034;
+        public static final int title_time=0x7f050035;
     }
     public static final class integer {
         public static final int num_cols=0x7f070000;
@@ -320,15 +322,16 @@ public static final class layout {
         public static final int content_view=0x7f030002;
         public static final int gridview_item=0x7f030003;
         public static final int home_fragment=0x7f030004;
-        public static final int safe_fragment=0x7f030005;
-        public static final int slidingmenu_gridview=0x7f030006;
-        public static final int slidingmenu_view=0x7f030007;
-        public static final int slidingmenumain=0x7f030008;
-        public static final int switch_six=0x7f030009;
-        public static final int temp_humidity_progress=0x7f03000a;
-        public static final int title=0x7f03000b;
-        public static final int toast_open_dor=0x7f03000c;
-        public static final int window=0x7f03000d;
+        public static final int mode_fragment=0x7f030005;
+        public static final int safe_fragment=0x7f030006;
+        public static final int slidingmenu_gridview=0x7f030007;
+        public static final int slidingmenu_view=0x7f030008;
+        public static final int slidingmenumain=0x7f030009;
+        public static final int switch_six=0x7f03000a;
+        public static final int temp_humidity_progress=0x7f03000b;
+        public static final int title=0x7f03000c;
+        public static final int toast_open_dor=0x7f03000d;
+        public static final int window=0x7f03000e;
     }
     public static final class string {
         public static final int app_name=0x7f080000;

diff --git a/gen/com/jeremyfeinstein/slidingmenu/lib/R.java b/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
@@ -30,10 +30,10 @@ public static final class id {
 		public static final int none = 0x7f050004;
 		public static final int right = 0x7f050001;
 		public static final int selected_view = 0x7f050005;
-		public static final int slidingmenumain = 0x7f050020;
+		public static final int slidingmenumain = 0x7f050022;
 	}
 	public static final class layout {
-		public static final int slidingmenumain = 0x7f030008;
+		public static final int slidingmenumain = 0x7f030009;
 	}
 	public static final class styleable {
 		public static final int[] SlidingMenu = { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005, 0x7f010006, 0x7f010007, 0x7f010008, 0x7f010009, 0x7f01000a, 0x7f01000b, 0x7f01000c, 0x7f01000d };

diff --git a/res/layout/home_fragment.xml b/res/layout/home_fragment.xml
@@ -5,14 +5,14 @@
     android:background="@drawable/background" >
 
     <include
-        android:id="@+id/title"
+        android:id="@+id/hometitle"
         android:layout_alignParentTop="true"
         layout="@layout/title" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/title"
+        android:layout_below="@id/hometitle"
         android:layout_margin="10dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"

diff --git a/res/layout/mode_fragment.xml b/res/layout/mode_fragment.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/background" >
+
+    <include
+        android:id="@+id/safetitle"
+        android:layout_alignParentTop="true"
+        layout="@layout/title" />
+
+    <LinearLayout 
+        android:layout_margin="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/safetitle">
+
+
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/safe_fragment.xml b/res/layout/safe_fragment.xml
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
-
+    android:background="@drawable/background" >
 
-</LinearLayout>
+    <include
+        android:id="@+id/safetitle"
+        android:layout_alignParentTop="true"
+        layout="@layout/title" />
+
+    <LinearLayout 
+        android:layout_margin="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/safetitle">
+
+
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/title.xml b/res/layout/title.xml
@@ -20,6 +20,7 @@
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
         android:text="智能宿舍"
+        android:textColor="#FFFFFF"
         android:textSize="30dp" />
 
     <TextView

diff --git a/src/com/bailv/smartdormitory/MainActivity.java b/src/com/bailv/smartdormitory/MainActivity.java
@@ -118,7 +118,8 @@ private void initFragment() {
 		homeFragment = new HomeFragment();
 		airFragment = new AirFragment();
 		platooninsertFragment = new PlatooninsertFragment();
-
+		safeFragment = new SafeFragment();
+		modeFragment = new ModeFragment();
 		tempFragment = fragment = homeFragment;
 	}
 
@@ -206,10 +207,10 @@ public void change(int key) {
 			fragment = airFragment;
 			break;
 		case 3:
-			fragment = homeFragment;
+			fragment = safeFragment;
 			break;
 		case 4:
-			fragment = homeFragment;
+			fragment = modeFragment;
 			break;
 		default:
 			break;
@@ -234,7 +235,6 @@ public void change(int key) {
 	@Override
 	public void show() {
 		// TODO 自动生成的方法存根
-
 		menu.showMenu();
 	}
 

diff --git a/src/com/bailv/smartdormitory/ModeFragment.java b/src/com/bailv/smartdormitory/ModeFragment.java
@@ -1,5 +1,38 @@
 package com.bailv.smartdormitory;
 
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
 public class ModeFragment extends SmartDormitoryFragment {
 
+	private Button titleMenu;
+	private TextView titleName;
+	private TextView titleTime;
+	private View view;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		// TODO 自动生成的方法存根
+		view = inflater.inflate(R.layout.mode_fragment, null);
+		initView();
+		return view;
+	}
+
+	private void initView() {
+		// TODO 自动生成的方法存根
+		titleMenu = (Button)view.findViewById(R.id.title_menu_button);
+		this.setTitleMenuButton(titleMenu);
+
+		titleName = (TextView)view.findViewById(R.id.title_name);
+		this.setTitlename(titleName,"宿舍模式");
+
+		titleTime = (TextView)view.findViewById(R.id.title_time);
+		this.setTitleTime(titleTime);
+
+	}
 }