From 3163c35b1939f4eed21b18850dd7fcb16159537b Mon Sep 17 00:00:00 2001 From: Yawasau <229953100a@gmail.com> Date: Sun, 27 Oct 2024 13:11:57 +0800 Subject: [PATCH] bugfix --- backup_settings.conf | 12 +++-- tools/Device_List | 121 +++++++++++++++++++++++++++---------------- tools/tools.sh | 2 +- 3 files changed, 86 insertions(+), 49 deletions(-) diff --git a/backup_settings.conf b/backup_settings.conf index a14989a..a201149 100644 --- a/backup_settings.conf +++ b/backup_settings.conf @@ -28,7 +28,7 @@ update=1 mount_point="rannki|0000-1" #使用者(如0 999等用戶，如存在多個用戶留空強制選擇，無多個用戶則默認用戶0不詢問) -user=0 +user= #備份模式 #1包含數據+安裝包，0僅包安裝包 @@ -36,6 +36,10 @@ user=0 #此外設置0時將同時忽略appList.txt的!與任何黑名單設置（包括黑名單列表） Backup_Mode=1 +#執行生成應用列表.sh時輸出用於recovery救援的卡刷包？ +#1輸出 0不輸出 +recovery_flash=0 + #是否備份使用者數據 (1備份 0不備份 留空強制選擇) Backup_user_data=1 @@ -47,7 +51,7 @@ Backup_obb_data=1 backup_media=0 #存在進程忽略備份(1忽略0備份) -Background_apps_ignore=1 +Background_apps_ignore=0 #假設你遇到列表輸出異常問題請將此設為1 debug_list=0 @@ -56,16 +60,16 @@ debug_list=0 Custom_path=" /storage/emulated/0/Pictures/ /storage/emulated/0/Download/ +/storage/emulated/0/Music /storage/emulated/0/DCIM/ /data/adb " #黑名單模式(1完全忽略，不備份 0僅備份安裝包，注意！此選項Backup_Mode=1時黑名單模式才能使用) -blacklist_mode=1 +blacklist_mode=0 #備份黑名單（備份策略由「黑名單模式」控制，此處只作為黑名單應用列表） blacklist=" -com.google.android.apps.messaging #com.esunbank #com.chailease.tw.app.android.ccfappcust" diff --git a/tools/Device_List b/tools/Device_List index aee8350..d2df932 100644 --- a/tools/Device_List +++ b/tools/Device_List @@ -135,6 +135,10 @@ "2407FPN8EG" "Xiaomi 14T Pro 國際版" "2407FPN8ER" "Xiaomi 14T Pro 日本版 (無鎖)" "A402XM" "Xiaomi 14T Pro 日本版 (SoftBank)" +"24129PN74C" "Xiaomi 15 國行版" +"24129PN74G" "Xiaomi 15 國際版" +"24129PN74I" "Xiaomi 15 印度版" +"2410DPN6CC" "Xiaomi 15 Pro" "2014616" "小米 Note 雙網通版" "2014619" "小米 Note 全網通版" "2014618" "小米 Note 移動合約版" @@ -214,6 +218,10 @@ "2307BRPDCC" "Xiaomi Pad 6 Max 14" "24018RPACC" "Xiaomi Pad 6S Pro 12.4 國行版" "24018RPACG" "Xiaomi Pad 6S Pro 12.4 國際版" +"2410CRP4CC" "Xiaomi Pad 7 國行版" +"2410CRP4CG" "Xiaomi Pad 7 國際版" +"24091RPADC" "Xiaomi Pad 7 Pro 國行版" +"24091RPADG" "Xiaomi Pad 7 Pro 國際版" "2013022" "紅米手機 移動版" "2013023" "紅米手機 聯通版" "2013029" "紅米 1S 聯通版" @@ -354,7 +362,6 @@ "2404ARN45I" "Redmi 13 印度版" "24049RN28L" "Redmi 13 拉美版" "24040RN64Y" "Redmi 13 國際版 (NFC)" -"2406ERN9CC" "Redmi 13 5G 國行版" "2406ERN9CI" "Redmi 13 5G 印度版" "23106RN0DA" "Redmi 13C 國際版" "2311DRN14I" "Redmi 13C 印度版" @@ -363,6 +370,12 @@ "23124RN87C" "Redmi 13C 5G 國行版 / Redmi 13R 5G" "23124RN87I" "Redmi 13C 5G 印度版" "23124RN87G" "Redmi 13C 5G 國際版" +"2409BRN2CC" "Redmi 14C 國行版" +"2409BRN2CA" "Redmi 14C 國際版" +"2409BRN2CI" "Redmi 14C 印度版" +"2409BRN2CL" "Redmi 14C 拉美版" +"2409BRN2CY" "Redmi 14C 國際版 (NFC)" +"2411DRN47C" "Redmi 14R 5G" "2014018" "紅米 Note 聯通 3G 標準版" "2013121" "紅米 Note 聯通 3G 增強版" "2014017" "紅米 Note 移動 3G 標準版" @@ -524,6 +537,16 @@ "24040RA98R" "Redmi Note 13 Pro+ 5G 日本版" "2406ERN9CC" "Redmi Note 13R" "2311FRAFDC" "Redmi Note 13R Pro" +"24094RAD4C" "Redmi Note 14 5G 國行版" +"24094RAD4G" "Redmi Note 14 5G 國際版" +"24094RAD4I" "Redmi Note 14 5G 印度版" +"24116RACCG" "Redmi Note 14 Pro 國際版" +"24090RA29C" "Redmi Note 14 Pro 國行版" +"24090RA29G" "Redmi Note 14 Pro 5G 國際版" +"24090RA29I" "Redmi Note 14 Pro 5G 印度版" +"24115RA8EC" "Redmi Note 14 Pro+ 國行版" +"24115RA8EG" "Redmi Note 14 Pro+ 5G 國際版" +"24115RA8EI" "Redmi Note 14 Pro+ 5G 印度版" "M2004J7AC" "Redmi 10X 5G" "M2004J7BC" "Redmi 10X Pro 5G" "M2003J15SC" "Redmi 10X 4G" @@ -561,6 +584,7 @@ "23117RK66C" "Redmi K70 Pro" "2311DRK48C" "Redmi K70E" "2407FRK8EC" "Redmi K70 至尊版" +"24117RK2CC" "Redmi K80" "2016020" "紅米 Pro 標準版" "2016021" "紅米 Pro 高配版 / 尊享版" "M1803E6E" "紅米 S2 全網通版" @@ -588,17 +612,23 @@ "24048RN6CG" "Redmi A3x 國際版" "24048RN6CI" "Redmi A3x 印度版" "24044RN32L" "Redmi A3x 拉美版" +"2409BRN2CG" "Redmi A3 Pro 國際版" "22081283C" "Redmi Pad 國行版" "22081283G" "Redmi Pad 國際版" "23073RPBFC" "Redmi Pad SE 國行版" "23073RPBFG" "Redmi Pad SE 國際版" "23073RPBFL" "Redmi Pad SE 拉美版" -"2405CRPFDC" "Redmi Pad Pro 國行版" -"2405CRPFDG" "Redmi Pad Pro 國際版" -"2405CRPFDI" "Redmi Pad Pro 印度版" -"2405CRPFDL" "Redmi Pad Pro 拉美版" +"23073RPBFC" "Redmi Pad M7" +"2405CRPFDC" "Redmi Pad Pro Wi-Fi 國行版" +"2405CRPFDG" "Redmi Pad Pro Wi-Fi 國際版" +"2405CRPFDI" "Redmi Pad Pro Wi-Fi 印度版" +"2405CRPFDL" "Redmi Pad Pro Wi-Fi 拉美版" "24074RPD2C" "Redmi Pad Pro 5G 國行版" "24074RPD2G" "Redmi Pad Pro 5G 國際版" +"24074RPD2I" "Redmi Pad Pro 5G 印度版" +"24075RP89G" "Redmi Pad SE 8.7 Wi-Fi 國際版" +"24076RP19G" "Redmi Pad SE 8.7 4G 國際版" +"24076RP19I" "Redmi Pad SE 4G 印度版" "M1805E10A" "POCO F1" "M2004J11G" "POCO F2 Pro 國際版" "M2012K11AG" "POCO F3 國際版" @@ -622,7 +652,6 @@ "2201116PG" "POCO X4 Pro 5G 國際版" "2201116PI" "POCO X4 Pro 5G 印度版" "22041216G" "POCO X4 GT 國際版" -"22041216UG" "POCO X4 GT Pro 國際版" "22111317PG" "POCO X5 5G 國際版" "22111317PI" "POCO X5 5G 印度版" "22101320G" "POCO X5 Pro 5G 國際版" @@ -654,6 +683,7 @@ "24066PC95I" "POCO M6 Plus 5G 印度版" "2312FPCA6G" "POCO M6 Pro 國際版" "23076PC4BI" "POCO M6 Pro 5G 印度版" +"24108PCE2I" "POCO M7 5G 印度版" "M2006C3MI" "POCO C3 印度版" "211033MI" "POCO C31 印度版" "220333QPG" "POCO C40 國際版" @@ -667,7 +697,10 @@ "2312BPC51H" "POCO C61 印度版" "2310FPCA4G" "POCO C65 國際版" "2310FPCA4I" "POCO C65 印度版" -"2405CPCFBG" "POCO Pad 國際版" +"2410FPCC5G" "POCO C75 國際版" +"2410FPCC5I" "POCO C75 印度版" +"2405CPCFBG" "POCO Pad Wi-Fi 國際版" +"24074PCD2I" "POCO Pad 5G 印度版" "FYJ01QP" "小米米家翻譯機" "21051191C" "CyberDog 仿生四足機器人" "GT-I9000" "Galaxy S 公開版" @@ -908,8 +941,11 @@ "SM-X916C" "Galaxy Tab S9 Ultra 5G" "SM-X510" "Galaxy Tab S9 FE WLAN" "SM-X516C" "Galaxy Tab S9 FE 5G" -"SM-X610" "Galaxy Tab S9 FE WLAN" -"SM-X616C" "Galaxy Tab S9 FE 5G" +"SM-X610" "Galaxy Tab S9 FE+ WLAN" +"SM-X616C" "Galaxy Tab S9 FE+ 5G" +"SM-X820" "Galaxy Tab S10+ WLAN" +"SM-X920" "Galaxy Tab S10 Ultra WLAN" +"SM-X926C" "Galaxy Tab S10 Ultra 5G" "SM-T350" "Galaxy Tab A 8.0 WLAN" "SM-T355C" "Galaxy Tab A 8.0 LTE" "SM-T550" "Galaxy Tab A 9.7 WLAN" @@ -1070,6 +1106,17 @@ "G576D" "Pixel 8a (Japan)" "G9FPL" "Pixel Fold (US, EU)" "G0B96" "Pixel Fold (Japan)" +"G2YBB" "Pixel 9 (US, mmWave)" +"GUR25" "Pixel 9 (Global)" +"G1B60" "Pixel 9 (Japan)" +"GR83Y" "Pixel 9 Pro (US, mmWave)" +"GEC77" "Pixel 9 Pro (Global)" +"GWVK6" "Pixel 9 Pro (Japan)" +"GGX8B" "Pixel 9 Pro XL (US, mmWave)" +"GZC4K" "Pixel 9 Pro XL (Global)" +"GQ57S" "Pixel 9 Pro XL (Japan)" +"GGH2X" "Pixel 9 Pro Fold (Global)" +"GC15S" "Pixel 9 Pro Fold (Japan)" "C1502W" "Pixel C" "GTU8P" "Pixel Tablet" "GQF4C" "Pixel Watch Bluetooth & Wi-Fi" @@ -1078,6 +1125,10 @@ "G4TSL" "Pixel Watch 2 Bluetooth & Wi-Fi" "GD2WG" "Pixel Watch 2 LTE (US)" "GC3G8" "Pixel Watch 2 LTE (Global)" +"GG3HH" "Pixel Watch 3 Bluetooth & Wi-Fi (41mm)" +"GBDU9" "Pixel Watch 3 LTE (41mm)" +"GGE4J" "Pixel Watch 3 Bluetooth & Wi-Fi (45mm)" +"GRY0E" "Pixel Watch 3 LTE (45mm)" "Lenovo L78012" "聯想 Z5" "Lenovo L78031" "聯想 Z5 Pro" "Lenovo L78032" "聯想 Z5 Pro GT" @@ -1125,6 +1176,7 @@ "TB132FU" "聯想小新 Pad Pro 2022 迅鯤版" "TB371FC" "聯想小新 Pad Pro 12.7 驍龍版" "TB370FU" "聯想小新 Pad Pro 12.7 天璣版" +"TB375FC" "聯想小新 Pad Pro 12.7 2025" "TB351FU" "聯想小新 Pad Studio" "TB372FC" "聯想小新學習平板 12.7" "Lenovo YT3-850F" "聯想 YOGA Tab 3 8」 Wi-Fi 版" @@ -1139,6 +1191,7 @@ "SP101FU" "聯想 YOGA Paper 墨水平板" "Lenovo TB-9707F" "聯想拯救者 Y700 (2022)" "TB320FC" "聯想拯救者 Y700 (2023)" +"TB321FU" "聯想拯救者 Y700 (2024)" "TB570FU" "聯想拯救者 Y900" "Lenovo TB-J616F" "聯想天驕平板電腦" "Lenovo TB-8504F" "聯想 TAB4 8 英寸 Wi-Fi 版" @@ -1261,6 +1314,7 @@ "M481Q" "魅族 21 PRO" "M468Q" "魅族 21 Note 公開版" "M468H" "魅族 21 Note 國際版" +"M431Q" "魅族 Lucky 08 公開版" "M852Q" "魅族 X8 公開版" "M852H" "魅族 X8 國際版" "M813Q" "魅族 V8 高配版" @@ -1271,6 +1325,8 @@ "M822H" "魅族 Note8 國際版" "M923Q" "魅族 Note9 公開版" "M923H" "魅族 Note9 國際版" +"M411L" "魅族 Note 21 國際版" +"M412H" "魅族 Note 21 Pro 國際版" "M810H" "魅族 M8c 國際版" "M818H" "魅族 C9 國際版" "M819H" "魅族 C9 Pro 國際版" @@ -1341,9 +1397,10 @@ "M712H" "魅族 M6s 國際版" "M811Q" "魅藍 6T 公開版" "M811H" "魅族 M6T 國際版" -"M2110" "魅藍 10" +"M2112" "魅藍 10" "M2111" "魅藍 10s" -"M421Q" "魅藍 20" +"M421Q" "魅藍 20 / 魅族 M20" +"M416L" "魅族 MBLU 21" "S685Q" "魅藍 Max 公開版" "S685M" "魅藍 Max 移動版" "S685C" "魅藍 Max 電信版" @@ -1362,7 +1419,10 @@ "M57AC" "魅藍 metal 電信版" "M710M" "魅藍 A5 移動定制版" "M710H" "魅族 M5c 國際版" +"M468Q" "LYNK & CO Phone Note" +"M481S" "LYNK & CO Phone Pro" "M481S" "Polestar Phone" +"M481R" "HongQi Phone" "XT1085" "Moto X" "XT1079" "Moto G LTE 移動/聯通版" "XT1077" "Moto G LTE 電信/聯通版" @@ -1406,9 +1466,11 @@ "XT2343-3" "moto g54" "XT2363-4" "moto g34" "XT2401-2" "moto X50 Ultra" +"XT2409-5" "moto S50" "XT2427-4" "moto S50 Neo" "XT2453-2" "moto razr 50" "XT2451-4" "moto razr 50 Ultra" +"XT2435-3" "moto g55" "TA-1000" "Nokia 6" "TA-1054" "Nokia 6 (第二代)" "TA-1041" "Nokia 7" @@ -1430,6 +1492,7 @@ "A065" "Nothing Phone (2) Global" "AIN065" "Nothing Phone (2) India" "A142" "Nothing Phone (2a)" +"A142P" "Nothing Phone (2a) Plus" "A015" "CMF Phone 1" "NX501" "nubia Z5" "NX402" "nubia Z5 mini" @@ -1512,6 +1575,8 @@ "NX769J" "紅魔 9 Pro / 紅魔 9 Pro+" "NX769J" "紅魔 9S Pro / 紅魔 9S Pro+" "NP01J" "紅魔電競平板 5G" +"NP03J" "紅魔電競平板 Pro" +"NP02J" "紅魔平板 · 3D 探索版 5G" "ONE A0001" "OnePlus One 全網通版 / 移動版 / 國際版" "ONE A1001" "OnePlus One 聯通版" "ONE A2001" "OnePlus 2" @@ -1615,6 +1680,7 @@ "CPH2611" "OnePlus 12R 北美版 / 原神刻晴定制機" "PJF110" "OnePlus Ace 3V 國行版" "PJX110" "OnePlus Ace 3 Pro 國行版" +"PJZ110" "OnePlus 13 國行版" "AC2001" "OnePlus Nord 印度版" "AC2003" "OnePlus Nord 歐洲版 / 國際版" "DN2101" "OnePlus Nord 2 印度版" @@ -1689,36 +1755,3 @@ "XQ-CQ72" "Xperia 5 IV" "XQ-DQ72" "Xperia 1 V" "XQ-DE72" "Xperia 5 V" -"RMX3350" "真我GT Neo 極速版" -"RMX2111" "真我 Q2" -"RMX2112" "真我 Q2" -"RMX2117" "真我 Q2" -"RMX2202" "真我 GT" -"RMX2205" "真我 Q3 PRO" -"RMX3031" "真我 GT Neo" -"RMX3041" "真我 v13" -"RMX3042" "真我 Q3i" -"RMX3043" "真我 v13電信版" -"RMX3161" "真我 Q3" -"RMX3300" "真我 GT2 PRO" -"RMX3357" "真我 GT Neo2T" -"RMX3366" "真我 GT 大師探索版" -"RMX3370" "真我 GT Neo2" -"RMX3372" "真我 Q5 PRO" -"RMX3461" "真我 Q3s" -"RMX3478" "真我 Q5" -"RMX3551" "真我 GT2 大師探索版" -"RMX3560" "真我 GT Neo3" -"RMX3562" "真我 GT Neo3 150w" -"RMX3700" "真我 GT Neo5 SE" -"RMX3706" "真我 GT Neo5 150W" -"RMX3708" "真我 GT Neo5 240W" -"RMX3770" "真我 11 Pro" -"RMX3740" "真我 11 Pro+" -"RMX3372" "真我 Q5 Pro" -"RMX3663" "真我 10 Pro" -"RMX2071" "真我 X50 Pro" -"RMX2072" "真我 X50 Pro 玩家版" -"RMX3475" "真我 V25" -"RMX3888" "真我 GT5 Pro" -"RMX3780" "realme 11 5G TWOP" diff --git a/tools/tools.sh b/tools/tools.sh index 43f09fe..de5703a 100644 --- a/tools/tools.sh +++ b/tools/tools.sh @@ -10,7 +10,7 @@ MODDIR_NAME="${MODDIR##*/}" tools_path="$MODDIR/tools" Compression_rate=9 script="${0##*/}" -backup_version="V15.9.5" +backup_version="V15.9.6" [[ $SHELL = *mt* ]] && echo "請勿使用MT管理器拓展包環境執行,請更換系統環境" && exit 2 update_backup_settings_conf() { echo "#0關閉音量鍵選擇 (如選項未設置，則強制使用音量鍵選擇)