diff --git a/代码/TimeBetter-master/AndroidManifest.xml b/代码/TimeBetter-master/AndroidManifest.xml
index 7c40a3d..c051fde 100644
--- a/代码/TimeBetter-master/AndroidManifest.xml
+++ b/代码/TimeBetter-master/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.planbetter.activity" android:versionCode="1"
+	package="com.timebetter.activity" android:versionCode="1"
 	android:versionName="1.0">
 	<supports-screens android:smallScreens="true"
 		android:normalScreens="true" android:largeScreens="true"
diff --git a/代码/TimeBetter-master/bin/AndroidManifest.xml b/代码/TimeBetter-master/bin/AndroidManifest.xml
index 7c40a3d..c051fde 100644
--- a/代码/TimeBetter-master/bin/AndroidManifest.xml
+++ b/代码/TimeBetter-master/bin/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.planbetter.activity" android:versionCode="1"
+	package="com.timebetter.activity" android:versionCode="1"
 	android:versionName="1.0">
 	<supports-screens android:smallScreens="true"
 		android:normalScreens="true" android:largeScreens="true"
diff --git a/代码/TimeBetter-master/bin/TimeBetter.apk b/代码/TimeBetter-master/bin/TimeBetter.apk
index 14f9965..4778e60 100644
Binary files a/代码/TimeBetter-master/bin/TimeBetter.apk and b/代码/TimeBetter-master/bin/TimeBetter.apk differ
diff --git a/代码/TimeBetter-master/bin/classes.dex b/代码/TimeBetter-master/bin/classes.dex
index 8fb8d43..1dc3581 100644
Binary files a/代码/TimeBetter-master/bin/classes.dex and b/代码/TimeBetter-master/bin/classes.dex differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/BuildConfig.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/BuildConfig.class
deleted file mode 100644
index 13c65c2..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/BuildConfig.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$anim.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$anim.class
deleted file mode 100644
index fc0079a..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$anim.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$array.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$array.class
deleted file mode 100644
index 78b2996..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$array.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$attr.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$attr.class
deleted file mode 100644
index 3d02841..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$attr.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$color.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$color.class
deleted file mode 100644
index 03a06cc..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$color.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$dimen.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$dimen.class
deleted file mode 100644
index dfb7e8b..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$dimen.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$drawable.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$drawable.class
deleted file mode 100644
index e155375..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$drawable.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$id.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$id.class
deleted file mode 100644
index 49bb16f..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$id.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$layout.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$layout.class
deleted file mode 100644
index 6aa61f6..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$layout.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$plurals.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$plurals.class
deleted file mode 100644
index c145b95..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$plurals.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$string.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$string.class
deleted file mode 100644
index af1626d..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$string.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$style.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$style.class
deleted file mode 100644
index d097762..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$style.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$xml.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$xml.class
deleted file mode 100644
index 418fe14..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R$xml.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R.class b/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R.class
deleted file mode 100644
index 020c7aa..0000000
Binary files a/代码/TimeBetter-master/bin/classes/com/planbetter/activity/R.class and /dev/null differ
diff --git a/代码/TimeBetter-master/bin/resources.ap_ b/代码/TimeBetter-master/bin/resources.ap_
index b0d610d..cd2fa4c 100644
Binary files a/代码/TimeBetter-master/bin/resources.ap_ and b/代码/TimeBetter-master/bin/resources.ap_ differ
diff --git a/代码/TimeBetter-master/gen/com/planbetter/activity/BuildConfig.java b/代码/TimeBetter-master/gen/com/planbetter/activity/BuildConfig.java
deleted file mode 100644
index b1c7cf1..0000000
--- a/代码/TimeBetter-master/gen/com/planbetter/activity/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.planbetter.activity;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/代码/TimeBetter-master/gen/com/planbetter/activity/R.java b/代码/TimeBetter-master/gen/com/planbetter/activity/R.java
deleted file mode 100644
index d4f5380..0000000
--- a/代码/TimeBetter-master/gen/com/planbetter/activity/R.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.planbetter.activity;
-
-public final class R {
-    public static final class anim {
-        public static final int my_scale_action=0x7f040000;
-        public static final int popup_window_bottom=0x7f040001;
-        public static final int popup_window_top=0x7f040002;
-        public static final int push_left_in=0x7f040003;
-        public static final int push_left_in_slowly=0x7f040004;
-        public static final int push_left_out=0x7f040005;
-        public static final int push_left_out_slowly=0x7f040006;
-        public static final int push_right_in=0x7f040007;
-        public static final int push_right_in_slowly=0x7f040008;
-        public static final int push_right_out=0x7f040009;
-        public static final int push_right_out_slowly=0x7f04000a;
-    }
-    public static final class array {
-        public static final int gmail_time=0x7f060000;
-        public static final int gmail_time_value=0x7f060001;
-    }
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int Green=0x7f070008;
-        public static final int Red=0x7f070007;
-        public static final int alarm_btn_bg=0x7f070013;
-        public static final int alarm_line=0x7f070012;
-        public static final int app_title=0x7f07000c;
-        public static final int black=0x7f070004;
-        public static final int blue=0x7f070000;
-        public static final int days_color=0x7f070009;
-        public static final int grey=0x7f070001;
-        public static final int guide_title_color=0x7f070011;
-        public static final int help_bg=0x7f070019;
-        public static final int orange=0x7f070005;
-        public static final int pls_talk_normal=0x7f070002;
-        public static final int save_button=0x7f07000a;
-        public static final int search_hint=0x7f070003;
-        public static final int status_done=0x7f070016;
-        public static final int status_error=0x7f070018;
-        public static final int status_idle=0x7f070015;
-        public static final int status_sync=0x7f070017;
-        public static final int title=0x7f07000b;
-        public static final int white=0x7f070006;
-        public static final int white_special=0x7f070014;
-        public static final int widget_days=0x7f07000e;
-        public static final int widget_silver=0x7f07000f;
-        public static final int widget_text=0x7f070010;
-        public static final int widget_title=0x7f07000d;
-    }
-    public static final class dimen {
-        public static final int day_container_width=0x7f080003;
-        public static final int expanded_height=0x7f080001;
-        public static final int normal_height=0x7f080000;
-        public static final int task_item_name_width=0x7f080006;
-        public static final int widget_font_size=0x7f080002;
-        public static final int widget_task_height=0x7f080005;
-        public static final int widget_task_width=0x7f080004;
-    }
-    public static final class drawable {
-        public static final int add_task_btn_normal=0x7f020000;
-        public static final int add_task_btn_pressed=0x7f020001;
-        public static final int add_task_dialog_icon=0x7f020002;
-        public static final int alert=0x7f020003;
-        public static final int bg_add_task_btn=0x7f020004;
-        public static final int bg_quick_dial=0x7f020005;
-        public static final int calendar_bg=0x7f020006;
-        public static final int chatfrom_bg=0x7f020007;
-        public static final int chatfrom_bg_focused=0x7f020008;
-        public static final int chatfrom_bg_normal=0x7f020009;
-        public static final int chatto_bg=0x7f02000a;
-        public static final int chatto_bg_focused=0x7f02000b;
-        public static final int chatto_bg_normal=0x7f02000c;
-        public static final int clock=0x7f02000d;
-        public static final int custom_button=0x7f02000e;
-        public static final int custom_button1=0x7f02000f;
-        public static final int dialog=0x7f020010;
-        public static final int dialog_divider_horizontal_light=0x7f020011;
-        public static final int droid_widget=0x7f020012;
-        public static final int droid_widget_focused=0x7f020013;
-        public static final int droid_widget_normal=0x7f020014;
-        public static final int droid_widget_pressed=0x7f020015;
-        public static final int droidman_closed=0x7f020016;
-        public static final int droidman_down_closed=0x7f020017;
-        public static final int droidman_down_open=0x7f020018;
-        public static final int droidman_open=0x7f020019;
-        public static final int edit_text=0x7f02001a;
-        public static final int face_gallery_bg=0x7f02001b;
-        public static final int focused=0x7f02001c;
-        public static final int goal1=0x7f02001d;
-        public static final int goal2=0x7f02001e;
-        public static final int goal3=0x7f02001f;
-        public static final int goal_bg=0x7f020020;
-        public static final int goal_delete=0x7f020021;
-        public static final int goal_edit=0x7f020022;
-        public static final int goal_edit_img=0x7f020023;
-        public static final int goal_empty=0x7f020024;
-        public static final int goal_full=0x7f020025;
-        public static final int h1=0x7f020026;
-        public static final int h2=0x7f020027;
-        public static final int h3=0x7f020028;
-        public static final int h4=0x7f020029;
-        public static final int h5=0x7f02002a;
-        public static final int h6=0x7f02002b;
-        public static final int h7=0x7f02002c;
-        public static final int heart_message=0x7f02002d;
-        public static final int history_flag=0x7f02002e;
-        public static final int ic_clock_alarm_selected=0x7f02002f;
-        public static final int ic_done=0x7f020030;
-        public static final int ic_error=0x7f020031;
-        public static final int ic_idle=0x7f020032;
-        public static final int ic_syncing=0x7f020033;
-        public static final int icon=0x7f020034;
-        public static final int im_my_del_btn=0x7f020035;
-        public static final int im_other_del_btn=0x7f020036;
-        public static final int img0002=0x7f020037;
-        public static final int img0003=0x7f020038;
-        public static final int img0004=0x7f020039;
-        public static final int img0005=0x7f02003a;
-        public static final int img0006=0x7f02003b;
-        public static final int img0007=0x7f02003c;
-        public static final int img0008=0x7f02003d;
-        public static final int layoutbg=0x7f02003e;
-        public static final int mm_chat_listitem=0x7f02003f;
-        public static final int mm_trans=0x7f020040;
-        public static final int mmtitle_bg=0x7f020041;
-        public static final int nofocused=0x7f020042;
-        public static final int notepad=0x7f020043;
-        public static final int option_normal=0x7f020044;
-        public static final int option_selected=0x7f020045;
-        public static final int popupview_down=0x7f020046;
-        public static final int popupview_up=0x7f020047;
-        public static final int recommend_bg=0x7f020048;
-        public static final int shape_selector=0x7f020049;
-        public static final int sms_embeded_text_editor_bg=0x7f02004a;
-        public static final int sms_insert=0x7f02004b;
-        public static final int sms_send_button_bg=0x7f02004c;
-        public static final int sms_send_button_bg_disabled=0x7f02004d;
-        public static final int sms_send_button_bg_normal=0x7f02004e;
-        public static final int sms_send_button_bg_pressed=0x7f02004f;
-        public static final int star1=0x7f020050;
-        public static final int star2=0x7f020051;
-        public static final int star3=0x7f020052;
-        public static final int star4=0x7f020053;
-        public static final int task_today_bg=0x7f020054;
-        public static final int task_tomorrow_bg=0x7f020055;
-        public static final int task_yesterday_bg=0x7f020056;
-        public static final int textfield_disabled=0x7f020057;
-        public static final int textfield_disabled_selected=0x7f020058;
-        public static final int textfield_pressed=0x7f020059;
-        public static final int theme_checked=0x7f02005a;
-        public static final int theme_checked_disable=0x7f02005b;
-        public static final int theme_checked_pressed=0x7f02005c;
-        public static final int tomorrowtask_love=0x7f02005d;
-        public static final int txt_msg_bg=0x7f02005e;
-        public static final int wifisms_insert_normal_bg=0x7f02005f;
-        public static final int wifisms_insert_pressed_bg=0x7f020060;
-        public static final int yesterday_delete_btn_bg=0x7f020061;
-    }
-    public static final class id {
-        public static final int HistoryGoalGallery=0x7f0c0030;
-        public static final int addTask=0x7f0c004e;
-        public static final int body=0x7f0c002f;
-        public static final int bugdroid=0x7f0c000e;
-        public static final int cancel=0x7f0c002d;
-        public static final int cb_time_alert=0x7f0c0008;
-        public static final int cb_tomorrow_time_alert=0x7f0c0019;
-        public static final int chatting_history_lv=0x7f0c0023;
-        public static final int current_goal_listview=0x7f0c0013;
-        public static final int details_error=0x7f0c003a;
-        public static final int details_sync=0x7f0c0036;
-        public static final int details_sync_label=0x7f0c0039;
-        public static final int details_sync_progress=0x7f0c0037;
-        public static final int details_sync_progress_indet=0x7f0c0038;
-        public static final int dialog_message=0x7f0c002c;
-        public static final int dialog_title=0x7f0c002b;
-        public static final int dp_tomorrow_task_date=0x7f0c0016;
-        public static final int edit_goal_dialog_et=0x7f0c0014;
-        public static final int et_task_info=0x7f0c0000;
-        public static final int et_task_position=0x7f0c0002;
-        public static final int et_tomorrow_task_info=0x7f0c0015;
-        public static final int goal_clear_btn=0x7f0c001c;
-        public static final int goal_content_textview=0x7f0c001e;
-        public static final int goal_edit_btn=0x7f0c001b;
-        public static final int goal_edit_popup_view=0x7f0c001a;
-        public static final int goal_rank_img=0x7f0c001d;
-        public static final int heart_content_itv=0x7f0c0021;
-        public static final int heart_state_iv=0x7f0c0022;
-        public static final int heart_time_tv=0x7f0c0020;
-        public static final int history_gallery=0x7f0c002a;
-        public static final int history_task_listview=0x7f0c0029;
-        public static final int linearLayout1=0x7f0c0018;
-        public static final int myCursor=0x7f0c001f;
-        public static final int ok=0x7f0c002e;
-        public static final int past_goal_popwindow_button=0x7f0c0032;
-        public static final int past_goal_popwindow_imageview=0x7f0c0031;
-        public static final int send_button=0x7f0c0026;
-        public static final int sms_button_insert=0x7f0c0024;
-        public static final int status_icon=0x7f0c0033;
-        public static final int status_label=0x7f0c0035;
-        public static final int sync_button=0x7f0c0034;
-        public static final int task_alert_dialog_confirm_btn=0x7f0c003c;
-        public static final int task_alert_dialog_content=0x7f0c003b;
-        public static final int task_rank_first=0x7f0c0004;
-        public static final int task_rank_fourth=0x7f0c0007;
-        public static final int task_rank_group=0x7f0c0003;
-        public static final int task_rank_second=0x7f0c0005;
-        public static final int task_rank_third=0x7f0c0006;
-        public static final int task_repeat=0x7f0c0009;
-        public static final int task_repeat_days_button=0x7f0c000c;
-        public static final int task_repeat_days_date=0x7f0c000a;
-        public static final int task_repeat_days_total=0x7f0c000b;
-        public static final int textView_datematter=0x7f0c004f;
-        public static final int textView_datemattermessage=0x7f0c0050;
-        public static final int textView_daysleft=0x7f0c0052;
-        public static final int textView_future=0x7f0c004c;
-        public static final int textView_futuremessage=0x7f0c004d;
-        public static final int textView_history=0x7f0c0027;
-        public static final int textView_history_date=0x7f0c0028;
-        public static final int textView_today=0x7f0c0044;
-        public static final int textView_today_date=0x7f0c0045;
-        public static final int textView_tomorrow_day=0x7f0c0051;
-        public static final int textView_yesterday=0x7f0c005d;
-        public static final int textView_yesterday_date=0x7f0c005e;
-        public static final int text_editor=0x7f0c0025;
-        public static final int tip_bubble=0x7f0c000d;
-        public static final int tip_callout=0x7f0c0010;
-        public static final int tip_footer=0x7f0c000f;
-        public static final int tip_header=0x7f0c0011;
-        public static final int tip_message=0x7f0c0012;
-        public static final int today_add_task_btn=0x7f0c0046;
-        public static final int today_repeat_days=0x7f0c003f;
-        public static final int today_star_rank=0x7f0c0040;
-        public static final int today_task_complete_state=0x7f0c0043;
-        public static final int today_task_info=0x7f0c003e;
-        public static final int today_task_listview=0x7f0c0047;
-        public static final int today_task_time_position_textview=0x7f0c0041;
-        public static final int today_task_widget=0x7f0c0048;
-        public static final int today_time_alert=0x7f0c0042;
-        public static final int tomorrow_item_textView_datematter=0x7f0c0049;
-        public static final int tomorrow_item_textView_daysleft=0x7f0c004a;
-        public static final int tomorrow_item_textView_tomorrow_day=0x7f0c004b;
-        public static final int tomorrow_task_listview=0x7f0c0053;
-        public static final int tomorrow_widget_date=0x7f0c0057;
-        public static final int tomorrow_widget_days=0x7f0c0056;
-        public static final int tomorrow_widget_event=0x7f0c0058;
-        public static final int tomorrow_widget_layout_inside=0x7f0c0054;
-        public static final int tomorrow_widget_title=0x7f0c0055;
-        public static final int tp_task_time=0x7f0c0001;
-        public static final int tp_tomorrow_task_time=0x7f0c0017;
-        public static final int viewFlipper=0x7f0c003d;
-        public static final int yesterday_star_rank=0x7f0c005a;
-        public static final int yesterday_task_edit_btn=0x7f0c005c;
-        public static final int yesterday_task_info=0x7f0c0059;
-        public static final int yesterday_task_listview=0x7f0c005f;
-        public static final int yesterday_task_time_position_textview=0x7f0c005b;
-    }
-    public static final class layout {
-        public static final int about_layout=0x7f030000;
-        public static final int add_task_dialog_layout=0x7f030001;
-        public static final int bubble=0x7f030002;
-        public static final int current_goal_layout=0x7f030003;
-        public static final int droid=0x7f030004;
-        public static final int edit_goal_dialog=0x7f030005;
-        public static final int edit_tomorrow_task_dialog_layout=0x7f030006;
-        public static final int goal_edit_popup_window=0x7f030007;
-        public static final int goal_item=0x7f030008;
-        public static final int goal_layout=0x7f030009;
-        public static final int heart_item_from=0x7f03000a;
-        public static final int heart_item_to=0x7f03000b;
-        public static final int heart_layout=0x7f03000c;
-        public static final int help_layout=0x7f03000d;
-        public static final int history_oneday=0x7f03000e;
-        public static final int iphone_alert_dialog_layout=0x7f03000f;
-        public static final int past_goal_layout=0x7f030010;
-        public static final int past_goal_popwindow=0x7f030011;
-        public static final int status=0x7f030012;
-        public static final int task_alert_layout=0x7f030013;
-        public static final int task_main_layout=0x7f030014;
-        public static final int task_notify_layout=0x7f030015;
-        public static final int today_task_item=0x7f030016;
-        public static final int today_task_layout=0x7f030017;
-        public static final int today_task_widget_layout=0x7f030018;
-        public static final int tomorrow_task_item=0x7f030019;
-        public static final int tomorrow_task_layout=0x7f03001a;
-        public static final int tomorrow_task_widget_in=0x7f03001b;
-        public static final int tomorrow_task_widget_layout=0x7f03001c;
-        public static final int yesterday_task_item=0x7f03001d;
-        public static final int yesterday_task_layout=0x7f03001e;
-    }
-    public static final class plurals {
-        public static final int status_done_details=0x7f0a0000;
-    }
-    public static final class string {
-        /**  关于 
-         */
-        public static final int about_string=0x7f090036;
-        public static final int about_title=0x7f090007;
-        /**  对话框 
-         */
-        public static final int add_task_dialog_title=0x7f09001a;
-        /**  button text 
-         */
-        public static final int add_task_label=0x7f090019;
-        public static final int alarm_notify_text=0x7f090072;
-        public static final int app_name=0x7f090000;
-        public static final int cancel_dialog_text=0x7f09001d;
-        public static final int current_goal_intro=0x7f090026;
-        public static final int delete_dialog_text=0x7f090035;
-        public static final int edit_goal_dialog_cancel=0x7f090034;
-        public static final int edit_goal_dialog_et_hint=0x7f090032;
-        public static final int edit_goal_dialog_ok=0x7f090033;
-        public static final int edit_goal_dialog_title=0x7f090030;
-        public static final int edit_goal_dialog_tv=0x7f090031;
-        public static final int edit_task_dialog_title=0x7f09001b;
-        public static final int err_communication_error=0x7f090071;
-        public static final int err_could_not_create_folder=0x7f09006f;
-        public static final int err_sync_requires_login_info=0x7f090070;
-        /**  Tab 
-         */
-        public static final int goal_tab_current_text=0x7f090027;
-        public static final int goal_tab_past_text=0x7f090028;
-        public static final int goal_title=0x7f090002;
-        public static final int heart_list_view_empty=0x7f090038;
-        public static final int help_goal=0x7f090075;
-        public static final int help_history=0x7f090077;
-        public static final int help_main_string=0x7f090073;
-        public static final int help_setup=0x7f090078;
-        public static final int help_task=0x7f090074;
-        public static final int help_tips=0x7f090076;
-        public static final int help_title=0x7f090006;
-        public static final int help_widget=0x7f090079;
-        public static final int history_task_list_view_empty=0x7f09003a;
-        public static final int history_title=0x7f090004;
-        public static final int label_history=0x7f090018;
-        /**  label 
-         */
-        public static final int label_today=0x7f090015;
-        public static final int label_tomorrow=0x7f090016;
-        public static final int label_yesterday=0x7f090017;
-        public static final int menu_about=0x7f09000e;
-        public static final int menu_delete_location=0x7f090011;
-        public static final int menu_exit=0x7f09000f;
-        public static final int menu_help=0x7f09000d;
-        public static final int menu_history=0x7f09000b;
-        public static final int menu_modify_location=0x7f090010;
-        public static final int menu_setup=0x7f09000c;
-        /**  菜单项名称 
-         */
-        public static final int menu_task=0x7f090008;
-        public static final int menu_time=0x7f090009;
-        public static final int menu_tips=0x7f09000a;
-        public static final int menu_widget=0x7f090012;
-        public static final int pager_footer=0x7f09003e;
-        public static final int planbetter_widget_title=0x7f090025;
-        public static final int save_task_dialog_text=0x7f09001c;
-        public static final int setting_one=0x7f090040;
-        public static final int setting_three=0x7f090042;
-        public static final int setting_two=0x7f090041;
-        public static final int setup_title=0x7f090005;
-        public static final int status_auth_failure=0x7f090054;
-        public static final int status_auth_failure_details=0x7f090055;
-        public static final int status_calc=0x7f090056;
-        public static final int status_calc_details=0x7f090057;
-        public static final int status_canceled=0x7f090058;
-        public static final int status_canceled_details=0x7f090059;
-        public static final int status_done=0x7f09004f;
-        public static final int status_done_details_max_per_sync=0x7f090050;
-        public static final int status_done_details_noitems=0x7f090051;
-        public static final int status_idle=0x7f090048;
-        public static final int status_idle_details=0x7f090049;
-        public static final int status_idle_details_never=0x7f09004a;
-        public static final int status_login=0x7f09004d;
-        public static final int status_login_details=0x7f09004e;
-        public static final int status_sync=0x7f09004b;
-        public static final int status_sync_details=0x7f09004c;
-        public static final int status_unknown_error=0x7f090052;
-        public static final int status_unknown_error_details=0x7f090053;
-        public static final int task_alert_dialog_confirm=0x7f09002f;
-        /**  闹钟提示对话框 
-         */
-        public static final int task_alert_dialog_title=0x7f09002e;
-        public static final int task_item_long_click_menu_delete=0x7f09002b;
-        public static final int task_item_long_click_menu_edit=0x7f09002a;
-        public static final int task_item_long_click_menu_pull=0x7f09002c;
-        /**  menu 
-         */
-        public static final int task_item_long_click_menu_title=0x7f090029;
-        /**  帮助 
-  
-	<string name="help_string">\tPlanBetter计划更好点是一个时间管理软件，这个软件专注于历史、今天和未来，通过自身目标的设立和鼓励自己的心语督促自己利用好每一天的时间去使自己计划更好点，达到自己想要的目标。
-		整个软件共有任务、目标、心语、历史、设置这几个主要菜单项\n\n
-		\t1
-		任务；任务专注于昨天、今天和未来。滑动屏幕可以进行昨天、今天和未来的切换。快捷回顾昨天的时间安排状况，并且通过帕累托原则将任务划分轻重缓急，合理安排今天，并有闹钟提醒、重复任务、widget桌面提示等功能，采用倒数日的方式规划明天，就是任务项的特色所在。\n\n
-		\t2
-		目标：目标分为两部分，当前目标和历史目标。当前目标显示的你当前的三个目标，当你对当前目标进行修改的时候，这些目标选项自动保存至历史目标。这个设计是为了让使用这个软件的人时刻牢记自己的目标，为未来奋斗。\n\n
-		\t3 心语：心语即自己的心路历程，你可以写下任何你想说的话，软件会保存这些内容，鼓励自己一步步向前。\n\n
-		\t4 历史：历史的主界面是个日历，点击这个日历，可以快捷的查看你当天的任务完成状况，让你不错过你的每一段历史。\n\n
-		\t5 设置：</string>
-	
- edittext 
- 今天活动列表为空时默认显示内容 
-         */
-        public static final int task_list_view_empty=0x7f090037;
-        public static final int task_long_click_menu_delete=0x7f09007b;
-        public static final int task_long_click_menu_edit=0x7f09007a;
-        public static final int task_long_click_menu_pull=0x7f09007c;
-        public static final int task_long_click_menu_title=0x7f09007d;
-        /**  notifycation 
-         */
-        public static final int task_notification=0x7f09002d;
-        public static final int task_position_title=0x7f090014;
-        public static final int task_rank_first_text=0x7f09001e;
-        public static final int task_rank_fourth_text=0x7f090021;
-        public static final int task_rank_second_text=0x7f09001f;
-        public static final int task_rank_third_text=0x7f090020;
-        public static final int task_time_alert_text=0x7f090022;
-        public static final int task_time_pull_dialog_title=0x7f090024;
-        public static final int task_time_repeat_dialog_title=0x7f090023;
-        /**  任务信息 
-         */
-        public static final int task_time_title=0x7f090013;
-        /**  activity标题 
-         */
-        public static final int task_title=0x7f090001;
-        public static final int tips_title=0x7f090003;
-        public static final int today_task_widget_name=0x7f09003d;
-        public static final int tomorrow_task_list_view_empty=0x7f090039;
-        public static final int tomorrow_task_widget_name=0x7f09003f;
-        public static final int tts_pause=0x7f09003c;
-        public static final int ui_dialog_invalid_imap_folder_msg=0x7f09006c;
-        public static final int ui_dialog_invalid_imap_folder_title=0x7f09006b;
-        public static final int ui_dialog_missing_credentials_msg=0x7f090068;
-        public static final int ui_dialog_missing_credentials_title=0x7f090067;
-        public static final int ui_dialog_need_first_manual_sync_msg=0x7f09006e;
-        public static final int ui_dialog_need_first_manual_sync_title=0x7f09006d;
-        public static final int ui_dialog_sync_data_reset_msg=0x7f09006a;
-        public static final int ui_dialog_sync_data_reset_title=0x7f090069;
-        public static final int ui_imap_folder_desc=0x7f090063;
-        public static final int ui_imap_folder_label=0x7f090062;
-        public static final int ui_imap_folder_label_dialog_msg=0x7f090064;
-        public static final int ui_login_desc=0x7f09005d;
-        public static final int ui_login_dialog_msg=0x7f09005e;
-        public static final int ui_login_label=0x7f09005c;
-        public static final int ui_max_items_per_sync_desc=0x7f090066;
-        public static final int ui_max_items_per_sync_label=0x7f090065;
-        public static final int ui_password_desc=0x7f090060;
-        public static final int ui_password_dialog_msg=0x7f090061;
-        public static final int ui_password_label=0x7f09005f;
-        public static final int ui_settings_label=0x7f09005b;
-        public static final int ui_status_label=0x7f09005a;
-        public static final int ui_sync_button_label_canceling=0x7f090047;
-        public static final int ui_sync_button_label_done=0x7f090044;
-        public static final int ui_sync_button_label_error=0x7f090045;
-        public static final int ui_sync_button_label_idle=0x7f090043;
-        /**  TODO(chstuder): Rename the following string resource. 
-         */
-        public static final int ui_sync_button_label_syncing=0x7f090046;
-        public static final int yesterday_task_list_view_empty=0x7f09003b;
-    }
-    public static final class style {
-        public static final int ChattingUISplit=0x7f0b0000;
-        public static final int ChattingUIText=0x7f0b0001;
-        public static final int MMTheme_Basic=0x7f0b0003;
-        public static final int MMTitleStyle=0x7f0b0002;
-        public static final int TipText=0x7f0b0004;
-        public static final int TipText_Footer=0x7f0b0007;
-        public static final int TipText_Header=0x7f0b0005;
-        public static final int TipText_Message=0x7f0b0006;
-    }
-    public static final class xml {
-        public static final int main_screen=0x7f050000;
-        public static final int today_task_widget_build=0x7f050001;
-        public static final int tomorrow_task_widget_build=0x7f050002;
-    }
-}
diff --git a/代码/TimeBetter-master/res/layout/help_layout.xml b/代码/TimeBetter-master/res/layout/help_layout.xml
index e7d39f9..7737ab7 100644
--- a/代码/TimeBetter-master/res/layout/help_layout.xml
+++ b/代码/TimeBetter-master/res/layout/help_layout.xml
@@ -50,7 +50,7 @@
 			android:textColor="#FFF" 
 			android:gravity="center_vertical"
 			android:layout_gravity="center_vertical"
-			android:text="@string/menu_tips" 
+			android:text="@string/menu_limit" 
 			android:textSize="15dp" />
 		<TextView android:layout_width="wrap_content"
 			android:layout_height="fill_parent" android:textColor="#FFF"
@@ -63,7 +63,7 @@
 			android:textColor="#FFF" 
 			android:gravity="center_vertical"
 			android:layout_gravity="center_vertical"
-			android:text="@string/menu_history" 
+			android:text="@string/menu_long" 
 			android:textSize="15dp" />
 		<TextView android:layout_width="wrap_content"
 			android:layout_height="fill_parent" android:textColor="#FFF"
diff --git a/代码/TimeBetter-master/res/values/strings.xml b/代码/TimeBetter-master/res/values/strings.xml
index 4a3551f..2374349 100644
--- a/代码/TimeBetter-master/res/values/strings.xml
+++ b/代码/TimeBetter-master/res/values/strings.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android" 
 	xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-	<string name="app_name">PlanBetter</string>
+	<string name="app_name">TimeBetter</string>
 	<!-- activity标题 -->
 	<string name="task_title">任务</string>
-	<string name="goal_title">目标</string>
-	<string name="tips_title">心语</string>
-	<string name="history_title">日历</string>
+	<string name="time_title">时间去哪了</string>
+	<string name="limit_title">限制使用时间</string>
+	<string name="long_title">限制使用时长</string>
 	<string name="setup_title">设置</string>
 	<string name="help_title">帮助</string>
 	<string name="about_title">关于</string>
 	<!-- 菜单项名称 -->
 	<string name="menu_task">任务</string>
 	<string name="menu_time">时间去哪了</string>
-	<string name="menu_tips">心语</string>
-	<string name="menu_history">日历</string>
+	<string name="menu_limit">限制使用时间</string>
+	<string name="menu_long">限制使用时长</string>
 	<string name="menu_setup">Gmail备份</string>
 	<string name="menu_help">帮助</string>
 	<string name="menu_about">关于</string>
@@ -76,8 +76,8 @@
 
 	<!-- 帮助 -->
 	<!--  
-	<string name="help_string">\tTimeBetter是一款专注于时间管理、拒绝“拖延症”“低头党”、统计手机使用数据的时间管理软件。通过设定使用时间，及时提醒用户放下手机，开始工作。设置手机使用时间段，拒绝在不适当的时间做“低头党”。统计手机使用数据，向您清楚展示您的时间分配，为进一步制定计划提供参考。
-		\n
+	<string name="help_string">\tPlanBetter计划更好点是一个时间管理软件，这个软件专注于历史、今天和未来，通过自身目标的设立和鼓励自己的心语督促自己利用好每一天的时间去使自己计划更好点，达到自己想要的目标。
+		整个软件共有任务、目标、心语、历史、设置这几个主要菜单项\n\n
 		\t1
 		任务；任务专注于昨天、今天和未来。滑动屏幕可以进行昨天、今天和未来的切换。快捷回顾昨天的时间安排状况，并且通过帕累托原则将任务划分轻重缓急，合理安排今天，并有闹钟提醒、重复任务、widget桌面提示等功能，采用倒数日的方式规划明天，就是任务项的特色所在。\n\n
 		\t2
@@ -167,7 +167,7 @@
 	<string name="err_communication_error">互联网连接错误.</string>
 	
 	<string name="alarm_notify_text">"选择暂停或关闭提醒"</string>
-	<string name="help_main_string">\t\tTimeBetter是一款专注于时间管理、拒绝“拖延症”“低头党”、统计手机使用数据的时间管理软件。通过设定使用时间，及时提醒用户放下手机，开始工作。设置手机使用时间段，拒绝在不适当的时间做“低头党”。统计手机使用数据，向您清楚展示您的时间分配，为进一步制定计划提供参考。\n</string>
+	<string name="help_main_string">\t\tPlanBetter(最佳计划)是一个专注于历史、今天和未来的时间管理软件，透过事先的规划作为一种提醒和指引，督促用户在规定的时间内把事情做好。设置人生目标、记录心路历程，鼓励用户珍惜每一天的时间去提升自我，实现自身价值。\n\t\t本软件设有任务、目标、心语、日历、Gmail备份和桌面小工具六个主要功能。\n</string>
 	<string name="help_task">\t\t任务界面可以通过左右滑动屏幕在昨天、今天和未来三个视图进行切换。“昨天视图”可以快捷回顾昨天任务完成状况；“今天视图”利用帕累托原则将当天任务划分轻重缓急，并设有闹钟提醒、周期设置等功能；“未来视图”采用倒数日的方式提醒用户。</string>
 	<string name="help_goal">\t\t目标分为当前目标和历史目标两部分。当前目标允许用户设置人生三大目标，修改或删除当前目标的内容将自动保存至历史目标。浏览历史目标可点击放大查看，也可以删除历史目标</string>
 	<string name="help_tips">\t\t记录用户的心路历程，描绘生活的点点滴滴。</string>
diff --git a/代码/TimeBetter-master/src/com/timebetter/view/DateWidgetDayHeader.java b/代码/TimeBetter-master/src/com/timebetter/view/DateWidgetDayHeader.java
index c2964ec..0ae4c14 100644
--- a/代码/TimeBetter-master/src/com/timebetter/view/DateWidgetDayHeader.java
+++ b/代码/TimeBetter-master/src/com/timebetter/view/DateWidgetDayHeader.java
@@ -12,7 +12,7 @@ import android.widget.LinearLayout.LayoutParams;
 import com.timebetter.constant.DayStyle;
 
 public class DateWidgetDayHeader extends View {
-	/*�޶���ʾ���ڵ�����Ĵ�С*/
+	/*�޶���ʾ���ڵ�����Ĵ�С*/
 	private int iDayHeaderFontSize = 12;
 
 	// fields
diff --git a/代码/TimeBetter-master/src/com/timebetter/view/HistoryGoalGalleryFlow.java b/代码/TimeBetter-master/src/com/timebetter/view/HistoryGoalGalleryFlow.java
index 7ad3930..6dabc11 100644
--- a/代码/TimeBetter-master/src/com/timebetter/view/HistoryGoalGalleryFlow.java
+++ b/代码/TimeBetter-master/src/com/timebetter/view/HistoryGoalGalleryFlow.java
@@ -91,8 +91,8 @@ public class HistoryGoalGalleryFlow extends Gallery{
             final int imageWidth = child.getLayoutParams().width;
             final int rotation = Math.abs(rotationAngle);
 
-            // ��Z���������ƶ�camera���ӽǣ�ʵ��Ч��Ϊ�Ŵ�ͼƬ��
-            // �����Y�����ƶ�����ͼƬ�����ƶ���X���϶�ӦͼƬ�����ƶ���
+            // ��Z���������ƶ�camera���ӽǣ�ʵ��Ч��Ϊ�Ŵ�ͼƬ��
+            // �����Y�����ƶ�����ͼƬ�����ƶ���X���϶�ӦͼƬ�����ƶ���
             mCamera.translate(0.0f, 0.0f, 100f);
 
             // As the angle of the view gets less, zoom in
@@ -101,8 +101,8 @@ public class HistoryGoalGalleryFlow extends Gallery{
                     mCamera.translate(0.0f, 0.0f, zoomAmount);
             }
 
-            // ��Y������ת����ӦͼƬ�������﷭ת��
-            // �����X������ת�����ӦͼƬ�������﷭ת��
+            // ��Y������ת����ӦͼƬ�������﷭ת��
+            // �����X������ת�����ӦͼƬ�������﷭ת��
             mCamera.rotateY(rotationAngle);
             mCamera.getMatrix(imageMatrix);
             imageMatrix.preTranslate(-(imageWidth / 2), -(imageHeight / 2));
diff --git a/代码/TimeBetter-master/src/com/timebetter/view/IphoneAlertDialog.java b/代码/TimeBetter-master/src/com/timebetter/view/IphoneAlertDialog.java
index df60183..ae44c14 100644
--- a/代码/TimeBetter-master/src/com/timebetter/view/IphoneAlertDialog.java
+++ b/代码/TimeBetter-master/src/com/timebetter/view/IphoneAlertDialog.java
@@ -8,7 +8,7 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.planbetter.activity.R;
+import com.timebetter.activity.R;
 
 public class IphoneAlertDialog {
 
diff --git a/代码/TimeBetter-master/src/com/timebetter/view/ResizeLayout.java b/代码/TimeBetter-master/src/com/timebetter/view/ResizeLayout.java
index e1da0ce..0362d54 100644
--- a/代码/TimeBetter-master/src/com/timebetter/view/ResizeLayout.java
+++ b/代码/TimeBetter-master/src/com/timebetter/view/ResizeLayout.java
@@ -11,7 +11,7 @@ public class ResizeLayout extends LinearLayout {
 	int count = 0;
 	int count1 = 0;
 	int count2 = 0;
-	//����Ĭ�ϵ��������С�߶ȣ�����Ϊ�˱���onSizeChanged��ijЩ����������³��ֵ����⡣
+	//����Ĭ�ϵ���������С�߶ȣ�����Ϊ�˱���onSizeChanged��ijЩ����������³��ֵ����⡣
 //	private static final int SOFTKEYPAD_MIN_HEIGHT = 50;
 	private Handler uiHandler = new Handler();
 	private static final String TAG = "ResizeLayout";
diff --git a/代码/TimeBetter-master/src/com/timebetter/view/SymbolButton.java b/代码/TimeBetter-master/src/com/timebetter/view/SymbolButton.java
index 4f19299..1c16a82 100644
--- a/代码/TimeBetter-master/src/com/timebetter/view/SymbolButton.java
+++ b/代码/TimeBetter-master/src/com/timebetter/view/SymbolButton.java
@@ -6,7 +6,7 @@ import android.graphics.Paint;
 import android.graphics.RectF;
 import android.widget.Button;
 
-/*���Ǵ���ͷ��������ť*/
+/*���Ǵ���ͷ��������ť*/
 public class SymbolButton extends Button {
 	// fields
 	private static final int iColor = 0xffaaaaaa;
diff --git a/代码/TimeBetter-master/src/com/timebetter/widget/TodayTaskWidget.java b/代码/TimeBetter-master/src/com/timebetter/widget/TodayTaskWidget.java
index 92805d8..82b61e2 100644
--- a/代码/TimeBetter-master/src/com/timebetter/widget/TodayTaskWidget.java
+++ b/代码/TimeBetter-master/src/com/timebetter/widget/TodayTaskWidget.java
@@ -14,7 +14,7 @@ import android.database.Cursor;
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.planbetter.activity.R;
+import com.timebetter.activity.R;
 import com.timebetter.activity.TaskActivity;
 import com.timebetter.bean.TaskBean;
 import com.timebetter.dao.DatabaseUtil;
@@ -47,27 +47,27 @@ public class TodayTaskWidget extends AppWidgetProvider {
     private void getTaskArray(Context context) {
     	int size = 0;
     	List<String> taskInfo = new ArrayList<String>();
-    	//��ѯ��������
-    	// ��ѯ���ݿ�,��ȡ����������Ϣ
+    	//��ѯ��������
+    	// ��ѯ���ݿ�,��ȡ����������Ϣ
 		todayTaskCur = DatabaseUtil.query(context,
 				TaskBean.TABLE_NAME, new String[]{TaskBean.DATETIME, TaskBean.POSITION_NAME, TaskBean.TASK_NAME}, TaskBean.DATETIME + " LIKE ?",
 				new String[] { DateUtils.now() + "%" }, null, null, TaskBean.ID
 						+ " ASC");
 
-		// ���������������Ϣ
+		// ���������������Ϣ
 		for (todayTaskCur.moveToFirst(); !todayTaskCur.isAfterLast(); todayTaskCur
 				.moveToNext()) {
 			String taskTime = DateUtils.getTaskTime(todayTaskCur.getString(0));
 			String positionName = todayTaskCur.getString(1);
-			String taskName = "�����:"+todayTaskCur.getString(2);
-			String temp = taskTime + " " + (positionName.equals("")?"�ص�δ֪":"��"+positionName) + "\n" + taskName;
+			String taskName = "�����:"+todayTaskCur.getString(2);
+			String temp = taskTime + " " + (positionName.equals("")?"�ص�δ֪":"��"+positionName) + "\n" + taskName;
 			taskInfo.add(size, temp);
 			size ++;
 		}
 		DatabaseUtil.closeDatabase();
 		if(size == 0) {
 			mTips = new CharSequence[1];
-			mTips[0] = "��������û������κλ";
+			mTips[0] = "��������û�������κλ";
 		} else {
 			mTips = new CharSequence[size];
 			for(int n=0; n<size; n++) {
diff --git a/代码/TimeBetter-master/src/com/timebetter/widget/TomorrowTaskWidgetService.java b/代码/TimeBetter-master/src/com/timebetter/widget/TomorrowTaskWidgetService.java
index 93134c2..3fbeb6c 100644
--- a/代码/TimeBetter-master/src/com/timebetter/widget/TomorrowTaskWidgetService.java
+++ b/代码/TimeBetter-master/src/com/timebetter/widget/TomorrowTaskWidgetService.java
@@ -11,7 +11,7 @@ import android.database.Cursor;
 import android.os.IBinder;
 import android.widget.RemoteViews;
 
-import com.planbetter.activity.R;
+import com.timebetter.activity.R;
 import com.timebetter.activity.TaskActivity;
 import com.timebetter.bean.TaskBean;
 import com.timebetter.constant.TaskConstant;
@@ -54,7 +54,7 @@ public class TomorrowTaskWidgetService extends Service {
 		RemoteViews views = new RemoteViews(this.getPackageName(), R.layout.tomorrow_task_widget_layout);
 		views.setOnClickPendingIntent(R.id.tomorrow_widget_layout_inside, PendingIntent.getActivity(this, 0, new Intent(this,TaskActivity.class), 0));
 		
-		//��ȡ����ʱ�
+		//��ȡ����ʱ�
 		tomorrowTaskCur = DatabaseUtil.query(this,
 				TaskBean.TABLE_NAME, new String[]{TaskBean.DATETIME, TaskBean.TASK_NAME}, TaskBean.IF_FUTURE + "="+
 				TaskConstant.IS_FUTURE+" AND "+TaskBean.PARENT+"="+TaskConstant.IS_PARENT, null, null, null, TaskBean.ID
@@ -69,7 +69,7 @@ public class TomorrowTaskWidgetService extends Service {
 		}
 		DatabaseUtil.closeDatabase();
 		
-		views.setTextViewText(R.id.tomorrow_widget_title, datetime.equals("")?"":"����");
+		views.setTextViewText(R.id.tomorrow_widget_title, datetime.equals("")?"":"����");
 		views.setTextViewText(R.id.tomorrow_widget_days, days);
 		views.setTextViewText(R.id.tomorrow_widget_date, date);
 		views.setTextViewText(R.id.tomorrow_widget_event, task);