p57486102
/
minote
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/ziji_wu' into develop 

# Conflicts:
#	src/.gradle/5.4.1/executionHistory/executionHistory.bin
#	src/.gradle/5.4.1/executionHistory/executionHistory.lock
#	src/.gradle/5.4.1/fileHashes/fileHashes.bin
#	src/.gradle/5.4.1/fileHashes/fileHashes.lock
#	src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
#	src/.gradle/5.4.1/javaCompile/javaCompile.lock
#	src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/.gradle/buildOutputCleanup/outputFiles.bin
#	src/.idea/caches/build_file_checksums.ser
#	src/.idea/caches/gradle_models.ser
#	src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13
#	src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710
#	src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
#	src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5
#	src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
#	src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
#	src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb
#	src/.idea/workspace.xml
#	src/app/app.iml
#	src/app/build.gradle
#	src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
#	src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
#	src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
#	src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
#	src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
#	src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
#	src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
#	src/app/build/outputs/apk/debug/app-debug.apk
#	src/app/src/main/java/net/micode/notes/data/NotesProvider.java
This commit is contained in:
ziji Wu 2019-10-11 15:47:40 +08:00
parent ccf0acedb5
commit 392ce4279f
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/.gradle/5.4.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
src/.gradle/5.4.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

23
src/app/src/main/java/net/micode/notes/model/Note.java
View File

@ -200,13 +200,14 @@ public class Note {
mCallDataId = id;
}
//
//插入通话记录数据
void setCallData(String key, String value) {
mCallDataValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
}
//插入文本数据
void setTextData(String key, String value) {
mTextDataValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
@ -215,7 +216,7 @@ public class Note {
Uri pushIntoContentResolver(Context context, long noteId) {
/**
* Check for safety
* 防止无效的id
*/
if (noteId <= 0) {
throw new IllegalArgumentException(WRONGNOTEID + noteId);
@ -224,42 +225,57 @@ public class Note {
ArrayList<ContentProviderOperation> operationList = new ArrayList<>();
ContentProviderOperation.Builder builder = null;
//文本内容发生改变
if(mTextDataValues.size() > 0) {
mTextDataValues.put(DataColumns.NOTE_ID, noteId);
//如果没有分配id号
if (mTextDataId == 0) {
mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
mTextDataValues);
try {
//尝试分配id
setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
} catch (NumberFormatException e) {
//分配失败
Log.e(TAG, "Insert new text data fail with noteId" + noteId);
//清除内容
mTextDataValues.clear();
return null;
}
} else {
//已经有id号，执行下列操作
builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mTextDataId));
builder.withValues(mTextDataValues);
//加入修改内容
operationList.add(builder.build());
}
//清除已修改
mTextDataValues.clear();
}
//如果数据内容发生改变
if(mCallDataValues.size() > 0) {
mCallDataValues.put(DataColumns.NOTE_ID, noteId);
if (mCallDataId == 0) {
//如果没有id号，执行下列操作
mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
mCallDataValues);
//尝试分配id
try {
setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
} catch (NumberFormatException e) {
//失败，错误信息加入日志
Log.e(TAG, "Insert new call data fail with noteId" + noteId);
//清除已修改内容
mCallDataValues.clear();
return null;
}
} else {
//有id号，执行下列操作
builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mCallDataId));
builder.withValues(mCallDataValues);
@ -269,9 +285,12 @@ public class Note {
}
if (!operationList.isEmpty()) {
//当前操作的便签不空，执行
try {
ContentProviderResult[] results = context.getContentResolver().applyBatch(
Notes.AUTHORITY, operationList);
//如果res无效，插入失败，返回null值
//否则返回uri
return (results == null || results.length == 0 || results[0] == null) ? null
: ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
} catch (RemoteException|OperationApplicationException e) {

2
src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
View File

@ -77,7 +77,7 @@ import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
private class HeadViewHolder {
//
public TextView tvModified;
public ImageView ivAlertIcon;