diff --git a/MiNote/src/net/micode/notes/data/Contact.java b/MiNote/src/net/micode/notes/data/Contact.java index d97ac5d..447cfcb 100644 --- a/MiNote/src/net/micode/notes/data/Contact.java +++ b/MiNote/src/net/micode/notes/data/Contact.java @@ -25,6 +25,90 @@ import android.util.Log; import java.util.HashMap; +public class Contact { //联系人 + private static HashMap sContactCache; + private static final String TAG = "Contact"; + + // 定义字符串CALLER_ID_SELECTION + private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + + + Phone.NUMBER + + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + + " AND " + Data.RAW_CONTACT_ID + " IN " + + "(SELECT raw_contact_id " + + " FROM phone_lookup" + + " WHERE min_match = '+')"; + + // 获取联系人 + public static String getContact(Context context, String phoneNumber) { + if(sContactCache == null) { + sContactCache = new HashMap(); + } + + // 查找HashMap中是否已有phoneNumber信息 + if(sContactCache.containsKey(phoneNumber)) { + return sContactCache.get(phoneNumber); + } + + String selection = CALLER_ID_SELECTION.replace("+", + PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + // 查找数据库中phoneNumber的信息 + Cursor cursor = context.getContentResolver().query( + Data.CONTENT_URI, + new String [] { Phone.DISPLAY_NAME }, + selection, + new String[] { phoneNumber }, + null); + + // 判定查询结果 + // moveToFirst()返回第一条 + if (cursor != null && cursor.moveToFirst()) { + try { + // 找到相关信息 + String name = cursor.getString(0); + sContactCache.put(phoneNumber, name); + return name; + // 异常 + } catch (IndexOutOfBoundsException e) { + Log.e(TAG, " Cursor get string error " + e.toString()); + return null; + } finally { + cursor.close(); + } + // 未找到相关信息 + } else { + Log.d(TAG, "No contact matched with number:" + phoneNumber); + return null; + } + } +} +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.data; + +import android.content.Context; +import android.database.Cursor; +import android.provider.ContactsContract.CommonDataKinds.Phone; +import android.provider.ContactsContract.Data; +import android.telephony.PhoneNumberUtils; +import android.util.Log; + +import java.util.HashMap; + public class Contact { private static HashMap sContactCache; private static final String TAG = "Contact"; diff --git a/MiNote/src/net/micode/notes/data/NotesProvider.java b/MiNote/src/net/micode/notes/data/NotesProvider.java index edb0a60..36a5241 100644 --- a/MiNote/src/net/micode/notes/data/NotesProvider.java +++ b/MiNote/src/net/micode/notes/data/NotesProvider.java @@ -33,9 +33,17 @@ import net.micode.notes.R; import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; +//涓哄瓨鍌ㄥ拰鑾峰彇鏁版嵁鎻愪緵鎺ュ彛銆傚彲浠ュ湪涓嶅悓鐨勫簲鐢ㄧ▼搴忎箣闂村叡浜暟鎹 +//ContentProvider鎻愪緵鐨勬柟娉 +//query锛氭煡璇 +//insert锛氭彃鍏 +//update锛氭洿鏂 +//delete锛氬垹闄 +//getType锛氬緱鍒版暟鎹被鍨 public class NotesProvider extends ContentProvider { + // UriMatcher鐢ㄤ簬鍖归厤Uri private static final UriMatcher mMatcher; private NotesDatabaseHelper mHelper; @@ -51,7 +59,10 @@ public class NotesProvider extends ContentProvider { private static final int URI_SEARCH_SUGGEST = 6; static { + // 鍒涘缓UriMatcher鏃讹紝璋冪敤UriMatcher(UriMatcher.NO_MATCH)琛ㄧず涓嶅尮閰嶄换浣曡矾寰勭殑杩斿洖鐮 + mMatcher = new UriMatcher(UriMatcher.NO_MATCH); + // 鎶婇渶瑕佸尮閰峌ri璺緞鍏ㄩ儴缁欐敞鍐屼笂 mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA); @@ -65,6 +76,7 @@ public class NotesProvider extends ContentProvider { * x'0A' represents the '\n' character in sqlite. For title and content in the search result, * we will trim '\n' and white space in order to show more information. */ + // 澹版槑 NOTES_SEARCH_PROJECTION private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," @@ -72,7 +84,7 @@ public class NotesProvider extends ContentProvider { + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - + // 澹版槑NOTES_SNIPPET_SEARCH_QUERY private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION + " FROM " + TABLE.NOTE + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" @@ -80,18 +92,24 @@ public class NotesProvider extends ContentProvider { + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; @Override + // Context鍙湁鍦╫nCreate()涓墠琚垵濮嬪寲 + // 瀵筸Helper杩涜瀹炰緥鍖 public boolean onCreate() { mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } @Override + // 鏌ヨuri鍦ㄦ暟鎹簱涓搴旂殑浣嶇疆 public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { Cursor c = null; + // 鑾峰彇鍙鏁版嵁搴 SQLiteDatabase db = mHelper.getReadableDatabase(); String id = null; + // 鍖归厤鏌ユ壘uri switch (mMatcher.match(uri)) { + // 瀵逛簬涓嶅悓鐨勫尮閰嶅硷紝鍦ㄦ暟鎹簱涓煡鎵剧浉搴旂殑鏉＄洰 case URI_NOTE: c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder); @@ -113,6 +131,7 @@ public class NotesProvider extends ContentProvider { case URI_SEARCH: case URI_SEARCH_SUGGEST: if (sortOrder != null || projection != null) { + // 涓嶅悎娉曠殑鍙傛暟寮傚父 throw new IllegalArgumentException( "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); } @@ -120,6 +139,8 @@ public class NotesProvider extends ContentProvider { String searchString = null; if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { if (uri.getPathSegments().size() > 1) { + // getPathSegments()鏂规硶寰楀埌涓涓猄tring鐨凩ist锛 + // 鍦╱ri.getPathSegments().get(1)涓虹2涓厓绱 searchString = uri.getPathSegments().get(1); } } else { @@ -139,6 +160,7 @@ public class NotesProvider extends ContentProvider { } break; default: + // 鎶涘嚭寮傚父 throw new IllegalArgumentException("Unknown URI " + uri); } if (c != null) { @@ -148,13 +170,17 @@ public class NotesProvider extends ContentProvider { } @Override + // 鎻掑叆涓涓猽ri public Uri insert(Uri uri, ContentValues values) { + // 鑾峰緱鍙啓鐨勬暟鎹簱 SQLiteDatabase db = mHelper.getWritableDatabase(); long dataId = 0, noteId = 0, insertedId = 0; switch (mMatcher.match(uri)) { + // 鏂板涓涓潯鐩 case URI_NOTE: insertedId = noteId = db.insert(TABLE.NOTE, null, values); break; + // 濡傛灉瀛樺湪锛屾煡鎵綨OTE_ID case URI_DATA: if (values.containsKey(DataColumns.NOTE_ID)) { noteId = values.getAsLong(DataColumns.NOTE_ID); @@ -165,6 +191,8 @@ public class NotesProvider extends ContentProvider { break; default: throw new IllegalArgumentException("Unknown URI " + uri); + // Notify the note uri + // notifyChange鑾峰緱涓涓狢ontextResolver瀵硅薄骞朵笖鏇存柊閲岄潰鐨勫唴瀹 } // Notify the note uri if (noteId > 0) { @@ -177,14 +205,19 @@ public class NotesProvider extends ContentProvider { getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); } - + // 杩斿洖鎻掑叆鐨剈ri鐨勮矾寰 return ContentUris.withAppendedId(uri, insertedId); } @Override + // 鍒犻櫎涓涓猽ri public int delete(Uri uri, String selection, String[] selectionArgs) { + //Uri浠ｈ〃瑕佹搷浣滅殑鏁版嵁锛孉ndroid涓婂彲鐢ㄧ殑姣忕璧勬簮 -鍖呮嫭 鍥惧儚銆佽棰戠墖娈点侀煶棰戣祫婧愮瓑閮藉彲浠ョ敤Uri鏉ヨ〃绀恒 + int count = 0; String id = null; + // 鑾峰緱鍙啓鐨勬暟鎹簱 + SQLiteDatabase db = mHelper.getWritableDatabase(); boolean deleteData = false; switch (mMatcher.match(uri)) { @@ -228,6 +261,8 @@ public class NotesProvider extends ContentProvider { } @Override + // 鏇存柊涓涓猽ri + public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { int count = 0; String id = null; @@ -267,11 +302,13 @@ public class NotesProvider extends ContentProvider { return count; } - private String parseSelection(String selection) { + private String parseSelection(String selection) { // 灏嗗瓧绗︿覆瑙ｆ瀽鎴愯瀹氭牸寮 + return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { + //澧炲姞涓涓猲oteVersion StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); sql.append(TABLE.NOTE); @@ -292,12 +329,13 @@ public class NotesProvider extends ContentProvider { } sql.append(selectString); } - + // execSQL()鏂规硶鍙互鎵цinsert銆乨elete銆乽pdate鍜孋REATE TABLE涔嬬被鏈夋洿鏀硅涓虹殑SQL璇彞 mHelper.getWritableDatabase().execSQL(sql.toString()); } @Override public String getType(Uri uri) { + // TODO Auto-generated method stub return null; } diff --git a/MiNote/src/net/micode/notes/ui/AlarmAlertActivity.java b/MiNote/src/net/micode/notes/ui/AlarmAlertActivity.java index ed82f0a..85723be 100644 --- a/MiNote/src/net/micode/notes/ui/AlarmAlertActivity.java +++ b/MiNote/src/net/micode/notes/ui/AlarmAlertActivity.java @@ -41,81 +41,56 @@ import java.io.IOException; public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { - private long mNoteId; //鏂囨湰鍦ㄦ暟鎹簱瀛樺偍涓殑ID鍙 - private String mSnippet; //闂归挓鎻愮ず鏃跺嚭鐜扮殑鏂囨湰鐗囨 + private long mNoteId; + private String mSnippet; private static final int SNIPPET_PREW_MAX_LEN = 60; MediaPlayer mPlayer; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //Bundle绫诲瀷鐨勬暟鎹笌Map绫诲瀷鐨勬暟鎹浉浼硷紝閮芥槸浠ey-value鐨勫舰寮忓瓨鍌ㄦ暟鎹殑 - //onsaveInstanceState鏂规硶鏄敤鏉ヤ繚瀛楢ctivity鐨勭姸鎬佺殑 - //鑳戒粠onCreate鐨勫弬鏁皊avedInsanceState涓幏寰楃姸鎬佹暟鎹 requestWindowFeature(Window.FEATURE_NO_TITLE); - //鐣岄潰鏄剧ず鈥斺旀棤鏍囬 + final Window win = getWindow(); win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); if (!isScreenOn()) { win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - //淇濇寔绐椾綋鐐逛寒 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - //灏嗙獥浣撶偣浜 | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON - //鍏佽绐椾綋鐐逛寒鏃堕攣灞 | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); - }//鍦ㄦ墜鏈洪攣灞忓悗濡傛灉鍒颁簡闂归挓鎻愮ず鏃堕棿锛岀偣浜睆骞 + } Intent intent = getIntent(); try { mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); - //鏍规嵁ID浠庢暟鎹簱涓幏鍙栨爣绛剧殑鍐呭锛 - //getContentResolver锛堬級鏄疄鐜版暟鎹叡浜紝瀹炰緥瀛樺偍銆 mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) : mSnippet; - //鍒ゆ柇鏍囩鐗囨鏄惁杈惧埌绗﹀悎闀垮害 } catch (IllegalArgumentException e) { e.printStackTrace(); return; } - /* - try - { - // 浠ｇ爜鍖 - } - catch(Exception e) - { - // 寮傚父澶勭悊 - } - 浠ｇ爜鍖哄鏋滄湁閿欒锛屽氨浼氳繑鍥炴墍鍐欏紓甯哥殑澶勭悊銆*/ - mPlayer = new MediaPlayer(); if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { showActionDialog(); - //寮瑰嚭瀵硅瘽妗 playAlarmSound(); - //闂归挓鎻愮ず闊虫縺鍙 } else { finish(); - //瀹屾垚闂归挓鍔ㄤ綔 } } private boolean isScreenOn() { - //鍒ゆ柇灞忓箷鏄惁閿佸睆锛岃皟鐢ㄧ郴缁熷嚱鏁板垽鏂紝鏈鍚庤繑鍥炲兼槸甯冨皵绫诲瀷 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); } private void playAlarmSound() { - //闂归挓鎻愮ず闊虫縺鍙 Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - //璋冪敤绯荤粺鐨勯搩澹扮鐞哢RI锛屽緱鍒伴椆閽熸彁绀洪煶 + int silentModeStreams = Settings.System.getInt(getContentResolver(), Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); @@ -126,12 +101,8 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } try { mPlayer.setDataSource(this, url); - //鏂规硶锛歴etDataSource(Context context, Uri uri) - //瑙ｉ噴锛氭棤杩斿洖鍊硷紝璁剧疆澶氬獟浣撴暟鎹潵婧愩愭牴鎹 Uri銆 mPlayer.prepare(); - //鍑嗗鍚屾 mPlayer.setLooping(true); - //璁剧疆鏄惁寰幆鎾斁 mPlayer.start(); } catch (IllegalArgumentException e) { // TODO Auto-generated catch block @@ -150,53 +121,37 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD private void showActionDialog() { AlertDialog.Builder dialog = new AlertDialog.Builder(this); - //AlertDialog鐨勬瀯閫犳柟娉曞叏閮ㄦ槸Protected鐨 - //鎵浠ヤ笉鑳界洿鎺ラ氳繃new涓涓狝lertDialog鏉ュ垱寤哄嚭涓涓狝lertDialog銆 - //瑕佸垱寤轰竴涓狝lertDialog锛屽氨瑕佺敤鍒癆lertDialog.Builder涓殑create()鏂规硶 - //濡傝繖閲岀殑dialog灏辨槸鏂板缓浜嗕竴涓狝lertDialog dialog.setTitle(R.string.app_name); - //涓哄璇濇璁剧疆鏍囬 dialog.setMessage(mSnippet); - //涓哄璇濇璁剧疆鍐呭 dialog.setPositiveButton(R.string.notealert_ok, this); - //缁欏璇濇娣诲姞"Yes"鎸夐挳 if (isScreenOn()) { dialog.setNegativeButton(R.string.notealert_enter, this); - }//瀵硅瘽妗嗘坊鍔"No"鎸夐挳 + } dialog.show().setOnDismissListener(this); } public void onClick(DialogInterface dialog, int which) { switch (which) { - //鐢╳hich鏉ラ夋嫨click鍚庝笅涓姝ョ殑鎿嶄綔 case DialogInterface.BUTTON_NEGATIVE: - //杩欐槸鍙栨秷鎿嶄綔 Intent intent = new Intent(this, NoteEditActivity.class); - //瀹炵幇涓や釜绫婚棿鐨勬暟鎹紶杈 intent.setAction(Intent.ACTION_VIEW); - //璁剧疆鍔ㄤ綔灞炴 intent.putExtra(Intent.EXTRA_UID, mNoteId); - //瀹炵幇key-value瀵 - //EXTRA_UID涓簁ey锛沵NoteId涓洪敭 startActivity(intent); - //寮濮嬪姩浣 break; default: - //杩欐槸纭畾鎿嶄綔 break; } } public void onDismiss(DialogInterface dialog) { - //蹇界暐 - stopAlarmSound();//鍋滄闂归挓澹伴煶 - finish();//瀹屾垚璇ュ姩浣 + stopAlarmSound(); + finish(); } private void stopAlarmSound() { if (mPlayer != null) { - mPlayer.stop();//鍋滄鎾斁 - mPlayer.release();//閲婃斁MediaPlayer瀵硅薄 + mPlayer.stop(); + mPlayer.release(); mPlayer = null; } } diff --git a/MiNote/src/net/micode/notes/ui/AlarmInitReceiver.java b/MiNote/src/net/micode/notes/ui/AlarmInitReceiver.java index a1edaad..f221202 100644 --- a/MiNote/src/net/micode/notes/ui/AlarmInitReceiver.java +++ b/MiNote/src/net/micode/notes/ui/AlarmInitReceiver.java @@ -30,26 +30,22 @@ import net.micode.notes.data.Notes.NoteColumns; public class AlarmInitReceiver extends BroadcastReceiver { - private static final String[] PROJECTION = new String[]{ - NoteColumns.ID, - NoteColumns.ALERTED_DATE + private static final String [] PROJECTION = new String [] { + NoteColumns.ID, + NoteColumns.ALERTED_DATE }; - //瀵规暟鎹簱鐨勬搷浣滐紝璋冪敤鏍囩ID鍜岄椆閽熸椂闂 - private static final int COLUMN_ID = 0; - private static final int COLUMN_ALERTED_DATE = 1; + + private static final int COLUMN_ID = 0; + private static final int COLUMN_ALERTED_DATE = 1; @Override public void onReceive(Context context, Intent intent) { long currentDate = System.currentTimeMillis(); - //System.currentTimeMillis()浜х敓涓涓綋鍓嶇殑姣 - //杩欎釜姣鍏跺疄灏辨槸鑷1970骞1鏈1鏃0鏃惰捣鐨勬绉掓暟 Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, PROJECTION, NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, - new String[]{String.valueOf(currentDate)}, - //灏唋ong鍙橀噺currentDate杞寲涓哄瓧绗︿覆 + new String[] { String.valueOf(currentDate) }, null); - //Cursor鍦ㄨ繖閲岀殑浣滅敤鏄氳繃鏌ユ壘鏁版嵁搴撲腑鐨勬爣绛惧唴瀹癸紝鎵惧埌鍜屽綋鍓嶇郴缁熸椂闂寸浉绛夌殑鏍囩 if (c != null) { if (c.moveToFirst()) { @@ -65,8 +61,5 @@ public class AlarmInitReceiver extends BroadcastReceiver { } c.close(); } - //鐒惰岄氳繃缃戜笂鏌ユ壘璧勬枡鍙戠幇锛屽浜庨椆閽熸満鍒剁殑鍚姩锛岄氬父闇瑕佷笂闈㈢殑鍑犱釜姝ラ - //濡傛柊寤篒ntent銆丳endingIntent浠ュ強AlarmManager绛 - //杩欓噷灏辨槸鏍规嵁鏁版嵁搴撻噷鐨勯椆閽熸椂闂村垱寤轰竴涓椆閽熸満鍒 } -} \ No newline at end of file +} diff --git a/MiNote/src/net/micode/notes/ui/AlarmReceiver.java b/MiNote/src/net/micode/notes/ui/AlarmReceiver.java index 981a59a..54e503b 100644 --- a/MiNote/src/net/micode/notes/ui/AlarmReceiver.java +++ b/MiNote/src/net/micode/notes/ui/AlarmReceiver.java @@ -24,12 +24,7 @@ public class AlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { intent.setClass(context, AlarmAlertActivity.class); - //鍚姩AlarmAlertActivity intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - //activity瑕佸瓨鍦ㄤ簬activity鐨勬爤涓紝鑰岄潪activity鐨勯斿緞鍚姩activity鏃跺繀鐒朵笉瀛樺湪涓涓猘ctivity鐨勬爤 - //鎵浠ヨ鏂拌捣涓涓爤瑁呭叆鍚姩鐨刟ctivity context.startActivity(intent); } } -//杩欐槸瀹炵幇alarm杩欎釜鍔熻兘鏈鎺ヨ繎鐢ㄦ埛灞傜殑鍖咃紝鍩轰簬涓婇潰鐨勪袱涓寘锛 -//浣滅敤杩橀渶瑕佹繁绌朵絾鏄浜巗etClass鍜宎ddFlags鐨 \ No newline at end of file diff --git a/MiNote/src/net/micode/notes/ui/DateTimePicker.java b/MiNote/src/net/micode/notes/ui/DateTimePicker.java index 7cda91e..496b0cd 100644 --- a/MiNote/src/net/micode/notes/ui/DateTimePicker.java +++ b/MiNote/src/net/micode/notes/ui/DateTimePicker.java @@ -29,8 +29,7 @@ import android.widget.FrameLayout; import android.widget.NumberPicker; public class DateTimePicker extends FrameLayout { - //FrameLayout鏄竷灞妯℃澘涔嬩竴 - //鎵鏈夌殑瀛愬厓绱犲叏閮ㄥ湪灞忓箷鐨勫彸涓婃柟 + private static final boolean DEFAULT_ENABLE_STATE = true; private static final int HOURS_IN_HALF_DAY = 12; @@ -46,15 +45,13 @@ public class DateTimePicker extends FrameLayout { private static final int MINUT_SPINNER_MAX_VAL = 59; private static final int AMPM_SPINNER_MIN_VAL = 0; private static final int AMPM_SPINNER_MAX_VAL = 1; - //鍒濆鍖栨帶浠 + private final NumberPicker mDateSpinner; private final NumberPicker mHourSpinner; private final NumberPicker mMinuteSpinner; private final NumberPicker mAmPmSpinner; - //NumberPicker鏄暟瀛楅夋嫨鍣 - //杩欓噷瀹氫箟鐨勫洓涓彉閲忓叏閮ㄦ槸鍦ㄨ缃椆閽熸椂闇瑕侀夋嫨鐨勫彉閲忥紙濡傛棩鏈熴佹椂銆佸垎銆佷笂鍗堟垨鑰呬笅鍗堬級 private Calendar mDate; - //瀹氫箟浜咰alendar绫诲瀷鐨勫彉閲弇Date锛岀敤浜庢搷浣滄椂闂 + private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; private boolean mIsAm; @@ -74,49 +71,41 @@ public class DateTimePicker extends FrameLayout { updateDateControl(); onDateTimeChanged(); } - };//OnValueChangeListener锛岃繖鏄椂闂存敼鍙樼洃鍚櫒锛岃繖閲屼富瑕佹槸瀵规棩鏈熺殑鐩戝惉 - //灏嗙幇鍦ㄦ棩鏈熺殑鍊间紶閫掔粰mDate锛泆pdateDateControl鏄悓姝ユ搷浣 + }; private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { - //杩欓噷鏄 灏忔椂锛圚our锛 鐨勭洃鍚 @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { boolean isDateChanged = false; Calendar cal = Calendar.getInstance(); - //澹版槑涓涓狢alendar鐨勫彉閲廲al锛屼究浜庡悗缁殑鎿嶄綔 if (!mIs24HourView) { if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; - //杩欓噷鏄浜12灏忔椂鍒舵椂锛屾櫄涓11鐐瑰拰12鐐逛氦鏇挎椂瀵规棩鏈熺殑鏇存敼 } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } - //杩欓噷鏄浜12灏忔椂鍒舵椂锛屽噷鏅11鐐瑰拰12鐐逛氦鏇挎椂瀵规棩鏈熺殑鏇存敼 if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { mIsAm = !mIsAm; updateAmPmControl(); - }//杩欓噷鏄浜12灏忔椂鍒舵椂锛屼腑鍗11鐐瑰拰12鐐逛氦鏇挎椂瀵笰M鍜孭M鐨勬洿鏀 + } } else { if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; - //杩欓噷鏄浜24灏忔椂鍒舵椂锛屾櫄涓11鐐瑰拰12鐐逛氦鏇挎椂瀵规棩鏈熺殑鏇存敼 } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } - } //杩欓噷鏄浜12灏忔椂鍒舵椂锛屽噷鏅11鐐瑰拰12鐐逛氦鏇挎椂瀵规棩鏈熺殑鏇存敼 + } int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); - //閫氳繃鏁板瓧閫夋嫨鍣ㄥnewHour鐨勮祴鍊 mDate.set(Calendar.HOUR_OF_DAY, newHour); - //閫氳繃set鍑芥暟灏嗘柊鐨凥our鍊间紶缁檓Date onDateTimeChanged(); if (isDateChanged) { setCurrentYear(cal.get(Calendar.YEAR)); @@ -128,19 +117,15 @@ public class DateTimePicker extends FrameLayout { private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { @Override - //杩欓噷鏄 鍒嗛挓锛圡inute锛夋敼鍙樼殑鐩戝惉 public void onValueChange(NumberPicker picker, int oldVal, int newVal) { int minValue = mMinuteSpinner.getMinValue(); int maxValue = mMinuteSpinner.getMaxValue(); int offset = 0; - //璁剧疆offset锛屼綔涓哄皬鏃舵敼鍙樼殑涓涓褰曟暟鎹 if (oldVal == maxValue && newVal == minValue) { offset += 1; } else if (oldVal == minValue && newVal == maxValue) { offset -= 1; } - //濡傛灉鍘熷间负59锛屾柊鍊间负0锛屽垯offset鍔1 - //濡傛灉鍘熷间负0锛屾柊鍊间负59锛屽垯offset鍑1 if (offset != 0) { mDate.add(Calendar.HOUR_OF_DAY, offset); mHourSpinner.setValue(getCurrentHour()); @@ -160,7 +145,6 @@ public class DateTimePicker extends FrameLayout { }; private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { - //瀵笰M鍜孭M鐨勭洃鍚 @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { mIsAm = !mIsAm; @@ -176,27 +160,24 @@ public class DateTimePicker extends FrameLayout { public interface OnDateTimeChangedListener { void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute); + int dayOfMonth, int hourOfDay, int minute); } public DateTimePicker(Context context) { this(context, System.currentTimeMillis()); - }//閫氳繃瀵规暟鎹簱鐨勮闂紝鑾峰彇褰撳墠鐨勭郴缁熸椂闂 + } public DateTimePicker(Context context, long date) { this(context, date, DateFormat.is24HourFormat(context)); - }//涓婇潰鍑芥暟鐨勫緱鍒扮殑鏄竴涓ぉ鏂囨暟瀛楋紙1970鑷充粖鐨勭鏁帮級锛岄渶瑕丏ateFormat灏嗗叾鍙樺緱鏈夋剰涔 + } public DateTimePicker(Context context, long date, boolean is24HourView) { super(context); - //鑾峰彇绯荤粺鏃堕棿 mDate = Calendar.getInstance(); mInitialising = true; mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; inflate(context, R.layout.datetime_picker, this); - //濡傛灉褰撳墠Activity閲岀敤鍒板埆鐨刲ayout锛屾瘮濡傚璇濇layout - //杩樿璁剧疆杩欎釜layout涓婄殑鍏朵粬缁勪欢鐨勫唴瀹癸紝灏卞繀椤荤敤inflate()鏂规硶鍏堝皢瀵硅瘽妗嗙殑layout鎵惧嚭鏉 - //鐒跺悗鍐嶇敤findViewById()鎵惧埌瀹冧笂闈㈢殑鍏跺畠缁勪欢 + mDateSpinner = (NumberPicker) findViewById(R.id.date); mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL); @@ -204,7 +185,7 @@ public class DateTimePicker extends FrameLayout { mHourSpinner = (NumberPicker) findViewById(R.id.hour); mHourSpinner.setOnValueChangedListener(mOnHourChangedListener); - mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); + mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL); mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL); mMinuteSpinner.setOnLongPressUpdateInterval(100); @@ -245,9 +226,7 @@ public class DateTimePicker extends FrameLayout { mAmPmSpinner.setEnabled(enabled); mIsEnabled = enabled; } - //瀛樺湪鐤戦棶锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒锛乻etEnabled鐨勪綔鐢 - //涓嬮潰鐨勪唬鐮侀氳繃鍘熺▼搴忕殑娉ㄩ噴宸茬粡姣旇緝娓呮櫚锛屽彟澶栧彲浠ラ氳繃鍑芥暟鍚嶆潵鍒ゆ柇 - //涓嬮潰鐨勫悇鍑芥暟涓昏鏄涓婇潰浠ｇ爜寮曠敤鍒扮殑鍚勫嚱鏁板姛鑳界殑瀹炵幇 + @Override public boolean isEnabled() { return mIsEnabled; @@ -260,7 +239,7 @@ public class DateTimePicker extends FrameLayout { */ public long getCurrentDateInTimeMillis() { return mDate.getTimeInMillis(); - }//瀹炵幇鍑芥暟鈥斺斿緱鍒板綋鍓嶇殑绉掓暟 + } /** * Set the current date @@ -272,7 +251,7 @@ public class DateTimePicker extends FrameLayout { cal.setTimeInMillis(date); setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)); - }//瀹炵幇鍑芥暟鍔熻兘鈥斺旇缃綋鍓嶇殑鏃堕棿锛屽弬鏁版槸date + } /** * Set the current date @@ -284,20 +263,19 @@ public class DateTimePicker extends FrameLayout { * @param minute The current minute */ public void setCurrentDate(int year, int month, - int dayOfMonth, int hourOfDay, int minute) { + int dayOfMonth, int hourOfDay, int minute) { setCurrentYear(year); setCurrentMonth(month); setCurrentDay(dayOfMonth); setCurrentHour(hourOfDay); setCurrentMinute(minute); - }//瀹炵幇鍑芥暟鍔熻兘鈥斺旇缃綋鍓嶇殑鏃堕棿锛屽弬鏁版槸鍚勮缁嗙殑鍙橀噺 + } /** * Get current year * * @return The current year */ - //涓嬮潰鏄緱鍒皔ear銆乵onth銆乨ay绛夊 public int getCurrentYear() { return mDate.get(Calendar.YEAR); } @@ -468,7 +446,7 @@ public class DateTimePicker extends FrameLayout { mDateSpinner.setDisplayedValues(mDateDisplayValues); mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); mDateSpinner.invalidate(); - }// 瀵逛簬鏄熸湡鍑犵殑绠楁硶 + } private void updateAmPmControl() { if (mIs24HourView) { @@ -477,7 +455,7 @@ public class DateTimePicker extends FrameLayout { int index = mIsAm ? Calendar.AM : Calendar.PM; mAmPmSpinner.setValue(index); mAmPmSpinner.setVisibility(View.VISIBLE); - }// 瀵逛簬涓婁笅鍗堟搷浣滅殑绠楁硶 + } } private void updateHourControl() { @@ -487,7 +465,7 @@ public class DateTimePicker extends FrameLayout { } else { mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW); mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW); - }// 瀵逛笌灏忔椂鐨勭畻娉 + } } /** @@ -504,4 +482,4 @@ public class DateTimePicker extends FrameLayout { getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute()); } } -} \ No newline at end of file +} diff --git a/MiNote/src/net/micode/notes/ui/DateTimePickerDialog.java b/MiNote/src/net/micode/notes/ui/DateTimePickerDialog.java index c5689bd..2c47ba4 100644 --- a/MiNote/src/net/micode/notes/ui/DateTimePickerDialog.java +++ b/MiNote/src/net/micode/notes/ui/DateTimePickerDialog.java @@ -32,47 +32,35 @@ import android.text.format.DateUtils; public class DateTimePickerDialog extends AlertDialog implements OnClickListener { private Calendar mDate = Calendar.getInstance(); - //鍒涘缓涓涓狢alendar绫诲瀷鐨勫彉閲 mDate锛屾柟渚挎椂闂寸殑鎿嶄綔 private boolean mIs24HourView; private OnDateTimeSetListener mOnDateTimeSetListener; - //澹版槑涓涓椂闂存棩鏈熸粴鍔ㄩ夋嫨鎺т欢 mOnDateTimeSetListener private DateTimePicker mDateTimePicker; - //DateTimePicker鎺т欢锛屾帶浠朵竴鑸敤浜庤鐢ㄦ埛鍙互浠庢棩鏈熷垪琛ㄤ腑閫夋嫨鍗曚釜鍊笺 - //杩愯鏃讹紝鍗曞嚮鎺т欢杈逛笂鐨勪笅鎷夌澶达紝浼氭樉绀轰负涓や釜閮ㄥ垎锛氫竴涓笅鎷夊垪琛紝涓涓敤浜庨夋嫨鏃ユ湡鐨 public interface OnDateTimeSetListener { void OnDateTimeSet(AlertDialog dialog, long date); } public DateTimePickerDialog(Context context, long date) { - //瀵硅鐣岄潰瀵硅瘽妗嗙殑瀹炰緥鍖 super(context); - //瀵规暟鎹簱鐨勬搷浣 mDateTimePicker = new DateTimePicker(context); setView(mDateTimePicker); - //娣诲姞涓涓瓙瑙嗗浘 mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { public void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute) { + int dayOfMonth, int hourOfDay, int minute) { mDate.set(Calendar.YEAR, year); mDate.set(Calendar.MONTH, month); mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); mDate.set(Calendar.MINUTE, minute); - //灏嗚鍥句腑鐨勫悇閫夐」璁剧疆涓虹郴缁熷綋鍓嶆椂闂 updateTitle(mDate.getTimeInMillis()); } }); mDate.setTimeInMillis(date); - //寰楀埌绯荤粺鏃堕棿 mDate.set(Calendar.SECOND, 0); - //灏嗙鏁拌缃负0 mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); setButton(context.getString(R.string.datetime_dialog_ok), this); setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); - //璁剧疆鎸夐挳 set24HourView(DateFormat.is24HourFormat(this.getContext())); - //鏃堕棿鏍囧噯鍖栨墦鍗 updateTitle(mDate.getTimeInMillis()); } @@ -82,22 +70,21 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { mOnDateTimeSetListener = callBack; - }//灏嗘椂闂存棩鏈熸粴鍔ㄩ夋嫨鎺т欢瀹炰緥鍖 + } private void updateTitle(long date) { int flag = - DateUtils.FORMAT_SHOW_YEAR | - DateUtils.FORMAT_SHOW_DATE | - DateUtils.FORMAT_SHOW_TIME; + DateUtils.FORMAT_SHOW_YEAR | + DateUtils.FORMAT_SHOW_DATE | + DateUtils.FORMAT_SHOW_TIME; flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); - }//android寮鍙戜腑甯歌鏃ユ湡绠＄悊宸ュ叿绫伙紙API锛夆斺擠ateUtils锛氭寜鐓т笂涓嬪崍鏄剧ず鏃堕棿 + } public void onClick(DialogInterface arg0, int arg1) { if (mOnDateTimeSetListener != null) { mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis()); } - }//绗竴涓弬鏁癮rg0鏄帴鏀跺埌鐐瑰嚮浜嬩欢鐨勫璇濇 - //绗簩涓弬鏁癮rg1鏄瀵硅瘽妗嗕笂鐨勬寜閽 + } -}} \ No newline at end of file +} \ No newline at end of file diff --git a/MiNote/src/net/micode/notes/ui/DropdownMenu.java b/MiNote/src/net/micode/notes/ui/DropdownMenu.java index 0c4b307..613dc74 100644 --- a/MiNote/src/net/micode/notes/ui/DropdownMenu.java +++ b/MiNote/src/net/micode/notes/ui/DropdownMenu.java @@ -30,18 +30,14 @@ import net.micode.notes.R; public class DropdownMenu { private Button mButton; private PopupMenu mPopupMenu; - //澹版槑涓涓笅鎷夎彍鍗 private Menu mMenu; public DropdownMenu(Context context, Button button, int menuId) { mButton = button; mButton.setBackgroundResource(R.drawable.dropdown_icon); - //璁剧疆杩欎釜view鐨勮儗鏅 mPopupMenu = new PopupMenu(context, mButton); mMenu = mPopupMenu.getMenu(); mPopupMenu.getMenuInflater().inflate(menuId, mMenu); - //MenuInflater鏄敤鏉ュ疄渚嬪寲Menu鐩綍涓嬬殑Menu甯冨眬鏂囦欢 - //鏍规嵁ID鏉ョ‘璁enu鐨勫唴瀹归夐」 mButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { mPopupMenu.show(); @@ -52,14 +48,14 @@ public class DropdownMenu { public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) { if (mPopupMenu != null) { mPopupMenu.setOnMenuItemClickListener(listener); - }//璁剧疆鑿滃崟鐨勭洃鍚 + } } public MenuItem findItem(int id) { return mMenu.findItem(id); - }//瀵逛簬鑿滃崟閫夐」鐨勫垵濮嬪寲锛屾牴鎹储寮曟悳绱㈣彍鍗曢渶瑕佺殑閫夐」 + } public void setTitle(CharSequence title) { mButton.setText(title); - }//甯冨眬鏂囦欢锛岃缃爣棰 -} \ No newline at end of file + } +} diff --git a/MiNote/src/net/micode/notes/ui/FoldersListAdapter.java b/MiNote/src/net/micode/notes/ui/FoldersListAdapter.java index 5e32e6d..96b77da 100644 --- a/MiNote/src/net/micode/notes/ui/FoldersListAdapter.java +++ b/MiNote/src/net/micode/notes/ui/FoldersListAdapter.java @@ -30,14 +30,10 @@ import net.micode.notes.data.Notes.NoteColumns; public class FoldersListAdapter extends CursorAdapter { - //CursorAdapter鏄疌ursor鍜孡istView鐨勬帴鍙 - //FoldersListAdapter缁ф壙浜咰ursorAdapter鐨勭被 - //涓昏浣滅敤鏄究绛炬暟鎹簱鍜岀敤鎴风殑浜や簰 - //杩欓噷灏辨槸鐢╢older锛堟枃浠跺す锛夌殑褰㈠紡灞曠幇缁欑敤鎴 public static final String [] PROJECTION = { - NoteColumns.ID, - NoteColumns.SNIPPET - };//璋冪敤鏁版嵁搴撲腑渚跨鐨処D鍜岀墖娈 + NoteColumns.ID, + NoteColumns.SNIPPET + }; public static final int ID_COLUMN = 0; public static final int NAME_COLUMN = 1; @@ -45,13 +41,12 @@ public class FoldersListAdapter extends CursorAdapter { public FoldersListAdapter(Context context, Cursor c) { super(context, c); // TODO Auto-generated constructor stub - }//鏁版嵁搴撴搷浣 + } @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { - //ViewGroup鏄鍣 return new FolderListItem(context); - }//鍒涘缓涓涓枃浠跺す锛屽浜庡悇鏂囦欢澶逛腑瀛愭爣绛剧殑鍒濆鍖 + } @Override public void bindView(View view, Context context, Cursor cursor) { @@ -60,22 +55,20 @@ public class FoldersListAdapter extends CursorAdapter { .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); ((FolderListItem) view).bind(folderName); } - }//灏嗗悇涓竷灞鏂囦欢缁戝畾璧锋潵 + } public String getFolderName(Context context, int position) { Cursor cursor = (Cursor) getItem(position); return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); - }//鏍规嵁鏁版嵁搴撲腑鏍囩鐨処D寰楀埌鏍囩鐨勫悇椤瑰唴瀹 + } private class FolderListItem extends LinearLayout { private TextView mName; public FolderListItem(Context context) { super(context); - //鎿嶄綔鏁版嵁搴 inflate(context, R.layout.folder_list_item, this); - //鏍规嵁甯冨眬鏂囦欢鐨勫悕瀛楃瓑淇℃伅灏嗗叾鎵惧嚭鏉 mName = (TextView) findViewById(R.id.tv_folder_name); } @@ -84,4 +77,4 @@ public class FoldersListAdapter extends CursorAdapter { } } -} \ No newline at end of file +} diff --git a/MiNote/src/net/micode/notes/ui/NoteEditActivity.java b/MiNote/src/net/micode/notes/ui/NoteEditActivity.java index db1fc20..96a9ff8 100644 --- a/MiNote/src/net/micode/notes/ui/NoteEditActivity.java +++ b/MiNote/src/net/micode/notes/ui/NoteEditActivity.java @@ -74,8 +74,6 @@ import java.util.regex.Pattern; public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { - //璇ョ被涓昏鏄拡瀵规爣绛剧殑缂栬緫 - //缁ф壙浜嗙郴缁熷唴閮ㄨ澶氬拰鐩戝惉鏈夊叧鐨勭被 private class HeadViewHolder { public TextView tvModified; @@ -85,7 +83,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, public ImageView ibSetBgColor; } - //浣跨敤Map瀹炵幇鏁版嵁瀛樺偍 + private static final Map sBgSelectorBtnsMap = new HashMap(); static { sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); @@ -93,7 +91,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); - //put鍑芥暟鏄皢鎸囧畾鍊煎拰鎸囧畾閿浉杩 } private static final Map sBgSelectorSelectionMap = new HashMap(); @@ -103,7 +100,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select); sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); - //put鍑芥暟鏄皢鎸囧畾鍊煎拰鎸囧畾閿浉杩 } private static final Map sFontSizeBtnsMap = new HashMap(); @@ -112,7 +108,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM); sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); - //put鍑芥暟鏄皢鎸囧畾鍊煎拰鎸囧畾閿浉杩 } private static final Map sFontSelectorSelectionMap = new HashMap(); @@ -121,7 +116,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select); sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); - //put鍑芥暟鏄皢鎸囧畾鍊煎拰鎸囧畾閿浉杩 } private static final String TAG = "NoteEditActivity"; @@ -129,23 +123,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, private HeadViewHolder mNoteHeaderHolder; private View mHeadViewPanel; - //绉佹湁鍖栦竴涓晫闈㈡搷浣渕HeadViewPanel锛屽琛ㄥご鐨勬搷浣 + private View mNoteBgColorSelector; - //绉佹湁鍖栦竴涓晫闈㈡搷浣渕NoteBgColorSelector锛屽鑳屾櫙棰滆壊鐨勬搷浣 + private View mFontSizeSelector; - //绉佹湁鍖栦竴涓晫闈㈡搷浣渕FontSizeSelector锛屽鏍囩瀛椾綋鐨勬搷浣 + private EditText mNoteEditor; - //澹版槑缂栬緫鎺т欢锛屽鏂囨湰鎿嶄綔 + private View mNoteEditorPanel; - //绉佹湁鍖栦竴涓晫闈㈡搷浣渕NoteEditorPanel锛屾枃鏈紪杈戠殑鎺у埗鏉 - //private WorkingNote mWorkingNote; - public WorkingNote mWorkingNote; - //瀵规ā鏉縒orkingNote鐨勫垵濮嬪寲 + + private WorkingNote mWorkingNote; + private SharedPreferences mSharedPrefs; - //绉佹湁鍖朣haredPreferences鐨勬暟鎹瓨鍌ㄦ柟寮 - //瀹冪殑鏈川鏄熀浜嶺ML鏂囦欢瀛樺偍key-value閿煎鏁版嵁 private int mFontSizeId; - //鐢ㄤ簬鎿嶄綔瀛椾綋鐨勫ぇ灏 + private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; @@ -154,7 +145,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); private LinearLayout mEditTextList; - //绾挎у竷灞 + private String mUserQuery; private Pattern mPattern; @@ -162,7 +153,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.note_edit); - //瀵规暟鎹簱鐨勮闂搷浣 + if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; @@ -185,7 +176,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } Log.d(TAG, "Restoring from killed activity"); - }//涓洪槻姝㈠唴瀛樹笉瓒虫椂绋嬪簭鐨勭粓姝紝鍦ㄨ繖閲屾湁涓涓繚瀛樼幇鍦虹殑鍑芥暟 + } } private boolean initActivityState(Intent intent) { @@ -197,42 +188,34 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); mUserQuery = ""; - //濡傛灉鐢ㄦ埛瀹炰緥鍖栨爣绛炬椂锛岀郴缁熷苟鏈粰鍑烘爣绛綢D + /** * Starting from the searched result */ - //鏍规嵁閿兼煡鎵綢D if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); } - //濡傛灉ID鍦ㄦ暟鎹簱涓湭鎵惧埌 + if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { Intent jump = new Intent(this, NotesListActivity.class); startActivity(jump); - //绋嬪簭灏嗚烦杞埌涓婇潰澹版槑鐨刬ntent鈥斺攋ump showToast(R.string.error_note_not_exist); finish(); return false; - } - //ID鍦ㄦ暟鎹簱涓壘鍒 - else { + } else { mWorkingNote = WorkingNote.load(this, noteId); if (mWorkingNote == null) { Log.e(TAG, "load note failed with note id" + noteId); - //鎵撳嵃鍑虹孩鑹茬殑閿欒淇℃伅 finish(); return false; } } - //setSoftInputMode鈥斺旇蒋閿洏杈撳叆妯″紡 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { - // intent.getAction() - // 澶у鐢ㄤ簬broadcast鍙戦佸箍鎾椂缁欐満鍒讹紙intent锛夎缃竴涓猘ction锛屽氨鏄竴涓瓧绗︿覆 - // 鐢ㄦ埛鍙互閫氳繃receive锛堟帴鍙楋級intent锛岄氳繃 getAction寰楀埌鐨勫瓧绗︿覆锛屾潵鍐冲畾鍋氫粈涔 + // New note long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); @@ -240,7 +223,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, Notes.TYPE_WIDGET_INVALIDE); int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, ResourceParser.getDefaultBgId(this)); - // intent.getInt锛圠ong銆丼tring锛塃xtra鏄鍚勫彉閲忕殑璇硶鍒嗘瀽 + // Parse call-record note String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); @@ -257,17 +240,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, finish(); return false; } - //灏嗙數璇濆彿鐮佷笌鎵嬫満鐨勫彿鐮佺翱鐩稿叧 } else { mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, bgResId); mWorkingNote.convertToCallNote(phoneNumber, callDate); - // } } else { mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, bgResId); - }//鍒涘缓涓涓柊鐨刉orkingNote + } getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE @@ -288,10 +269,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private void initNoteScreen() { - //瀵圭晫闈㈢殑鍒濆鍖栨搷浣 mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); - //璁剧疆澶栬 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); } else { @@ -315,21 +294,18 @@ public class NoteEditActivity extends Activity implements OnClickListener, */ showAlertHeader(); } - //璁剧疆闂归挓鐨勬樉绀 + private void showAlertHeader() { if (mWorkingNote.hasClockAlert()) { long time = System.currentTimeMillis(); if (time > mWorkingNote.getAlertDate()) { mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); - } - //濡傛灉绯荤粺鏃堕棿澶т簬浜嗛椆閽熻缃殑鏃堕棿锛岄偅涔堥椆閽熷け鏁 - else { + } else { mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); } mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); - //鏄剧ず闂归挓寮鍚殑鍥炬爣 } else { mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); @@ -353,29 +329,26 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (!mWorkingNote.existInDatabase()) { saveNote(); } - //鍦ㄥ垱寤轰竴涓柊鐨勬爣绛炬椂锛屽厛鍦ㄦ暟鎹簱涓尮閰 - //濡傛灉涓嶅瓨鍦紝閭ｄ箞鍏堝湪鏁版嵁搴撲腑瀛樺偍 outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId()); Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); } @Override - //MotionEvent鏄灞忓箷瑙︽帶鐨勪紶閫掓満鍒 public boolean dispatchTouchEvent(MotionEvent ev) { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE && !inRangeOfView(mNoteBgColorSelector, ev)) { mNoteBgColorSelector.setVisibility(View.GONE); return true; - }//棰滆壊閫夋嫨鍣ㄥ湪灞忓箷涓婂彲瑙 + } if (mFontSizeSelector.getVisibility() == View.VISIBLE && !inRangeOfView(mFontSizeSelector, ev)) { mFontSizeSelector.setVisibility(View.GONE); return true; - }//瀛椾綋澶у皬閫夋嫨鍣ㄥ湪灞忓箷涓婂彲瑙 + } return super.dispatchTouchEvent(ev); } - //瀵瑰睆骞曡Е鎺х殑鍧愭爣杩涜鎿嶄綔 + private boolean inRangeOfView(View view, MotionEvent ev) { int []location = new int[2]; view.getLocationOnScreen(location); @@ -384,11 +357,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (ev.getX() < x || ev.getX() > (x + view.getWidth()) || ev.getY() < y - || ev.getY() > (y + view.getHeight())) - //濡傛灉瑙︽帶鐨勪綅缃秴鍑轰簡缁欏畾鐨勮寖鍥达紝杩斿洖false - { - return false; - } + || ev.getY() > (y + view.getHeight())) { + return false; + } return true; } @@ -406,13 +377,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, for (int id : sBgSelectorBtnsMap.keySet()) { ImageView iv = (ImageView) findViewById(id); iv.setOnClickListener(this); - }//瀵规爣绛惧悇椤瑰睘鎬у唴瀹圭殑鍒濆鍖 + } mFontSizeSelector = findViewById(R.id.font_size_selector); for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); view.setOnClickListener(this); - };//瀵瑰瓧浣撳ぇ灏忕殑閫夋嫨 + }; mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); /** @@ -434,7 +405,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } clearSettingState(); } - //鍜屾闈㈠皬宸ュ叿鐨勫悓姝 + private void updateWidget() { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { @@ -447,7 +418,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() + mWorkingNote.getWidgetId() }); sendBroadcast(intent); @@ -479,7 +450,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } mFontSizeSelector.setVisibility(View.GONE); } - }//************************瀛樺湪闂 + } @Override public void onBackPressed() { @@ -510,7 +481,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - //瀵归夋嫨鑿滃崟鐨勫噯澶 public boolean onPrepareOptionsMenu(Menu menu) { if (isFinishing()) { return true; @@ -519,7 +489,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, menu.clear(); if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_note_edit, menu); - // MenuInflater鏄敤鏉ュ疄渚嬪寲Menu鐩綍涓嬬殑Menu甯冨眬鏂囦欢鐨 } else { getMenuInflater().inflate(R.menu.note_edit, menu); } @@ -537,71 +506,45 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - /* - * 鍑芥暟鍔熻兘锛氬姩鎬佹敼鍙樿彍鍗曢夐」鍐呭 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - //鏍规嵁鑿滃崟鐨刬d鏉ョ紪鍓х浉鍏抽」鐩 case R.id.menu_new_note: - //鍒涘缓涓涓柊鐨勪究绛 createNewNote(); break; case R.id.menu_delete: - //鍒犻櫎渚跨 AlertDialog.Builder builder = new AlertDialog.Builder(this); - //鍒涘缓鍏充簬鍒犻櫎鎿嶄綔鐨勫璇濇 builder.setTitle(getString(R.string.alert_title_delete)); - // 璁剧疆鏍囩鐨勬爣棰樹负alert_title_delete builder.setIcon(android.R.drawable.ic_dialog_alert); - //璁剧疆瀵硅瘽妗嗗浘鏍 builder.setMessage(getString(R.string.alert_message_delete_note)); - //璁剧疆瀵硅瘽妗嗗唴瀹 builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - //寤虹珛鎸夐敭鐩戝惉鍣 public void onClick(DialogInterface dialog, int which) { - //鐐瑰嚮鎵瑙﹀彂浜嬩欢 deleteCurrentNote(); - // 鍒犻櫎鍗曠渚跨 finish(); } }); - //娣诲姞鈥淵ES鈥濇寜閽 builder.setNegativeButton(android.R.string.cancel, null); - //娣诲姞鈥淣O鈥濈殑鎸夐挳 builder.show(); - //鏄剧ず瀵硅瘽妗 break; case R.id.menu_font_size: - //瀛椾綋澶у皬鐨勭紪杈 mFontSizeSelector.setVisibility(View.VISIBLE); - // 灏嗗瓧浣撻夋嫨鍣ㄧ疆涓哄彲瑙 findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - // 閫氳繃id鎵惧埌鐩稿簲鐨勫ぇ灏 break; case R.id.menu_list_mode: - //閫夋嫨鍒楄〃妯″紡 mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? TextNote.MODE_CHECK_LIST : 0); break; case R.id.menu_share: - //鑿滃崟鍏变韩 getWorkingText(); sendTo(this, mWorkingNote.getContent()); - // 鐢╯endto鍑芥暟灏嗚繍琛屾枃鏈彂閫佸埌閬嶅巻鐨勬湰鏂囧唴 break; case R.id.menu_send_to_desktop: - //鍙戦佸埌妗岄潰 sendToDesktop(); break; case R.id.menu_alert: - //鍒涘缓鎻愰啋鍣 setReminder(); break; case R.id.menu_delete_remind: - //鍒犻櫎鏃ユ湡鎻愰啋 mWorkingNote.setAlertDate(0, false); break; default: @@ -610,170 +553,111 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } - /* - * 鍑芥暟鍔熻兘锛氬缓绔嬩簨浠舵彁閱掑櫒 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void setReminder() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); - // 寤虹珛淇敼鏃堕棿鏃ユ湡鐨勫璇濇 d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { mWorkingNote.setAlertDate(date , true); - //閫夋嫨鎻愰啋鐨勬棩鏈 } }); - //寤虹珛鏃堕棿鏃ユ湡鐨勭洃鍚櫒 d.show(); - //鏄剧ず瀵硅瘽妗 } /** * Share note to apps that support {@link Intent#ACTION_SEND} action * and {@text/plain} type */ - /* - * 鍑芥暟鍔熻兘锛氬叡浜究绛 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void sendTo(Context context, String info) { Intent intent = new Intent(Intent.ACTION_SEND); - //寤虹珛intent閾炬帴閫夐」 intent.putExtra(Intent.EXTRA_TEXT, info); - //灏嗛渶瑕佷紶閫掔殑渚跨淇℃伅鏀惧叆text鏂囦欢涓 intent.setType("text/plain"); - //缂栬緫杩炴帴鍣ㄧ殑绫诲瀷 context.startActivity(intent); - //鍦╝cti涓繘琛岄摼鎺 } - /* - * 鍑芥暟鍔熻兘锛氬垱寤轰竴涓柊鐨勪究绛 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void createNewNote() { // Firstly, save current editing notes - //淇濆瓨褰撳墠渚跨 saveNote(); // For safety, start a new NoteEditActivity finish(); Intent intent = new Intent(this, NoteEditActivity.class); - //璁剧疆閾炬帴鍣 intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - //璇ユ椿鍔ㄥ畾涔変负鍒涘缓鎴栫紪杈 intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId()); - //灏嗚繍琛屼究绛剧殑id娣诲姞鍒癐NTENT_EXTRA_FOLDER_ID鏍囪涓 startActivity(intent); - //寮濮媋ctivity骞堕摼鎺 } - /* - * 鍑芥暟鍔熻兘锛氬垹闄ゅ綋鍓嶄究绛 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void deleteCurrentNote() { if (mWorkingNote.existInDatabase()) { - //鍋囧褰撳墠杩愯鐨勪究绛惧唴瀛樻湁鏁版嵁 HashSet ids = new HashSet(); long id = mWorkingNote.getNoteId(); if (id != Notes.ID_ROOT_FOLDER) { ids.add(id); - //濡傛灉涓嶆槸澶存枃浠跺す寤虹珛涓涓猦ash琛ㄦ妸渚跨id瀛樿捣鏉 } else { Log.d(TAG, "Wrong note id, should not happen"); - //鍚﹀垯鎶ラ敊 } if (!isSyncMode()) { - //鍦ㄩ潪鍚屾妯″紡鎯呭喌涓 - //鍒犻櫎鎿嶄綔 if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { Log.e(TAG, "Delete Note error"); } } else { - //鍚屾妯″紡 - //绉诲姩鑷冲瀮鍦炬枃浠跺す鐨勬搷浣 if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); } } } mWorkingNote.markDeleted(true); - //灏嗚繖浜涙爣绛剧殑鍒犻櫎鏍囪缃负true } - /* - * 鍑芥暟鍔熻兘锛氬垽鏂槸鍚︿负鍚屾妯″紡 - * 鍑芥暟瀹炵幇锛氱洿鎺ョ湅NotesPreferenceActivity涓悓姝ュ悕绉版槸鍚︿负绌 - */ private boolean isSyncMode() { return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; } - /* - * 鍑芥暟鍔熻兘锛氳缃彁閱掓椂闂 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public void onClockAlertChanged(long date, boolean set) { /** * User could set clock to an unsaved note, so before setting the * alert clock, we should save the note first */ if (!mWorkingNote.existInDatabase()) { - //棣栧厛淇濆瓨宸叉湁鐨勪究绛 saveNote(); } if (mWorkingNote.getNoteId() > 0) { Intent intent = new Intent(this, AlarmReceiver.class); intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); - //鑻ユ湁鏈夎繍琛岀殑渚跨灏辨槸寤虹珛涓涓摼鎺ュ櫒灏嗘爣绛緄d閮藉瓨鍦╱ri涓 PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); - //璁剧疆鎻愰啋绠＄悊鍣 showAlertHeader(); if(!set) { alarmManager.cancel(pendingIntent); } else { alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); } - //濡傛灉鐢ㄦ埛璁剧疆浜嗘椂闂达紝灏遍氳繃鎻愰啋绠＄悊鍣ㄨ缃竴涓洃鍚簨椤 } else { /** * There is the condition that user has input nothing (the note is * not worthy saving), we have no note id, remind the user that he * should input something */ - //娌℃湁杩愯鐨勪究绛惧氨鎶ラ敊 Log.e(TAG, "Clock alert setting error"); showToast(R.string.error_note_empty_for_clock); } } - /* - * 鍑芥暟鍔熻兘锛歐idget鍙戠敓鏀瑰彉鐨勬墍瑙﹀彂鐨勪簨浠 - */ public void onWidgetChanged() { - updateWidget();//鏇存柊Widget + updateWidget(); } - /* - * 鍑芥暟鍔熻兘锛 鍒犻櫎缂栬緫鏂囨湰妗嗘墍瑙﹀彂鐨勪簨浠 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public void onEditTextDelete(int index, String text) { int childCount = mEditTextList.getChildCount(); if (childCount == 1) { return; } - //娌℃湁缂栬緫妗嗙殑璇濈洿鎺ヨ繑鍥 + for (int i = index + 1; i < childCount; i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i - 1); - //閫氳繃id鎶婄紪杈戞瀛樺湪渚跨缂栬緫妗嗕腑 } mEditTextList.removeViewAt(index); - //鍒犻櫎鐗瑰畾浣嶇疆鐨勮鍥 NoteEditText edit = null; if(index == 0) { edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( @@ -782,101 +666,69 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById( R.id.et_edit_text); } - //閫氳繃id鎶婄紪杈戞瀛樺湪绌虹殑NoteEditText涓 int length = edit.length(); edit.append(text); - edit.requestFocus();//璇锋眰浼樺厛瀹屾垚璇ユ 缂栬緫 - edit.setSelection(length);//瀹氫綅鍒發ength浣嶇疆澶勭殑鏉＄洰 + edit.requestFocus(); + edit.setSelection(length); } - /* - * 鍑芥暟鍔熻兘锛氳繘鍏ョ紪杈戞枃鏈鎵瑙﹀彂鐨勪簨浠 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public void onEditTextEnter(int index, String text) { /** * Should not happen, check for debug */ if(index > mEditTextList.getChildCount()) { Log.e(TAG, "Index out of mEditTextList boundrary, should not happen"); - //瓒婄晫鎶婂伓鍋 } View view = getListItem(text, index); mEditTextList.addView(view, index); - //寤虹珛涓涓柊鐨勮鍥惧苟娣诲姞鍒扮紪杈戞枃鏈鍐 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.requestFocus();//璇锋眰浼樺厛鎿嶄綔 - edit.setSelection(0);//瀹氫綅鍒拌捣濮嬩綅缃 + edit.requestFocus(); + edit.setSelection(0); for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i); - //閬嶅巻瀛愭枃鏈骞惰缃搴斿涓嬫爣 } } - /* - * 鍑芥暟鍔熻兘锛氬垏鎹㈣嚦鍒楄〃妯″紡 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void switchToListMode(String text) { mEditTextList.removeAllViews(); String[] items = text.split("\n"); int index = 0; - //娓呯┖鎵鏈夎鍥撅紝鍒濆鍖栦笅鏍 for (String item : items) { if(!TextUtils.isEmpty(item)) { mEditTextList.addView(getListItem(item, index)); index++; - //閬嶅巻鎵鏈夋枃鏈崟鍏冨苟娣诲姞鍒版枃鏈涓 } } mEditTextList.addView(getListItem("", index)); mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); - //浼樺厛璇锋眰姝ゆ搷浣 mNoteEditor.setVisibility(View.GONE); - //渚跨缂栬緫鍣ㄤ笉鍙 mEditTextList.setVisibility(View.VISIBLE); - //灏嗘枃鏈紪杈戞缃负鍙 } - /* - * 鍑芥暟鍔熻兘锛氳幏鍙栭珮浜晥鏋滅殑鍙嶉鎯呭喌 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private Spannable getHighlightQueryResult(String fullText, String userQuery) { SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); - //鏂板缓涓涓晥鏋滈夐」 if (!TextUtils.isEmpty(userQuery)) { mPattern = Pattern.compile(userQuery); - //灏嗙敤鎴风殑璇㈤棶杩涜瑙ｆ瀽 Matcher m = mPattern.matcher(fullText); - //寤虹珛涓涓姸鎬佹満妫鏌attern骞惰繘琛屽尮閰 int start = 0; while (m.find(start)) { spannable.setSpan( new BackgroundColorSpan(this.getResources().getColor( R.color.user_query_highlight)), m.start(), m.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - //璁剧疆鑳屾櫙棰滆壊 start = m.end(); - //璺熸柊璧峰浣嶇疆 } } return spannable; } - /* - * 鍑芥暟鍔熻兘锛氳幏鍙栧垪琛ㄩ」 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private View getListItem(String item, int index) { View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); - //鍒涘缓涓涓鍥 final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); - //鍒涘缓涓涓枃鏈紪杈戞骞惰缃彲瑙佹 CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -887,15 +739,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } }); - //寤虹珛涓涓墦閽╂骞惰缃洃鍚櫒 if (item.startsWith(TAG_CHECKED)) { - //閫夋嫨鍕鹃 cb.setChecked(true); edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); item = item.substring(TAG_CHECKED.length(), item.length()).trim(); } else if (item.startsWith(TAG_UNCHECKED)) { - //閫夋嫨涓嶅嬀閫 cb.setChecked(false); edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); @@ -904,94 +753,61 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit.setOnTextViewChangeListener(this); edit.setIndex(index); edit.setText(getHighlightQueryResult(item, mUserQuery)); - //杩愯缂栬緫妗嗙殑鐩戝惉鍣ㄥ璇ヨ涓轰綔鍑哄弽搴旓紝骞惰缃笅鏍囧強鏂囨湰鍐呭 return view; } - /* - * 鍑芥暟鍔熻兘锛氫究绛惧唴瀹瑰彂鐢熸敼鍙樻墍 瑙﹀彂鐨勪簨浠 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public void onTextChange(int index, boolean hasText) { if (index >= mEditTextList.getChildCount()) { Log.e(TAG, "Wrong index, should not happen"); return; - //瓒婄晫鎶ラ敊 } if(hasText) { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); } else { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); } - //濡傛灉鍐呭涓嶄负绌哄垯灏嗗叾瀛愮紪杈戞鍙鎬х疆涓哄彲瑙侊紝鍚﹀垯涓嶅彲瑙 } - /* - * 鍑芥暟鍔熻兘锛氭鏌ユā寮忓拰鍒楄〃妯″紡鐨勫垏鎹 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public void onCheckListModeChanged(int oldMode, int newMode) { if (newMode == TextNote.MODE_CHECK_LIST) { switchToListMode(mNoteEditor.getText().toString()); - //妫鏌ユā寮忓垏鎹㈠埌鍒楄〃妯″紡 } else { if (!getWorkingText()) { mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); } - //鑻ユ槸鑾峰彇鍒版枃鏈氨鏀瑰彉鍏舵鏌ユ爣璁 mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); - //淇敼鏂囨湰缂栬緫鍣ㄧ殑鍐呭鍜屽彲瑙佹 } } - /* - * 鍑芥暟鍔熻兘锛氳缃嬀閫夐夐」琛ㄥ苟杩斿洖鏄惁鍕鹃夌殑鏍囪 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private boolean getWorkingText() { boolean hasChecked = false; - //鍒濆鍖朿heck鏍囪 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - // 鑻ユā寮忎负CHECK_LIST StringBuilder sb = new StringBuilder(); - //鍒涘缓鍙彉瀛楃涓 for (int i = 0; i < mEditTextList.getChildCount(); i++) { View view = mEditTextList.getChildAt(i); - //閬嶅巻鎵鏈夊瓙缂栬緫妗嗙殑瑙嗗浘 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); if (!TextUtils.isEmpty(edit.getText())) { - //鑻ユ枃鏈笉涓虹┖ if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { - //璇ラ夐」妗嗗凡鎵撻挬 sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); hasChecked = true; - //鎵╁睍瀛楃涓蹭负宸叉墦閽╁苟鎶婃爣璁扮疆true } else { sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); - //鎵╁睍瀛楃涓叉坊鍔犳湭鎵撻挬 } } } mWorkingNote.setWorkingText(sb.toString()); - //鍒╃敤缂栬緫濂界殑瀛楃涓茶缃繍琛屼究绛剧殑鍐呭 } else { mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); - // 鑻ヤ笉鏄妯″紡鐩存帴鐢ㄧ紪杈戝櫒涓殑鍐呭璁剧疆杩愯涓爣绛剧殑鍐呭 } return hasChecked; } - /* - * 鍑芥暟鍔熻兘锛氫繚瀛樹究绛 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private boolean saveNote() { getWorkingText(); boolean saved = mWorkingNote.saveNote(); - //杩愯 getWorkingText()涔嬪悗淇濆瓨 if (saved) { /** * There are two modes from List view to edit view, open one note, @@ -1000,16 +816,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, * new node requires to the top of the list. This code * {@link #RESULT_OK} is used to identify the create/edit state */ - //濡傝嫳鏂囨敞閲婃墍璇撮摼鎺ESULT_OK鏄负浜嗚瘑鍒繚瀛樼殑2绉嶆儏鍐碉紝涓鏄垱寤哄悗淇濆瓨锛屼簩鏄慨鏀瑰悗淇濆瓨 setResult(RESULT_OK); } return saved; } - /* - * 鍑芥暟鍔熻兘锛氬皢渚跨鍙戦佽嚦妗岄潰 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void sendToDesktop() { /** * Before send message to home, we should make sure that current @@ -1018,16 +829,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, */ if (!mWorkingNote.existInDatabase()) { saveNote(); - //鑻ヤ笉瀛樺湪鏁版嵁涔熷氨鏄柊鐨勬爣绛惧氨淇濆瓨璧锋潵鍏 } if (mWorkingNote.getNoteId() > 0) { - //鑻ユ槸鏈夊唴瀹 Intent sender = new Intent(); Intent shortcutIntent = new Intent(this, NoteEditActivity.class); - //寤虹珛鍙戦佸埌妗岄潰鐨勮繛鎺ュ櫒 shortcutIntent.setAction(Intent.ACTION_VIEW); - //閾炬帴涓轰竴涓鍥 shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); sender.putExtra(Intent.EXTRA_SHORTCUT_NAME, @@ -1035,12 +842,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app)); sender.putExtra("duplicate", true); - //灏嗕究绛剧殑鐩稿叧淇℃伅閮芥坊鍔犲埌瑕佸彂閫佺殑鏂囦欢閲 sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); - //璁剧疆sneder鐨勮涓烘槸鍙戦 showToast(R.string.info_note_enter_desktop); sendBroadcast(sender); - //鏄剧ず鍒版闈 } else { /** * There is the condition that user has input nothing (the note is @@ -1049,35 +853,21 @@ public class NoteEditActivity extends Activity implements OnClickListener, */ Log.e(TAG, "Send to desktop error"); showToast(R.string.error_note_empty_for_send_to_desktop); - //绌轰究绛剧洿鎺ユ姤閿 } } - /* - * 鍑芥暟鍔熻兘锛氱紪杈戝皬鍥炬爣鐨勬爣棰 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private String makeShortcutIconTitle(String content) { content = content.replace(TAG_CHECKED, ""); content = content.replace(TAG_UNCHECKED, ""); return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, SHORTCUT_ICON_TITLE_MAX_LEN) : content; - //鐩存帴璁剧疆涓篶ontent涓殑鍐呭骞惰繑鍥烇紝鏈夊嬀閫夊拰鏈嬀閫2绉 } - /* - * 鍑芥暟鍔熻兘锛氭樉绀烘彁绀虹殑瑙嗗浘 - * 鍑芥暟瀹炵幇锛氭牴鎹笅鏍囨樉绀哄搴旂殑鎻愮ず - */ private void showToast(int resId) { showToast(resId, Toast.LENGTH_SHORT); } - /* - * 鍑芥暟鍔熻兘锛氭寔缁樉绀烘彁绀虹殑瑙嗗浘 - * 鍑芥暟瀹炵幇锛氭牴鎹笅鏍囧拰鎸佺画鐨勬椂闂达紙duration锛夌紪杈戞彁绀鸿鍥惧苟鏄剧ず - */ private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } -} \ No newline at end of file +} diff --git a/MiNote/src/net/micode/notes/ui/NoteItemData.java b/MiNote/src/net/micode/notes/ui/NoteItemData.java index 2a48593..0f5a878 100644 --- a/MiNote/src/net/micode/notes/ui/NoteItemData.java +++ b/MiNote/src/net/micode/notes/ui/NoteItemData.java @@ -28,20 +28,20 @@ import net.micode.notes.tool.DataUtils; public class NoteItemData { static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.ALERTED_DATE, - NoteColumns.BG_COLOR_ID, - NoteColumns.CREATED_DATE, - NoteColumns.HAS_ATTACHMENT, - NoteColumns.MODIFIED_DATE, - NoteColumns.NOTES_COUNT, - NoteColumns.PARENT_ID, - NoteColumns.SNIPPET, - NoteColumns.TYPE, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, + NoteColumns.ID, + NoteColumns.ALERTED_DATE, + NoteColumns.BG_COLOR_ID, + NoteColumns.CREATED_DATE, + NoteColumns.HAS_ATTACHMENT, + NoteColumns.MODIFIED_DATE, + NoteColumns.NOTES_COUNT, + NoteColumns.PARENT_ID, + NoteColumns.SNIPPET, + NoteColumns.TYPE, + NoteColumns.WIDGET_ID, + NoteColumns.WIDGET_TYPE, }; - //甯搁噺鏍囪鍜屾暟鎹氨涓嶄竴涓鏍囪浜嗭紝鎰忎箟缈昏瘧鍩烘湰灏辩煡閬 + private static final int ID_COLUMN = 0; private static final int ALERTED_DATE_COLUMN = 1; private static final int BG_COLOR_ID_COLUMN = 2; @@ -75,9 +75,8 @@ public class NoteItemData { private boolean mIsOnlyOneItem; private boolean mIsOneNoteFollowingFolder; private boolean mIsMultiNotesFollowingFolder; - //鍒濆鍖朜oteItemData锛屼富瑕佸埄鐢ㄥ厜鏍嘽ursor鑾峰彇鐨勪笢瑗 - public NoteItemData(Context context, Cursor cursor) { - //getxxx涓鸿浆鎹㈡牸寮 + + public NoteItemData(Context context, Cursor cursor) { mId = cursor.getLong(ID_COLUMN); mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN); mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN); @@ -93,11 +92,10 @@ public class NoteItemData { mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); - //鍒濆鍖栫數璇濆彿鐮佺殑淇℃伅 mPhoneNumber = ""; if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId); - if (!TextUtils.isEmpty(mPhoneNumber)) {//mphonenumber閲屾湁绗﹀悎瀛楃涓诧紝鍒欑敤contart鍔熻兘杩炴帴 + if (!TextUtils.isEmpty(mPhoneNumber)) { mName = Contact.getContact(context, mPhoneNumber); if (mName == null) { mName = mPhoneNumber; @@ -110,35 +108,32 @@ public class NoteItemData { } checkPostion(cursor); } - ///鏍规嵁榧犳爣鐨勪綅缃缃爣璁帮紝鍜屼綅缃 + private void checkPostion(Cursor cursor) { - //鍒濆鍖栧嚑涓爣璁帮紝cursor鍏蜂綋鍔熻兘绗旇涓凡鎻愬埌锛屼笉涓涓鍙欒堪 mIsLastItem = cursor.isLast() ? true : false; mIsFirstItem = cursor.isFirst() ? true : false; mIsOnlyOneItem = (cursor.getCount() == 1); - //鍒濆鍖栤滃閲嶅瓙鏂囦欢鈥濃滃崟涓瀛愭枃浠垛2涓爣璁 mIsMultiNotesFollowingFolder = false; mIsOneNoteFollowingFolder = false; - //涓昏鏄缃笂璇2鏍囪 - if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//鑻ユ槸note鏍煎紡骞朵笖涓嶆槸绗竴涓厓绱 + if (mType == Notes.TYPE_NOTE && !mIsFirstItem) { int position = cursor.getPosition(); - if (cursor.moveToPrevious()) {//鑾峰彇鍏夋爣浣嶇疆鍚庣湅涓婁竴琛 + if (cursor.moveToPrevious()) { if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER - || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//鑻ュ厜鏍囨弧瓒崇郴缁熸垨note鏍煎紡 + || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) { if (cursor.getCount() > (position + 1)) { - mIsMultiNotesFollowingFolder = true;//鑻ユ槸鏁版嵁琛屾暟澶т簬浣嗗墠浣嶇疆+1鍒欒缃垚姝ｇ‘ + mIsMultiNotesFollowingFolder = true; } else { - mIsOneNoteFollowingFolder = true;//鍚﹀垯鍗曚竴鏂囦欢澶规爣璁颁负true + mIsOneNoteFollowingFolder = true; } } - if (!cursor.moveToNext()) {//鑻ヤ笉鑳藉啀寰涓嬭蛋鍒欐姤閿 + if (!cursor.moveToNext()) { throw new IllegalStateException("cursor move to previous but can't move back"); } } } } - ///浠ヤ笅閮芥槸鑾峰彇鏍囪娌′粈涔堝ソ璇寸殑锛屼笉杩囧掓暟绗簩涓渶瑕佽鏄庝笅锛屽緢鍏蜂綋鐪嬩笅闈 + public boolean isOneFollowingFolder() { return mIsOneNoteFollowingFolder; } @@ -219,7 +214,6 @@ public class NoteItemData { return (mAlertDate > 0); } - //鑻ユ暟鎹埗id涓轰繚瀛樿嚦鏂囦欢澶规ā寮忕殑id涓旀弧瓒崇數璇濆彿鐮佸崟鍏冧笉涓虹┖锛屽垯isCallRecord涓簍rue public boolean isCallRecord() { return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber)); } @@ -227,4 +221,4 @@ public class NoteItemData { public static int getNoteType(Cursor cursor) { return cursor.getInt(TYPE_COLUMN); } -} \ No newline at end of file +} diff --git a/MiNote/src/net/micode/notes/ui/NotesListAdapter.java b/MiNote/src/net/micode/notes/ui/NotesListAdapter.java index 524dd3c..51c9cb9 100644 --- a/MiNote/src/net/micode/notes/ui/NotesListAdapter.java +++ b/MiNote/src/net/micode/notes/ui/NotesListAdapter.java @@ -23,7 +23,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CursorAdapter; - import net.micode.notes.data.Notes; import java.util.Collection; @@ -32,94 +31,55 @@ import java.util.HashSet; import java.util.Iterator; -/* - * 鍔熻兘锛氱洿璇戜负渚跨琛ㄨ繛鎺ュ櫒锛岀户鎵夸簡CursorAdapter锛屽畠涓篶ursor鍜孡istView鎻愪緵浜嗚繛鎺ョ殑妗ユ銆 - * 鎵浠otesListAdapter瀹炵幇鐨勬槸榧犳爣鍜岀紪杈戜究绛鹃摼鎺ョ殑妗ユ - */ public class NotesListAdapter extends CursorAdapter { private static final String TAG = "NotesListAdapter"; private Context mContext; private HashMap mSelectedIndex; - private int mNotesCount; //渚跨鏁 - private boolean mChoiceMode; //閫夋嫨妯″紡鏍囪 + private int mNotesCount; + private boolean mChoiceMode; - /* - * 妗岄潰widget鐨勫睘鎬э紝鍖呮嫭缂栧彿鍜岀被鍨 - */ public static class AppWidgetAttribute { public int widgetId; public int widgetType; }; - /* - * 鍑芥暟鍔熻兘锛氬垵濮嬪寲渚跨閾炬帴鍣 - * 鍑芥暟瀹炵幇锛氭牴鎹紶杩涙潵鐨勫唴瀹硅缃浉鍏冲彉閲 - */ public NotesListAdapter(Context context) { - super(context, null); //鐖剁被瀵硅薄缃┖ - mSelectedIndex = new HashMap(); //鏂板缓閫夐」涓嬫爣鐨刪ash琛 + super(context, null); + mSelectedIndex = new HashMap(); mContext = context; mNotesCount = 0; } @Override - /* - * 鍑芥暟鍔熻兘锛氭柊寤轰竴涓鍥炬潵瀛樺偍鍏夋爣鎵鎸囧悜鐨勬暟鎹 - * 鍑芥暟瀹炵幇锛氫娇鐢ㄥ厔寮熺被NotesListItem鏂板缓涓涓」鐩夐」 - */ public View newView(Context context, Cursor cursor, ViewGroup parent) { return new NotesListItem(context); } - /* - * 鍑芥暟鍔熻兘锛氬皢宸茬粡瀛樺湪鐨勮鍥惧拰榧犳爣鎸囧悜鐨勬暟鎹繘琛屾崋缁 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ @Override public void bindView(View view, Context context, Cursor cursor) { if (view instanceof NotesListItem) { - //鑻iew鏄疦otesListItem鐨勪竴涓疄渚 NoteItemData itemData = new NoteItemData(context, cursor); ((NotesListItem) view).bind(context, itemData, mChoiceMode, isSelectedItem(cursor.getPosition())); - //鍒欐柊寤轰竴涓」鐩夐」骞朵笖鐢╞ind璺熷皢view鍜岄紶鏍囷紝鍐呭锛屼究绛炬暟鎹崋缁戝湪涓璧 } } - /* - * 鍑芥暟鍔熻兘锛氳缃嬀閫夋 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public void setCheckedItem(final int position, final boolean checked) { mSelectedIndex.put(position, checked); - //鏍规嵁瀹氫綅鍜屾槸鍚﹀嬀閫夎缃笅鏍 notifyDataSetChanged(); - //鍦ㄤ慨鏀瑰悗鍒锋柊activity } - /* - * 鍑芥暟鍔熻兘锛氬垽鏂崟閫夋寜閽槸鍚﹀嬀閫 - */ public boolean isInChoiceMode() { return mChoiceMode; } - /* - * 鍑芥暟鍔熻兘锛氳缃崟椤归夐」妗 - * 鍑芥暟瀹炵幇锛氶噸缃笅鏍囧苟涓旀牴鎹弬鏁癿ode璁剧疆閫夐」 - */ public void setChoiceMode(boolean mode) { mSelectedIndex.clear(); mChoiceMode = mode; } - /* - * 鍑芥暟鍔熻兘锛氶夋嫨鍏ㄩ儴閫夐」 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public void selectAll(boolean checked) { Cursor cursor = getCursor(); - //鑾峰彇鍏夋爣浣嶇疆 for (int i = 0; i < getCount(); i++) { if (cursor.moveToPosition(i)) { if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) { @@ -127,47 +87,30 @@ public class NotesListAdapter extends CursorAdapter { } } } - //閬嶅巻鎵鏈夊厜鏍囧彲鐢ㄧ殑浣嶇疆鍦ㄥ垽鏂负渚跨绫诲瀷涔嬪悗鍕鹃夊崟椤规 } - /* - * 鍑芥暟鍔熻兘锛氬缓绔嬮夋嫨椤圭殑涓嬫爣鍒楄〃 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public HashSet getSelectedItemIds() { HashSet itemSet = new HashSet(); - //寤虹珛hash琛 for (Integer position : mSelectedIndex.keySet()) { - //閬嶅巻鎵鏈夌殑鍏抽敭 if (mSelectedIndex.get(position) == true) { - //鑻ュ厜鏍囦綅缃彲鐢 Long id = getItemId(position); if (id == Notes.ID_ROOT_FOLDER) { - //鍘熸枃浠朵笉闇瑕佹坊鍔 Log.d(TAG, "Wrong item id, should not happen"); } else { itemSet.add(id); } - //鍒欏皢id璇ヤ笅鏍囧亣濡傞夐」闆嗗悎涓 - } } return itemSet; } - /* - * 鍑芥暟鍔熻兘锛氬缓绔嬫闈idget鐨勯夐」琛 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public HashSet getSelectedWidget() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { if (mSelectedIndex.get(position) == true) { Cursor c = (Cursor) getItem(position); - //浠ヤ笂4鍙ュ拰getSelectedItemIds涓鏍凤紝涓嶅啀閲嶅 if (c != null) { - //鍏夋爣浣嶇疆鍙敤鐨勮瘽灏卞缓绔嬫柊鐨刉idget灞炴у苟缂栬緫涓嬫爣鍜岀被鍨嬶紝鏈鍚庢坊鍔犲埌閫夐」闆嗕腑 AppWidgetAttribute widget = new AppWidgetAttribute(); NoteItemData item = new NoteItemData(mContext, c); widget.widgetId = item.getWidgetId(); @@ -185,42 +128,26 @@ public class NotesListAdapter extends CursorAdapter { return itemSet; } - /* - * 鍑芥暟鍔熻兘锛氳幏鍙栭夐」涓暟 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public int getSelectedCount() { Collection values = mSelectedIndex.values(); - //棣栧厛鑾峰彇閫夐」涓嬫爣鐨勫 if (null == values) { return 0; } Iterator iter = values.iterator(); - //鍒濆鍖栧彔鍔犲櫒 int count = 0; while (iter.hasNext()) { if (true == iter.next()) { - //鑻alue鍊间负鐪熻鏁+1 count++; } } return count; } - /* - * 鍑芥暟鍔熻兘锛氬垽鏂槸鍚﹀叏閮ㄩ変腑 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public boolean isAllSelected() { int checkedCount = getSelectedCount(); return (checkedCount != 0 && checkedCount == mNotesCount); - //鑾峰彇閫夐」鏁扮湅鏄惁绛変簬渚跨鐨勪釜鏁 } - /* - * 鍑芥暟鍔熻兘锛氬垽鏂槸鍚︿负閫夐」琛 - * 鍑芥暟瀹炵幇锛氶氳繃浼犻掔殑涓嬫爣鏉ョ‘瀹 - */ public boolean isSelectedItem(final int position) { if (null == mSelectedIndex.get(position)) { return false; @@ -229,45 +156,29 @@ public class NotesListAdapter extends CursorAdapter { } @Override - /* - * 鍑芥暟鍔熻兘锛氬湪activity鍐呭鍙戠敓灞閮ㄥ彉鍔ㄧ殑鏃跺欏洖璋冭鍑芥暟璁＄畻渚跨鐨勬暟閲 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ protected void onContentChanged() { super.onContentChanged(); - //鎵ц鍩虹被鍑芥暟 calcNotesCount(); } @Override - /* - * 鍑芥暟鍔熻兘锛氬湪activity鍏夋爣鍙戠敓灞閮ㄥ彉鍔ㄧ殑鏃跺欏洖璋冭鍑芥暟璁＄畻渚跨鐨勬暟閲 - */ public void changeCursor(Cursor cursor) { super.changeCursor(cursor); - //鎵ц鍩虹被鍑芥暟 calcNotesCount(); } - /* - * 鍑芥暟鍔熻兘锛氳绠椾究绛炬暟閲 - * - */ private void calcNotesCount() { mNotesCount = 0; for (int i = 0; i < getCount(); i++) { - //鑾峰彇鎬绘暟鍚屾椂閬嶅巻 Cursor c = (Cursor) getItem(i); if (c != null) { if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) { mNotesCount++; - //鑻ヨ浣嶇疆涓嶄负绌哄苟涓旀枃鏈被鍨嬩负渚跨灏+1 } } else { Log.e(TAG, "Invalid cursor"); return; } - //鍚﹀垯鎶ラ敊 } } -} \ No newline at end of file +} diff --git a/MiNote/src/net/micode/notes/ui/NotesListItem.java b/MiNote/src/net/micode/notes/ui/NotesListItem.java index 81c356a..1221e80 100644 --- a/MiNote/src/net/micode/notes/ui/NotesListItem.java +++ b/MiNote/src/net/micode/notes/ui/NotesListItem.java @@ -30,43 +30,37 @@ import net.micode.notes.tool.DataUtils; import net.micode.notes.tool.ResourceParser.NoteItemBgResources; -//鍒涘缓渚跨鍒楄〃椤圭洰閫夐」 public class NotesListItem extends LinearLayout { - private ImageView mAlert;//闂归挓鍥剧墖 - private TextView mTitle; //鏍囬 - private TextView mTime; //鏃堕棿 - private TextView mCallName; // - private NoteItemData mItemData; //鏍囩鏁版嵁 - private CheckBox mCheckBox; //鎵撻挬妗 + private ImageView mAlert; + private TextView mTitle; + private TextView mTime; + private TextView mCallName; + private NoteItemData mItemData; + private CheckBox mCheckBox; - /*鍒濆鍖栧熀鏈俊鎭*/ public NotesListItem(Context context) { - super(context); //super()瀹冪殑涓昏浣滅敤鏄皟鏁磋皟鐢ㄧ埗绫绘瀯閫犲嚱鏁扮殑椤哄簭 - inflate(context, R.layout.note_item, this);//Inflate鍙敤浜庡皢涓涓獂ml涓畾涔夌殑甯冨眬鎺т欢鎵惧嚭鏉,杩欓噷鐨剎ml鏄痳銆俵ayout - //findViewById鐢ㄤ簬浠巆ontentView涓煡鎵炬寚瀹欼D鐨刅iew锛岃浆鎹㈠嚭鏉ョ殑褰㈠紡鏍规嵁闇瑕佽屽畾; + super(context); + inflate(context, R.layout.note_item, this); mAlert = (ImageView) findViewById(R.id.iv_alert_icon); mTitle = (TextView) findViewById(R.id.tv_title); mTime = (TextView) findViewById(R.id.tv_time); mCallName = (TextView) findViewById(R.id.tv_name); mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); } - ///鏍规嵁data鐨勫睘鎬у鍚勪釜鎺т欢鐨勫睘鎬х殑鎺у埗锛屼富瑕佹槸鍙鎬isibility锛屽唴瀹箂etText锛屾牸寮弒etTextAppearance + public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { if (choiceMode && data.getType() == Notes.TYPE_NOTE) { - mCheckBox.setVisibility(View.VISIBLE); ///璁剧疆鍙琛屼负鍙 - mCheckBox.setChecked(checked); ///鏍煎瓙鎵撻挬 + mCheckBox.setVisibility(View.VISIBLE); + mCheckBox.setChecked(checked); } else { mCheckBox.setVisibility(View.GONE); } mItemData = data; - ///璁剧疆鎺т欢灞炴э紝涓鍏变笁绉嶆儏鍐碉紝鐢眃ata鐨刬d鍜岀埗id鏄惁涓庝繚瀛樺埌鏂囦欢澶圭殑id涓鑷存潵鍐冲畾 if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { mCallName.setVisibility(View.GONE); mAlert.setVisibility(View.VISIBLE); - //璁剧疆璇extview鐨剆tyle mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); - //settext涓鸿缃唴瀹 mTitle.setText(context.getString(R.string.call_record_folder_name) + context.getString(R.string.format_folder_files_count, data.getNotesCount())); mAlert.setImageResource(R.drawable.call_record); @@ -75,9 +69,8 @@ public class NotesListItem extends LinearLayout { mCallName.setText(data.getCallName()); mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem); mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - ///鍏充簬闂归挓鐨勮缃 if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock);//鍥剧墖鏉ユ簮鐨勮缃 + mAlert.setImageResource(R.drawable.clock); mAlert.setVisibility(View.VISIBLE); } else { mAlert.setVisibility(View.GONE); @@ -85,48 +78,45 @@ public class NotesListItem extends LinearLayout { } else { mCallName.setVisibility(View.GONE); mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); - ///璁剧疆title鏍煎紡 + if (data.getType() == Notes.TYPE_FOLDER) { mTitle.setText(data.getSnippet() + context.getString(R.string.format_folder_files_count, - data.getNotesCount())); + data.getNotesCount())); mAlert.setVisibility(View.GONE); } else { mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock);///璁剧疆鍥剧墖鏉ユ簮 + mAlert.setImageResource(R.drawable.clock); mAlert.setVisibility(View.VISIBLE); } else { mAlert.setVisibility(View.GONE); } } } - ///璁剧疆鍐呭锛岃幏鍙栫浉鍏虫椂闂达紝浠巇ata閲岀紪杈戠殑鏃ユ湡涓幏鍙 - mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); + mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); setBackground(data); } - //鏍规嵁data鐨勬枃浠跺睘鎬ф潵璁剧疆鑳屾櫙 + private void setBackground(NoteItemData data) { int id = data.getBgColorId(); - //锛岃嫢鏄痭ote鍨嬫枃浠讹紝鍒4绉嶆儏鍐碉紝瀵逛簬4绉嶄笉鍚屾儏鍐电殑鑳屾櫙鏉ユ簮 if (data.getType() == Notes.TYPE_NOTE) { - //鍗曚釜鏁版嵁骞朵笖鍙湁涓涓瓙鏂囦欢澶 if (data.isSingle() || data.isOneFollowingFolder()) { setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); - } else if (data.isLast()) {//鏄渶鍚庝竴涓暟鎹 + } else if (data.isLast()) { setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id)); - } else if (data.isFirst() || data.isMultiFollowingFolder()) {//鏄竴涓暟鎹苟鏈夊涓瓙鏂囦欢澶 + } else if (data.isFirst() || data.isMultiFollowingFolder()) { setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id)); } else { setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); } } else { - //鑻ヤ笉鏄痭ote鐩存帴璋冪敤鏂囦欢澶圭殑鑳屾櫙鏉ユ簮 setBackgroundResource(NoteItemBgResources.getFolderBgRes()); } } + public NoteItemData getItemData() { return mItemData; } -} \ No newline at end of file +} diff --git a/MiNote/src/net/micode/notes/ui/NotesPreferenceActivity.java b/MiNote/src/net/micode/notes/ui/NotesPreferenceActivity.java index 7c9e2ef..07c5f7e 100644 --- a/MiNote/src/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/MiNote/src/net/micode/notes/ui/NotesPreferenceActivity.java @@ -47,92 +47,66 @@ import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; -/* - *璇ョ被鍔熻兘锛歂otesPreferenceActivity锛屽湪灏忕背渚跨涓富瑕佸疄鐜扮殑鏄鑳屾櫙棰滆壊鍜屽瓧浣撳ぇ灏忕殑鏁版嵁鍌ㄥ瓨銆 - * 缁ф壙浜哖referenceActivity涓昏鍔熻兘涓哄绯荤粺淇℃伅鍜岄厤缃繘琛岃嚜鍔ㄤ繚瀛樼殑Activity - */ + public class NotesPreferenceActivity extends PreferenceActivity { public static final String PREFERENCE_NAME = "notes_preferences"; - //浼樺厛鍚 + public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name"; - //鍚屾璐﹀彿 + public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time"; - //鍚屾鏃堕棿 + public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear"; private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key"; - //鍚屾瀵嗙爜 + private static final String AUTHORITIES_FILTER_KEY = "authorities"; - //鏈湴瀵嗙爜 + private PreferenceCategory mAccountCategory; - //璐︽埛鍒嗙粍 + private GTaskReceiver mReceiver; - //鍚屾浠诲姟鎺ユ敹鍣 + private Account[] mOriAccounts; - //璐︽埛 + private boolean mHasAddedAccount; - //璐︽埛鐨刪ash鏍囪 @Override - /* - *鍑芥暟鍔熻兘锛氬垱寤轰竴涓猘ctivity锛屽湪鍑芥暟閲岃瀹屾垚鎵鏈夌殑姝ｅ父闈欐佽缃 - *鍙傛暟锛欱undle icicle锛氬瓨鏀句簡 activity 褰撳墠鐨勭姸鎬 - *鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ protected void onCreate(Bundle icicle) { - //鍏堟墽琛岀埗绫荤殑鍒涘缓鍑芥暟 super.onCreate(icicle); /* using the app icon for navigation */ getActionBar().setDisplayHomeAsUpEnabled(true); - //缁欏乏涓婅鍥炬爣鐨勫乏杈瑰姞涓婁竴涓繑鍥炵殑鍥炬爣 addPreferencesFromResource(R.xml.preferences); - //娣诲姞xml鏉ユ簮骞舵樉绀 xml mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); - //鏍规嵁鍚屾璐︽埛鍏抽敭鐮佹潵鍒濆鍖栧垎缁 mReceiver = new GTaskReceiver(); IntentFilter filter = new IntentFilter(); filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); registerReceiver(mReceiver, filter); - //鍒濆鍖栧悓姝ョ粍浠 mOriAccounts = null; View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); - //鑾峰彇listvivew锛孡istView鐨勪綔鐢:鐢ㄤ簬鍒楀嚭鎵鏈夐夋嫨 getListView().addHeaderView(header, null, true); - //鍦╨istview缁勪欢涓婃柟娣诲姞鍏朵粬缁勪欢 } @Override - /* - * 鍑芥暟鍔熻兘锛歛ctivity浜や簰鍔熻兘鐨勫疄鐜帮紝鐢ㄤ簬鎺ュ彈鐢ㄦ埛鐨勮緭鍏 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ protected void onResume() { - //鍏堟墽琛岀埗绫 鐨勪氦浜掑疄鐜 super.onResume(); // need to set sync account automatically if user has added a new // account if (mHasAddedAccount) { - //鑻ョ敤鎴锋柊鍔犱簡璐︽埛鍒欒嚜鍔ㄨ缃悓姝ヨ处鎴 Account[] accounts = getGoogleAccounts(); - //鑾峰彇google鍚屾璐︽埛 if (mOriAccounts != null && accounts.length > mOriAccounts.length) { - //鑻ュ師璐︽埛涓嶄负绌轰笖褰撳墠璐︽埛鏈夊鍔 for (Account accountNew : accounts) { boolean found = false; for (Account accountOld : mOriAccounts) { if (TextUtils.equals(accountOld.name, accountNew.name)) { - //鏇存柊璐︽埛 found = true; break; } } if (!found) { setSyncAccount(accountNew.name); - //鑻ユ槸娌℃湁鎵惧埌鏃х殑璐︽埛锛岄偅涔堝悓姝ヨ处鍙蜂腑灏卞彧娣诲姞鏂拌处鎴 break; } } @@ -140,52 +114,35 @@ public class NotesPreferenceActivity extends PreferenceActivity { } refreshUI(); - //鍒锋柊鏍囩鐣岄潰 } @Override - /* - * 鍑芥暟鍔熻兘锛氶攢姣佷竴涓猘ctivity - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ protected void onDestroy() { if (mReceiver != null) { unregisterReceiver(mReceiver); - //娉ㄩ攢鎺ユ敹鍣 } super.onDestroy(); - //鎵ц鐖剁被鐨勯攢姣佸姩浣 } - /* - * 鍑芥暟鍔熻兘锛氶噸鏂拌缃处鎴蜂俊鎭 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void loadAccountPreference() { mAccountCategory.removeAll(); - //閿姣佹墍鏈夌殑鍒嗙粍 + Preference accountPref = new Preference(this); - //寤虹珛棣栭夐」 final String defaultAccount = getSyncAccountName(this); accountPref.setTitle(getString(R.string.preferences_account_title)); accountPref.setSummary(getString(R.string.preferences_account_summary)); - //璁剧疆棣栭夐」鐨勫ぇ鏍囬鍜屽皬鏍囬 accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) { - //寤虹珛鐩戝惉鍣 if (!GTaskSyncService.isSyncing()) { if (TextUtils.isEmpty(defaultAccount)) { // the first time to set account - //鑻ユ槸绗竴娆″缓绔嬭处鎴锋樉绀洪夋嫨璐︽埛鎻愮ず瀵硅瘽妗 showSelectAccountAlertDialog(); } else { // if the account has already been set, we need to promp // user about the risk - //鑻ユ槸宸茬粡寤虹珛鍒欐樉绀轰慨鏀瑰璇濇骞惰繘琛屼慨鏀规搷浣 showChangeAccountConfirmAlertDialog(); } } else { - //鑻ュ湪娌℃湁鍚屾鐨勬儏鍐典笅锛屽垯鍦╰oast涓樉绀轰笉鑳戒慨鏀 Toast.makeText(NotesPreferenceActivity.this, R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) .show(); @@ -194,29 +151,21 @@ public class NotesPreferenceActivity extends PreferenceActivity { } }); - //鏍规嵁鏂板缓棣栭夐」缂栬緫鏂扮殑璐︽埛鍒嗙粍 mAccountCategory.addPreference(accountPref); } - /* - *鍑芥暟鍔熻兘锛氳缃寜閿殑鐘舵佸拰鏈鍚庡悓姝ョ殑鏃堕棿 - *鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void loadSyncButton() { Button syncButton = (Button) findViewById(R.id.preference_sync_button); TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); - //鑾峰彇鍚屾鎸夐挳鎺т欢鍜屾渶缁堝悓姝ユ椂闂寸殑鐨勭獥鍙 + // set button state - //璁剧疆鎸夐挳鐨勭姸鎬 if (GTaskSyncService.isSyncing()) { - //鑻ユ槸鍦ㄥ悓姝ョ姸鎬佷笅 syncButton.setText(getString(R.string.preferences_button_sync_cancel)); syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { GTaskSyncService.cancelSync(NotesPreferenceActivity.this); } }); - //璁剧疆鎸夐挳鏄剧ず鐨勬枃鏈负鈥滃彇娑堝悓姝モ濅互鍙婄洃鍚櫒 } else { syncButton.setText(getString(R.string.preferences_button_sync_immediately)); syncButton.setOnClickListener(new View.OnClickListener() { @@ -224,67 +173,50 @@ public class NotesPreferenceActivity extends PreferenceActivity { GTaskSyncService.startSync(NotesPreferenceActivity.this); } }); - //鑻ユ槸涓嶅悓姝ュ垯璁剧疆鎸夐挳鏄剧ず鐨勬枃鏈负鈥滅珛鍗冲悓姝モ濅互鍙婂搴旂洃鍚櫒 } syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); - //璁剧疆鎸夐敭鍙敤杩樻槸涓嶅彲鐢 // set last sync time - // 璁剧疆鏈缁堝悓姝ユ椂闂 if (GTaskSyncService.isSyncing()) { - //鑻ユ槸鍦ㄥ悓姝ョ殑鎯呭喌涓 lastSyncTimeView.setText(GTaskSyncService.getProgressString()); lastSyncTimeView.setVisibility(View.VISIBLE); - // 鏍规嵁褰撳墠鍚屾鏈嶅姟鍣ㄨ缃椂闂存樉绀烘鐨勬枃鏈互鍙婂彲瑙佹 } else { - //鑻ユ槸闈炲悓姝ユ儏鍐 long lastSyncTime = getLastSyncTime(this); if (lastSyncTime != 0) { lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time, DateFormat.format(getString(R.string.preferences_last_sync_time_format), lastSyncTime))); lastSyncTimeView.setVisibility(View.VISIBLE); - //鍒欐牴鎹渶鍚庡悓姝ユ椂闂寸殑淇℃伅鏉ョ紪杈戞椂闂存樉绀烘鐨勬枃鏈唴瀹瑰拰鍙鎬 } else { - //鑻ユ椂闂翠负绌虹洿鎺ヨ缃负涓嶅彲瑙佺姸鎬 lastSyncTimeView.setVisibility(View.GONE); } } } - /* - *鍑芥暟鍔熻兘锛氬埛鏂版爣绛剧晫闈 - *鍑芥暟瀹炵幇锛氳皟鐢ㄤ笂鏂囪缃处鍙峰拰璁剧疆鎸夐敭涓や釜鍑芥暟鏉ュ疄鐜 - */ + private void refreshUI() { loadAccountPreference(); loadSyncButton(); } - /* - * 鍑芥暟鍔熻兘锛氭樉绀鸿处鎴烽夋嫨鐨勫璇濇骞惰繘琛岃处鎴风殑璁剧疆 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void showSelectAccountAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - //鍒涘缓涓涓柊鐨勫璇濇 View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); titleTextView.setText(getString(R.string.preferences_dialog_select_account_title)); TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips)); - //璁剧疆鏍囬浠ュ強瀛愭爣棰樼殑鍐呭 + dialogBuilder.setCustomTitle(titleView); dialogBuilder.setPositiveButton(null, null); - //璁剧疆瀵硅瘽妗嗙殑鑷畾涔夋爣棰橈紝寤虹珛涓涓猋ES鐨勬寜閽 + Account[] accounts = getGoogleAccounts(); String defAccount = getSyncAccountName(this); - //鑾峰彇鍚屾璐︽埛淇℃伅 + mOriAccounts = accounts; mHasAddedAccount = false; if (accounts.length > 0) { - //鑻ヨ处鎴蜂笉涓虹┖ CharSequence[] items = new CharSequence[accounts.length]; final CharSequence[] itemMapping = items; int checkedItem = -1; @@ -292,119 +224,83 @@ public class NotesPreferenceActivity extends PreferenceActivity { for (Account account : accounts) { if (TextUtils.equals(account.name, defAccount)) { checkedItem = index; - //鍦ㄨ处鎴峰垪琛ㄤ腑鏌ヨ鍒版墍闇璐︽埛 } items[index++] = account.name; } dialogBuilder.setSingleChoiceItems(items, checkedItem, - //鍦ㄥ璇濇寤虹珛涓涓崟閫夌殑澶嶉夋 new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { setSyncAccount(itemMapping[which].toString()); dialog.dismiss(); - //鍙栨秷瀵硅瘽妗 refreshUI(); } - //璁剧疆鐐瑰嚮鍚庢墽琛岀殑浜嬩欢锛屽寘鎷褰曟柊鍚屾璐︽埛鍜屽埛鏂版爣绛剧晫闈 }); - //寤虹珛瀵硅瘽妗嗙綉缁滅増鐨勭洃鍚櫒 } View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null); dialogBuilder.setView(addAccountView); - //缁欐柊鍔犺处鎴峰璇濇璁剧疆鑷畾涔夋牱寮 final AlertDialog dialog = dialogBuilder.show(); - //鏄剧ず瀵硅瘽妗 addAccountView.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { mHasAddedAccount = true; - //灏嗘柊鍔犺处鎴风殑hash缃畉rue Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); - //寤虹珛缃戠粶寤虹珛缁勪欢 intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { - "gmail-ls" + "gmail-ls" }); startActivityForResult(intent, -1); - //璺冲洖涓婁竴涓夐」 dialog.dismiss(); } }); - //寤虹珛鏂板姞璐︽埛瀵硅瘽妗嗙殑鐩戝惉鍣 } - /* - * 鍑芥暟鍔熻兘锛氭樉绀鸿处鎴烽夋嫨瀵硅瘽妗嗗拰鐩稿叧璐︽埛鎿嶄綔 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ private void showChangeAccountConfirmAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - //鍒涘缓涓涓柊鐨勫璇濇 + View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); titleTextView.setText(getString(R.string.preferences_dialog_change_account_title, getSyncAccountName(this))); TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle); subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg)); - //鏍规嵁鍚屾淇敼鐨勮处鎴蜂俊鎭缃爣棰樹互鍙婂瓙鏍囬鐨勫唴瀹 dialogBuilder.setCustomTitle(titleView); - //璁剧疆瀵硅瘽妗嗙殑鑷畾涔夋爣棰 + CharSequence[] menuItemArray = new CharSequence[] { getString(R.string.preferences_menu_change_account), getString(R.string.preferences_menu_remove_account), getString(R.string.preferences_menu_cancel) }; - //瀹氫箟涓浜涙爣璁板瓧绗︿覆 dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() { - //璁剧疆瀵硅瘽妗嗚鏄剧ず鐨勪竴涓猯ist锛岀敤浜庢樉绀哄嚑涓懡浠ゆ椂,鍗砪hange锛宺emove锛宑ancel public void onClick(DialogInterface dialog, int which) { - //鎸夐敭鍔熻兘锛岀敱which鏉ュ喅瀹 if (which == 0) { - //杩涘叆璐︽埛閫夋嫨瀵硅瘽妗 showSelectAccountAlertDialog(); } else if (which == 1) { - //鍒犻櫎璐︽埛骞朵笖璺熸柊渚跨鐣岄潰 removeSyncAccount(); refreshUI(); } } }); dialogBuilder.show(); - //鏄剧ず瀵硅瘽妗 } - /* - *鍑芥暟鍔熻兘锛氳幏鍙栬胺姝岃处鎴 - *鍑芥暟瀹炵幇锛氶氳繃璐︽埛绠＄悊鍣ㄧ洿鎺ヨ幏鍙 - */ private Account[] getGoogleAccounts() { AccountManager accountManager = AccountManager.get(this); return accountManager.getAccountsByType("com.google"); } - /* - * 鍑芥暟鍔熻兘锛氳缃悓姝ヨ处鎴 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲婏細 - */ private void setSyncAccount(String account) { if (!getSyncAccountName(this).equals(account)) { - //鍋囧璇ヨ处鍙蜂笉鍦ㄥ悓姝ヨ处鍙峰垪琛ㄤ腑 SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); - //缂栬緫鍏变韩鐨勯閫夐」 if (account != null) { editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account); } else { editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); } - //灏嗚璐﹀彿鍔犲叆鍒伴閫夐」涓 - editor.commit(); - //鎻愪氦淇敼鐨勬暟鎹 - + // clean up last sync time setLastSyncTime(this, 0); - //灏嗘渶鍚庡悓姝ユ椂闂存竻闆 // clean up local gtask related info new Thread(new Runnable() { @@ -415,33 +311,23 @@ public class NotesPreferenceActivity extends PreferenceActivity { getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); } }).start(); - //閲嶇疆褰撳湴鍚屾浠诲姟鐨勪俊鎭 Toast.makeText(NotesPreferenceActivity.this, getString(R.string.preferences_toast_success_set_accout, account), Toast.LENGTH_SHORT).show(); - //灏唗oast鐨勬枃鏈俊鎭疆涓衡滆缃处鎴锋垚鍔熲濆苟鏄剧ず鍑烘潵 } } - /* - * 鍑芥暟鍔熻兘锛氬垹闄ゅ悓姝ヨ处鎴 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲婏細 - */ + private void removeSyncAccount() { SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); - //璁剧疆鍏变韩棣栭夐」 - if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) { editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME); - //鍋囧褰撳墠棣栭夐」涓湁璐︽埛灏卞垹闄 } if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) { editor.remove(PREFERENCE_LAST_SYNC_TIME); - //鍒犻櫎褰撳墠棣栭夐」涓湁璐︽埛鏃堕棿 } editor.commit(); - //鎻愪氦鏇存柊鍚庣殑鏁版嵁 // clean up local gtask related info new Thread(new Runnable() { @@ -452,76 +338,49 @@ public class NotesPreferenceActivity extends PreferenceActivity { getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null); } }).start(); - //閲嶇疆褰撳湴鍚屾浠诲姟鐨勪俊鎭 } - /* - * 鍑芥暟鍔熻兘锛氳幏鍙栧悓姝ヨ处鎴峰悕绉 - * 鍑芥暟瀹炵幇锛氶氳繃鍏变韩鐨勯閫夐」閲岀殑淇℃伅鐩存帴鑾峰彇 - */ public static String getSyncAccountName(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); } - /* - * 鍑芥暟鍔熻兘锛氳缃渶缁堝悓姝ョ殑鏃堕棿 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - */ public static void setLastSyncTime(Context context, long time) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); - // 浠庡叡浜閫夐」涓壘鍒扮浉鍏宠处鎴峰苟鑾峰彇鍏剁紪杈戝櫒 editor.putLong(PREFERENCE_LAST_SYNC_TIME, time); editor.commit(); - //缂栬緫鏈缁堝悓姝ユ椂闂村苟鎻愪氦鏇存柊 } - /* - * 鍑芥暟鍔熻兘锛氳幏鍙栨渶缁堝悓姝ユ椂闂 - * 鍑芥暟瀹炵幇锛氶氳繃鍏变韩鐨勯閫夐」閲岀殑淇℃伅鐩存帴鑾峰彇 - */ + public static long getLastSyncTime(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0); } - /* - * 鍑芥暟鍔熻兘锛氭帴鍙楀悓姝ヤ俊鎭 - * 鍑芥暟瀹炵幇锛氱户鎵緽roadcastReceiver - */ private class GTaskReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { refreshUI(); if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { - //鑾峰彇闅忓箍鎾屾潵鐨処ntent涓殑鍚屾鏈嶅姟鐨勬暟鎹 TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); syncStatus.setText(intent .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); - //閫氳繃鑾峰彇鐨勬暟鎹湪璁剧疆绯荤粺鐨勭姸鎬 } } } - /* - * 鍑芥暟鍔熻兘锛氬鐞嗚彍鍗曠殑閫夐」 - * 鍑芥暟瀹炵幇锛氬涓嬫敞閲 - * 鍙傛暟:MenuItem鑿滃崟閫夐」 - */ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - //鏍规嵁閫夐」鐨刬d閫夋嫨锛岃繖閲屽彧鏈変竴涓富椤 case android.R.id.home: Intent intent = new Intent(this, NotesListActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); return true; - //鍦ㄤ富椤垫儏鍐典笅鍦ㄥ垱寤鸿繛鎺ョ粍浠秈ntent锛屽彂鍑烘竻绌虹殑淇″彿骞跺紑濮嬩竴涓浉搴旂殑activity default: return false; }