维护版本

main
zcx 2 years ago
parent 73ccd49a0b
commit 3139f41b3a

@ -53,6 +53,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.OnInitListener; import android.speech.tts.TextToSpeech.OnInitListener;
import android.graphics.Typeface;
import net.micode.notes.R; import net.micode.notes.R;
import net.micode.notes.data.Notes; import net.micode.notes.data.Notes;
@ -75,6 +76,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener, public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener { NoteSettingChangedListener, OnTextViewChangeListener {
private class HeadViewHolder { private class HeadViewHolder {
@ -87,6 +89,32 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public ImageView ibSetBgColor; public ImageView ibSetBgColor;
} }
//显示选择列表
public void showSingleAlterDiglog(){
final String[] items ={"默认—普通","非衬线","衬线","宽体"};
AlertDialog.Builder alterBuilder = new AlertDialog.Builder(this);
alterBuilder.setTitle("选择字体");
alterBuilder.setSingleChoiceItems(items,0,new DialogInterface.OnClickListener(){
//选择字体
@Override
public void onClick(DialogInterface dialogInterface,int i){
if(i == 0){
mNoteEditor.setTypeface(Typeface.DEFAULT);
}else if(i == 1){
mNoteEditor.setTypeface(Typeface.SANS_SERIF);
}else if(i == 2){
mNoteEditor.setTypeface(Typeface.SERIF);
}else if(i == 3){
mNoteEditor.setTypeface(Typeface.MONOSPACE);
}/**else if(i == 4){
Typeface typeface0 = Typeface.createFromAsset(getAssets(),"front/impact.ttf");
mNoteEditor.setTypeface(typeface0);
}**/
}
});
alterBuilder.show();
}
private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>(); private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
static { static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@ -367,12 +395,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private TextToSpeech mTTS; private TextToSpeech mTTS;
private void initResources() { private void initResources() {
mTTS = new TextToSpeech(this, new OnInitListener() { mTTS = new TextToSpeech(this, new OnInitListener() {
//朗读设置配置,可以修改
@Override @Override
public void onInit(int status) { public void onInit(int status) {
if(status==TextToSpeech.SUCCESS){ if(status==TextToSpeech.SUCCESS){
mTTS.setLanguage(Locale.US); mTTS.setLanguage(Locale.US);//设置朗读语言
mTTS.setPitch(1.5f); mTTS.setPitch(1.5f);
mTTS.setSpeechRate(0.5f); mTTS.setSpeechRate(0.5f);//设置朗读速度
} }
} }
}); });
@ -552,10 +581,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
setReminder(); setReminder();
} else if (itemId == R.id.menu_delete_remind) { } else if (itemId == R.id.menu_delete_remind) {
mWorkingNote.setAlertDate(0, false); mWorkingNote.setAlertDate(0, false);
}else if(itemId==R.id.menu_voice_read){ }else if(itemId==R.id.menu_voice_read){//当点击voice read按钮时触发朗读功能
Log.d("voice mix","in"); Log.d("voice read","in");
texttoSpeech(); texttoSpeech();//朗读实现的方法
}else if(itemId==R.id.menu_font_select){
showSingleAlterDiglog();
} }
return true; return true;
} }
@ -568,6 +600,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}); });
d.show(); d.show();
} }
//功能:朗读文本
//实现使用使用TextToSpeechTTS引擎进行文本转语音的操作
private void texttoSpeech(){ private void texttoSpeech(){
mTTS.speak(mNoteEditor.getText().toString(),TextToSpeech.QUEUE_FLUSH,null,null); mTTS.speak(mNoteEditor.getText().toString(),TextToSpeech.QUEUE_FLUSH,null,null);
} }

@ -79,6 +79,9 @@ import java.io.InputStreamReader;
import java.util.HashSet; import java.util.HashSet;
public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
/*用于切换背景图片*/
private int mode = -1;
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
private static final int FOLDER_LIST_QUERY_TOKEN = 1; private static final int FOLDER_LIST_QUERY_TOKEN = 1;
@ -141,6 +144,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.note_list); setContentView(R.layout.note_list);
/*设置初始页面*/
getWindow().setBackgroundDrawableResource(R.drawable.hmbb);
initResources(); initResources();
/** /**
@ -407,11 +412,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} }
}; };
/*
*
*/
private void startAsyncNotesListQuery() { private void startAsyncNotesListQuery() {
// 根据当前文件夹确定选择条件
String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
: NORMAL_SELECTION; : NORMAL_SELECTION;
// 检查是否启用了秘密模式
if(secret_mode == 0) { if(secret_mode == 0) {
// 使用默认的PROJECTION开始查询
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{ Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
String.valueOf(mCurrentFolderId) String.valueOf(mCurrentFolderId)
@ -419,6 +430,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} }
else{ else{
String str1 = "404"; String str1 = "404";
// 定义一个新的PROJECTION数组将SNIPPET替换为自定义值"404"
String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组只换掉SNIPPET String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组只换掉SNIPPET
NoteColumns.ID, NoteColumns.ID,
NoteColumns.ALERTED_DATE, NoteColumns.ALERTED_DATE,
@ -434,6 +446,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
NoteColumns.WIDGET_ID, NoteColumns.WIDGET_ID,
NoteColumns.WIDGET_TYPE, NoteColumns.WIDGET_TYPE,
}; };
// 使用更新后的PROJECTION开始查询
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{ Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{
String.valueOf(mCurrentFolderId) String.valueOf(mCurrentFolderId)
@ -800,6 +813,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
menu.findItem(R.id.menu_secret).setVisible(false); menu.findItem(R.id.menu_secret).setVisible(false);
else else
menu.findItem(R.id.menu_quit_secret).setVisible(false); menu.findItem(R.id.menu_quit_secret).setVisible(false);
/*通过mode的值隐藏当前背景对应的按钮*/
if(mode==-1){
menu.findItem(R.id.menu_hmbb).setVisible(false);
}
else if(mode==0){
menu.findItem(R.id.menu_pdx).setVisible(false);
}
return true; return true;
} }
@ -828,7 +849,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
onSearchRequested(); onSearchRequested();
}else if(itemId == R.id.menu_secret){ }else if(itemId == R.id.menu_secret){
secret_mode = 1; secret_mode = 1;
AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);//建立新对话框
//发送确认信息
dialog.setTitle("重要提醒"); dialog.setTitle("重要提醒");
dialog.setMessage("您确认进入私密模式吗?"); dialog.setMessage("您确认进入私密模式吗?");
dialog.setCancelable(false); dialog.setCancelable(false);
@ -836,10 +858,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
startAsyncNotesListQuery(); startAsyncNotesListQuery();
Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show();//显示对话信息
} }
}); });
dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
//判断点击对话框,弹出新信息
@Override @Override
public void onClick(DialogInterface dialog, int which){} public void onClick(DialogInterface dialog, int which){}
}); });
@ -848,23 +871,36 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
}else if(itemId == R.id.menu_quit_secret){ }else if(itemId == R.id.menu_quit_secret){
secret_mode = 0; secret_mode = 0;
AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this);//建立新对话框
//发送确认信息
dialog.setTitle("重要提醒"); dialog.setTitle("重要提醒");
dialog.setMessage("您确认退出私密模式吗?"); dialog.setMessage("您确认退出私密模式吗?");
dialog.setCancelable(false); dialog.setCancelable(false);
dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() { dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() {
//判断点击对话框,弹出新信息
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
startAsyncNotesListQuery(); startAsyncNotesListQuery();
Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show(); Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show();//显示对话信息
} }
}); });
dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
//判断点击对话框
@Override @Override
public void onClick(DialogInterface dialog, int which){} public void onClick(DialogInterface dialog, int which){}
}); });
dialog.show(); dialog.show();
} }
/*实现背景切换的按钮响应*/
else if(itemId == R.id.menu_hmbb){
//更改mode对应的值并且改变背景
mode = -1;
getWindow().setBackgroundDrawableResource(R.drawable.hmbb);
}else if(itemId == R.id.menu_pdx){
//更改mode对应的值并且改变背景
mode = 0;
getWindow().setBackgroundDrawableResource(R.drawable.pdx);
}
return true; return true;
} }

Loading…
Cancel
Save