diff --git a/src/main/java/notes/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java similarity index 100% rename from src/main/java/notes/data/Contact.java rename to src/main/java/net/micode/notes/data/Contact.java diff --git a/src/main/java/notes/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java similarity index 100% rename from src/main/java/notes/data/Notes.java rename to src/main/java/net/micode/notes/data/Notes.java diff --git a/src/main/java/notes/data/NotesDatabaseHelper.java b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 96% rename from src/main/java/notes/data/NotesDatabaseHelper.java rename to src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 253c26a..8d0d5bb 100644 --- a/src/main/java/notes/data/NotesDatabaseHelper.java +++ b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -18,6 +18,7 @@ package net.micode.notes.data; import android.content.ContentValues;//就是用于保存一些数据(string boolean byte double float int long short ...)信息,这些信息可以被数据库操作时使用。 import android.content.Context;//加载和访问资源。(android中主要是这两个功能,但是这里具体不清楚) +import android.database.Cursor; import android.database.sqlite.SQLiteDatabase;//主要提供了对应于添加、删除、更新、查询的操作方法: insert()、delete()、update()和query()。配合content.values import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新 import android.util.Log; @@ -395,4 +396,21 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TOP + " INTEGER NOT NULL DEFAULT 0"); } + + public void dosearch(String querystring){//搜索时不区分大小写 + Cursor cursor = null; + SQLiteDatabase db = mInstance.getReadableDatabase(); + String query_sql_string = "select * from " + TABLE.DATA + " where content like " + "'%"+ querystring + "%'"; + Log.i(TAG,query_sql_string); + cursor = db.rawQuery(query_sql_string,null); + if(cursor!=null) + { + while(cursor.moveToNext()) + { + String content = cursor.getString(cursor.getColumnIndex("content")); + Log.i(TAG, content); + } + } + cursor.close(); + } } diff --git a/src/main/java/notes/data/NotesProvider.java b/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from src/main/java/notes/data/NotesProvider.java rename to src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/src/main/java/notes/gtask/data/MetaData.java b/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from src/main/java/notes/gtask/data/MetaData.java rename to src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/src/main/java/notes/gtask/data/MetaData.java.bak b/src/main/java/net/micode/notes/gtask/data/MetaData.java.bak similarity index 100% rename from src/main/java/notes/gtask/data/MetaData.java.bak rename to src/main/java/net/micode/notes/gtask/data/MetaData.java.bak diff --git a/src/main/java/notes/gtask/data/Node.java b/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from src/main/java/notes/gtask/data/Node.java rename to src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/src/main/java/notes/gtask/data/SqlData.java b/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from src/main/java/notes/gtask/data/SqlData.java rename to src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/src/main/java/notes/gtask/data/SqlNote.java b/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from src/main/java/notes/gtask/data/SqlNote.java rename to src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/src/main/java/notes/gtask/data/Task.java b/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from src/main/java/notes/gtask/data/Task.java rename to src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/src/main/java/notes/gtask/data/TaskList.java b/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from src/main/java/notes/gtask/data/TaskList.java rename to src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/src/main/java/notes/gtask/exception/ActionFailureException.java b/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from src/main/java/notes/gtask/exception/ActionFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/src/main/java/notes/gtask/exception/NetworkFailureException.java b/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from src/main/java/notes/gtask/exception/NetworkFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/src/main/java/notes/gtask/remote/GTaskASyncTask.java b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 100% rename from src/main/java/notes/gtask/remote/GTaskASyncTask.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java diff --git a/src/main/java/notes/gtask/remote/GTaskClient.java b/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from src/main/java/notes/gtask/remote/GTaskClient.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/src/main/java/notes/gtask/remote/GTaskManager.java b/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from src/main/java/notes/gtask/remote/GTaskManager.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/src/main/java/notes/gtask/remote/GTaskSyncService.java b/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from src/main/java/notes/gtask/remote/GTaskSyncService.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/src/main/java/notes/model/Note.java b/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from src/main/java/notes/model/Note.java rename to src/main/java/net/micode/notes/model/Note.java diff --git a/src/main/java/notes/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from src/main/java/notes/model/WorkingNote.java rename to src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/src/main/java/notes/tool/BackupUtils.java b/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from src/main/java/notes/tool/BackupUtils.java rename to src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/src/main/java/notes/tool/DataUtils.java b/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from src/main/java/notes/tool/DataUtils.java rename to src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/src/main/java/notes/tool/GTaskStringUtils.java b/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from src/main/java/notes/tool/GTaskStringUtils.java rename to src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/src/main/java/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from src/main/java/notes/tool/ResourceParser.java rename to src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/src/main/java/notes/ui/AlarmAlertActivity.java b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from src/main/java/notes/ui/AlarmAlertActivity.java rename to src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/src/main/java/notes/ui/AlarmInitReceiver.java b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from src/main/java/notes/ui/AlarmInitReceiver.java rename to src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/src/main/java/notes/ui/AlarmReceiver.java b/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from src/main/java/notes/ui/AlarmReceiver.java rename to src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/src/main/java/notes/ui/DateTimePicker.java b/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from src/main/java/notes/ui/DateTimePicker.java rename to src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/src/main/java/notes/ui/DateTimePickerDialog.java b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from src/main/java/notes/ui/DateTimePickerDialog.java rename to src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/src/main/java/notes/ui/DropdownMenu.java b/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from src/main/java/notes/ui/DropdownMenu.java rename to src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/src/main/java/notes/ui/FoldersListAdapter.java b/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from src/main/java/notes/ui/FoldersListAdapter.java rename to src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/src/main/java/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 99% rename from src/main/java/notes/ui/NoteEditActivity.java rename to src/main/java/net/micode/notes/ui/NoteEditActivity.java index 696b3fb..9aac1a3 100644 --- a/src/main/java/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -78,6 +78,7 @@ import android.widget.Toast; import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.TextNote; +import net.micode.notes.data.NotesDatabaseHelper; import net.micode.notes.model.WorkingNote; import net.micode.notes.model.WorkingNote.NoteSettingChangedListener; import net.micode.notes.tool.DataUtils; @@ -250,7 +251,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen mWorkingNote = null; if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); - mUserQuery = ""; + mUserQuery = "";//要高亮的字符串 //如果用户实例化标签时,系统并未给出标签ID /** * Starting from the searched result @@ -326,7 +327,14 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - } else { + }else if (TextUtils.equals(Intent.ACTION_SEARCH,intent.getAction())){//点击搜索按钮响应 + String querystring = intent.getStringExtra(SearchManager.QUERY);//获取搜索框的字符 + NotesDatabaseHelper dbhelper = new NotesDatabaseHelper(this); + dbhelper.dosearch(querystring); + finish(); + return false; + } + else { Log.e(TAG, "Intent not specified action, should not support"); finish(); return false; @@ -603,7 +611,8 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen menu.findItem(R.id.menu_alert).setVisible(false); } else { menu.findItem(R.id.menu_delete_remind).setVisible(false); - }if (mWorkingNote.getTopId() == 1){ + } + if (mWorkingNote.getTopId() == 1){ menu.findItem(R.id.menu_top).setTitle("Cancel top"); }else { menu.findItem(R.id.menu_top).setTitle("Top"); @@ -1471,5 +1480,4 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } return null; } - } diff --git a/src/main/java/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from src/main/java/notes/ui/NoteEditText.java rename to src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/src/main/java/notes/ui/NoteItemData.java b/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from src/main/java/notes/ui/NoteItemData.java rename to src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/src/main/java/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 99% rename from src/main/java/notes/ui/NotesListActivity.java rename to src/main/java/net/micode/notes/ui/NotesListActivity.java index cb6c547..b6999fa 100644 --- a/src/main/java/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -555,7 +555,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe } } } - + //打开一个便签 private void openNode(NoteItemData data) { Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); diff --git a/src/main/java/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from src/main/java/notes/ui/NotesListAdapter.java rename to src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/src/main/java/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from src/main/java/notes/ui/NotesListItem.java rename to src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/src/main/java/notes/ui/NotesPreferenceActivity.java b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from src/main/java/notes/ui/NotesPreferenceActivity.java rename to src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/main/java/notes/widget/NoteWidgetProvider.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from src/main/java/notes/widget/NoteWidgetProvider.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/src/main/java/notes/widget/NoteWidgetProvider_2x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from src/main/java/notes/widget/NoteWidgetProvider_2x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/src/main/java/notes/widget/NoteWidgetProvider_4x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from src/main/java/notes/widget/NoteWidgetProvider_4x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/main/res/drawable-hdpi/list_footer_bg.9.png index 5325c25..57d85ba 100644 Binary files a/src/main/res/drawable-hdpi/list_footer_bg.9.png and b/src/main/res/drawable-hdpi/list_footer_bg.9.png differ