modify notification

sunfusheng · Feb 21, 2018 · a9da435 · a9da435
1 parent 6cb447a
commit a9da435
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 6 deletions.
diff --git a/FirUpdater/build.gradle b/FirUpdater/build.gradle
@@ -27,11 +27,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:' + gradle.supportLibraryVersion
 }
 

diff --git a/FirUpdater/src/main/AndroidManifest.xml b/FirUpdater/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application>
 

diff --git a/FirUpdater/src/main/java/com/sunfusheng/FirNotification.java b/FirUpdater/src/main/java/com/sunfusheng/FirNotification.java
@@ -1,11 +1,18 @@
 package com.sunfusheng;
 
+import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
+import static android.support.v4.app.NotificationCompat.DEFAULT_LIGHTS;
+import static android.support.v4.app.NotificationCompat.VISIBILITY_PUBLIC;
+
 /**
  * @author sunfusheng on 2018/2/17.
  */
@@ -22,11 +29,24 @@ public void createBuilder(Context context) {
         this.context = context;
         manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         builder = new NotificationCompat.Builder(context, CHANNEL_ID);
+        builder.setTicker("正在下载");
         builder.setSmallIcon(android.R.drawable.stat_sys_download);
+        Drawable icon = FirUpdaterUtils.getIcon(context);
+        if (icon != null && icon instanceof BitmapDrawable) {
+            builder.setLargeIcon(((BitmapDrawable) icon).getBitmap());
+        }
         builder.setAutoCancel(false);
         builder.setOngoing(true);
         builder.setProgress(100, 0, false);
         builder.setWhen(System.currentTimeMillis());
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setFullScreenIntent(pendingIntent, false);
+        builder.setVisibility(VISIBILITY_PUBLIC);
+        builder.setContentIntent(pendingIntent);
+        builder.setDefaults(DEFAULT_LIGHTS);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            builder.setPriority(Notification.PRIORITY_HIGH);
+        }
     }
 
     public void setContentTitle(String title) {

diff --git a/Sample/build.gradle b/Sample/build.gradle
@@ -65,5 +65,5 @@ dependencies {
     implementation 'com.android.support:design:' + gradle.supportLibraryVersion
     implementation 'com.sunfusheng:GroupRecyclerViewAdapter:1.0.2'
     implementation project(":FirUpdater")
-//    implementation'com.sunfusheng:FirUpdater:1.0.3'
+//    implementation'com.sunfusheng:FirUpdater:1.0.4'
 }
diff --git a/Sample/outputs/FirUpdater.apk b/Sample/outputs/FirUpdater.apk
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     repositories {
         google()
         jcenter()
-//        maven { url 'https://dl.bintray.com/sfsheng0322/maven' }
+        maven { url 'https://dl.bintray.com/sfsheng0322/maven' }
     }
 
     dependencies {
@@ -15,7 +15,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-//        maven { url 'https://dl.bintray.com/sfsheng0322/maven' }
+        maven { url 'https://dl.bintray.com/sfsheng0322/maven' }
     }
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -7,4 +7,4 @@ gradle.ext.supportLibraryVersion = '27.0.2'
 gradle.ext.minSdkVersion = 14
 gradle.ext.targetSdkVersion = 27
 gradle.ext.versionCode = 5
-gradle.ext.versionName = "1.0.4"
+gradle.ext.versionName = '1.0.4'