From f71efa38e4ad746d9941ba2b8a0cf092bedfc4da Mon Sep 17 00:00:00 2001
From: CYZ <2782394648@qq.com>
Date: Tue, 25 Oct 2022 20:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E6=9D=BF=E5=8F=AF=E4=BB=A5=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/src/main/AndroidManifest.xml | 2 +-
.../net/micode/notes/ui/DrawActivity.java | 44 ++++++++++++++++++-
.../net/micode/notes/ui/NoteEditActivity.java | 38 ++++++++--------
src/app/src/main/res/layout/note_edit.xml | 7 +--
4 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml
index 502020b..666d84a 100644
--- a/src/app/src/main/AndroidManifest.xml
+++ b/src/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
android:versionCode="1"
android:versionName="0.1" >
-
+
diff --git a/src/app/src/main/java/net/micode/notes/ui/DrawActivity.java b/src/app/src/main/java/net/micode/notes/ui/DrawActivity.java
index 8c37304..4cb55e7 100644
--- a/src/app/src/main/java/net/micode/notes/ui/DrawActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/DrawActivity.java
@@ -18,9 +18,12 @@ import android.widget.ImageView;
import net.micode.notes.R;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
public class DrawActivity extends Activity {
private ImageView img;
@@ -48,7 +51,8 @@ public class DrawActivity extends Activity {
save_paint.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- //save();
+ String path = saveBitmap();
+ Log.i(TAG, path);
finish();
}
});
@@ -114,4 +118,42 @@ public class DrawActivity extends Activity {
e.printStackTrace();
}
}
+
+ public String saveBitmap(){
+ //获得系统当前时间,并以该时间作为文件名
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+ Date curDate = new Date(System.currentTimeMillis());//获取当前时间
+ String str = formatter.format(curDate);
+ String paintPath = "";
+ str = str + "paint.jpg";
+ File dir = new File("/sdcard/DCIM/Camera");
+ File file = new File("/sdcard/DCIM/Camera",str);
+ if (!dir.exists()) {
+ dir.mkdir();
+ }
+ else{
+ if(file.exists()){
+ file.delete();
+ }
+ }
+
+ try {
+ FileOutputStream out = new FileOutputStream(file);
+ mBitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
+ out.flush();
+ out.close();
+ //保存绘图文件路径
+ paintPath = "/sdcard/notes/" + str;
+
+
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return paintPath;
+ }
}
diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index f3b75cf..90a4569 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -123,7 +123,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public ImageButton note_Read;
- public Button note_revote;
+ public Button note_revoke;
}
private static final Map sBgSelectorBtnsMap = new HashMap();
@@ -428,8 +428,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
mNoteHeaderHolder.startDraw = (ImageButton) findViewById(R.id.imageButton2);
mNoteHeaderHolder.note_Read = (ImageButton) findViewById(R.id.menu_note_read);
- mNoteHeaderHolder.note_revote = (Button) findViewById(R.id.action_undo);
- mNoteHeaderHolder.note_revote.setOnClickListener(new OnClickListener() {
+ mNoteHeaderHolder.note_revoke = (Button) findViewById(R.id.action_undo);
+ mNoteHeaderHolder.note_revoke.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
backTrack();
@@ -438,6 +438,19 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mNoteHeaderHolder.note_Read.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
+ mTTS = new TextToSpeech(NoteEditActivity.this, new OnInitListener() {
+ @Override
+ public void onInit(int i) {
+ if (i == TextToSpeech.SUCCESS){
+ int result = mTTS.setLanguage(Locale.US);
+ if (result != TextToSpeech.LANG_COUNTRY_AVAILABLE
+ && result != TextToSpeech.LANG_AVAILABLE){
+ //Toast.makeText(NoteEditActivity.this,"暂不支持此种语言", Toast.LENGTH_LONG);
+ return;
+ }
+ }
+ }
+ });
readText();
}
});
@@ -500,19 +513,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
- mTTS = new TextToSpeech(this, new OnInitListener() {
- @Override
- public void onInit(int i) {
- if (i == TextToSpeech.SUCCESS){
- int result = mTTS.setLanguage(Locale.US);
- if (result != TextToSpeech.LANG_COUNTRY_AVAILABLE
- && result != TextToSpeech.LANG_AVAILABLE){
- //Toast.makeText(NoteEditActivity.this,"暂不支持此种语言", Toast.LENGTH_LONG);
- return;
- }
- }
- }
- });
}
@Override
@@ -532,20 +532,20 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}else{
mHistory.add(input_text);
}
- mNoteHeaderHolder.note_revote.setEnabled(true);
+ mNoteHeaderHolder.note_revoke.setEnabled(true);
}
private void backTrack(){
int stack_size = mHistory.size();
mIsRevort = true;
if (stack_size <= 1){
- mNoteHeaderHolder.note_revote.setEnabled(false);
+ mNoteHeaderHolder.note_revoke.setEnabled(false);
return;
}else{
mNoteEditor.setText((CharSequence) mHistory.elementAt(stack_size - 2));
mHistory.removeElementAt(stack_size - 1);
if (stack_size == 2){
- mNoteHeaderHolder.note_revote.setEnabled(false);
+ mNoteHeaderHolder.note_revoke.setEnabled(false);
}
}
diff --git a/src/app/src/main/res/layout/note_edit.xml b/src/app/src/main/res/layout/note_edit.xml
index ce3cc12..475cde2 100644
--- a/src/app/src/main/res/layout/note_edit.xml
+++ b/src/app/src/main/res/layout/note_edit.xml
@@ -43,8 +43,8 @@
@@ -115,7 +115,7 @@
+