diff --git a/app/build.gradle b/app/build.gradle index a5564c2fa..a392be461 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -176,7 +176,8 @@ def Lombok = "1.18.10" def useFlutterAar = Boolean.parseBoolean(with_flutter_aar) dependencies { - api fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar','*.aar']) + implementation fileTree(dir: 'aliyun-libs', include: ['*.jar','*.aar']) testImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' @@ -221,12 +222,6 @@ dependencies { annotationProcessor "org.projectlombok:lombok:${Lombok}" implementation 'nl.dionsegijn:konfetti:1.1.2' - //阿里云实名认证 - api(name: 'rpsdk-4.14.3-open', ext: 'aar') - api(name: 'MiddleTierSDK-external-release-5.5.72-preInstall', ext: 'aar') - api(name: 'SecurityBodySDK-external-release-5.5.85-preInstall', ext: 'aar') - api(name: 'SecurityGuardSDK-external-release-5.5.75-preInstall', ext: 'aar') - //数字滚动效果 implementation 'com.github.YvesCheung:RollingText:1.2.3' // 引入原有第三方裁图源码,方便修改 @@ -245,21 +240,12 @@ dependencies { implementation 'io.github.yidun:quicklogin:3.1.5' implementation 'com.github.fodroid:XRadioGroup:v1.5' - - implementation files('libs/humesdk-1.0.0.aar') - - implementation(name: 'SudMGP-v1.1.32.200', ext: 'aar') - - // 魅族推送 - implementation 'com.meizu.flyme.internet:push-internal:3.9.0@aar' - // vivo推送 - implementation files("libs/vivo_pushsdk_v3.0.0.0_480.aar") - //魅族推送 - implementation files('libs/msa_mdid_1.0.13.aar') //华为推送 - implementation 'com.huawei.hms:push:5.3.0.304' - //oppo推送 - implementation files("libs/com.heytap.msp-push-2.1.0.aar") + implementation 'com.huawei.hms:push:6.5.0.300' + //魅族推送 + implementation 'com.meizu.flyme.internet:push-internal:4.1.0' + //oppo推送需要 + implementation 'commons-codec:commons-codec:1.6' // xplan flutter module if (useFlutterAar) { diff --git a/app/libs/com.heytap.msp-push-2.1.0.aar b/app/libs/com.heytap.msp-push-2.1.0.aar deleted file mode 100644 index 197f12c55..000000000 Binary files a/app/libs/com.heytap.msp-push-2.1.0.aar and /dev/null differ diff --git a/app/libs/miit_mdid_1.0.10.aar b/app/libs/miit_mdid_1.0.10.aar deleted file mode 100644 index 22131484c..000000000 Binary files a/app/libs/miit_mdid_1.0.10.aar and /dev/null differ diff --git a/app/libs/msa_mdid_1.0.13.aar b/app/libs/msa_mdid_1.0.13.aar deleted file mode 100644 index 650e98d2d..000000000 Binary files a/app/libs/msa_mdid_1.0.13.aar and /dev/null differ diff --git a/app/libs/nanohttpd-2.2.0.jar b/app/libs/nanohttpd-2.2.0.jar deleted file mode 100644 index 1f1e82cd9..000000000 Binary files a/app/libs/nanohttpd-2.2.0.jar and /dev/null differ diff --git a/app/libs/push-3.0.0.aar b/app/libs/push-3.0.0.aar new file mode 100644 index 000000000..af93542f6 Binary files /dev/null and b/app/libs/push-3.0.0.aar differ diff --git a/app/libs/vivo_pushSDK_v3.0.0.4_484.aar b/app/libs/vivo_pushSDK_v3.0.0.4_484.aar new file mode 100644 index 000000000..f278999dc Binary files /dev/null and b/app/libs/vivo_pushSDK_v3.0.0.4_484.aar differ diff --git a/app/libs/vivo_pushsdk_v3.0.0.0_480.aar b/app/libs/vivo_pushsdk_v3.0.0.0_480.aar deleted file mode 100644 index 52ec10922..000000000 Binary files a/app/libs/vivo_pushsdk_v3.0.0.0_480.aar and /dev/null differ diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt index 31cdb502c..56b3dbcc6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt @@ -2,7 +2,6 @@ package com.yizhuan.erban.ui.im.friend import android.text.TextUtils import androidx.fragment.app.viewModels -import com.bun.miitmdid.core.JLibrary.context import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseFragment import com.yizhuan.erban.common.widget.dialog.DialogManager diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/WebServer.java b/app/src/main/java/com/yizhuan/erban/ui/webview/WebServer.java deleted file mode 100644 index 24d5ccce6..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/WebServer.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yizhuan.erban.ui.webview; - -import android.os.Environment; -import android.util.Log; - -import com.netease.nim.uikit.common.util.log.LogUtil; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; - -import fi.iki.elonen.NanoHTTPD; - -public class WebServer extends NanoHTTPD { - public static final String MIME_JAVASCRIPT = "text/javascript"; - public static final String MIME_CSS = "text/css"; - public static final String MIME_JPEG = "image/jpeg"; - public static final String MIME_PNG = "image/png"; - public static final String MIME_SVG = "image/svg+xml"; - public static final String MIME_JSON = "application/json"; - - - public WebServer() { - super(8080); - } - - @Override - public Response serve(IHTTPSession session) { - - String mime_type = NanoHTTPD.MIME_PLAINTEXT; - Method method = session.getMethod(); - String uri = session.getUri(); - System.out.println(method + " '" + uri + "' "); - InputStream descriptor = null; - - if (method.toString().equalsIgnoreCase("GET")) { - String path; - if (uri.equals("/")) { - path = "/index.html"; - } else { - path = uri; - try { - if (path.endsWith(".js")) { - mime_type = MIME_JAVASCRIPT; - } else if (path.endsWith(".css")) { - mime_type = MIME_CSS; - } else if (path.endsWith(".html")) { - mime_type = MIME_HTML; - } else if (path.endsWith(".jpeg")) { - mime_type = MIME_JPEG; - } else if (path.endsWith(".png")) { - mime_type = MIME_PNG; - } else if (path.endsWith(".jpg")) { - mime_type = MIME_JPEG; - } else if (path.endsWith(".svg")) { - mime_type = MIME_SVG; - } else if (path.endsWith(".json")) { - mime_type = MIME_JSON; - } - } catch (Exception e) { - - } - } - String sub = path.substring(path.indexOf("feidao") + 7); -// LogUtil.e("path:" + path); -// LogUtil.e("sub:" + sub); - try { - File file = new File(Environment.getExternalStorageDirectory() + "/feidao/" + sub); - descriptor = new FileInputStream(file); - } catch (IOException ioe) { - Log.w("Httpd", ioe.toString()); - } - } - try { - return newFixedLengthResponse(Response.Status.OK, mime_type, descriptor, descriptor.available()); - } catch (IOException e) { - return null; - - } - } -} diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle index ead646ffa..1da97e045 100644 --- a/nim_uikit/build.gradle +++ b/nim_uikit/build.gradle @@ -47,7 +47,7 @@ def overscroll_android = "1.0.4" def base_recyclerview_helper = "2.9.49-androidx" def ShortcutBadger = "1.1.17" def GlideTransformationsVersion = "3.0.1" -def NimNetVersion = "8.11.5" +def NimNetVersion = "8.9.103" def glideVersion = "4.11.0" dependencies {