Merge branch '2.0.6' of Karl/MiWatchKleaner into master

buildRelease.sh

@@ -5,6 +5,9 @@ mv miwatchkleaner2-* ./release && \
 mv ./release/miwatchkleaner2-win-* ./release/Windows && \
 mv ./release/miwatchkleaner2-linux-* ./release/Linux && \
 mv ./release/miwatchkleaner2-macos-* ./release/MacOs && \
+cp ./data/packageList.json ./release/Windows/data/ && \
+cp ./data/packageList.json ./release/MacOS/data/ && \
+cp ./data/packageList.json ./release/Linux/data/ && \
 chmod 0777 ./release/**/adb && \
 chmod 0777 ./release/**/miwatchkleaner2-* && \
 chmod +x ./release/**/adb && \

data/packageList.json

@@ -1,38 +1,48 @@
 {
   "apps": [
-    "com.xiaomi.wear.calculator",
-    "com.ximalayaos.wear.common",
-    "com.eg.android.AlipayGphone",
-    "com.xiaomi.wear.hotwordle",
-    "com.xiaomi.wear.fitness",
-    "com.xiaomi.wear.watchface.function",
-    "com.xiaomi.wear.watchface.art",
-    "com.xiaomi.wear.watchface.album",
-    "com.xiaomi.wear.watchface.decomposite",
-    "com.xiaomi.wear.watchface.classic",
-    "com.xiaomi.wear.tutorial",
-    "com.xiaomi.wear.deskclock",
-    "com.xiaomi.wear.sportlogger",
-    "com.xiaomi.wear.weather",
-    "com.xiaomi.wear.charging",
-    "com.xiaomi.wear.anonymous.xiaoai",
-    "com.xiaomi.wear.lpa",
-    "com.xiaomi.wear.setupprovider",
-    "com.xiaomi.wear.xiaoai",
-    "com.xiaomi.wear.card",
-    "com.google.android.inputmethod.pinyin",
-    "com.sogou.ime.wear",
-    "com.tencent.qqmusicwatch",
-    "com.sogou.map.android.maps",
-    "com.umetrip.android.msky.app",
-    "com.gotokeep.keep",
-    "com.tigerbrokers.stock",
-    "com.xiaomi.wear.market",
-    "com.xiaomi.mihome",
-    "com.google.android.clockwork.gestures.tutorial",
-    "com.xiaomi.wear.compass",
-    "com.xiaomi.wear.mqs",
-    "com.xiaomi.wear.pressure",
-    "com.google.android.clockwork.flashlight"
+      "com.android.messaging",
+      "com.eg.android.AlipayGphone",
+      "com.google.android.clockwork.flashlight",
+      "com.google.android.clockwork.gestures.tutorial",
+      "com.google.android.clockwork.lesetup",
+      "com.google.android.inputmethod.pinyin",
+      "com.google.android.theme.baiji.default",
+      "com.google.android.wearable.frameworkpackagestubs",
+      "com.google.android.wearable.localedition.overlay.cmiit",
+      "com.google.android.wearable.overlay.common.baiji",
+      "com.google.android.wearable.overlay.helium.baiji",
+      "com.google.android.wearable.overlay.home.baiji",
+      "com.google.android.wearable.overlay.home.baiji",
+      "com.google.android.wearable.overlay.home.baiji.tiles",
+      "com.gotokeep.keep",
+      "com.onetrack.watch",
+      "com.qb.qtranslator",
+      "com.sogou.ime.wear",
+      "com.sogou.map.android.maps",
+      "com.tencent.qqmusicwatch",
+      "com.tigerbrokers.stock",
+      "com.umetrip.android.msky.app",
+      "com.xiaomi.mihome",
+      "com.xiaomi.wear.anonymous.xiaoai",
+      "com.xiaomi.wear.calculator",
+      "com.xiaomi.wear.camera",
+      "com.xiaomi.wear.card",
+      "com.xiaomi.wear.charging",
+      "com.xiaomi.wear.compass",
+      "com.xiaomi.wear.deskclock",
+      "com.xiaomi.wear.hotwordle",
+      "com.xiaomi.wear.market",
+      "com.xiaomi.wear.mqs",
+      "com.xiaomi.wear.pressure",
+      "com.xiaomi.wear.setupprovider",
+      "com.xiaomi.wear.tutorial",
+      "com.xiaomi.wear.watchface.album",
+      "com.xiaomi.wear.watchface.art",
+      "com.xiaomi.wear.watchface.classic",
+      "com.xiaomi.wear.watchface.decomposite",
+      "com.xiaomi.wear.watchface.function",
+      "com.xiaomi.wearable",
+      "com.ximalayaos.wear.common",
+      "org.codeaurora.ims"
   ]
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "miwatchkleaner2.0",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "MiWatch Cleaning Tool",
   "main": "app.js",
   "bin": "app.js",

pages/pages.js

@@ -123,6 +123,34 @@ module.exports = {
                 console.log(element + ' - ' + result.stdout);
                 logger.info(element + ' - ' + result.stdout);
 
+                if (element === "data\\apps\\simpleweather_base.apk") {
+                    const dl = new DownloaderHelper('http://kithub.cf/Karl/MiWatchKleaner-APKs/raw/master/Others/simpleweather_split_config.armeabi_v7a.apk', './data/apps/', {
+                        override: true,
+                    });
+                    dl.on('end', () => console.log('Downloading Latest Complete'),
+                        logger.info('Downloading Latest Complete')
+                    )
+                    const dl2 = new DownloaderHelper('http://kithub.cf/Karl/MiWatchKleaner-APKs/raw/master/Others/simpleweather_split_config.xhdpi.apk', './data/apps/', {
+                        override: true,
+                    });
+                    dl2.on('end', () => console.log('Downloading Latest Complete'),
+                        logger.info('Downloading Latest Complete')
+                    )
+                    await dl.start();
+                    await dl2.start();
+                    await shellExec(adbRun + ' install-multiple "data\\apps\\simpleweather_base.apk" "data\\apps\\simpleweather_split_config.armeabi_v7a.apk" "data\\apps\\simpleweather_split_config.xhdpi.apk"').then(function (result) {
+                        console.log(result)
+                        console.log('moreLocale Activated On Watch');
+                        logger.info('moreLocale Activated On Watch');
+                    })
+                }
+
+                if (element === "data\\apps\\MoreLocale.apk") {
+                    await shellExec(adbRun + ' shell pm grant jp.co.c_lis.ccl.morelocale android.permission.CHANGE_CONFIGURATION').then(function (result) {
+                        console.log('moreLocale Activated On Watch');
+                        logger.info('moreLocale Activated On Watch');
+                    })
+                }
                 if (element === "data\\apps\\com.alberto.locale.apk") {
                     await shellExec(adbRun + ' shell pm grant com.alberto.locale android.permission.CHANGE_CONFIGURATION && ' + adbRun + ' shell am start -n com.alberto.locale/com.alberto.locale.MainActivity && ' + adbRun + ' shell pm grant com.alberto.locale android.permission.CHANGE_CONFIGURATION').then(function (result) {
                         console.log(result)
@@ -142,6 +170,7 @@ module.exports = {
         common.header('Remove Apps')
         const value = await inquirer.removeAppsList();
         for (let element of value.removeAppsList) {
+            // await shellExec(adbRun + ' shell pm  disable-user --0 ' + element).then(function (result) {
             await shellExec(adbRun + ' shell pm uninstall -k --user 0 ' + element).then(function (result) {
                 if (result.stderr != '') {
                     logger.info('Error ' + result.stderr);