diff --git a/README.md b/README.md index 5b3cdd1..cea9f5b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The Magisk module integrated with Monet color extraction can select whether to i [![GitHub release (latest by date)](https://img.shields.io/github/v/release/YangguangZhou/Monet-All)](https://github.com/YangguangZhou/Monet-All/releases) [![GitHub Release Date](https://img.shields.io/github/release-date/YangguangZhou/Monet-All)](https://github.com/YangguangZhou/Monet-All/releases) ![last commit](https://img.shields.io/github/last-commit/YangguangZhou/Monet-All?style=flat) -[![Telegram](https://img.shields.io/badge/Telegram-Monet__All-informational?logo=telegram)](https://monet.jerryz.com.cn/group) +[![Telegram](https://img.shields.io/badge/dynamic/json?&label=Monet_All&logo=telegram&query=%24.data.totalSubs&url=https%3A%2F%2Fapi.spencerwoo.com%2Fsubstats%2F%3Fsource%3Dtelegram%26queryKey%3Dmonet_all)](https://monet.jerryz.com.cn/group) ## 捐赠 Donate diff --git a/customize.sh b/customize.sh index 9099d8b..a7ed142 100644 --- a/customize.sh +++ b/customize.sh @@ -23,7 +23,7 @@ Volume_key_monitoring() { #开始安装 sleep 0.07 -echo -en "\nMonet-All v2.0.2\nby Jerry Zhou\n\n" +echo -en "\nMonet-All v2.0.3\nby Jerry Zhou\n\n" sleep 0.07 echo -en '安装模块前请先确认模块适配的应用版本并阅读注意事项\n搞机不谨慎,救砖两行泪\n' Outputs "—————————————————————————————————————" @@ -36,7 +36,7 @@ if [[ $(Volume_key_monitoring) == 0 ]]; then else Outputs "请认真阅读模块适配的应用版本并阅读注意事项" sleep 0.5 - am start -a android.intent.action.VIEW -d https://monet.jerryz.com.cn/ &>/dev/null + am start -a android.intent.action.VIEW -d https://monet.jerryz.com.cn/?utm_source=module &>/dev/null fi #初始化变量 @@ -78,7 +78,7 @@ if [[ "$output" != "" ]]; then fi fi -for loop in com.coolapk.market com.tencent.wetype com.tencent.weread com.apple.android.music tv.danmaku.bili com.bilibili.app.in com.android.systemui mark.via com.douban.frodo com.huanchengfly.tieba.post com.github.kr328.clash.foss com.github.kr328.clash com.netease.cloudmusic com.omarea.vtools com.sup.android.superb com.miui.player com.jiongji.andriod.card com.newskyer.draw com.taptap org.mozilla.firefox org.mozilla.fenix io.github.forkmaintainers.iceraven cn.icyflame.unknown com.aefyr.sai com.caiyuninterpreter.activity com.jarstones.jizhang com.Jesse205.hellotool com.liuzho.file.explorer com.modosa.apkinstaller com.modosa.rootinstaller com.nowcasting.activity com.realvnc.viewer.android com.tencent.androidqqmail com.wangc.bill eu.thedarken.sdm idm.internet.download.manager idm.internet.download.manager.plus me.gfuil.bmap nutstore.android web1n.stopapp x7890.shortcutcreator; do +for loop in com.coolapk.market com.tencent.wetype com.tencent.weread com.apple.android.music tv.danmaku.bili com.bilibili.app.in com.android.systemui mark.via com.douban.frodo com.huanchengfly.tieba.post com.github.kr328.clash.foss com.github.kr328.clash com.netease.cloudmusic com.omarea.vtools com.sup.android.superb com.miui.player com.jiongji.andriod.card com.newskyer.draw com.taptap org.mozilla.firefox org.mozilla.fenix io.github.forkmaintainers.iceraven cn.icyflame.unknown com.aefyr.sai com.caiyuninterpreter.activity com.jarstones.jizhang com.Jesse205.hellotool com.liuzho.file.explorer com.modosa.apkinstaller com.modosa.rootinstaller com.nowcasting.activity com.realvnc.viewer.android com.tencent.androidqqmail com.wangc.bill eu.thedarken.sdm idm.internet.download.manager idm.internet.download.manager.plus me.gfuil.bmap nutstore.android web1n.stopapp x7890.shortcutcreator cn.wps.moffice_eng cn.wps.note com.mojitec.mojidict com.mutangtech.qianji com.salt.music com.vmos.pro; do case $loop in com.coolapk.market) name=酷安 @@ -200,6 +200,24 @@ for loop in com.coolapk.market com.tencent.wetype com.tencent.weread com.apple.a x7890.shortcutcreator) name=创建快捷方式 ;; + cn.wps.moffice_eng) + name="WPS Office" + ;; + cn.wps.note) + name=WPS便签 + ;; + com.mojitec.mojidict) + name=MOJI辞書 + ;; + com.mutangtech.qianji) + name=钱迹 + ;; + com.salt.music) + name=椒盐音乐 + ;; + com.vmos.pro) + name="VMOS Pro" + ;; *) continue ;; esac output="$(pm list package | grep $loop)" @@ -223,6 +241,11 @@ for loop in com.coolapk.market com.tencent.wetype com.tencent.weread com.apple.a monet=${monet}"、"${name} fi fi + if [[ "$cnt" -le 1 ]]; then + module=${name} + else + module=${module}"、"${name} + fi else Outputs "不安装$name莫奈取色" rm -rf "$MODPATH"/system/priv-app/$loop.apk @@ -261,11 +284,12 @@ if [[ $(Volume_key_monitoring) == 0 ]]; then Outputs "支持作者" Outputs "感谢您的支持" sleep 0.5 - am start -a android.intent.action.VIEW -d https://pay.jerryz.com.cn/ &>/dev/null + am start -a android.intent.action.VIEW -d https://pay.jerryz.com.cn/?utm_source=module &>/dev/null else Outputs "不支持作者" fi echo -en "\n" +Outputs "说明文档:monet.jerryz.com.cn" Outputs "GitHub项目地址:github.com/YangguangZhou/Monet-All" Outputs "交流群:t.me/Monet_All" echo -en "\n" diff --git a/module.prop b/module.prop index 187127b..1f631d7 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=Monet-All name=Monet-All -version=v2.0.2 -versionCode=202 +version=v2.0.3 +versionCode=203 author=Jerry Zhou -description=莫奈取色整合模块 GitHub项目地址:https://github.com/YangguangZhou/Monet-All Telegram交流群:https://t.me/Monet_All +description=莫奈取色整合模块 说明文档:monet.jerryz.com.cn updateJson=https://monet.jerryz.com.cn/Monet-All.json diff --git a/system/priv-app/cn.wps.moffice_eng.apk b/system/priv-app/cn.wps.moffice_eng.apk new file mode 100644 index 0000000..3d9cb9e Binary files /dev/null and b/system/priv-app/cn.wps.moffice_eng.apk differ diff --git a/system/priv-app/cn.wps.note.apk b/system/priv-app/cn.wps.note.apk new file mode 100644 index 0000000..4a90a1b Binary files /dev/null and b/system/priv-app/cn.wps.note.apk differ diff --git a/system/priv-app/com.mojitec.mojidict.apk b/system/priv-app/com.mojitec.mojidict.apk new file mode 100644 index 0000000..1d514ac Binary files /dev/null and b/system/priv-app/com.mojitec.mojidict.apk differ diff --git a/system/priv-app/com.mutangtech.qianji.apk b/system/priv-app/com.mutangtech.qianji.apk new file mode 100644 index 0000000..3a8ccea Binary files /dev/null and b/system/priv-app/com.mutangtech.qianji.apk differ diff --git a/system/priv-app/com.salt.music.apk b/system/priv-app/com.salt.music.apk new file mode 100644 index 0000000..4631b37 Binary files /dev/null and b/system/priv-app/com.salt.music.apk differ diff --git a/system/priv-app/com.tencent.mm(Play).apk b/system/priv-app/com.tencent.mm(Play).apk index e941167..c0a9dda 100644 Binary files a/system/priv-app/com.tencent.mm(Play).apk and b/system/priv-app/com.tencent.mm(Play).apk differ diff --git a/system/priv-app/com.tencent.mm.apk b/system/priv-app/com.tencent.mm.apk index 7dc3eba..bce378c 100644 Binary files a/system/priv-app/com.tencent.mm.apk and b/system/priv-app/com.tencent.mm.apk differ diff --git a/system/priv-app/com.vmos.pro.apk b/system/priv-app/com.vmos.pro.apk new file mode 100644 index 0000000..ca74ba1 Binary files /dev/null and b/system/priv-app/com.vmos.pro.apk differ