diff --git a/.github/workflows/auto_build.yml b/.github/workflows/auto_build.yml index 039d620ddd..a3561ee68e 100644 --- a/.github/workflows/auto_build.yml +++ b/.github/workflows/auto_build.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v2 with: repository: pppscn/keystore - token: ${{ secrets.GITHUB_TOKEN }} # 连接仓库的token,需要单独配置 + token: ${{ secrets.TOKEN }} # 连接仓库的token,需要单独配置 path: keystore # 仓库的根目录名 # 打包release - name: Build with Gradle diff --git a/app/build.gradle b/app/build.gradle index 5b5485d656..a880cc3eac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ android { } } //apk file name - /*android.applicationVariants.all { variant -> + android.applicationVariants.all { variant -> variant.outputs.all { //def date = new Date().format("yyyyMMdd" , TimeZone.getTimeZone("Asia/Shanghai")) def date = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08")) @@ -69,7 +69,7 @@ android { outputFileName = "SmsForwarder_release_${date}_${versionName}.apk" } } - }*/ + } } diff --git a/app/src/main/java/com/idormy/sms/forwarder/service/FrontService.java b/app/src/main/java/com/idormy/sms/forwarder/service/FrontService.java index 081e39f3d8..726f4fc93f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/service/FrontService.java +++ b/app/src/main/java/com/idormy/sms/forwarder/service/FrontService.java @@ -25,7 +25,6 @@ import com.idormy.sms.forwarder.sender.SendUtil; import com.idormy.sms.forwarder.sender.SenderUtil; import com.idormy.sms.forwarder.utils.LogUtil; -import com.idormy.sms.forwarder.utils.OSUtils; import com.idormy.sms.forwarder.utils.PhoneUtils; import com.idormy.sms.forwarder.utils.SettingUtil; @@ -47,11 +46,11 @@ public void onCreate() { Log.i(TAG, "onCreate"); Notification.Builder builder = new Notification.Builder(this); builder.setSmallIcon(R.drawable.ic_forwarder); - OSUtils.ROM_TYPE romType = OSUtils.getRomType(); + //OSUtils.ROM_TYPE romType = OSUtils.getRomType(); //Log.d(TAG, "onCreate: " + romType); - if (romType == OSUtils.ROM_TYPE.MIUI_ROM) { - builder.setContentTitle(getString(R.string.app_name)); - } + //if (romType == OSUtils.ROM_TYPE.MIUI_ROM) { + builder.setContentTitle(getString(R.string.app_name)); + //} builder.setContentText(getString(R.string.notification_content)); Intent intent = new Intent(this, MainActivity.class); @SuppressLint("UnspecifiedImmutableFlag") PendingIntent pendingIntent = PendingIntent.getActivity diff --git a/app/src/main/res/drawable-anydpi-v24/ic_forwarder.xml b/app/src/main/res/drawable-anydpi-v24/ic_forwarder.xml new file mode 100644 index 0000000000..737767c3a6 --- /dev/null +++ b/app/src/main/res/drawable-anydpi-v24/ic_forwarder.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_forwarder.png b/app/src/main/res/drawable-hdpi/ic_forwarder.png new file mode 100644 index 0000000000..6b0d4afc2f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_forwarder.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_forwarder.png b/app/src/main/res/drawable-mdpi/ic_forwarder.png new file mode 100644 index 0000000000..403c6ad1af Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_forwarder.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_forwarder.png b/app/src/main/res/drawable-xhdpi/ic_forwarder.png new file mode 100644 index 0000000000..b37220b7ac Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_forwarder.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_forwarder.png b/app/src/main/res/drawable-xxhdpi/ic_forwarder.png new file mode 100644 index 0000000000..c40720d9c8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_forwarder.png differ diff --git a/app/src/main/res/drawable/ic_forwarder.xml b/app/src/main/res/drawable/ic_forwarder.xml deleted file mode 100644 index 2d7c7d1754..0000000000 --- a/app/src/main/res/drawable/ic_forwarder.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000..6183789bdf Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000..09039bfb76 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000..2b72e7ffeb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000..fed5969c9c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000..8971eea635 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ