Skip to content

Commit 63afe8e

Browse files
committed
v1.6.1版本
1 parent 3992f6d commit 63afe8e

File tree

4 files changed

+52
-22
lines changed

4 files changed

+52
-22
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ V免签为完全开源项目,开源项目意味着作者没有任何收入来
7272
+ 微信店员收款推送通知
7373

7474
## 更新记录
75+
+ v1.6.1(2019.05.17)
76+
+ 修复微信无法正常回调的问题
77+
7578
+ v1.6(2019.05.16)
7679
+ 启用新方式监听到账通知,理论支持更多设备!
7780

app/app-release.apk

56 Bytes
Binary file not shown.

app/src/main/java/com/vone/vmq/MainActivity.java

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.Manifest;
44
import android.app.AlertDialog;
55
import android.app.Notification;
6+
import android.app.NotificationChannel;
67
import android.app.NotificationManager;
78
import android.content.ActivityNotFoundException;
89
import android.content.ComponentName;
@@ -11,13 +12,14 @@
1112
import android.content.Intent;
1213
import android.content.SharedPreferences;
1314
import android.content.pm.PackageManager;
15+
import android.graphics.Color;
1416
import android.media.RingtoneManager;
17+
import android.os.Build;
1518
import android.os.Bundle;
1619
import android.os.Looper;
1720
import android.provider.Settings;
1821
import android.support.annotation.NonNull;
1922
import android.support.v4.app.ActivityCompat;
20-
import android.support.v4.app.NotificationCompat;
2123
import android.support.v4.app.NotificationManagerCompat;
2224
import android.support.v7.app.AppCompatActivity;
2325
import android.text.TextUtils;
@@ -327,28 +329,49 @@ public void checkPush(View v){
327329
// return;
328330
// }
329331

330-
331-
332332
Notification mNotification;
333333
NotificationManager mNotificationManager;
334-
mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
335-
336-
mNotification = new NotificationCompat.Builder(this)
337-
// 设置小图标
338-
.setSmallIcon(R.mipmap.ic_launcher)
339-
.setTicker("这是一条测试推送信息,如果程序正常,则会提示监听权限正常")
340-
// 设置标题
341-
.setContentTitle("V免签测试推送")
342-
// 设置内容
343-
.setContentText("这是一条测试推送信息,如果程序正常,则会提示监听权限正常")
344-
// 设置Notification提示铃声为系统默认铃声
345-
.setSound(
346-
RingtoneManager.getActualDefaultRingtoneUri(
347-
getBaseContext(),
348-
RingtoneManager.TYPE_NOTIFICATION))
349-
350-
// 点击Notification的时候自动移除
351-
.build();
334+
mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
335+
336+
337+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
338+
//ChannelId为"1",ChannelName为"Channel1"
339+
NotificationChannel channel = new NotificationChannel("1",
340+
"Channel1", NotificationManager.IMPORTANCE_DEFAULT);
341+
channel.enableLights(true); //是否在桌面icon右上角展示小红点
342+
channel.setLightColor(Color.GREEN); //小红点颜色
343+
channel.setShowBadge(true); //是否在久按桌面图标时显示此渠道的通知
344+
mNotificationManager.createNotificationChannel(channel);
345+
346+
Notification.Builder builder = new Notification.Builder(this,"1"); //与channelId对应
347+
348+
mNotification = builder
349+
// 设置小图标
350+
.setSmallIcon(R.mipmap.ic_launcher)
351+
.setTicker("这是一条测试推送信息,如果程序正常,则会提示监听权限正常")
352+
// 设置标题
353+
.setContentTitle("V免签测试推送")
354+
// 设置内容
355+
.setContentText("这是一条测试推送信息,如果程序正常,则会提示监听权限正常")
356+
.build();
357+
}else{
358+
mNotification = new Notification.Builder(MainActivity.this)
359+
// 设置小图标
360+
.setSmallIcon(R.mipmap.ic_launcher)
361+
.setTicker("这是一条测试推送信息,如果程序正常,则会提示监听权限正常")
362+
// 设置标题
363+
.setContentTitle("V免签测试推送")
364+
// 设置内容
365+
.setContentText("这是一条测试推送信息,如果程序正常,则会提示监听权限正常")
366+
367+
// 设置Notification提示铃声为系统默认铃声
368+
.setSound(
369+
RingtoneManager.getActualDefaultRingtoneUri(
370+
getBaseContext(),
371+
RingtoneManager.TYPE_NOTIFICATION))
372+
373+
.build();
374+
}
352375

353376
//Toast.makeText(MainActivity.this, "已推送信息,如果权限,那么将会有下一条提示!", Toast.LENGTH_SHORT).show();
354377

app/src/main/java/com/vone/vmq/NeNotificationService2.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,13 @@ public void onNotificationPosted(StatusBarNotification sbn) {
8585
//微信支付: 微信支付收款0.01元(朋友到店)
8686
String[] tmp = text.split(":");
8787
if (tmp.length==2){
88-
if (tmp[0].equals("微信支付") || tmp[0].equals("微信收款助手") ){
88+
if (tmp[0].equals("微信支付") || tmp[0].equals("微信收款助手") || tmp[0].equals("微信收款商业版")){
8989
if (text.indexOf("微信支付收款")!=-1){
9090
String money = getSubString(text,"微信支付收款","元");
91+
if (money.indexOf("支付")!=-1){
92+
money = getSubString(money+"元","微信支付收款","元");
93+
}
94+
9195
Log.d(TAG, "onAccessibilityEvent: 匹配成功: 微信 到账 "+money);
9296
appPush(1,Double.valueOf(money));
9397
}else if (text.indexOf("店员消息")!=-1){

0 commit comments

Comments
 (0)