Skip to content
This repository has been archived by the owner on Apr 6, 2021. It is now read-only.

Commit

Permalink
添加了ddpush,实现远程控制,同时优化其他代码
Browse files Browse the repository at this point in the history
  • Loading branch information
clanaid committed Jun 26, 2015
1 parent 5ed7fa7 commit 5d9f05e
Show file tree
Hide file tree
Showing 145 changed files with 3,156 additions and 634 deletions.
17 changes: 17 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

<application
android:allowBackup="true"
Expand All @@ -29,6 +30,22 @@
<action android:name="com.bailv.smartdormitory.SerialService" />
</intent-filter>
</service>

<service android:name="com.bailv.smartdormitory.DDPushService">
<intent-filter>
<action android:name="com.bailv.smartdormitory.DDPushService" />
</intent-filter>
</service>

<receiver android:name="com.bailv.smartdormitory.ModeAlarmBReceiver" >
<intent-filter>
</intent-filter>
</receiver>
<!-- <receiver android:name="com.bailv.smartdormitory.SlefStartBReceeiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver> -->
</application>

</manifest>
17 changes: 17 additions & 0 deletions bin/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

<application
android:allowBackup="true"
Expand All @@ -29,6 +30,22 @@
<action android:name="com.bailv.smartdormitory.SerialService" />
</intent-filter>
</service>

<service android:name="com.bailv.smartdormitory.DDPushService">
<intent-filter>
<action android:name="com.bailv.smartdormitory.DDPushService" />
</intent-filter>
</service>

<receiver android:name="com.bailv.smartdormitory.ModeAlarmBReceiver" >
<intent-filter>
</intent-filter>
</receiver>
<!-- <receiver android:name="com.bailv.smartdormitory.SlefStartBReceeiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver> -->
</application>

</manifest>
211 changes: 141 additions & 70 deletions bin/R.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ int animator slide_in_left 0x7f040002
int animator slide_out_right 0x7f040003
int animator toast_in 0x7f040004
int animator toast_out 0x7f040005
int array slidingMenuImg 0x7f060000
int array slidingMenuName 0x7f060001
int attr behindOffset 0x7f010003
int attr behindScrollScale 0x7f010005
int attr behindWidth 0x7f010004
Expand All @@ -25,11 +27,15 @@ int attr touchModeAbove 0x7f010006
int attr touchModeBehind 0x7f010007
int attr viewAbove 0x7f010001
int attr viewBehind 0x7f010002
int dimen activity_horizontal_margin 0x7f060003
int dimen activity_vertical_margin 0x7f060004
int dimen list_padding 0x7f060001
int dimen shadow_width 0x7f060002
int dimen slidingmenu_offset 0x7f060000
int color mode_text_select 0x7f070001
int color mode_text_unselect 0x7f070000
int color platooninser_switch_tag_set 0x7f070003
int color platooninser_switch_tag_unset 0x7f070002
int dimen activity_horizontal_margin 0x7f080003
int dimen activity_vertical_margin 0x7f080004
int dimen list_padding 0x7f080001
int dimen shadow_width 0x7f080002
int dimen slidingmenu_offset 0x7f080000
int drawable aa 0x7f020000
int drawable air_background_shadow 0x7f020001
int drawable air_close 0x7f020002
Expand Down Expand Up @@ -57,26 +63,46 @@ int drawable checkswitch_btn_pressed 0x7f020017
int drawable checkswitch_btn_unpressed 0x7f020018
int drawable checkswitch_frame 0x7f020019
int drawable checkswitch_mask 0x7f02001a
int drawable gridview_item 0x7f02001b
int drawable gridview_item_color 0x7f02001c
int drawable gridview_item_select_color 0x7f02001d
int drawable home_tubiao 0x7f02001e
int drawable ic_launcher 0x7f02001f
int drawable icon_app 0x7f020020
int drawable my_checkbox 0x7f020021
int drawable power 0x7f020022
int drawable safe_tubiao 0x7f020023
int drawable set_tubiao 0x7f020024
int drawable shadow 0x7f020025
int drawable shape 0x7f020026
int drawable slidingmenu_color 0x7f020027
int drawable switch_background 0x7f020028
int drawable switch_background_shadow 0x7f020029
int drawable switch_unbackground 0x7f02002a
int drawable title 0x7f02002b
int drawable title_color 0x7f02002c
int drawable toast_opendor_background 0x7f02002d
int drawable z 0x7f02002e
int drawable chuanglian 0x7f02001b
int drawable chuanglian2 0x7f02001c
int drawable chuanglian_close 0x7f02001d
int drawable chuanglian_close2 0x7f02001e
int drawable door_close 0x7f02001f
int drawable door_open 0x7f020020
int drawable gridview_item 0x7f020021
int drawable gridview_item_color 0x7f020022
int drawable gridview_item_select_color 0x7f020023
int drawable home_tubiao 0x7f020024
int drawable ic_launcher 0x7f020025
int drawable icon_app 0x7f020026
int drawable ir 0x7f020027
int drawable light_off 0x7f020028
int drawable light_on 0x7f020029
int drawable mode_background_shadow 0x7f02002a
int drawable mode_clock_background 0x7f02002b
int drawable my_checkbox 0x7f02002c
int drawable neative_select 0x7f02002d
int drawable neative_unselect 0x7f02002e
int drawable positive_select 0x7f02002f
int drawable positive_unselect 0x7f020030
int drawable power 0x7f020031
int drawable safe_background_shadow 0x7f020032
int drawable safe_tubiao 0x7f020033
int drawable set_tubiao 0x7f020034
int drawable shadow 0x7f020035
int drawable shape 0x7f020036
int drawable slidingmenu_color 0x7f020037
int drawable switch_background 0x7f020038
int drawable switch_background_shadow 0x7f020039
int drawable switch_unbackground 0x7f02003a
int drawable tag_neative_background 0x7f02003b
int drawable tag_positive_background 0x7f02003c
int drawable title 0x7f02003d
int drawable title_color 0x7f02003e
int drawable toast_opendor_background 0x7f02003f
int drawable window_off 0x7f020040
int drawable window_on 0x7f020041
int drawable z 0x7f020042
int id ContenView_fragment 0x7f050014
int id air 0x7f050008
int id air_block 0x7f050007
Expand All @@ -92,69 +118,114 @@ int id air_power 0x7f050009
int id air_temp_down 0x7f050010
int id air_temp_up 0x7f050011
int id fullscreen 0x7f050003
int id home_air_state 0x7f050023
int id home_door_state 0x7f050022
int id home_light_state 0x7f050025
int id home_rain_no 0x7f050021
int id home_rain_yes 0x7f05001f
int id home_smoke_no 0x7f05001b
int id home_smoke_ye 0x7f05001c
int id home_window_state 0x7f050024
int id hometitle 0x7f050018
int id humidity_progress 0x7f050031
int id humidity_value 0x7f050032
int id humidity_progress 0x7f05005b
int id humidity_value 0x7f05005c
int id item_background 0x7f050015
int id item_icon 0x7f050016
int id item_text 0x7f050017
int id left 0x7f050000
int id light_power 0x7f050046
int id light_type 0x7f050019
int id light_value 0x7f05001a
int id margin 0x7f050002
int id mode_getUp_text 0x7f050031
int id mode_getup_action_closedoor 0x7f050035
int id mode_getup_action_closewindow 0x7f050036
int id mode_getup_checked 0x7f050032
int id mode_getup_clock 0x7f050033
int id mode_getup_setClock 0x7f050034
int id mode_out_action_closecurtains 0x7f05003c
int id mode_out_action_closedoor 0x7f050039
int id mode_out_action_closelight 0x7f05003b
int id mode_out_action_closewindow 0x7f05003a
int id mode_out_checked 0x7f050038
int id mode_out_text 0x7f050037
int id mode_sleep_action_closecurtains 0x7f05002f
int id mode_sleep_action_closedoor 0x7f05002c
int id mode_sleep_action_closelight 0x7f05002e
int id mode_sleep_action_closeswitch 0x7f050030
int id mode_sleep_action_closewindow 0x7f05002d
int id mode_sleep_checked 0x7f050028
int id mode_sleep_clock 0x7f050029
int id mode_sleep_setClock 0x7f05002a
int id mode_sleep_text 0x7f050027
int id none 0x7f050004
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 platooninsert_two_1 0x7f05003e
int id platooninsert_two_2 0x7f050041
int id platooninsert_two_3 0x7f050044
int id platooninsert_two_image_1 0x7f05003d
int id platooninsert_two_image_2 0x7f050040
int id platooninsert_two_image_3 0x7f050043
int id platooninsert_two_tag_1 0x7f05003f
int id platooninsert_two_tag_2 0x7f050042
int id platooninsert_two_tag_3 0x7f050045
int id pm_type 0x7f05001d
int id pm_value 0x7f05001e
int id rain_img 0x7f050020
int id rfid_user_img 0x7f050060
int id rfid_user_name 0x7f050061
int id right 0x7f050001
int id safetitle 0x7f05001f
int id safe_chuanglian_off 0x7f050047
int id safe_chuanglian_on 0x7f050048
int id safe_chuanlian_swtich 0x7f050049
int id safe_door_close_power 0x7f050050
int id safe_door_off 0x7f05004d
int id safe_door_on 0x7f05004e
int id safe_door_open_power 0x7f05004f
int id safe_ir_state 0x7f050051
int id safe_window_off 0x7f05004a
int id safe_window_on 0x7f05004b
int id safe_window_switch 0x7f05004c
int id safetitle 0x7f050026
int id selected_view 0x7f050005
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 slidingmen_gridview 0x7f050052
int id slidingmenu_fragment 0x7f050053
int id slidingmenumain 0x7f050054
int id tag_edit 0x7f050056
int id tag_neative 0x7f050058
int id tag_positive 0x7f050057
int id tag_title 0x7f050055
int id temp_progress 0x7f050059
int id temp_value 0x7f05005a
int id tempid 0x7f05002b
int id title 0x7f050006
int id title_menu_button 0x7f050033
int id title_name 0x7f050034
int id title_time 0x7f050035
int integer num_cols 0x7f070000
int id title_menu_button 0x7f05005d
int id title_name 0x7f05005e
int id title_time 0x7f05005f
int integer num_cols 0x7f090000
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 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
int style AudioFileInfoOverlayText 0x7f090002
int style custom_checkbox 0x7f090003
int style toast_view 0x7f090004
int layout platooninser 0x7f030006
int layout safe_fragment 0x7f030007
int layout slidingmenu_gridview 0x7f030008
int layout slidingmenu_view 0x7f030009
int layout slidingmenumain 0x7f03000a
int layout tag_dialog 0x7f03000b
int layout temp_humidity_progress 0x7f03000c
int layout title 0x7f03000d
int layout toast_open_dor 0x7f03000e
int layout window 0x7f03000f
int string app_name 0x7f0a0000
int string platooninser_switch_tag_unset 0x7f0a0001
int style AppBaseTheme 0x7f0b0000
int style AppTheme 0x7f0b0001
int style AudioFileInfoOverlayText 0x7f0b0002
int style custom_checkbox 0x7f0b0003
int style dialog 0x7f0b0005
int style toast_view 0x7f0b0004
int[] styleable CircleButton { 0x7f010013, 0x7f010014 }
int styleable CircleButton_cb_color 0
int styleable CircleButton_cb_pressedRingWidth 1
Expand Down
Binary file modified bin/SmartDormitory.apk
Binary file not shown.
Binary file modified bin/classes.dex
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$1.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$10.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$11.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$12.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$2.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$3.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$4.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$5.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$6.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$7.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$8.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment$9.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/AirFragment.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/HomeFragment.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/MainActivity$1.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/MainActivity$2.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/MainActivity$3.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/MainActivity.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/ModeFragment.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/PlatooninsertFragment$1.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/PlatooninsertFragment$2.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/PlatooninsertFragment$3.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/PlatooninsertFragment$4.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/PlatooninsertFragment$5.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/PlatooninsertFragment$6.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/PlatooninsertFragment.class
Binary file not shown.
Binary file added bin/classes/com/bailv/smartdormitory/R$array.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$attr.class
Binary file not shown.
Binary file added bin/classes/com/bailv/smartdormitory/R$color.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$dimen.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$drawable.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$id.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$integer.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$layout.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$string.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$style.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R$styleable.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/R.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/SafeFragment.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/SerialFragment.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/SerialService.class
Binary file not shown.
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/SlidingMenuFragment$1.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/SlidingMenuFragment.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified bin/classes/com/bailv/smartdormitory/SmartDormitoryFragment.class
Binary file not shown.
Binary file not shown.
Binary file modified bin/classes/com/bailv/util/CircleProgressBar.class
Binary file not shown.
Binary file added bin/classes/com/bailv/util/ControlCmd$1.class
Binary file not shown.
Binary file not shown.
Binary file added bin/classes/com/bailv/util/ControlCmd.class
Binary file not shown.
Binary file added bin/classes/com/bailv/util/DDPUSHUtil.class
Binary file not shown.
Binary file not shown.
Binary file added bin/classes/com/bailv/util/EventsPost$State.class
Binary file not shown.
Binary file added bin/classes/com/bailv/util/EventsPost.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/util/SerialThread.class
Binary file not shown.
Binary file modified bin/classes/com/bailv/util/ToastShow.class
Binary file not shown.
Binary file modified bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
Binary file not shown.
Binary file modified bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
Binary file not shown.
Binary file not shown.
Binary file modified bin/dexedLibs/eventbus-1ee9ad30b25251597eb76ce11db1fc64.jar
Binary file not shown.
Binary file modified bin/dexedLibs/library-2662f62588fee1bfcef75db7a2350120.jar
Binary file not shown.
Binary file added bin/res/crunch/drawable-hdpi/chuanglian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/chuanglian2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/door_close.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/door_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/ir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/light_off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/light_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/window_off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/res/crunch/drawable-hdpi/window_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bin/resources.ap_
Binary file not shown.
Loading

0 comments on commit 5d9f05e

Please sign in to comment.