Merge pull request #409 from penguin-statistics/dev

Release v3.4.0
penguin-statistics · Dec 21, 2020 · e4e9bb3 · e4e9bb3
2 parents 22eabed + 9625d7c
commit e4e9bb3
Show file tree

Hide file tree

Showing 243 changed files with 5,908 additions and 2,076 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,2 @@
+# aliyun edgescript
+*.edgescript
diff --git a/.eslintrc b/.eslintrc
@@ -1,7 +1,9 @@
 {
   "root": true,
   "globals": {
-    "GIT_COMMIT": true
+    "GIT_COMMIT": true,
+    "PENGUIN_BUILD": true,
+    "PENGUIN_BUILD_FROM": true
   },
   "env": {
     "node": true

diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,14 @@ node_js:
 cache:
   directories:
     - node_modules
+env:
+  - PENGUIN_BUILD_FROM=travis
 script:
   - yarn lint
-  - yarn build:single
+  - yarn build:web
+notifications:
+  webhooks:
+    urls:
+      - https://open.feishu.cn/officialapp/notify/7acc2a56a36dacb0a47d60c557a7bb469b0eeeb49f433469ccceb2bba0861887
+    on_success: always
+    on_failure: always
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Penguin Statistics
+Copyright (c) 2020 Penguin Statistics
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -48,18 +48,18 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Camera, Photos, input file -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
+<!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
     <!-- Geolocation API -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-feature android:name="android.hardware.location.gps" />
+<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
+<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
+<!--    <uses-feature android:name="android.hardware.location.gps" />-->
     <!-- Network API -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- Navigator.getUserMedia -->
     <!-- Video -->
-    <uses-permission android:name="android.permission.CAMERA" />
+<!--    <uses-permission android:name="android.permission.CAMERA" />-->
     <!-- Audio -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+<!--    <uses-permission android:name="android.permission.RECORD_AUDIO" />-->
+<!--    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>-->
 </manifest>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/electron/.gitignore b/electron/.gitignore
diff --git a/electron/capacitor.config.json b/electron/capacitor.config.json
diff --git a/electron/index.js b/electron/index.js
diff --git a/electron/package.json b/electron/package.json
diff --git a/electron/splash_assets/splash.gif b/electron/splash_assets/splash.gif
diff --git a/electron/splash_assets/splash.png b/electron/splash_assets/splash.png