增加显示图片按钮

linwenbang · May 20, 2015 · 6c19a01 · 6c19a01
1 parent f158dd7
commit 6c19a01
Show file tree

Hide file tree

Showing 30 changed files with 252 additions and 121 deletions.
diff --git a/bin/classes/com/lwb/nicecontroller/R$drawable.class b/bin/classes/com/lwb/nicecontroller/R$drawable.class
diff --git a/bin/classes/com/lwb/nicecontroller/R$id.class b/bin/classes/com/lwb/nicecontroller/R$id.class
diff --git a/bin/classes/com/lwb/nicecontroller/R$layout.class b/bin/classes/com/lwb/nicecontroller/R$layout.class
diff --git a/bin/classes/com/lwb/nicecontroller/R$menu.class b/bin/classes/com/lwb/nicecontroller/R$menu.class
diff --git a/bin/classes/com/lwb/nicecontroller/R$raw.class b/bin/classes/com/lwb/nicecontroller/R$raw.class
diff --git a/bin/classes/com/lwb/nicecontroller/R$string.class b/bin/classes/com/lwb/nicecontroller/R$string.class
diff --git a/bin/classes/com/lwb/nicecontroller/R$style.class b/bin/classes/com/lwb/nicecontroller/R$style.class
diff --git a/bin/classes/com/lwb/nicecontroller/R$styleable.class b/bin/classes/com/lwb/nicecontroller/R$styleable.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/SplashActivity.class b/bin/classes/com/lwb/nicecontroller/app/SplashActivity.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/device/DeviceStatusFragment$1.class b/bin/classes/com/lwb/nicecontroller/app/device/DeviceStatusFragment$1.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/device/DeviceStatusFragment$2.class b/bin/classes/com/lwb/nicecontroller/app/device/DeviceStatusFragment$2.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/device/DeviceStatusFragment.class b/bin/classes/com/lwb/nicecontroller/app/device/DeviceStatusFragment.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/main/NiceMainActivity$1.class b/bin/classes/com/lwb/nicecontroller/app/main/NiceMainActivity$1.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/main/NiceMainActivity.class b/bin/classes/com/lwb/nicecontroller/app/main/NiceMainActivity.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/user/activity/UserManagerActivity.class b/bin/classes/com/lwb/nicecontroller/app/user/activity/UserManagerActivity.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/user/activity/UserRegisterActivity.class b/bin/classes/com/lwb/nicecontroller/app/user/activity/UserRegisterActivity.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/user/adpater/UserManagerAdpater.class b/bin/classes/com/lwb/nicecontroller/app/user/adpater/UserManagerAdpater.class
diff --git a/bin/classes/com/lwb/nicecontroller/app/user/fragment/SettingFragment.class b/bin/classes/com/lwb/nicecontroller/app/user/fragment/SettingFragment.class
diff --git a/gen/com/lwb/nicecontroller/R.java b/gen/com/lwb/nicecontroller/R.java
@@ -77,42 +77,45 @@ public static final class drawable {
         public static final int img_hum_selector=0x7f020018;
         public static final int img_led_selector=0x7f020019;
         public static final int img_lock_selector=0x7f02001a;
-        public static final int img_pir_selector=0x7f02001b;
-        public static final int img_sound_selector=0x7f02001c;
-        public static final int img_tmp_selector=0x7f02001d;
-        public static final int led_defualt=0x7f02001e;
-        public static final int led_light=0x7f02001f;
-        public static final int main_bar_bg_default=0x7f020020;
-        public static final int mikegray=0x7f020021;
-        public static final int mikewhite=0x7f020022;
-        public static final int pir_default=0x7f020023;
-        public static final int pir_on=0x7f020024;
-        public static final int player_settings_bright_thumb=0x7f020025;
-        public static final int po_seekbar=0x7f020026;
-        public static final int progress_bg=0x7f020027;
-        public static final int recent_contact_list_bg=0x7f020028;
-        public static final int seekbar_thumb=0x7f020029;
-        public static final int seekbar_thumb_normal=0x7f02002a;
-        public static final int seekbar_thumb_pressed=0x7f02002b;
-        public static final int sercue_default=0x7f02002c;
-        public static final int sercue_locked=0x7f02002d;
-        public static final int setting=0x7f02002e;
-        public static final int setting_bright_seekbar_background=0x7f02002f;
-        public static final int setting_bright_seekbar_progress=0x7f020030;
-        public static final int sound_default=0x7f020031;
-        public static final int sound_on=0x7f020032;
-        public static final int splash=0x7f020033;
-        public static final int temp_alert=0x7f020034;
-        public static final int temp_defalut=0x7f020035;
-        public static final int title_bar_bg_one_row=0x7f020036;
-        public static final int transparent=0x7f02003a;
-        public static final int volumn_bg=0x7f020037;
-        public static final int volumn_front=0x7f020038;
-        public static final int volumn_primary=0x7f020039;
+        public static final int img_motor_selector=0x7f02001b;
+        public static final int img_pir_selector=0x7f02001c;
+        public static final int img_sound_selector=0x7f02001d;
+        public static final int img_tmp_selector=0x7f02001e;
+        public static final int led_defualt=0x7f02001f;
+        public static final int led_light=0x7f020020;
+        public static final int main_bar_bg_default=0x7f020021;
+        public static final int mikegray=0x7f020022;
+        public static final int mikewhite=0x7f020023;
+        public static final int motor_default=0x7f020024;
+        public static final int motor_on=0x7f020025;
+        public static final int pic_default=0x7f020026;
+        public static final int pir_default=0x7f020027;
+        public static final int pir_on=0x7f020028;
+        public static final int player_settings_bright_thumb=0x7f020029;
+        public static final int po_seekbar=0x7f02002a;
+        public static final int progress_bg=0x7f02002b;
+        public static final int recent_contact_list_bg=0x7f02002c;
+        public static final int seekbar_thumb=0x7f02002d;
+        public static final int seekbar_thumb_normal=0x7f02002e;
+        public static final int seekbar_thumb_pressed=0x7f02002f;
+        public static final int sercue_default=0x7f020030;
+        public static final int sercue_locked=0x7f020031;
+        public static final int setting=0x7f020032;
+        public static final int setting_bright_seekbar_background=0x7f020033;
+        public static final int setting_bright_seekbar_progress=0x7f020034;
+        public static final int sound_default=0x7f020035;
+        public static final int sound_on=0x7f020036;
+        public static final int splash=0x7f020037;
+        public static final int temp_alert=0x7f020038;
+        public static final int temp_defalut=0x7f020039;
+        public static final int title_bar_bg_one_row=0x7f02003a;
+        public static final int transparent=0x7f02003e;
+        public static final int volumn_bg=0x7f02003b;
+        public static final int volumn_front=0x7f02003c;
+        public static final int volumn_primary=0x7f02003d;
     }
     public static final class id {
         public static final int ImageView02=0x7f0b0033;
-        public static final int ImageView05=0x7f0b001c;
         public static final int LinearLayout1=0x7f0b0013;
         public static final int RelativeLayout01=0x7f0b002c;
         public static final int RelativeLayout02=0x7f0b0032;
@@ -123,41 +126,43 @@ public static final class id {
         public static final int TextView06=0x7f0b0028;
         public static final int TextView07=0x7f0b0034;
         public static final int TextView08=0x7f0b0030;
-        public static final int action_settings=0x7f0b005a;
-        public static final int btn_del=0x7f0b0057;
+        public static final int action_settings=0x7f0b005b;
+        public static final int btn_del=0x7f0b0058;
         public static final int btn_dialog_cancel=0x7f0b0008;
         public static final int btn_dialog_ok=0x7f0b0006;
         public static final int btn_login=0x7f0b003d;
-        public static final int btn_register=0x7f0b0049;
+        public static final int btn_register=0x7f0b004a;
         public static final int btn_signOut=0x7f0b003f;
         public static final int btn_submit=0x7f0b0043;
         public static final int editText_tag=0x7f0b0010;
         public static final int edit_url=0x7f0b000a;
         public static final int edt_admin_pwd=0x7f0b003e;
-        public static final int edt_alisa=0x7f0b0048;
+        public static final int edt_alisa=0x7f0b0049;
         public static final int edt_modify_url=0x7f0b0045;
         public static final int edt_new_pwd=0x7f0b0042;
         public static final int edt_old_pwd=0x7f0b0041;
-        public static final int edt_warning_value0=0x7f0b004b;
-        public static final int edt_warning_value1=0x7f0b004e;
-        public static final int id_indicator=0x7f0b0058;
-        public static final int id_vp=0x7f0b0059;
-        public static final int imageView2=0x7f0b004a;
+        public static final int edt_warning_value0=0x7f0b004c;
+        public static final int edt_warning_value1=0x7f0b004f;
+        public static final int id_indicator=0x7f0b0059;
+        public static final int id_vp=0x7f0b005a;
+        public static final int imageView2=0x7f0b004b;
         public static final int img_auto_led=0x7f0b0019;
         public static final int img_beep=0x7f0b0017;
         public static final int img_fan=0x7f0b0016;
         public static final int img_hum=0x7f0b0025;
-        public static final int img_icon0=0x7f0b004f;
+        public static final int img_icon0=0x7f0b0050;
         public static final int img_icon1=0x7f0b002d;
         public static final int img_led=0x7f0b0015;
         public static final int img_lock=0x7f0b0018;
-        public static final int img_pir=0x7f0b001b;
-        public static final int img_sound=0x7f0b001a;
+        public static final int img_motor=0x7f0b001b;
+        public static final int img_pic=0x7f0b0047;
+        public static final int img_pir=0x7f0b001a;
+        public static final int img_sound=0x7f0b001c;
         public static final int img_temp=0x7f0b001f;
         public static final int linearLayout1=0x7f0b0014;
         public static final int linearlayout_ok=0x7f0b0004;
         public static final int listView_push=0x7f0b0012;
-        public static final int lv_users=0x7f0b0053;
+        public static final int lv_users=0x7f0b0054;
         public static final int ly_seek_cpu_gpu=0x7f0b002b;
         public static final int ly_seek_temp_hum=0x7f0b001d;
         public static final int rly_seek_hum=0x7f0b0024;
@@ -170,22 +175,22 @@ public static final class id {
         public static final int textView1=0x7f0b0026;
         public static final int textView2=0x7f0b002a;
         public static final int textView3=0x7f0b0022;
-        public static final int txt_0=0x7f0b004c;
-        public static final int txt_1=0x7f0b004d;
-        public static final int txt_admin_login=0x7f0b0050;
+        public static final int txt_0=0x7f0b004d;
+        public static final int txt_1=0x7f0b004e;
+        public static final int txt_admin_login=0x7f0b0051;
         public static final int txt_admin_pwd_modify=0x7f0b0001;
-        public static final int txt_alisa=0x7f0b0055;
+        public static final int txt_alisa=0x7f0b0056;
         public static final int txt_appkey=0x7f0b000d;
         public static final int txt_cpu_temp=0x7f0b002f;
         public static final int txt_dialog_content=0x7f0b0005;
         public static final int txt_get_users_list=0x7f0b0002;
         public static final int txt_gpu_temp=0x7f0b0037;
         public static final int txt_http_get=0x7f0b0009;
         public static final int txt_hum=0x7f0b0029;
-        public static final int txt_id=0x7f0b0054;
+        public static final int txt_id=0x7f0b0055;
         public static final int txt_imei=0x7f0b000c;
-        public static final int txt_info=0x7f0b0047;
-        public static final int txt_isAdmin=0x7f0b0056;
+        public static final int txt_info=0x7f0b0048;
+        public static final int txt_isAdmin=0x7f0b0057;
         public static final int txt_json=0x7f0b000b;
         public static final int txt_logout=0x7f0b0003;
         public static final int txt_modify_url=0x7f0b0044;
@@ -196,8 +201,8 @@ public static final class id {
         public static final int txt_setTag=0x7f0b0011;
         public static final int txt_submit=0x7f0b0023;
         public static final int txt_temp=0x7f0b0021;
-        public static final int txt_title=0x7f0b0052;
-        public static final int txt_user_register=0x7f0b0051;
+        public static final int txt_title=0x7f0b0053;
+        public static final int txt_user_register=0x7f0b0052;
         public static final int txt_version=0x7f0b000f;
         public static final int txt_voice=0x7f0b003a;
         public static final int txt_voice_result=0x7f0b0039;
@@ -213,14 +218,15 @@ public static final class layout {
         public static final int main=0x7f030006;
         public static final int modify_pwd_layout=0x7f030007;
         public static final int modify_server_url_layout=0x7f030008;
-        public static final int push_item=0x7f030009;
-        public static final int register_layout=0x7f03000a;
-        public static final int seek_info_layout=0x7f03000b;
-        public static final int setting_layout=0x7f03000c;
-        public static final int splash=0x7f03000d;
-        public static final int user_manager_layout=0x7f03000e;
-        public static final int user_manager_layout_item=0x7f03000f;
-        public static final int vp_indicator=0x7f030010;
+        public static final int pic_windows_layout=0x7f030009;
+        public static final int push_item=0x7f03000a;
+        public static final int register_layout=0x7f03000b;
+        public static final int seek_info_layout=0x7f03000c;
+        public static final int setting_layout=0x7f03000d;
+        public static final int splash=0x7f03000e;
+        public static final int user_manager_layout=0x7f03000f;
+        public static final int user_manager_layout_item=0x7f030010;
+        public static final int vp_indicator=0x7f030011;
     }
     public static final class menu {
         public static final int main=0x7f0a0000;

diff --git a/res/drawable-hdpi/motor_default.png b/res/drawable-hdpi/motor_default.png
diff --git a/res/drawable-hdpi/motor_on.png b/res/drawable-hdpi/motor_on.png
diff --git a/res/drawable-hdpi/pic_default.png b/res/drawable-hdpi/pic_default.png
diff --git a/res/drawable/img_motor_selector.xml b/res/drawable/img_motor_selector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/motor_on" android:state_pressed="true"/>
+    <item android:drawable="@drawable/motor_on" android:state_focused="true"/>
+    <item android:drawable="@drawable/motor_on" android:state_enabled="false"/>
+    <item android:drawable="@drawable/motor_on" android:state_selected="true"/>
+    <item android:drawable="@drawable/motor_default"/>
+
+</selector>
diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml
@@ -115,28 +115,29 @@
                     android:src="@drawable/img_auto_led_selector" />
 
                 <ImageView
-                    android:id="@+id/img_sound"
+                    android:id="@+id/img_pir"
                     android:layout_width="0dp"
                     android:layout_height="100dp"
                     android:layout_weight="1"
                     android:padding="15dp"
-                    android:src="@drawable/img_sound_selector" />
+                    android:src="@drawable/img_pir_selector" />
 
                 <ImageView
-                    android:id="@+id/img_pir"
+                    android:id="@+id/img_motor"
                     android:layout_width="0dp"
                     android:layout_height="100dp"
                     android:layout_weight="1"
                     android:padding="15dp"
-                    android:src="@drawable/img_pir_selector" />
+                    android:src="@drawable/img_motor_selector" />
 
                 <ImageView
-                    android:id="@+id/ImageView05"
+                    android:id="@+id/img_sound"
                     android:layout_width="0dp"
                     android:layout_height="100dp"
                     android:layout_weight="1"
                     android:padding="15dp"
-                    android:src="@null" />
+                    android:src="@drawable/pic_default" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -160,24 +161,26 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:text="设备声音"
+                    android:text="红外状态"
                     android:textColor="@color/white" />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:text="红外开关"
-                    android:textColor="@color/white" />
+                    android:text="窗帘"
+                    android:textColor="@color/white" 
+                    />
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:text=""
+                    android:text="获取监控图"
                     android:textColor="@color/white" />
+
             </LinearLayout>
 
             <LinearLayout

diff --git a/res/layout/pic_windows_layout.xml b/res/layout/pic_windows_layout.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/img_pic"
+        android:layout_width="320dp"
+        android:layout_height="240dp"
+        android:layout_gravity="center"
+        android:src="@color/black" />
+
+</LinearLayout>