From c5fd1e2c2dd5c9a156b5ab56db373833445dfac6 Mon Sep 17 00:00:00 2001 From: HINOTOR <3635271576@qq.com> Date: Fri, 9 Jun 2023 13:53:35 +0800 Subject: [PATCH] src --- other/05_张锦辉_贡献度.xlsx | Bin 9170 -> 9229 bytes .../7.5/executionHistory/executionHistory.bin | Bin 367886 -> 367886 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 120233 -> 120233 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes src/Notes-master/.gradle/file-system.probe | Bin 8 -> 8 bytes .../intermediates/apk/debug/app-debug.apk | Bin 1730115 -> 1730115 bytes .../compile-file-map.properties | 8 +- .../values-zh-rCN/values-zh-rCN.xml | 2 +- .../values-zh-rTW/values-zh-rTW.xml | 108 +++++++++++ .../merged.dir/values/values.xml | 177 ++++++++++++++++++ .../debug/mergeDebugResources/merger.xml | 2 +- .../tmp/debug/dex-renamer-state.txt | 2 +- .../tmp/debug/zip-cache/androidResources | Bin 8879 -> 8879 bytes .../values-zh-rCN_values-zh-rCN.arsc.flat | Bin 8000 -> 8000 bytes .../debug/out/multi-v2/debug.json | 139 +++++--------- .../debug/out/multi-v2/values-zh-rCN.json | 53 +----- .../debug/out/resources-debug.ap_ | Bin 1623203 -> 1623203 bytes .../app/build/outputs/apk/debug/app-debug.apk | Bin 1739350 -> 1739352 bytes .../src/main/res/values-zh-rCN/strings.xml | 2 +- 21 files changed, 350 insertions(+), 143 deletions(-) create mode 100644 src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml create mode 100644 src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml diff --git a/other/05_张锦辉_贡献度.xlsx b/other/05_张锦辉_贡献度.xlsx index 33a19ae995d2f2cdc71df072b30fef7eb67fa3a1..221a9850a807c8c7474c92fc106211a49455d89b 100644 GIT binary patch delta 2886 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 delta 2804 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 F{|n9gm9YQ- delta 4822 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 diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock index 6b9e4240010a852a0314a8025abfaef3535101e5..f268e901df245d4f64a8f65d97f0a910e0c7a2bd 100644 GIT binary patch literal 17 VcmZQxz;RmS+p=4G8Nh(+763V$1)=}| literal 17 VcmZQxz;RmS+p=4G8Nh&R0{}U31$Y1e diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin index c341d12cba7c9c0e4bcf309392531e6a9192d48f..89c8b0f681d4bd9e093054700f53708eb883f2e1 100644 GIT binary patch delta 3026 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 diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock index 90b9c89b297059ddd8eea747c630c8ceb1957443..213e01ede1f46f59b5ab54f8168cf8d145d4fdf5 100644 GIT binary patch literal 17 VcmZQRo*5Z&vA9*20SxRW001(<1gQW3 literal 17 UcmZQRo*5Z&vA9*20Ss(J0Wv}aEC2ui diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a14bedb440c6f381a49c2d8a625f21cbec169760..333519fb446fe06c8834417892317e751d35d40d 100644 GIT binary patch literal 17 VcmZSXk9-=r@5|}C<=2mn4I1zi9D literal 17 VcmZSXk9-=r@5|}C=50{}hj1tS diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk index 5b2dd8121c558d221d86a0930fcdfbf6332c4c04..890864f78d09e655691bac77af0e280970747748 100644 GIT binary patch delta 547 zcmV+;0^I$>%xS~SX@G z7*7H5mw}WRKLPcZ!IT(J0rHm-l^DMP^_S6=7=Hotmr<4&9|7;Tah4d{0|E25O_~_b z0s-}x9i15O0ri*Bl^7qFES?xp0rQ7_o*1`%o*AciBZ+=qqmmfLpDVjzT?_&*QeI zTR-HEVFc83mfl#y%>V{DfWxW2lye=GDwFSA!g2_=$nBxH)wM?7iU93@ydUm!_)Lvg z3h0xvLV|N9e8h3Jz@WTKA delta 555 zcmV+`0@VG(%xS~SX@G7y|?iTpIuYZW{mqeH#D(hPOo_7=Im?(>@q*4g?J4 zkCx`Ph~=+_=b(YNLO&QTQUUU}agi9G0Ri)u5tA4%0q>VVlNjF-?EnA(2mk;8;{X5v z2mk;B^_MY}7*7H4mw}WRKLPZY!IT(J0r8g+l^DMP^q0|<7=Hosmr<4&9|7*Sah4d{ z0|D~4O_~_b0s-`w9i15O0rZ#Al^7qFES?xp0rH1^o*1`%o*Ac19q{+m21Sjr0^=Qj=rZ)11#j(IN1-@k-nG)8)JZHSNfFC28qNyf9q?AtSd;HyV5{1jDa)mY2+B8h1Y#`cVJ? diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 4a76c68..4e29a4e 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,11 +1,11 @@ -#Fri Jun 09 13:37:56 CST 2023 +#Fri Jun 09 13:52:07 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/menu_lock.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_lock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat @@ -14,10 +14,10 @@ net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\programming\\gitProje net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/password_lock_note.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_password_lock_note.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/password_lock_note.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_password_lock_note.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml index 9e1fec6..e9e33c5 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -61,7 +61,7 @@ 退出清单模式 设置密码 删除提醒 - 取消密码 + 删除密码 搜索 全选 没有选中项，操作无效 diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..be0a1eb --- /dev/null +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -0,0 +1,177 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Confirm to make the selected %d notes go back? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + bg:default + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + go back + Enter check list + set lock + Move to folder + Parent folder + Leave check list + set private note password + Delete reminder + revoke private note password + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + trash + remove lock + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index c007e80..60e9927 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -46,7 +46,7 @@ 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图/MIUI/notes/notes_%s.txt(%d)新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$syyyy-MM-dd hh:mm:ss添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消还原确定使这 %d 个便签还原?便签回收站背景：默认设置密码取消密码设置锁移出锁 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图/MIUI/notes/notes_%s.txt(%d)新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$syyyy-MM-dd hh:mm:ss添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消还原确定使这 %d 个便签还原?便签回收站背景：默认设置密码删除密码设置锁移出锁 %1$s 条符合“%2$s”的搜索结果 短信 diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index bd6ac68..3d2d640 100644 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Jun 09 13:38:16 CST 2023 +#Fri Jun 09 13:52:20 CST 2023 base.0=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index f541dfe2ea147430f22d154933a6dd4b2b38c3e7..0a7def601710fb859a63f6f4e65141776aa2f257 100644 GIT binary patch delta 16 XcmZ4Qy54m|t`bYw4TreNg-Uh+I+O-n delta 16 YcmZ4Qy54m|t`f`P_2tth7b@8S06#wm4*&oF diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 88db34b31420c11d3dfce4cf111b03e92287d5aa..6b99afd3cbda64392136b1daa389591065c5bcc8 100644 GIT binary patch delta 18 acmX?LcffALBYxJ71uthV+5DV8k{Moh)I` z_;vbG5bx7;(J2!9fjq&v67ti(Op!=n{5(B$s)Rh_`|YJuC2lhV4G)|tah?gNL~)M9 Xdx*+>plIVTZ~*aR2+jO;y6I#I zf5s2fTPI7{Gk%$V6vX>DU37}Xejrb9u7v#bFHZk4V@70F%&KVE_OC diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk index e0ffb2c7c8b26972cbbcd022f8dcea6466ad7206..ac843844d103a3bf52133c0499a15ea264dbe0b2 100644 GIT binary patch delta 10144 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 delta 10162 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 diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml index 0515c34..2e76b2a 100644 --- a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml @@ -131,7 +131,7 @@ 背景：默认 设置密码 - 取消密码 + 删除密码 设置锁 移出锁