Skip to content

Commit

Permalink
Merge pull request #14 from YangguangZhou/dev
Browse files Browse the repository at this point in the history
更新 v2.0.3
  • Loading branch information
YangguangZhou authored May 14, 2023
2 parents 6b7893f + d74fd03 commit 16127c0
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
32 changes: 28 additions & 4 deletions customize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "—————————————————————————————————————"
Expand All @@ -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

#初始化变量
Expand Down Expand Up @@ -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=酷安
Expand Down Expand Up @@ -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)"
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions module.prop
Original file line number Diff line number Diff line change
@@ -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
Binary file added system/priv-app/cn.wps.moffice_eng.apk
Binary file not shown.
Binary file added system/priv-app/cn.wps.note.apk
Binary file not shown.
Binary file added system/priv-app/com.mojitec.mojidict.apk
Binary file not shown.
Binary file added system/priv-app/com.mutangtech.qianji.apk
Binary file not shown.
Binary file added system/priv-app/com.salt.music.apk
Binary file not shown.
Binary file modified system/priv-app/com.tencent.mm(Play).apk
Binary file not shown.
Binary file modified system/priv-app/com.tencent.mm.apk
Binary file not shown.
Binary file added system/priv-app/com.vmos.pro.apk
Binary file not shown.

0 comments on commit 16127c0

Please sign in to comment.