Merge branch 'master' of https://bdgit.educoder.net/pbyhqr72x/Xiao_Mi_promote into luoxinxin

# Conflicts:
#	src/Notes-master/res/menu/note_edit.xml
#	src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
#	src/Notes-master/src/net/micode/notes/model/WorkingNote.java
#	src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
#	src/Notes-master/src/net/micode/notes/ui/PassWordEditActivity.java

src/Notes-master/res/menu/note_edit.xml

@@ -50,6 +50,12 @@
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
     <item
+<<<<<<< HEAD
+=======
+        android:id="@+id/top"
+        android:title="Top" />
+    <item
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
         android:id="@+id/menu_set_passwd"
         android:title="Set password" />
     <item

src/Notes-master/res/values-zh-rCN/strings.xml

@@ -80,6 +80,9 @@
     <string name="success_sdcard_export">导出成功</string>
     <string name="failed_sdcard_export">导出失败</string>
     <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <!-- TOP -->
+    <string name="menu_top">置顶</string>
+    <string name="note_top">置顶</string>
     <!-- Sync -->
     <string name="ticker_syncing">同步便签...</string>
     <string name="ticker_success">同步成功</string>

src/Notes-master/res/values/strings.xml

@@ -84,6 +84,9 @@
     <string name="success_sdcard_export">Export successful</string>
     <string name="failed_sdcard_export">Export fail</string>
     <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <!-- TOP -->
+    <string name="menu_top">menu top</string>
+    <string name="note_top">note top</string>
     <!-- Sync -->
     <string name="ticker_syncing">Syncing notes...</string>
     <string name="ticker_success">Sync is successful</string>

src/Notes-master/src/net/micode/notes/data/Notes.java

@@ -169,6 +169,8 @@ public class Notes {
          * <P> Type : INTEGER (long) </P>
          */
         public static final String VERSION = "version";
+
+        public static final String TOP = "top";
     }
 
     public interface DataColumns {

src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java

@@ -61,7 +61,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
             NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +
+<<<<<<< HEAD
                 NoteColumns.PASSWORD+ " TEXT NOT NULL DEFAULT ''" +
+=======
+                NoteColumns.PASSWORD+ " TEXT NOT NULL DEFAULT ''," +
+                NoteColumns.TOP+" INTEGER NOT NULL DEFAULT 0"+
+
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
                 //NoteColumns.PASSWORD+ " INTEGER NOT NULL DEFAULT 0" +
         ")";
 
@@ -323,6 +329,10 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             upgradeToV4(db);
             oldVersion++;
         }
+        if (oldVersion == 4) {
+            upgradeToV5(db);
+            oldVersion++;
+        }
 
         if (reCreateTriggers) {
             reCreateNoteTableTriggers(db);
@@ -361,4 +371,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
     }
+    private void upgradeToV5(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.TOP
+                + " INTEGER NOT NULL DEFAULT 0");
+    }
+
 }

src/Notes-master/src/net/micode/notes/model/Note.java

@@ -75,6 +75,11 @@ public class Note {
         mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
         mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
     }
+    public void setTopValue(String key, String value) {
+        mNoteDiffValues.put(key, value);
+        mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+        mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+    }
 
     public void setTextData(String key, String value) {
         mNoteData.setTextData(key, value);

src/Notes-master/src/net/micode/notes/model/WorkingNote.java

@@ -53,6 +53,7 @@ public class WorkingNote {
     private int mWidgetType;
 
     private long mFolderId;
+    private String mTop;
 
     private Context mContext;
 
@@ -83,6 +84,10 @@ public class WorkingNote {
             NoteColumns.MODIFIED_DATE,
             //增加一个密码项
             NoteColumns.PASSWORD,
+<<<<<<< HEAD
+=======
+            NoteColumns.TOP,
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
     };
 
     private static final int DATA_ID_COLUMN = 0;
@@ -149,6 +154,7 @@ public class WorkingNote {
         mNoteId = 0;
         mIsDeleted = false;
         mMode = 0;
+        mTop = "0";
         mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
         //导入便签
         loadNote();
@@ -161,6 +167,7 @@ public class WorkingNote {
         mFolderId = folderId;
         mIsDeleted = false;
         mNote = new Note();
+        mTop = "0";
         loadNote();
     }
 
@@ -281,6 +288,13 @@ public class WorkingNote {
         }
     }
 
+    public void setTop(String Top){
+        if(Top != mTop){
+            mTop = Top;
+            mNote.setTopValue(NoteColumns.TOP,mTop);
+        }
+    }
+
     public void markDeleted(boolean mark) {
         mIsDeleted = mark;
         if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
@@ -360,6 +374,14 @@ public class WorkingNote {
         return mBgColorId;
     }
 
+    public int getTopId(){
+        if(mTop.equals("1")){
+            return 1;
+        }else{
+            return 0 ;
+        }
+    }
+
     public int getTitleBgResId() {
         return NoteBgResources.getNoteTitleBgResource(mBgColorId);
     }

src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java

@@ -45,6 +45,10 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+<<<<<<< HEAD
+=======
+import android.widget.Button;
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -296,6 +300,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                         Toast.makeText(NoteEditActivity.this, "密码错误", Toast.LENGTH_SHORT).show();
                         dialog.dismiss();
                         onBackPressed();
+<<<<<<< HEAD
+=======
+                        //关闭软键盘
+                        InputMethodManager inputMethodManager = (InputMethodManager)
+                                getSystemService(Context.INPUT_METHOD_SERVICE);
+                        inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
                     }
                     else{
                         Toast.makeText(NoteEditActivity.this, "密码正确", Toast.LENGTH_SHORT).show();
@@ -559,6 +570,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+
+        //final Button topBtn = (Button) findViewById(R.id.top);
         switch (item.getItemId()) {
             case R.id.menu_new_note:
                 createNewNote();
@@ -609,6 +622,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 checkPassword();
                 deletePassword();
                 break;
+<<<<<<< HEAD
+=======
+            case R.id.top:
+                mWorkingNote.setTop((mWorkingNote.getTopId()) == 1 ? "0" : "1");
+                break;
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
             default:
                 break;
         }
@@ -656,6 +675,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     public void deletePassword()
     {
         mWorkingNote.setPassword("");
+<<<<<<< HEAD
+=======
+
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
     }
 
     private void setReminder() {

src/Notes-master/src/net/micode/notes/ui/PassWordEditActivity.java

@@ -9,7 +9,10 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.os.Bundle;
 import android.widget.Toast;
+<<<<<<< HEAD
 
+=======
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
 import net.micode.notes.R;
 import net.micode.notes.model.WorkingNote;
 
@@ -30,7 +33,10 @@ public class PassWordEditActivity extends Activity {
             finish();
             return;
         }
+<<<<<<< HEAD
 
+=======
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_password);
         //不知道作用
@@ -38,9 +44,12 @@ public class PassWordEditActivity extends Activity {
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
                         | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
         //
+<<<<<<< HEAD
 
 
 
+=======
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
         boolean User_boolean = mWorkingNote.hasPassword();//获取用户是否设置了密码
         if(!User_boolean) //User_boolean = false时，（没有设置密码），直接跳转到便签主界面
         {
@@ -88,6 +97,9 @@ public class PassWordEditActivity extends Activity {
         }
         return false;
     }
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> e012e4479fa528d71d041140775f3e142df8eab2
 }