From 56f20167290570fd27998ba9816a8f63d199f152 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 19 十二月 2023 10:33:08 +0800 Subject: [PATCH] 2023年12月19日10:32:54 --- app/src/main/java/com/hdl/photovoltaic/jpush/JpushService.java | 9 +++ app/src/main/AndroidManifest.xml | 40 +++++++++++++ app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 7 +- app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java | 70 +++++++++++++++++++++++ app/build.gradle | 26 ++++++-- 5 files changed, 140 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 573fc70..10ce0ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,17 +36,26 @@ abiFilters 'x86', 'armeabi-v7a', "arm64-v8a" //涓嶆敮鎸乤rmeabi } + manifestPlaceholders = [ + JPUSH_PKGNAME: applicationId, + //JPush 涓婃敞鍐岀殑鍖呭悕瀵瑰簲鐨� Appkey. + JPUSH_APPKEY : "3baee103750e192ba68f3878", + //鏆傛椂濉啓榛樿鍊煎嵆鍙�. + JPUSH_CHANNEL: "developer-default", + + ] + + } + repositories { + flatDir { + dirs 'libs' + } } //姝ゅ閰嶇疆蹇呴』娣诲姞 鍚﹀垯鏃犳硶姝g‘杩愯uni aaptOptions { additionalParameters '--auto-add-overlay' //noCompress 'foo', 'bar' ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~" - } - repositories { - flatDir { - dirs 'libs' - } } /** * 鎵撳寘鑷姩鍛藉悕 @@ -139,9 +148,10 @@ //閫氱敤閫傞厤鍣� implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6' -// //鏋佸厜 -// implementation 'cn.jiguang.sdk:jpush:4.6.2' // 姝ゅ浠Push 4.6.2 鐗堟湰涓轰緥銆� -// implementation 'cn.jiguang.sdk:jcore:3.2.2' // 姝ゅ浠Core 3.2.2 鐗堟湰涓轰緥銆� + // 姝ゅ浠Push 5.0.3 鐗堟湰涓轰緥锛屾敞鎰忥細浠� 5.0.0 鐗堟湰寮�濮嬪彲浠ヨ嚜鍔ㄦ媺鍙� JCore 鍖咃紝鏃犻渶鍙﹀閰嶇疆 + implementation 'cn.jiguang.sdk:jpush-google:5.2.2' + //鍒嗘瀽鍜岀敤鎴锋爣绛剧瓑鍔熻兘(鍙�夛紝闆嗘垚鏋佸厜鍒嗘瀽SDK鍚庯紝鍗冲彲鏀寔琛屼负瑙﹀彂鎺ㄩ�佹秷鎭�佹帹閫佽浆鍖栫巼缁熻锛岀敤鎴疯涓哄垎) + implementation 'cn.jiguang.sdk:joperate:2.0.2' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c6f697c..2a511ac 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -56,10 +56,20 @@ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> - <uses-permission android:name="com.hdl.debugtreasure.permission.JPUSH_MESSAGE" /> + <uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH" /> + + + <!-- Required --> + <permission + android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" + android:protectionLevel="signature" /> + <uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> + + <!-- 閫傞厤Android13锛屽脊鍑洪�氱煡蹇呴』鏉冮檺--> + <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <application android:name=".HDLApp" @@ -154,6 +164,34 @@ tools:replace="android:resource" /> </provider> + <!-- Since JCore2.0.0 Required SDK鏍稿績鍔熻兘--> + <!-- 鍙厤缃產ndroid:process鍙傛暟灏哠ervice鏀惧湪鍏朵粬杩涚▼涓紱android:enabled灞炴�т笉鑳芥槸false --> + <!-- 杩欎釜鏄嚜瀹氫箟Service锛岃缁ф壙鏋佸厜JCommonService锛屽彲浠ュ湪鏇村鎵嬫満骞冲彴涓婁娇寰楁帹閫侀�氶亾淇濇寔鐨勬洿绋冲畾 --> + <service + android:name=".jpush.JpushService" + android:enabled="true" + android:exported="false" + android:process=":pushcore"> + <intent-filter> + <action android:name="cn.jiguang.user.service.action" /> + </intent-filter> + </service> + + + <!-- Required since 5.2.0 --> + <!-- 鏂扮殑 tag/alias 鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氫箟鐨凷ervice --> + <!-- 5.2.0寮�濮嬫墍鏈変簨浠跺皢閫氳繃璇ョ被鍥炶皟 --> + <!-- 璇ュ箍鎾渶瑕佺户鎵� JPush 鎻愪緵鐨� JPushMessageService 绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter --> + <service + android:name=".jpush.JPushReceiverService" + android:enabled="true" + android:exported="false"> + <intent-filter> + <action android:name="cn.jpush.android.intent.SERVICE_MESSAGE" /> + <category android:name="com.hdl.photovoltaic" /> + </intent-filter> + </service> + <meta-data android:name="design_height_in_dp" android:value="812" /> diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java index 1854535..53ddf88 100644 --- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java +++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java @@ -38,6 +38,7 @@ import java.util.Locale; import java.util.Objects; +import cn.jpush.android.api.JPushInterface; import io.dcloud.common.util.RuningAcitvityUtil; import okhttp3.logging.HttpLoggingInterceptor; @@ -127,7 +128,7 @@ // //9.鍒濆鍖栫綉缁滃伐鍏� // NetWorkUtil.init(this); // //10.鍒濆鍖栨瀬鍏夋帹閫� -// initJPush(); + initJPush(); initHDLLinkPMSdk(); HDLLinkLocalSdk.getInstance().init(getInstance()); initSocket(); @@ -217,8 +218,8 @@ } private void initJPush() { -// JPushInterface.setDebugMode(true); -// JPushInterface.init(getBaseContext()); + JPushInterface.setDebugMode(true); + JPushInterface.init(getBaseContext()); } diff --git a/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java b/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java new file mode 100644 index 0000000..a46f997 --- /dev/null +++ b/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java @@ -0,0 +1,70 @@ +package com.hdl.photovoltaic.jpush; + +import android.content.Context; + +import com.google.gson.Gson; +import com.hdl.photovoltaic.other.HdlLogLogic; + +import cn.jpush.android.api.CustomMessage; +import cn.jpush.android.api.NotificationMessage; +import cn.jpush.android.service.JPushMessageService; + +/** + * 鎺ユ敹鏋佸厜鎺ㄩ�佹秷鎭� + */ +public class JPushReceiverService extends JPushMessageService { + + /** + * 鑷畾涔夋秷鎭洖璋� + * + * @param context Context + * @param customMessage 鎺ユ敹鑷畾涔夋秷鎭唴瀹� + */ + public void onMessage(Context context, CustomMessage customMessage) { + + HdlLogLogic.print("鏋佸厜->鑷畾涔夋秷鎭洖璋�====>" + new Gson().toJson(customMessage), true); + } + + /** + * 鐐瑰嚮閫氱煡鍥炶皟 + * + * @param context Context + * @param message 鎺ユ敹鍒扮殑閫氱煡鍐呭 + */ + public void onNotifyMessageOpened(Context context, NotificationMessage message) { + HdlLogLogic.print("鏋佸厜->鐐瑰嚮閫氱煡鍥炶皟====>" + new Gson().toJson(message), true); + + } + + /** + * 鏀跺埌閫氱煡鍥炶皟 + * + * @param context Context + * @param message 鎺ユ敹鍒扮殑閫氱煡鍐呭 + */ + public void onNotifyMessageArrived(Context context, NotificationMessage message) { + HdlLogLogic.print("鏋佸厜->鎺ユ敹鍒扮殑閫氱煡鍐呭====>" + new Gson().toJson(message), true); + + } + + /** + * 娉ㄥ唽鎴愬姛鍥炶皟 + * + * @param context Context + * @param registrationId 娉ㄥ唽 id + */ + public void onRegister(Context context, String registrationId) { + HdlLogLogic.print("鏋佸厜->娉ㄥ唽鎴愬姛鍥炶皟Id====>" + registrationId, true); + } + + /** + * 闀胯繛鎺ョ姸鎬佸洖璋� + * + * @param context Context銆� + * @param isConnected 闀胯繛鎺ョ姸鎬� + */ + public void onConnected(Context context, boolean isConnected) { + HdlLogLogic.print("鏋佸厜->闀胯繛鎺ョ姸鎬佸洖璋�====>" + isConnected, true); + } + +} diff --git a/app/src/main/java/com/hdl/photovoltaic/jpush/JpushService.java b/app/src/main/java/com/hdl/photovoltaic/jpush/JpushService.java new file mode 100644 index 0000000..5813845 --- /dev/null +++ b/app/src/main/java/com/hdl/photovoltaic/jpush/JpushService.java @@ -0,0 +1,9 @@ +package com.hdl.photovoltaic.jpush; + +import cn.jpush.android.service.JCommonService; + +/** + * 鏋佸厜鎺ㄩ�佹湇鍔� + */ +public class JpushService extends JCommonService { +} -- Gitblit v1.8.0