Compare commits

..

No commits in common. 'master' and 'tangbo_branch' have entirely different histories.

@ -2,7 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_CONTACTS" />

@ -27,7 +27,6 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.graphics.Paint;
import android.os.Bundle;
import android.preference.PreferenceManager;
@ -57,28 +56,11 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.database.Cursor;
import android.content.ContentResolver;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.Manifest;
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import android.content.Intent;
import android.provider.MediaStore;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.text.Html;
import android.util.Base64;
import android.os.Bundle;
import android.net.Uri;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.List;
import android.content.pm.ResolveInfo;
import net.micode.notes.R;
import net.micode.notes.data.Notes;
@ -217,13 +199,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
/** 模板选择请求码 */
private static final int REQUEST_CODE_TEMPLATE = 1001;
/** 图片选择请求码 */
private static final int REQUEST_CODE_IMAGE_PICK = 1002;
/** 拍照请求码 */
private static final int REQUEST_CODE_CAMERA = 1003;
/** 相机权限请求码 */
private static final int REQUEST_CAMERA_PERMISSION = 1004;
/** 清单模式下的编辑文本列表 */
private LinearLayout mEditTextList;
@ -377,32 +352,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
} else {
// 解析HTML格式的富文本内容添加null检查防止闪退
String content = mWorkingNote.getContent();
CharSequence htmlContent = Html.fromHtml(content == null ? "" : content, new Html.ImageGetter() {
@Override
public Drawable getDrawable(String source) {
// 处理data:image格式的图片
if (source.startsWith("data:image/")) {
try {
// 提取Base64部分
String base64 = source.substring(source.indexOf(",") + 1);
// 解码Base64
byte[] data = Base64.decode(base64, Base64.DEFAULT);
// 创建Bitmap
Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
if (bitmap != null) {
// 创建Drawable
BitmapDrawable drawable = new BitmapDrawable(getResources(), bitmap);
// 设置Drawable的边界
drawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
return drawable;
}
} catch (Exception e) {
Log.e(TAG, "Error loading image: " + e.getMessage());
}
}
return null;
}
}, null);
CharSequence htmlContent = Html.fromHtml(content == null ? "" : content);
mNoteEditor.setText(getHighlightQueryResult(htmlContent, mUserQuery));
mNoteEditor.setSelection(mNoteEditor.getText().length());
}
@ -834,9 +784,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
case R.id.menu_note_template:
openTemplateSelector();
break;
case R.id.menu_insert_image:
showImageSourceDialog();
break;
default:
break;
}
@ -1662,271 +1609,37 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
/**
*
*
* <p>
* TemplateSelectActivity
*
* </p>
* @param requestCode
* @param resultCode
* @param data Intent
*/
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK) {
switch (requestCode) {
case REQUEST_CODE_TEMPLATE:
// 模板选择结果处理
if (data != null) {
String templateContent = data.getStringExtra(TemplateSelectActivity.EXTRA_TEMPLATE_CONTENT);
if (!TextUtils.isEmpty(templateContent)) {
// 保存模板内容到WorkingNote防止onResume时被覆盖
mWorkingNote.setWorkingText(templateContent);
// 更新笔记内容
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(templateContent);
} else {
mNoteEditor.setText(Html.fromHtml(templateContent));
mNoteEditor.setSelection(mNoteEditor.getText().length());
}
Toast.makeText(this, R.string.notealert_enter, Toast.LENGTH_SHORT).show();
}
}
break;
case REQUEST_CODE_IMAGE_PICK:
// 从相册选择图片
if (data != null && data.getData() != null) {
handleImageSelection(data.getData());
}
break;
case REQUEST_CODE_CAMERA:
// 拍照结果
if (resultCode == RESULT_OK) {
if (data != null && data.getExtras() != null) {
Bitmap bitmap = (Bitmap) data.getExtras().get("data");
if (bitmap != null) {
insertImageToNote(bitmap);
} else {
showToast(R.string.error_image_capture);
}
} else {
showToast(R.string.error_image_capture);
}
} else if (resultCode == RESULT_CANCELED) {
// 用户取消拍照,不显示错误
if (requestCode == REQUEST_CODE_TEMPLATE && resultCode == RESULT_OK) {
if (data != null) {
String templateContent = data.getStringExtra(TemplateSelectActivity.EXTRA_TEMPLATE_CONTENT);
if (!TextUtils.isEmpty(templateContent)) {
// 保存模板内容到WorkingNote防止onResume时被覆盖
mWorkingNote.setWorkingText(templateContent);
// 更新笔记内容
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(templateContent);
} else {
showToast(R.string.error_image_capture);
mNoteEditor.setText(Html.fromHtml(templateContent));
mNoteEditor.setSelection(mNoteEditor.getText().length());
}
break;
}
}
}
/**
*
*/
private void showImageSourceDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.menu_insert_image);
builder.setItems(new CharSequence[] {
getString(R.string.menu_take_photo),
getString(R.string.menu_choose_from_gallery)
}, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case 0:
// 拍照
if (ContextCompat.checkSelfPermission(NoteEditActivity.this, Manifest.permission.CAMERA)
!= PackageManager.PERMISSION_GRANTED) {
// 请求相机权限
ActivityCompat.requestPermissions(NoteEditActivity.this,
new String[]{Manifest.permission.CAMERA},
REQUEST_CAMERA_PERMISSION);
} else {
// 权限已授予,启动相机
launchCamera();
}
break;
case 1:
// 从相册选择
Intent galleryIntent = new Intent(Intent.ACTION_PICK,
MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
galleryIntent.setType("image/*");
startActivityForResult(galleryIntent, REQUEST_CODE_IMAGE_PICK);
break;
}
}
});
builder.show();
}
/**
*
*/
private void launchCamera() {
Log.d(TAG, "Attempting to launch camera");
// 检查相机权限状态
int permissionStatus = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
Log.d(TAG, "Camera permission status: " + permissionStatus);
// 尝试使用不同的相机 Intent 构造方式
Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// 检查是否有应用可以处理相机 Intent
PackageManager packageManager = getPackageManager();
if (packageManager != null) {
Log.d(TAG, "PackageManager obtained successfully");
// 方法1使用 resolveActivity
if (cameraIntent.resolveActivity(packageManager) != null) {
Log.d(TAG, "Camera intent resolved successfully using resolveActivity");
try {
startActivityForResult(cameraIntent, REQUEST_CODE_CAMERA);
return;
} catch (Exception e) {
Log.e(TAG, "Error starting camera: " + e.getMessage());
}
} else {
Log.d(TAG, "Camera intent not resolved using resolveActivity");
}
// 方法2使用 queryIntentActivities
List<ResolveInfo> activities = packageManager.queryIntentActivities(cameraIntent, 0);
if (activities != null && !activities.isEmpty()) {
Log.d(TAG, "Camera intent resolved successfully using queryIntentActivities, found " + activities.size() + " activities");
try {
startActivityForResult(cameraIntent, REQUEST_CODE_CAMERA);
return;
} catch (Exception e) {
Log.e(TAG, "Error starting camera: " + e.getMessage());
Toast.makeText(this, R.string.notealert_enter, Toast.LENGTH_SHORT).show();
}
} else {
Log.d(TAG, "Camera intent not resolved using queryIntentActivities");
}
} else {
Log.e(TAG, "Failed to obtain PackageManager");
}
// 尝试使用更具体的相机 Intent
Intent explicitCameraIntent = new Intent();
explicitCameraIntent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
explicitCameraIntent.addCategory(Intent.CATEGORY_DEFAULT);
try {
Log.d(TAG, "Attempting to start camera with explicit intent");
startActivityForResult(explicitCameraIntent, REQUEST_CODE_CAMERA);
return;
} catch (Exception e) {
Log.e(TAG, "Error starting camera with explicit intent: " + e.getMessage());
}
// 所有方法都失败,显示错误提示
Log.e(TAG, "All attempts to launch camera failed");
showToast(R.string.error_image_selection);
}
/**
*
*/
private void handleImageSelection(Uri uri) {
try {
Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), uri);
if (bitmap != null) {
insertImageToNote(bitmap);
}
} catch (IOException e) {
Log.e(TAG, "Error loading image: " + e.getMessage());
showToast(R.string.error_image_selection);
}
}
/**
*
*/
private void insertImageToNote(Bitmap bitmap) {
try {
// 压缩图片
Bitmap compressedBitmap = compressBitmap(bitmap, 800, 600, 80);
// 转换为Base64
String base64Image = bitmapToBase64(compressedBitmap);
// 创建HTML图片标签
String imageTag = "<img src=\"data:image/jpeg;base64," + base64Image + "\" style=\"max-width:100%;height:auto;\" />";
// 获取当前光标位置
int cursorPosition = mNoteEditor.getSelectionStart();
// 获取当前文本
String currentText = mNoteEditor.getText().toString();
// 插入图片标签
String newText = currentText.substring(0, cursorPosition) + imageTag + currentText.substring(cursorPosition);
// 更新编辑器内容
mNoteEditor.setText(Html.fromHtml(newText, new Html.ImageGetter() {
@Override
public Drawable getDrawable(String source) {
// 处理data:image格式的图片
if (source.startsWith("data:image/")) {
try {
// 提取Base64部分
String base64 = source.substring(source.indexOf(",") + 1);
// 解码Base64
byte[] data = Base64.decode(base64, Base64.DEFAULT);
// 创建Bitmap
Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
if (bitmap != null) {
// 创建Drawable
BitmapDrawable drawable = new BitmapDrawable(getResources(), bitmap);
// 设置Drawable的边界
drawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
return drawable;
}
} catch (Exception e) {
Log.e(TAG, "Error loading image from data URL: " + e.getMessage());
}
}
return null;
}
}, null));
// 设置光标位置到图片后面
mNoteEditor.setSelection(mNoteEditor.getText().length());
// 保存笔记
saveNote();
} catch (Exception e) {
Log.e(TAG, "Error inserting image: " + e.getMessage());
showToast(R.string.error_image_insertion);
}
}
/**
*
*/
private Bitmap compressBitmap(Bitmap bitmap, int maxWidth, int maxHeight, int quality) {
int width = bitmap.getWidth();
int height = bitmap.getHeight();
// 计算缩放比例
float scaleWidth = ((float) maxWidth) / width;
float scaleHeight = ((float) maxHeight) / height;
float scale = Math.min(scaleWidth, scaleHeight);
// 如果不需要缩放,直接返回原图片
if (scale >= 1) {
return bitmap;
}
// 计算新尺寸
int newWidth = Math.round(width * scale);
int newHeight = Math.round(height * scale);
// 创建压缩后的图片
return Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, true);
}
/**
* BitmapBase64
*/
private String bitmapToBase64(Bitmap bitmap) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.JPEG, 80, baos);
byte[] byteArray = baos.toByteArray();
return Base64.encodeToString(byteArray, Base64.DEFAULT);
}
/**
* Toast
@ -1939,21 +1652,4 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private void showToast(int resId, int duration) {
Toast.makeText(this, resId, duration).show();
}
/**
*
*/
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == REQUEST_CAMERA_PERMISSION) {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
// 权限授予成功,启动相机
launchCamera();
} else {
// 权限被拒绝,显示错误提示
showToast(R.string.error_camera_permission);
}
}
}
}

@ -23,7 +23,6 @@ import android.text.Selection;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.Editable;
import android.text.TextUtils;
import android.text.style.StyleSpan;
import android.text.style.URLSpan;
@ -39,7 +38,6 @@ import android.view.MenuItem.OnMenuItemClickListener;
import android.view.MotionEvent;
import android.widget.EditText;
import android.text.TextWatcher;
import android.text.style.ImageSpan;
import net.micode.notes.R;
@ -201,7 +199,6 @@ public class NoteEditText extends EditText {
*
* <p>
*
*
* </p>
* @param event
* @return
@ -221,34 +218,12 @@ public class NoteEditText extends EditText {
Layout layout = getLayout();
int line = layout.getLineForVertical(y);
int off = layout.getOffsetForHorizontal(line, x);
// 检查是否点击了图片
if (isClickOnImage(off)) {
// 显示上下文菜单
this.showContextMenu();
return true;
}
Selection.setSelection(getText(), off);
break;
}
return super.onTouchEvent(event);
}
/**
*
* @param offset
* @return
*/
private boolean isClickOnImage(int offset) {
if (getText() instanceof Spannable) {
Spannable spannable = (Spannable) getText();
ImageSpan[] imageSpans = spannable.getSpans(offset, offset, ImageSpan.class);
return imageSpans.length > 0;
}
return false;
}
/**
*
@ -346,7 +321,6 @@ public class NoteEditText extends EditText {
*
* <p>
*
*
* </p>
* @param menu
*/
@ -359,21 +333,6 @@ public class NoteEditText extends EditText {
int min = Math.min(selStart, selEnd);
int max = Math.max(selStart, selEnd);
// 检查是否有图片
final ImageSpan[] imageSpans = ((Spanned) getText()).getSpans(min, max, ImageSpan.class);
if (imageSpans.length > 0) {
menu.add(0, 1, 0, R.string.menu_delete_image).setOnMenuItemClickListener(
new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
// 删除图片
deleteImage(imageSpans[0]);
return true;
}
});
return;
}
// 检查是否有链接
final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
if (urls.length == 1) {
int defaultResId = 0;
@ -400,26 +359,6 @@ public class NoteEditText extends EditText {
}
super.onCreateContextMenu(menu);
}
/**
*
* @param imageSpan span
*/
private void deleteImage(ImageSpan imageSpan) {
if (getText() instanceof Spannable && getText() instanceof Editable) {
Editable editable = (Editable) getText();
int start = editable.getSpanStart(imageSpan);
int end = editable.getSpanEnd(imageSpan);
if (start >= 0 && end >= 0) {
// 删除图片
editable.delete(start, end);
// 通知内容变化
if (mOnTextViewChangeListener != null) {
mOnTextViewChangeListener.onContentChange();
}
}
}
}
/**
*

@ -65,8 +65,4 @@
<item
android:id="@+id/menu_note_template"
android:title="@string/menu_note_template" />
<item
android:id="@+id/menu_insert_image"
android:title="@string/menu_insert_image" />
</menu>

@ -164,15 +164,5 @@
<string name="message_template_deleted">Template deleted successfully</string>
<string name="alert_message_delete_template">Are you sure you want to delete this template?</string>
<string name="menu_note_template">Note Template</string>
<!-- Image related strings -->
<string name="menu_insert_image">Insert Image</string>
<string name="menu_take_photo">Take Photo</string>
<string name="menu_choose_from_gallery">Choose from Gallery</string>
<string name="menu_delete_image">Delete Image</string>
<string name="error_image_selection">Failed to select image</string>
<string name="error_image_insertion">Failed to insert image</string>
<string name="error_image_capture">Failed to capture image</string>
<string name="error_camera_permission">Camera permission is required to take photos</string>
</resources>

Loading…
Cancel
Save