From 1c91b62ea573082581e72fd433d02e3dc52dbf51 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 一月 2026 11:03:29 +0800
Subject: [PATCH] 2026年01月05日11:00:26 升级gradle和uni库
---
countrypicker/build.gradle | 3
third-zxing/build.gradle | 1
app/libs/uniMPSDK-V2-release.aar | 0
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 12 -
wheelview/build.gradle | 1
app/src/main/AndroidManifest.xml | 95 -----------
app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 58 -------
aa_chart_core/build.gradle | 1
gradle/wrapper/gradle-wrapper.properties | 2
app/libs/android-gif-drawable-1.2.29.aar | 0
app/libs/breakpad-build-release.aar | 0
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 67 +-------
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 58 -------
gradle.properties | 4
/dev/null | 10 -
sdk/build.gradle | 7
pickerview/build.gradle | 1
build.gradle | 4
app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java | 12 -
app/build.gradle | 101 ++----------
app/libs/uniapp-v8-release.aar | 0
22 files changed, 50 insertions(+), 388 deletions(-)
diff --git a/aa_chart_core/build.gradle b/aa_chart_core/build.gradle
index 6a6b2f0..563ffd3 100644
--- a/aa_chart_core/build.gradle
+++ b/aa_chart_core/build.gradle
@@ -1,6 +1,7 @@
apply plugin: 'com.android.library'
android {
+ namespace 'com.github.AAChartModel.AAChartCore'
compileSdkVersion 33
defaultConfig {
diff --git a/app/build.gradle b/app/build.gradle
index 55ca496..0721c4f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,6 +11,7 @@
]
android {
+ namespace 'com.hdl.photovoltaic'
signingConfigs {
debug {
storeFile file('../keystore/Untitled')
@@ -63,10 +64,10 @@
]
}
- // 淇濊瘉鍏朵粬鐨刲ib娌℃湁琚玴reDex
- dexOptions {
- preDexLibraries = false
- }
+// // 淇濊瘉鍏朵粬鐨刲ib娌℃湁琚玴reDex
+// dexOptions {
+// preDexLibraries = false
+// }
repositories {
flatDir {
dirs 'libs'
@@ -85,7 +86,11 @@
// abortOnError false
// }
-
+ packagingOptions {
+ jniLibs {
+ useLegacyPackaging true
+ }
+ }
/**
* 鎵撳寘鑷姩鍛藉悕
*/
@@ -110,6 +115,7 @@
buildFeatures {
viewBinding true
aidl true
+ buildConfig = true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -154,7 +160,7 @@
//浜岀淮鐮佸簱
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
- implementation 'com.hdl.android:pmsdk:1.0.18'
+ implementation 'com.hdl.android:pmsdk:1.0.22'
// implementation 'com.hdl.android:debugsdk:1.0.71'
implementation project(path: ':sdk')
implementation 'androidx.activity:activity:1.2.3'
@@ -175,8 +181,7 @@
//鍥剧墖鍔犺浇搴�
- implementation 'com.github.bumptech.glide:glide:4.13.0'
- annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+ annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
//娣诲姞StatusBarUtil鐨勪緷璧� 鐘舵�佹爮閫傞厤
implementation 'com.jaeger.statusbarutil:library:1.5.1'
@@ -185,13 +190,13 @@
//********UniSDK蹇呴』娣诲姞鐨勪緷璧� start********
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation 'com.alibaba:fastjson:1.2.66'//蹇呴』闆嗘垚锛宖astjson鍔熻兘闇�瑕�
- implementation 'com.facebook.fresco:fresco:2.5.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
- implementation 'com.facebook.fresco:animated-gif:2.5.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
- implementation 'com.facebook.fresco:webpsupport:2.5.0'
- implementation 'com.facebook.fresco:animated-webp:2.5.0'
- implementation 'com.github.bumptech.glide:glide:4.9.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+ implementation 'com.facebook.fresco:fresco:3.6.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+ implementation 'com.facebook.fresco:animated-gif:3.6.0'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
+ implementation 'com.facebook.fresco:webpsupport:3.6.0'
+ implementation 'com.facebook.fresco:animated-webp:3.6.0'
+ implementation 'com.github.bumptech.glide:glide:5.0.5'//蹇呴』闆嗘垚锛屽浘鐗囧姞杞介渶瑕�
implementation 'com.android.support:multidex:1.0.3'
- implementation 'androidx.webkit:webkit:1.3.0'//3.6.15鐗堟湰涔嬪悗 蹇呴』闆嗘垚锛岀敤鏉ユ敮鎸佹殫榛戞ā寮�
+ implementation 'androidx.webkit:webkit:1.6.1'//3.6.15鐗堟湰涔嬪悗 蹇呴』闆嗘垚锛岀敤鏉ユ敮鎸佹殫榛戞ā寮�
//********UniSDK蹇呴』娣诲姞鐨勪緷璧� end********
//NanoHTTPD鎼缓鏈嶅姟鍣�
implementation 'org.nanohttpd:nanohttpd:2.3.1'
@@ -203,82 +208,14 @@
//閫氱敤閫傞厤鍣�
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'
- // 姝ゅ浠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'
-
- //鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
- // 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
- // 鎺ュ叆鍗庝负鍘傚晢
- implementation 'com.huawei.hms:push:6.9.0.300'
- implementation 'cn.jiguang.sdk.plugin:huawei:5.0.3'
- implementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
-
// //鍙嬬洘
// implementation 'com.umeng.umsdk:common:9.5.6'// 蹇呴��
// implementation 'com.umeng.umsdk:asms:1.6.3'// 蹇呴��
// implementation 'com.umeng.umsdk:apm:1.7.0' // 閿欒鍒嗘瀽
//寮曞叆FCM锛堝師鐢熻胺姝岋級
implementation 'com.google.firebase:firebase-messaging:23.2.1'
-
- // 寮曞叆FCM
- implementation 'com.google.firebase:firebase-messaging:23.0.0' // 浣跨敤鏈�鏂扮増鏈�
// 浣跨敤 ShortcutBadger 搴擄紝娓呴櫎瑙掓爣
implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
- // 闃块噷浜戞帹閫佹牳蹇冨簱
- implementation 'com.aliyun.ams:alicloud-android-push:3.9.3'
-
-
- //杈呭姪閫氶亾
- implementation 'com.aliyun.ams:alicloud-android-third-push:3.9.2'
-////鍗庝负渚濊禆
-// implementation 'com.aliyun.ams:alicloud-android-third-push-huawei:3.10.1'
-//灏忕背鍥藉唴閫氶亾渚濊禆
- implementation 'com.aliyun.ams:alicloud-android-third-push-xiaomi:3.9.2'
-//OPPO渚濊禆
- implementation 'com.aliyun.ams:alicloud-android-third-push-oppo:3.9.2'
-////vivo渚濊禆
-// implementation 'com.aliyun.ams:alicloud-android-third-push-vivo:3.10.1'
-////榄呮棌渚濊禆
-// implementation 'com.aliyun.ams:alicloud-android-third-push-meizu:3.10.1'
-////璋锋瓕渚濊禆
-// implementation 'com.aliyun.ams:alicloud-android-third-push-fcm:3.10.1'
-////鑽ｈ��渚濊禆
-// implementation 'com.aliyun.ams:alicloud-android-third-push-honor:3.10.1'
-
-// // 鍙�夛細濡傛灉浣犻渶瑕佸鐞嗗悗鍙版秷鎭紝鍙兘闇�瑕佷互涓嬩緷璧�
-// implementation 'com.google.firebase:firebase-analytics:21.0.0'
-
-// // 鎺ュ叆 FCM 鍘傚晢
-// implementation 'com.google.firebase:firebase-messaging:23.1.2'
-// implementation 'cn.jiguang.sdk.plugin:fcm:5.0.3'
-// // 鎺ュ叆榄呮棌鍘傚晢
-// implementation 'cn.jiguang.sdk.plugin:meizu:5.0.3'
-// // 鎺ュ叆 VIVO 鍘傚晢
-// implementation 'cn.jiguang.sdk.plugin:vivo:5.0.3'
-// // 鎺ュ叆灏忕背鍘傚晢
-// implementation 'cn.jiguang.sdk.plugin:xiaomi:5.0.3'
-// // 鎺ュ叆 OPPO 鍘傚晢
-// implementation 'cn.jiguang.sdk.plugin:oppo:5.0.3'
-// // JPush Android SDK v4.6.0 寮�濮嬶紝闇�瑕佸崟鐙紩鍏� oppo 鍘傚晢 aar 锛岃涓嬭浇瀹樼綉 SDK 鍖呭苟鎶� jpush-android-xxx-release/third-push/oppo/libs 涓嬬殑 aar 鏂囦欢鍗曠嫭鎷疯礉涓�浠藉埌搴旂敤 module/libs 涓�
-// implementation(name: 'com.heytap.msp-push-3.1.0', ext: 'aar')
-//
-// //浠ヤ笅涓� OPPO 3.1.0 aar闇�瑕佷緷璧�
-// implementation 'com.google.code.gson:gson:2.6.2'
-// implementation 'commons-codec:commons-codec:1.6'
-// implementation 'androidx.annotation:annotation:1.1.0'
-// // 鎺ュ叆鑽ｈ��鍘傚晢
-// implementation 'cn.jiguang.sdk.plugin:honor:5.0.3'
-// //闇�瑕佸崟鐙紩鍏ヨ崳鑰�鍘傚晢 aar 锛岃涓嬭浇瀹樼綉 SDK 鍖呭苟鎶� jpush-android-xxx-release/third-push/honor/libs 涓嬬殑 aar 鏂囦欢鍗曠嫭鎷疯礉涓�浠藉埌搴旂敤 module/libs 涓�
-// implementation(name: 'HiPushSdk-v7.0.41.301', ext: 'aar')
-
-
-// 搴旂敤 Module 閰嶇疆
-// 濡傛灉閫夋嫨鐨勫巶鍟嗛�氶亾鍖呭惈浜� Huawei 鍘傚晢閫氶亾鍜� FCM 鍘傚晢閫氶亾锛屽垯闇�瑕侀澶栨墽琛屼互涓嬫搷浣滐紝鑻ユ湭閫夋嫨鍙拷鐣ユ湰姝ラ銆�
-// FCM锛氬湪 Firebase 涓婂垱寤哄拰 JPush 涓婂悓鍖呭悕鐨勫緟鍙戝竷搴旂敤锛屽垱寤哄畬鎴愬悗涓嬭浇璇ュ簲鐢ㄧ殑 google-services.json 閰嶇疆鏂囦欢骞舵坊鍔犲埌搴旂敤鐨� module 鐩綍涓嬨��
-// Huawei锛氬湪 Huawei 涓婂垱寤哄拰 JPush 涓婂悓鍖呭悕鐨勫緟鍙戝竷搴旂敤锛屽垱寤哄畬鎴愬悗涓嬭浇璇ュ簲鐢ㄧ殑 agconnect-services.json 閰嶇疆鏂囦欢骞舵坊鍔犲埌搴旂敤鐨� module 鐩綍涓嬨��
- //鍙互浣跨敤CardView缁勪欢鏉ヤ负瑙嗗浘璁剧疆闃村奖鏁堟灉
}
\ No newline at end of file
diff --git a/app/libs/android-gif-drawable-1.2.28.aar b/app/libs/android-gif-drawable-1.2.28.aar
deleted file mode 100644
index f50965f..0000000
--- a/app/libs/android-gif-drawable-1.2.28.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/android-gif-drawable-1.2.29.aar b/app/libs/android-gif-drawable-1.2.29.aar
new file mode 100644
index 0000000..7059bbd
--- /dev/null
+++ b/app/libs/android-gif-drawable-1.2.29.aar
Binary files differ
diff --git a/app/libs/breakpad-build-release.aar b/app/libs/breakpad-build-release.aar
index 5efe624..12af05c 100644
--- a/app/libs/breakpad-build-release.aar
+++ b/app/libs/breakpad-build-release.aar
Binary files differ
diff --git a/app/libs/uniMPSDK-V2-release.aar b/app/libs/uniMPSDK-V2-release.aar
index c27b2e5..fea5d65 100644
--- a/app/libs/uniMPSDK-V2-release.aar
+++ b/app/libs/uniMPSDK-V2-release.aar
Binary files differ
diff --git a/app/libs/uniapp-v8-release.aar b/app/libs/uniapp-v8-release.aar
index a3f4c59..2ca195f 100644
--- a/app/libs/uniapp-v8-release.aar
+++ b/app/libs/uniapp-v8-release.aar
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 49ba0ac..3ceb084 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -106,59 +106,6 @@
android:supportsRtl="false"
android:theme="@style/Theme.PhotovoltaicDebug"
tools:replace="android:supportsRtl">
- <!-- 鍘傚晢閫氶亾涓撶敤Activity锛堥�忔槑涓浆椤碉級,鍒涘缓涓�涓�忔槑鐨凙ctivity鏉ュ鐞嗗巶鍟嗛�氶亾鐐瑰嚮 -->
- <!-- <activity-->
- <!-- android:name=".push.VendorChannelActivity"-->
- <!-- android:excludeFromRecents="true"-->
- <!-- android:exported="true"-->
- <!-- android:launchMode="singleTask"-->
- <!-- android:noHistory="true"-->
- <!-- android:screenOrientation="portrait"-->
- <!-- android:taskAffinity="">-->
- <activity
- android:name=".push.VendorChannelActivity"
- android:exported="true"
- android:screenOrientation="portrait">
-
- <!-- <!– 灏忕背閫氶亾 –>-->
- <!-- <intent-filter>-->
- <!-- <action android:name="android.intent.action.VIEW" />-->
- <!-- <category android:name="android.intent.category.DEFAULT" />-->
- <!-- <category android:name="android.intent.category.BROWSABLE" />-->
-
- <!-- <data-->
- <!-- android:host="com.hdl.photovoltaic"-->
- <!-- android:scheme="push" />-->
- <!-- </intent-filter>-->
-
- <!-- <!– 鍗庝负閫氶亾 –>-->
- <!-- <intent-filter>-->
- <!-- <action android:name="android.intent.action.VIEW" />-->
- <!-- <category android:name="android.intent.category.DEFAULT" />-->
- <!-- <data-->
- <!-- android:host="com.hdl.photovoltaic.huawei"-->
- <!-- android:scheme="push" />-->
- <!-- </intent-filter>-->
-
- <!-- <!– OPPO閫氶亾 –>-->
- <!-- <intent-filter>-->
- <!-- <action android:name="android.intent.action.VIEW" />-->
- <!-- <category android:name="android.intent.category.DEFAULT" />-->
- <!-- <data-->
- <!-- android:host="com.hdl.photovoltaic.oppo"-->
- <!-- android:scheme="push" />-->
- <!-- </intent-filter>-->
-
- <!-- <!– vivo閫氶亾 –>-->
- <!-- <intent-filter>-->
- <!-- <action android:name="android.intent.action.VIEW" />-->
- <!-- <category android:name="android.intent.category.DEFAULT" />-->
- <!-- <data-->
- <!-- android:host="com.hdl.photovoltaic.vivo"-->
- <!-- android:scheme="push" />-->
- <!-- </intent-filter>-->
- </activity>
-
<activity
android:name=".ui.me.NotificationSettingsActivity"
android:exported="false" />
@@ -227,7 +174,6 @@
android:name=".ui.me.CPersonalDataActivity"
android:exported="false" />
- <service android:name=".widget.apkwgtupload.ApkDownLoadService" /> <!-- largeHeap="true" 涓存椂缂撹В鍐呭瓨涓嶈冻闂 -->
<activity
android:name=".ui.me.WebActivity"
android:exported="false"
@@ -266,7 +212,6 @@
android:name=".ui.LoginActivity"
android:exported="false"
android:theme="@style/login_Theme" />
- <activity android:name=".widget.apkwgtupload.AndroidPermissionActivity" />
<activity
android:name=".ui.StartActivity"
android:exported="true"
@@ -297,31 +242,7 @@
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/dcloud_file_provider" />
- </provider> <!-- Since JCore2.0.0 Required SDK鏍稿績鍔熻兘 -->
- <!-- 鍙厤缃產ndroid:process鍙傛暟灏哠ervice鏀惧湪鍏朵粬杩涚▼涓紱android:enabled灞炴�т笉鑳芥槸false -->
- <!-- 杩欎釜鏄嚜瀹氫箟Service锛岃缁ф壙鏋佸厜JCommonService锛屽彲浠ュ湪鏇村鎵嬫満骞冲彴涓婁娇寰楁帹閫侀�氶亾淇濇寔鐨勬洿绋冲畾 -->
- <service
- android:name=".push.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=".push.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> <!-- uniMqtt蹇呰鐨�,寮�鍚痬qtt1883绔彛涓�涓湇鍔� -->
+ </provider>
<service
android:name="org.eclipse.paho.android.service.MqttService"
android:exported="false" />
@@ -348,19 +269,7 @@
android:enabled="true"
android:exported="false"
android:foregroundServiceType="dataSync" /> <!-- Android 10+ 闇�瑕佹寚瀹氱被鍨� -->
- <receiver
- android:name=".push.aliyun.MyAliYunMessageReceiver"
- android:exported="false">
- <intent-filter>
- <action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />
- </intent-filter>
- <intent-filter>
- <action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />
- </intent-filter>
- <intent-filter>
- <action android:name="com.alibaba.sdk.android.push.RECEIVE" />
- </intent-filter>
- </receiver>
+
<meta-data
android:name="design_height_in_dp"
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index f52773f..986fcae 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -19,12 +19,6 @@
import androidx.multidex.MultiDex;
-import com.alibaba.sdk.android.push.CloudPushService;
-import com.alibaba.sdk.android.push.CommonCallback;
-import com.alibaba.sdk.android.push.noonesdk.PushInitConfig;
-import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
-import com.alibaba.sdk.android.push.register.MiPushRegister;
-import com.alibaba.sdk.android.push.register.OppoRegister;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.firebase.messaging.FirebaseMessaging;
@@ -193,18 +187,16 @@
// //9.鍒濆鍖栫綉缁滃伐鍏�
// NetWorkUtil.init(this);
initAutoSize();
-// //鍒濆鍖栨瀬鍏夋帹閫�
-// initJPush();
-// //璋锋瓕鍘熺敓fcm鎺ㄩ��
-// // 妫�鏌� Google Play Services 鍚庡啀鍒濆鍖� FCM
-// if (isGooglePlayServicesAvailable(this)) {
-// initFCM();
-// } else {
-// HdlLogLogic.print("Google Play Services 涓嶅彲鐢紝鏃犳硶浣跨敤 FCM", true);
-// // 鍙互鍦ㄨ繖閲屽垵濮嬪寲澶囬�夋帹閫佹柟妗堬紙濡傞樋閲屼簯鑷缓閫氶亾锛�
-// }
- //闃块噷浜戞帹閫�
- initAliYunPush();
+ //鍒濆鍖栨瀬鍏夋帹閫�
+ initJPush();
+ //璋锋瓕鍘熺敓fcm鎺ㄩ��
+ // 妫�鏌� Google Play Services 鍚庡啀鍒濆鍖� FCM
+ if (isGooglePlayServicesAvailable(this)) {
+ initFCM();
+ } else {
+ HdlLogLogic.print("Google Play Services 涓嶅彲鐢紝鏃犳硶浣跨敤 FCM", true);
+ // 鍙互鍦ㄨ繖閲屽垵濮嬪寲澶囬�夋帹閫佹柟妗堬紙濡傞樋閲屼簯鑷缓閫氶亾锛�
+ }
initHDLLinkPMSdk();
HDLLinkLocalSdk.getInstance().init(getInstance());
initSocket();
@@ -221,45 +213,6 @@
}
- /**
- * 鍒濆鍖栭樋閲屼簯鎺ㄩ��
- */
- private void initAliYunPush() {
- PushInitConfig pushInitConfig = new PushInitConfig.Builder()
- .application(this)
- .appKey("335628427") //璇峰～鍐欎綘鑷繁鐨刟ppKey锛屼簯绔粰鐨�
- .appSecret("fd1dabe7ec494c878a5970d8646c83bc") //璇峰～鍐欎綘鑷繁鐨刟ppSecret,浜戠缁欑殑
- .build();
- PushServiceFactory.init(pushInitConfig);
- CloudPushService pushService = PushServiceFactory.getCloudPushService();
- pushService.register(this, new CommonCallback() {
- @Override
- public void onSuccess(String success) {
- String deviceId = pushService.getDeviceId();
- Log.d("com.aliyun.emas.pocdemo", "鑾峰彇deviceId " + deviceId);
- saveToken(deviceId);
-
- }
-
- @Override
- public void onFailed(String errorCode, String errorMessage) {
- //閿欒鐮佽繛鎺ワ細https://help.aliyun.com/document_detail/434686.html?spm=a2c4g.11186623.0.0.62d3556dC2DqKJ#topic-1824037
- Log.d("com.aliyun.emas.pocdemo", "鍒濆鍖栧け璐�,閿欒鐮�: " + errorCode + "閿欒淇℃伅: " + errorMessage);
-
- }
- });
- if (AppConfigManage.isDebug()) {
- //浠呴�傜敤浜嶥ebug鍖咃紝姝ｅ紡鍖呬笉闇�瑕佹琛�
- pushService.setLogLevel(CloudPushService.LOG_DEBUG);
- }
- //灏忕背
- //appKey/appSecret鍦ㄥ皬绫冲紑鍙戣�呭钩鍙拌幏鍙�
- MiPushRegister.register(this, "2882303761520382032", "5612038223032");
- // OPPO閫氶亾娉ㄥ唽
- //appKey/appSecret鍦∣PPO寮�鍙戣�呭钩鍙拌幏鍙�
- OppoRegister.register(this, "d80747c83e38442aaa2e5183c310bae0", "86afce21417b49a4984816024b15d4b9");
-
- }
/**
* 鍒濆鍖栧弸鐩烻DK锛屾姄闂��鏃ュ織
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
index 6883ba5..70e0a8d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
@@ -27,7 +27,6 @@
import java.util.Objects;
-import cn.jpush.android.api.NotificationMessage;
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java b/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java
deleted file mode 100644
index 9509177..0000000
--- a/app/src/main/java/com/hdl/photovoltaic/push/VendorChannelActivity.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.hdl.photovoltaic.push;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.sdk.android.push.popup.OnPushParseFailedListener;
-import com.alibaba.sdk.android.push.popup.PopupNotifyClick;
-import com.alibaba.sdk.android.push.popup.PopupNotifyClickListener;
-import com.hdl.photovoltaic.HDLApp;
-import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.base.CustomBaseActivity;
-import com.hdl.photovoltaic.other.HdlPushLogic;
-import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
-
-import java.util.Map;
-
-/**
- * 鍟嗗巶閫氶亾涓撶敤Activity锛堥�忔槑涓浆椤�)
- */
-public class VendorChannelActivity extends CustomBaseActivity implements PopupNotifyClickListener, OnPushParseFailedListener {
-
- private final static String TAG = "VendorChannelActivity";
- private final PopupNotifyClick mPopupNotifyClick = new PopupNotifyClick(this);
-
-
- @Override
- public Object getContentView() {
- return R.layout.activity_vendor_channel;
- }
-
- @Override
- public void onBindView(Bundle savedInstanceState) {
- mPopupNotifyClick.onCreate(this, getIntent());
- // // 寤惰繜涓�灏忔鏃堕棿纭繚鏁版嵁澶勭悊濂藉啀finish锛屽鐞咺ntent
-// handleIntent(getIntent());
- // 灏藉揩缁撴潫锛屼笉鏄剧ず鐣岄潰
-
- }
-
- @Override
- protected void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- Log.d(TAG, "VendorChannelActivity onNewIntent");
- mPopupNotifyClick.onNewIntent(intent);
-
- }
-
-
- /**
- * 璺宠浆鍒癝tartActivity
- */
- private void jumpToStartActivity(String title, String content, Map<String, String> map) {
- try {
- String extra = JSONObject.toJSONString(map);
- PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, extra);
- Intent launchIntent = CustomNotification.getInstance().createNotificationIntent(this, pushMessageInfoBean, CustomNotification.FromPush.AliYun);
- // 鍚姩鐪熸鐨凷tartActivity
- startActivity(launchIntent);
- finish();
- } catch (Exception e) {
- try {
- //Log.e(TAG, "璺宠浆鍒癝tartActivity澶辫触", e);
- // 濡傛灉StartActivity涓嶅瓨鍦紝璺宠浆鍒癕ainActivity
- Intent mainIntent = CustomNotification.getInstance().createNotificationIntent(this, null, CustomNotification.FromPush.AliYun);
- startActivity(mainIntent);
- finish();
- } catch (Exception e2) {
- Log.e(TAG, "璺宠浆鍒癕ainActivity涔熷け璐�", e2);
- }
- }
-
- }
-
-
- @Override
- public void finish() {
- super.finish();
-// // 绂佺敤Activity鍒囨崲鍔ㄧ敾锛屽疄鐜版棤缂濊烦杞�
-// overridePendingTransition(0, 0);
- }
-
-
- @Override
- public void onSysNoticeOpened(String s, String s1, Map<String, String> map) {
- //TODO 鑾峰彇鎺ㄩ�佸弬鏁帮紝鏍规嵁涓氬姟闇�姹傚鐞�
- jumpToStartActivity(s, s1, map);
-
- }
-
- @Override
- public void onPointerCaptureChanged(boolean hasCapture) {
- super.onPointerCaptureChanged(hasCapture);
- }
-
- /**
- * 涓嶆槸鎺ㄩ�佹暟鎹殑鍥炶皟
- *
- * @param intent
- */
- @Override
- public void onNotPushData(Intent intent) {
- //TODO 娌℃湁鎺ㄩ�佹暟鎹紝鍙兘鏄紓甯歌皟鐢紝闇�瑕佸紓甯稿鐞�
- finish();
- }
-
- /**
- * 鏄帹閫佹暟鎹紝浣嗘槸鍙堣В瀵嗗け璐ユ椂鐨勫洖璋�
- *
- * @param intent
- */
- @Override
- public void onParseFailed(Intent intent) {
- //TODO 鎺ㄩ�佹暟鎹В瀵嗗紓甯革紝闇�瑕佸紓甯稿鐞�
- finish();
- }
-
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java b/app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java
deleted file mode 100644
index f1dacd5..0000000
--- a/app/src/main/java/com/hdl/photovoltaic/push/aliyun/MyAliYunMessageReceiver.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.hdl.photovoltaic.push.aliyun;
-
-
-import android.content.Context;
-import android.util.Log;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.sdk.android.push.MessageReceiver;
-import com.alibaba.sdk.android.push.notification.CPushMessage;
-import com.hdl.photovoltaic.other.HdlPushLogic;
-import com.hdl.photovoltaic.push.CustomNotification;
-import com.hdl.photovoltaic.push.PushMessageInfoBean;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
-
-import java.util.Map;
-
-/**
- * 闃块噷浜戞帹閫佹秷鎭帴鏀舵柟娉�
- * 鏂囨。鍦板潃锛坔ttps://help.aliyun.com/document_detail/434669.html?scm=20140722.S_help%40%40%E6%96%87%E6%A1%A3%40%40434669._.ID_help%40%40%E6%96%87%E6%A1%A3%40%40434669-RL_onNotificationOpened-LOC_doc%7EUND%7Eab-OR_ser-PAR1_212a5d4017647281629576475d8240-V_4-PAR3_r-RE_new8-P0_1-P1_0&spm=a2c4g.11186623.help-search.i10#section-kk1-wnc-oyd锛�
- */
-public class MyAliYunMessageReceiver extends MessageReceiver {
- private static final String TAG = "MyAliYunMessageReceiver";
-
- /**
- * 瑙﹀彂鍦烘櫙锛氬綋閫氱煡鍒拌揪璁惧鏃惰Е鍙戙�傛敞鎰忥細杩欎釜鏂规硶鍦ㄩ�氱煡琚睍绀哄埌閫氱煡鏍忎箣鍓嶈皟鐢ㄣ��
- * 鍙傛暟璇存槑锛�
- *
- * @param context锛氫笂涓嬫枃
- * @param title锛氶�氱煡鏍囬
- * @param content锛氶�氱煡鍐呭
- * @param extraMap锛氶澶栫殑鍙傛暟锛岀敤浜庤嚜瀹氫箟key-value
- */
-
- @Override
- protected void onNotification(Context context, String title, String content, Map<String, String> extraMap) {
- Log.d(TAG, "onNotification: " + JSON.toJSONString(extraMap));
-// CustomNotification.getInstance().messageDataProcessing(context, title, content, JSON.toJSONString(extraMap));
- }
-
- /**
- * 瑙﹀彂鍦烘櫙锛氬綋搴旂敤鍐呮秷鎭埌杈炬椂瑙﹀彂銆傚簲鐢ㄥ唴娑堟伅涓嶄細灞曠ず鍦ㄩ�氱煡鏍忥紝鑰屾槸鐩存帴浼犻�掔粰搴旂敤澶勭悊銆傞�氬父鐢ㄤ簬搴旂敤鍐呮秷鎭�忎紶銆�
- * 鍙傛暟璇存槑锛�
- *
- * @param context锛氫笂涓嬫枃
- * @param cPushMessage锛氭秷鎭璞★紝鍖呭惈娑堟伅ID銆佹爣棰樸�佸唴瀹圭瓑銆�
- */
- @Override
- protected void onMessage(Context context, CPushMessage cPushMessage) {
-// String title = cPushMessage.getTitle();
-// String content = cPushMessage.getContent();
-// Log.d(TAG, "onMessage: " + JSON.toJSONString(cPushMessage));
-// if (isForeground) {
-// //App澶勪簬鍓嶅彴锛屽脊绐楀舰寮忔樉绀�
-// } else {
-// //App澶勪簬鍚庡彴锛岄�氱煡褰㈠紡鏄剧ず
-// }
- }
-
- /**
- * 瑙﹀彂鍦烘櫙锛氬綋鐢ㄦ埛鐐瑰嚮閫氱煡鏍忎腑鐨勯�氱煡鏃惰Е鍙戙��
- * 鍙傛暟璇存槑锛�
- *
- * @param context锛氫笂涓嬫枃
- * @param title锛氶�氱煡鏍囬
- * @param content锛氶�氱煡鍐呭
- * @param extra锛氶澶栫殑鍙傛暟瀛楃涓诧紙JSON鏍煎紡锛�
- */
- @Override
- protected void onNotificationOpened(Context context, String title, String content, String extra) {
- Log.d(TAG, "onNotificationOpened: " + "title=" + title + " content=" + content + " extra=" + extra);
- }
-
- /**
- * 瑙﹀彂鍦烘櫙锛氬綋鐢ㄦ埛鐐瑰嚮閫氱煡鏍忎腑鐨勯�氱煡锛屼絾鏄棤娉曞惎鍔ㄥ簲鐢ㄦ椂瑙﹀彂锛堜緥濡傚簲鐢ㄨ寮哄埗鍋滄锛夈��
- * 鍙傛暟璇存槑锛�
- *
- * @param context锛氫笂涓嬫枃
- * @param title锛氶�氱煡鏍囬
- * @param content锛氶�氱煡鍐呭
- * @param extra锛氶澶栫殑鍙傛暟瀛楃涓诧紙JSON鏍煎紡锛�
- */
- @Override
- protected void onNotificationClickedWithNoAction(Context context, String title, String content, String extra) {
- Log.d(TAG, "onNotificationClickedWithNoAction: " + "title=" + title + " content=" + content + " extra=" + extra);
- }
-
- /**
- * 瑙﹀彂鍦烘櫙锛氬綋閫氱煡琚竻闄ゆ椂瑙﹀彂銆備緥濡傦紝鐢ㄦ埛娓呴櫎浜嗛�氱煡鏍忎腑鐨勯�氱煡銆�
- * 鍙傛暟璇存槑锛�
- *
- * @param context 涓婁笅鏂�
- * @param messageId 琚竻闄ょ殑娑堟伅ID
- */
- @Override
- protected void onNotificationRemoved(Context context, String messageId) {
- Log.d(TAG, "onNotificationClickedWithNoAction: " + "messageId=" + messageId);
- }
-
- /**
- * 瑙﹀彂鍦烘櫙锛氬綋閫氱煡鍦ㄥ簲鐢ㄥ唴灞曠ず鏃惰Е鍙戙�傝繖涓柟娉曞湪showNotificationNow鏂规硶杩斿洖false鏃朵細琚皟鐢紝琛ㄧず鎷︽埅浜嗛�氱煡鐨勯粯璁ゅ睍绀猴紝杞�屼娇鐢ㄥ簲鐢ㄥ唴灞曠ず銆�
- * 鍙傛暟璇存槑锛�
- *
- * @param context锛氫笂涓嬫枃
- * @param title锛氶�氱煡鏍囬
- * @param content锛氶�氱煡鍐呭
- * @param extraMap锛氶澶栫殑鍙傛暟
- * @param openType锛氭墦寮�绫诲瀷锛屼緥濡傛墦寮�搴旂敤銆佹墦寮�Activity銆佹墦寮�URL绛夛紙1锛氭墦寮�APP锛�2锛氭墦寮�activity锛�3锛氭墦寮�URL锛�4锛氭棤璺宠浆閫昏緫銆傦級
- * @param openActivity锛氶渶瑕佹墦寮�鐨凙ctivity锛堟墍瑕佹墦寮�鐨刟ctivity鐨勫悕绉帮紝浠呭綋鏈嶅姟绔弬鏁皁penType=2鏃舵湁鏁堬紝鍏朵綑鎯呭喌涓簄ull銆傦級
- * @param openUrl锛氶渶瑕佹墦寮�鐨刄RL锛堟墍瑕佹墦寮�鐨刄RL锛屼粎褰撴湇鍔＄鍙傛暟openType=3鏃舵湁鏁堬紝鍏朵綑鎯呭喌涓簄ull銆傦級
- */
- @Override
- protected void onNotificationReceivedInApp(Context context, String title, String content, Map<String, String> extraMap, int openType, String openActivity, String openUrl) {
- //杩欓噷鍙互澶勭悊涓嬪彂鐨勬帹閫侀�氱煡
- Log.d(TAG, "onNotificationReceivedInApp:title=" + title
- + " content=" + content + " extraMap=" + JSON.toJSONString(extraMap) + " openType="
- + openType + " openActivity=" + openActivity + " openUrl=" + openUrl);
- //濡傛灉鍦ㄥ墠鍙版椂锛屽彂閫侀�氱煡璁╂秷鎭垪琛ㄦ洿鏂帮紝鍦ㄥ悗鍙版槸锛岃繖閲屼笉浼氭墽琛岋紝浼氭墽琛孷endorChannelActivity.onSysNoticeOpened()鐨勬柟娉�
- CustomNotification.getInstance().messageDataProcessing(context, title, content, JSON.toJSONString(extraMap),CustomNotification.FromPush.AliYun);
- }
-
- /**
- * 瑙﹀彂鍦烘櫙锛氬湪閫氱煡鍗冲皢灞曠ず鏃惰Е鍙戙�傝繖涓柟娉曞厑璁镐綘鍐冲畾鏄惁鎷︽埅閫氱煡鐨勯粯璁ゅ睍绀鸿涓恒��
- * 鍙傛暟璇存槑锛�
- *
- * @param context 涓婁笅鏂�
- * @param extraMap 棰濆鐨勫弬鏁�
- * @return false琛ㄧず鎷︽埅锛宼rue琛ㄧず涓嶆嫤鎴紝璇锋牴鎹繘琛屾嫤鎴紝鎷︽埅鍚庝細鎵ц鍒� onNotificationReceivedInApp
- */
- @Override
- public boolean showNotificationNow(Context context, Map<String, String> extraMap) {
- //false琛ㄧず鎷︽埅锛宼rue琛ㄧず涓嶆嫤鎴紝璇锋牴鎹繘琛屾嫤鎴紝鎷︽埅鍚庝細鎵ц鍒� onNotificationReceivedInApp
- Log.d(TAG, "showNotificationNow:" + "extraMap=" + JSON.toJSONString(extraMap));
- return !CustomNotification.getInstance().isAppInForeground(context);
-// return false;
- }
-}
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java b/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
index 89ec8fa..6b0565b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
+++ b/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
@@ -20,24 +20,16 @@
import com.google.firebase.messaging.RemoteMessage;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.ConstantManage;
-import com.hdl.photovoltaic.config.UserConfigManage;
-import com.hdl.photovoltaic.enums.MessageStateType;
-import com.hdl.photovoltaic.other.HdlPushLogic;
import com.hdl.photovoltaic.push.CustomNotification;
import com.hdl.photovoltaic.push.PushMessageInfoBean;
-import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.StartActivity;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import cn.jpush.android.api.NotificationMessage;
+import java.util.List;
+
/**
* 璋锋瓕鎺ㄩ�佹秷鎭帴鏀舵柟娉�
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/jpush/JPushReceiverService.java b/app/src/main/java/com/hdl/photovoltaic/push/jpush/JPushReceiverService.java
deleted file mode 100644
index 9379907..0000000
--- a/app/src/main/java/com/hdl/photovoltaic/push/jpush/JPushReceiverService.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.hdl.photovoltaic.push.jpush;
-
-import android.content.Context;
-import android.text.TextUtils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.Gson;
-import com.hdl.photovoltaic.other.HdlPushLogic;
-import com.hdl.photovoltaic.other.HdlLogLogic;
-import com.hdl.photovoltaic.push.PushMessageInfoBean;
-
-import java.util.Objects;
-
-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), false);
- }
-
- /**
- * 鐐瑰嚮閫氱煡鏍忓洖璋�
- *
- * @param context Context
- * @param message 鎺ユ敹鍒扮殑閫氱煡鍐呭
- */
- public void onNotifyMessageOpened(Context context, NotificationMessage message) {
- PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(message.notificationTitle, message.notificationContent, message.notificationExtras);
- HdlPushLogic.getInstance().PushPushCommonData(context, pushMessageInfoBean, true);
-// //鐐瑰嚮鍚庡垹闄ゆ湰鍦伴�氱煡
-// JPushInterface.clearAllNotifications(context);
- }
-
- /**
- * 鏀跺埌鎺ㄩ�侀�氱煡鍥炶皟
- *
- * @param context Context
- * @param message 鎺ユ敹鍒扮殑閫氱煡鍐呭
- */
- public void onNotifyMessageArrived(Context context, NotificationMessage message) {
- PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(message.notificationTitle, message.notificationContent, message.notificationExtras);
- HdlPushLogic.getInstance().PushPushCommonData(context, pushMessageInfoBean, false);
- }
-
- /**
- * 娉ㄥ唽鎴愬姛鍥炶皟
- *
- * @param context Context
- * @param registrationId 娉ㄥ唽 id
- */
- public void onRegister(Context context, String registrationId) {
- HdlLogLogic.print("鏋佸厜---娉ㄥ唽鎴愬姛鍥炶皟Id:" + registrationId, false);
- }
-
- /**
- * 闀胯繛鎺ョ姸鎬佸洖璋�
- *
- * @param context Context銆�
- * @param isConnected 闀胯繛鎺ョ姸鎬�
- */
- public void onConnected(Context context, boolean isConnected) {
- HdlLogLogic.print("鏋佸厜---闀胯繛鎺ョ姸鎬佸洖璋�:" + isConnected, false);
- }
-
-}
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/jpush/JpushService.java b/app/src/main/java/com/hdl/photovoltaic/push/jpush/JpushService.java
deleted file mode 100644
index 2ec3d3c..0000000
--- a/app/src/main/java/com/hdl/photovoltaic/push/jpush/JpushService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.hdl.photovoltaic.push.jpush;
-
-import cn.jpush.android.service.JCommonService;
-
-/**
- * 鏋佸厜鎺ㄩ�佹湇鍔�
- */
-public class JpushService extends JCommonService {
-
-}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index adc9df0..8f44ed1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -85,7 +85,6 @@
import java.util.List;
import java.util.Objects;
-import cn.jpush.android.api.JPushInterface;
/**
@@ -294,63 +293,6 @@
portConflictDialog();
}
-
- /**
- * 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
- */
- private void pushTokens() {
- String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId();
- String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag);
- if (is_registrationID.equals("true")) {
- //涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
- return;
- }
-
- HdlThreadLogic.runSubThread(new Runnable() {
- @Override
- public void run() {
- String registrationID = JPushInterface.getRegistrationID(_mActivity);
- int addCount = 0;
- while (TextUtils.isEmpty(registrationID)) {
- SystemClock.sleep(1000);//1s浼戠湢
- registrationID = JPushInterface.getRegistrationID(_mActivity);
- addCount++;
- if (addCount > 5) {
- //5s瓒呮椂
- break;
- }
- }
- if (!TextUtils.isEmpty(registrationID)) {
-// UserConfigManage.getInstance().setRegistrationID(registrationID);
-// UserConfigManage.getInstance().Save();
- String finalRegistrationID = registrationID;
- HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String pushId) {
-
- if (!TextUtils.isEmpty(pushId)) {
- UserConfigManage.getInstance().setPushToken(finalRegistrationID);
- UserConfigManage.getInstance().setPushId(pushId);
- UserConfigManage.getInstance().Save();
- }
- HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔�---registrationID:" + UserConfigManage.getInstance().getUserName() + "---" + finalRegistrationID, true);
-
- }
-
- @Override
- public void onFailure(HDLException e) {
- HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("娣诲姞鏋佸厜ID鍒颁簯绔け璐�---registrationID:" + UserConfigManage.getInstance().getUserName() + "---" + finalRegistrationID, true);
- }
- });
-
- }
-
-
- }
- });
- }
/**
* 涓婁紶 token 鍒版湇鍔″櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index 04f16b1..5318b2f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -68,7 +68,6 @@
import java.util.List;
import java.util.Objects;
-import cn.jpush.android.api.JPushInterface;
/**
* C绔�-鐢电珯鐣岄潰
@@ -438,63 +437,6 @@
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
// stopService(mForegroundService);
- }
-
- /**
- * 涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
- */
- private void pushTokens() {
- String registrationId_tag = "registrationID_" + UserConfigManage.getInstance().getUserId();
- String is_registrationID = HDLApp.getInstance().getKey(registrationId_tag);
- if (is_registrationID.equals("true")) {
- //涓婅繃灏辨病鏈夊繀瑕佸湪涓婁紶鍟�
- return;
- }
-
- HdlThreadLogic.runSubThread(new Runnable() {
- @Override
- public void run() {
- String registrationID = JPushInterface.getRegistrationID(_mActivity);
- int addCount = 0;
- while (TextUtils.isEmpty(registrationID)) {
- SystemClock.sleep(1000);//1s浼戠湢
- registrationID = JPushInterface.getRegistrationID(_mActivity);
- addCount++;
- if (addCount > 5) {
- //5s瓒呮椂
- break;
- }
- }
- if (!TextUtils.isEmpty(registrationID)) {
-// UserConfigManage.getInstance().setRegistrationID(registrationID);
-// UserConfigManage.getInstance().Save();
- String finalRegistrationID = registrationID;
- HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String pushId) {
-
- if (!TextUtils.isEmpty(pushId)) {
- UserConfigManage.getInstance().setPushToken(finalRegistrationID);
- UserConfigManage.getInstance().setPushId(pushId);
- UserConfigManage.getInstance().Save();
- }
- HDLApp.getInstance().setInfoMap(registrationId_tag, "true");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("C绔�---娣诲姞鏋佸厜ID鍒颁簯绔�---registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
-
- }
-
- @Override
- public void onFailure(HDLException e) {
- HDLApp.getInstance().setInfoMap(registrationId_tag, "false");//璁板綍涓�涓嬬姸鎬�,鍚庡彴鏉�姝籥pp浼氭竻绌�;
- HdlLogLogic.print("C绔�---娣诲姞鏋佸厜ID鍒颁簯绔け璐�---registrationID:" + UserConfigManage.getInstance().getUserName() + "--->" + finalRegistrationID, true);
- }
- });
-
- }
-
-
- }
- });
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 3c18344..680539e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -39,7 +39,6 @@
import java.util.List;
import java.util.Objects;
-import cn.jpush.android.api.JPushInterface;
/**
@@ -263,19 +262,10 @@
HDLApp.getInstance().isStartInitThirdSDK = true;
//鍒濆鍖栧弸鐩烻DK
// initUMengSDK();
-// //鍒濆鍖栨瀬鍏夋帹閫�
-// initJPush();
-
}
- /**
- * 鍒濆鍖栨瀬鍏塖DK
- */
- private void initJPush() {
- JPushInterface.setDebugMode(true);
- JPushInterface.init(getBaseContext());
- }
+
/**
* 鍒濆鍖栧弸鐩烻DK锛屾姄闂��鏃ュ織
diff --git a/build.gradle b/build.gradle
index eff2298..b5950d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
buildscript {
ext {
- agp_version = '4.1.3'
+ agp_version = '8.7.3'
}
repositories {
google()
@@ -23,7 +23,7 @@
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
//澧炲姞AGC鎻掍欢閰嶇疆锛屼互渚胯兘鍚屾鈥渁gconnect-services.json鈥濇枃浠朵腑鐨勪俊鎭�.锛堝崕涓烘瀬鍏夋帹閫侊級
- classpath 'com.huawei.agconnect:agcp:1.6.1.300'
+ classpath 'com.huawei.agconnect:agcp:1.9.1.300'
classpath 'com.google.gms:google-services:4.3.15' // Google Services 鎻掍欢
}
}
diff --git a/countrypicker/build.gradle b/countrypicker/build.gradle
index b9c3af2..d7fb20d 100644
--- a/countrypicker/build.gradle
+++ b/countrypicker/build.gradle
@@ -1,6 +1,7 @@
apply plugin: 'com.android.library'
android {
+ namespace 'com.sahooz.library.countrypicker'
compileSdkVersion 33
defaultConfig {
@@ -26,7 +27,7 @@
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
+ androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'androidx.appcompat:appcompat:1.2.0'
diff --git a/gradle.properties b/gradle.properties
index d7154ba..7aae401 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -21,4 +21,4 @@
android.nonTransitiveRClass=true
# 鍙互灏唙4,v7搴撹浆鎴怉ndroid X
android.enableJetifier=true
-android.bundle.enableUncompressedNativeLibs=false
\ No newline at end of file
+#android.bundle.enableUncompressedNativeLibs=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d9c40af..63e8d6e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Wed Mar 19 11:08:39 CST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/pickerview/build.gradle b/pickerview/build.gradle
index 1183484..1f88b29 100644
--- a/pickerview/build.gradle
+++ b/pickerview/build.gradle
@@ -4,6 +4,7 @@
android {
+ namespace 'com.bigkoo.pickerview'
compileSdkVersion 33
defaultConfig {
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 73753d8..38ffc87 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -3,6 +3,7 @@
}
android {
+ namespace 'com.hdl.sdk.link'
compileSdkVersion 33
defaultConfig {
@@ -26,7 +27,9 @@
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
-
+ buildFeatures {
+ buildConfig = true
+ }
/**
* 鎵撳寘鑷姩鍛藉悕
*/
@@ -63,7 +66,7 @@
publishing {
publications {
plugin(MavenPublication) {
- from components.release
+ from components.findByName('release')
groupId 'com.hdl.android'
version "$android.defaultConfig.versionName"
artifactId = 'debugsdk'
diff --git a/third-zxing/build.gradle b/third-zxing/build.gradle
index 9b1be11..00cd9f0 100644
--- a/third-zxing/build.gradle
+++ b/third-zxing/build.gradle
@@ -2,6 +2,7 @@
android {
+ namespace 'com.zxing'
compileSdkVersion 33
buildToolsVersion "29.0.1"
diff --git a/wheelview/build.gradle b/wheelview/build.gradle
index f7425a1..f8b17a9 100644
--- a/wheelview/build.gradle
+++ b/wheelview/build.gradle
@@ -4,6 +4,7 @@
android {
+ namespace 'com.contrarywind.view'
compileSdkVersion 33
defaultConfig {
--
Gitblit v1.8.0