Labels Milestones

背景功能（master分支-陈捷恺）和统计字符功能（develop分支-李亦婷）合并 #4

Closed

pafmz8biv wants to merge 3 commits from develop into master

pull from: develop

merge into: pafmz8biv:master

pafmz8biv:master

pafmz8biv:a_branch

pafmz8biv:main

Conversation 0 Commits 3 Files Changed 799

pafmz8biv commented 2 years ago

Owner

There is no content yet.

pafmz8biv added 3 commits 2 years ago

497cb3a7ac l

6c6328e346 Squashed commit of the following: ...

commit af0dad3df8c5badd0607130ade6af8cdea08fbbb
Merge: 1e8ed0c 26876ea
Author: lyt <1905191745@qq.com>
Date:   Thu Jan 4 11:01:40 2024 +0800

    Merge branch 'master' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit 1e8ed0c8415849d4c3d8c8e9a6d2807f4eb8026b
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 10:59:01 2024 +0800

lyt

commit 26876ea2e6
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 10:59:01 2024 +0800

    jkjkjk

commit eb6f44cc78
Merge: 100b975 0aa0683
Author: pafmz8biv <893824054@qq.com>
Date:   Thu Jan 4 10:27:17 2024 +0800

    Merge pull request '合并尝试' (#3) from a_branch into master

commit 0aa06835b1
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 10:25:21 2024 +0800

    chen123

commit 100b975b7d
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 10:24:32 2024 +0800

    chen

commit c4390e1c71
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 10:11:47 2024 +0800

    jkjk

commit e391751773
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 10:08:19 2024 +0800

    jkjk

commit 44202ad4fe
Merge: a638789 4907de0
Author: pafmz8biv <893824054@qq.com>
Date:   Thu Jan 4 09:17:48 2024 +0800

    Merge pull request '合并' (#2) from a_branch into master

commit 4907de0d40
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 09:10:39 2024 +0800

    0104jk

commit a638789568
Merge: 14620f3 b886faa
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 09:04:30 2024 +0800

    0104jk

commit 14620f34d2
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 08:52:50 2024 +0800

    jk0104

commit b886faadaf
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Jan 4 08:50:36 2024 +0800

    jk0104

commit 813c1ef918
Author: pxurivswg <1461476498@qq.com>
Date:   Thu Jan 4 01:49:23 2024 +0800

    ADD file via upload

commit a910e029a6
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Jan 3 23:36:58 2024 +0800

    jk0103

commit 78590135b4
Merge: 988cfa8 b957d78
Author: lyt <1905191745@qq.com>
Date:   Wed Jan 3 22:35:21 2024 +0800

    Merge branch 'master' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit 988cfa88e0
Author: lyt <1905191745@qq.com>
Date:   Wed Jan 3 22:33:00 2024 +0800

    lyt

commit b957d78391
Author: lyt <1905191745@qq.com>
Date:   Wed Jan 3 22:33:00 2024 +0800

    lyt

commit 48ee97e959
Merge: c05ca89 25e95a1
Author: lyt <1905191745@qq.com>
Date:   Wed Jan 3 16:10:56 2024 +0800

    Merge branch 'master' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit 25e95a1955
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Jan 3 08:29:44 2024 +0800

    jk103

commit c05ca89ed9
Merge: ebd3992 a13848b
Author: lyt <1905191745@qq.com>
Date:   Tue Jan 2 11:45:02 2024 +0800

    Merge branch 'master' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit ebd3992673
Author: lyt <1905191745@qq.com>
Date:   Tue Jan 2 11:42:12 2024 +0800

    lyt

commit a13848ba52
Author: lyt <1905191745@qq.com>
Date:   Tue Jan 2 11:42:12 2024 +0800

    lyt

commit 397bc5c173
Merge: d4187ee cf52655
Author: lyt <1905191745@qq.com>
Date:   Mon Jan 1 13:30:48 2024 +0800

    Merge branch 'master' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit d4187ee4d7
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Fri Dec 29 11:49:57 2023 +0800

    jk1229

commit cf52655a3c
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Fri Dec 29 11:49:57 2023 +0800

    jk1229

commit b34e301b03
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Dec 28 11:24:57 2023 +0800

    1228报告后

commit 4dd7a59f1d
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Dec 28 11:19:33 2023 +0800

    1228报告后

commit 0a0c67fca8
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Dec 28 10:36:21 2023 +0800

    jk

commit 176ab2e4eb
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Dec 28 10:28:47 2023 +0800

    jk

commit 38e1fb9acf
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Dec 28 10:07:16 2023 +0800

    1228

commit 8a95a51981
Author: pxurivswg <1461476498@qq.com>
Date:   Thu Dec 28 00:30:26 2023 +0800

    ADD file via upload

commit 192c7cd549
Author: pxurivswg <1461476498@qq.com>
Date:   Thu Dec 28 00:28:26 2023 +0800

    ADD file via upload

commit 6b5b66f9b2
Author: lyt <1905191745@qq.com>
Date:   Wed Dec 27 23:48:45 2023 +0800

    '前7个'

commit 2f57fb4341
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Dec 27 22:44:31 2023 +0800

    jk newest 1227

commit 324039fa0d
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Dec 27 22:40:18 2023 +0800

    jk newest 1227

commit 49512ee7c3
Author: pxurivswg <1461476498@qq.com>
Date:   Wed Dec 27 20:46:28 2023 +0800

    ADD file via upload

commit 41e563d157
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 18 08:53:24 2023 +0800

    1218jk

commit 793bf3b59e
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 18 08:50:02 2023 +0800

    1218jk

commit 442fdfc63b
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 18 08:42:51 2023 +0800

    jk1218

commit d6ca55cdff
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 18 08:31:35 2023 +0800

    1218

commit e11aa7a352
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 18 08:30:46 2023 +0800

    1218

commit c1c2fe3c4c
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 18 07:52:24 2023 +0800

    1218

commit 6ed4c3c0e9
Author: pxurivswg <1461476498@qq.com>
Date:   Mon Dec 18 00:21:54 2023 +0800

    ADD file via upload

commit e28cd9ea9f
Author: pxurivswg <1461476498@qq.com>
Date:   Mon Dec 18 00:21:28 2023 +0800

    ADD file via upload

commit 17a8f463d0
Author: pxurivswg <1461476498@qq.com>
Date:   Mon Dec 18 00:20:09 2023 +0800

    ADD file via upload

commit f4f7162fbc
Author: lyt <1905191745@qq.com>
Date:   Thu Dec 14 00:21:03 2023 +0800

    //1214

commit 7d2255ffd4
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Dec 13 21:48:18 2023 +0800

    1213

commit a2a12934a6
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Dec 13 21:23:57 2023 +0800

    newest change

commit 6dc4b4ed4c
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Dec 13 21:19:16 2023 +0800

    newest change

commit 0447417400
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 11 08:14:50 2023 +0800

    1210

commit c580419475
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Mon Dec 11 08:11:45 2023 +0800

    1210

commit cefc40af2b
Merge: 36fa7ef 7c1f016
Author: lyt <1905191745@qq.com>
Date:   Mon Dec 11 00:18:04 2023 +0800

    Merge branch 'master' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit 36fa7ef310
Author: lyt <1905191745@qq.com>
Date:   Mon Dec 11 00:08:14 2023 +0800

    git

commit 7c1f01649a
Author: lyt <1905191745@qq.com>
Date:   Mon Dec 11 00:08:14 2023 +0800

    git

commit 6a6d1728da
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Nov 23 08:29:08 2023 +0800

    second add

commit 8263ff1994
Merge: 470be25 19936c0
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Nov 23 08:20:30 2023 +0800

    Merge branch 'main' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit 470be25a47
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Thu Nov 23 08:18:21 2023 +0800

    secondtime

commit 19936c0866
Merge: 1ab4068 16d79cf
Author: lyt <1905191745@qq.com>
Date:   Wed Nov 22 23:33:57 2023 +0800

    Merge branch 'main' of https://bdgit.educoder.net/pafmz8biv/mi_note

commit 1ab4068ee7
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Nov 22 22:16:23 2023 +0800

    first add

commit 16d79cf487
Author: 陈@jkccchen123 <893824054@qq.com>
Date:   Wed Nov 22 22:16:23 2023 +0800

    first add

# Conflicts:
#	src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
#	src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
#	src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
#	src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
#	src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin
#	src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
#	src/Notes-master1/.gradle/file-system.probe
#	src/Notes-master1/.idea/deploymentTargetDropDown.xml
#	src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
#	src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
#	src/Notes-master1/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
#	src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
#	src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
#	src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
#	src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out
#	src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
#	src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
#	src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	src/Notes-master1/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
#	src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
#	src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
#	src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
#	src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
#	src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
#	src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
#	src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
#	src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
#	src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
#	src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	src/Notes-master1/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
#	src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
#	src/Notes-master1/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
#	src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
#	src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId13
#	src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4
#	src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
#	src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
#	src/Notes-master1/app/src/main/res/layout/note_edit.xml
#	src/Notes-master1/local.properties

4b0d470645 ytytytyt

pafmz8biv closed this pull request 2 years ago

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: pafmz8biv/mi_note#4

Write Preview

Loading…

Cancel

Save

There is no content yet.