From 32921f93f3dec57571a75b6eefcc1360e1a8f42e Mon Sep 17 00:00:00 2001 From: jia Date: Thu, 26 Dec 2024 00:40:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 6 ++++++ iFish7/build.gradle | 9 +++++++++ .../main/java/com/ifish/activity/BindPhoneActivity.java | 3 ++- .../main/java/com/ifish/activity/LoadingActivity.java | 5 +++-- .../src/main/java/com/ifish/activity/LoginActivity.java | 5 +++-- iFish7/src/main/java/com/ifish/utils/Config.kt | 2 +- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index da6a5d132..2aae630a3 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,9 @@ buildscript { maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } maven {url 'https://dl.google.com/dl/android/maven2/'} maven {url 'https://developer.huawei.com/repo/'} + maven { + url 'https://developer.hihonor.com/repo/' + } mavenCentral() google() } @@ -35,6 +38,9 @@ allprojects { url "https://mvn.getui.com/nexus/content/repositories/releases/" } maven {url 'https://developer.huawei.com/repo/'} + maven { + url 'https://developer.hihonor.com/repo/' + } mavenCentral() google() } diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 7505f3ec9..a3aa7f254 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'org.jetbrains.kotlin.android' +apply plugin: 'com.huawei.agconnect' gradle.ext { // pushVersion = '3.8.6' // thirdPushVersion = '3.8.6' @@ -163,4 +164,12 @@ dependencies { implementation 'com.getui:gtc:3.2.18.0' //个推核心组件 implementation 'com.getui.opt:xmp:3.3.1' // 小米 implementation 'com.huawei.hms:push:6.12.0.300' + + // 添加荣耀 SDK + implementation 'com.hihonor.mcs:push:7.0.61.303' + + //以下依赖都需要添加 + implementation 'com.google.code.gson:gson:2.6.2' + implementation 'commons-codec:commons-codec:1.6' + implementation 'com.android.support:support-annotations:28.0.0' } \ No newline at end of file diff --git a/iFish7/src/main/java/com/ifish/activity/BindPhoneActivity.java b/iFish7/src/main/java/com/ifish/activity/BindPhoneActivity.java index fca6f43b0..6bcfcb339 100644 --- a/iFish7/src/main/java/com/ifish/activity/BindPhoneActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/BindPhoneActivity.java @@ -30,6 +30,7 @@ import com.ifish.utils.HttpManager; import com.ifish.utils.MD5Util; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; +import com.igexin.sdk.PushManager; import java.util.List; import java.util.Timer; @@ -373,7 +374,7 @@ public class BindPhoneActivity extends BaseActivity { public void finish() { } - }, Commons.USER.getUserId(), Config.deviceId); + }, Commons.USER.getUserId(), PushManager.getInstance().getClientid(BindPhoneActivity.this)); } }); } diff --git a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java index eaf2ec3a7..483e98626 100644 --- a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java @@ -53,6 +53,7 @@ import com.ifish.utils.HttpManager; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.view.SuperTextView; +import com.igexin.sdk.PushManager; import com.squareup.picasso.Picasso; import com.tencent.mm.opensdk.openapi.IWXAPI; import com.tencent.mm.opensdk.openapi.WXAPIFactory; @@ -644,7 +645,7 @@ public class LoadingActivity extends BaseActivityNotAnim { public void finish() { } - }, Commons.USER.getUserId(), Config.deviceId); + }, Commons.USER.getUserId(), PushManager.getInstance().getClientid(LoadingActivity.this)); } catch (Exception e) { e.printStackTrace(); } @@ -733,7 +734,7 @@ public class LoadingActivity extends BaseActivityNotAnim { public void finish() { } - }, Commons.USER.getUserId(), Config.deviceId); + }, Commons.USER.getUserId(), PushManager.getInstance().getClientid(LoadingActivity.this)); } catch (Exception e) { e.printStackTrace(); } diff --git a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java index 0afcdf3bf..58be1c86c 100644 --- a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java @@ -43,6 +43,7 @@ import com.ifish.utils.HttpManager; import com.ifish.utils.MD5Util; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; +import com.igexin.sdk.PushManager; import com.tencent.mm.opensdk.modelmsg.SendAuth; import java.util.List; @@ -249,7 +250,7 @@ public class LoginActivity extends BaseActivity { public void finish() { } - }, Commons.USER.getUserId(), Config.deviceId); + }, Commons.USER.getUserId(), PushManager.getInstance().getClientid(LoginActivity.this)); } catch (Exception e) { e.printStackTrace(); } @@ -458,7 +459,7 @@ public class LoginActivity extends BaseActivity { public void finish() { } - }, Commons.USER.getUserId(), Config.deviceId); + }, Commons.USER.getUserId(), PushManager.getInstance().getClientid(LoginActivity.this)); } catch (Exception e) { e.printStackTrace(); } diff --git a/iFish7/src/main/java/com/ifish/utils/Config.kt b/iFish7/src/main/java/com/ifish/utils/Config.kt index dcc872e8e..43c055d08 100644 --- a/iFish7/src/main/java/com/ifish/utils/Config.kt +++ b/iFish7/src/main/java/com/ifish/utils/Config.kt @@ -3,6 +3,6 @@ package com.ifish.utils class Config { companion object{ - const val deviceId= "" +// const val deviceId= "" } } \ No newline at end of file