配置代码提交

2023-09-21 11:54:19 +08:00 · 2023-09-21 11:54:19 +08:00 · a6f680a344
parent 350e2c43b9
commit a6f680a344
6 changed files with 52 additions and 52 deletions
--- a/JCVideo_Library/build.gradle
+++ b/JCVideo_Library/build.gradle
@ -9,6 +9,9 @@ android {
        targetSdkVersion rootProject.ext.targetSdkVersion
        versionCode 59
        versionName "5.5.4"
+        ndk {
+            abiFilters 'armeabi','arm64-v8a'
+        }
    }
    buildTypes {
        release {
@ -24,6 +27,6 @@ android {
 dependencies {
    compile fileTree(dir: 'libs', include: ['*.jar'])
    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
 }

--- a/build.gradle
+++ b/build.gradle
@ -2,18 +2,17 @@
 buildscript {
    repositories {
        jcenter()
+        maven {url 'https://dl.google.com/dl/android/maven2/'}
    }
    dependencies {
 //        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2'
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
    }
 }
 allprojects {
    repositories {
        jcenter()
-        maven {
-            url "http://repo.baichuan-android.taobao.com/content/groups/BaichuanRepositories/"
-        }
+        maven {url 'https://dl.google.com/dl/android/maven2/'}
        maven { url 'http://developer.huawei.com/repo/' }
        maven { url 'https://jitpack.io' }
        maven {
@ -22,8 +21,8 @@ allprojects {
    }
 }
 ext {
-    compileSdkVersion = 26
-    buildToolsVersion = "26.0.2"
+    compileSdkVersion = 28
+    buildToolsVersion = "28.0.2"
    minSdkVersion = 21
-    targetSdkVersion = 26
+    targetSdkVersion = 28
 }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Thu Mar 01 16:09:44 CST 2018
+#Thu Sep 21 11:53:04 CST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+zipStoreBase=GRADLE_USER_HOME
--- a/iFish7/build.gradle
+++ b/iFish7/build.gradle
@ -13,12 +13,14 @@ android {
        exclude 'META-INF/license.txt'
        exclude 'META-INF/dependencies.txt'
        exclude 'META-INF/LGPL2.1'
+        exclude 'META-INF/rxjava.properties'
    }
+
    signingConfigs {
        debug {
            keyAlias 'android.keystore'
            keyPassword 'ifish7'
-            storeFile file('C:/work/ifish/ifish7.keystore')
+            storeFile file('/Users/zau18/Desktop/Emobile7keys/ifish7.keystore')
            storePassword 'ifish7'
        }
    }
@ -33,13 +35,11 @@ android {
        targetSdkVersion rootProject.ext.targetSdkVersion
        applicationId "com.ifish.activity"
        versionCode 40
-        versionName "4.8.4"
+        versionName '4.10.0'
        multiDexEnabled true
-        ndk { abiFilters "armeabi" }
-        jackOptions
-                {
-                    enabled true
-                }
+        ndk {
+            abiFilters 'armeabi','arm64-v8a'
+        }
    }
    allprojects {
        sourceCompatibility = 1.7
@ -77,13 +77,16 @@ configurations.all {
    }
 }
 dependencies {
+    implementation files('libs/xUtils-2.6.14.jar')
+    implementation files('libs/commons-logging-1.1.1.jar')
    //技威平台
    compile project(':umeng_sharesdk_library')
    //友盟分享
    compile 'com.google.code.gson:gson:2.4'
    //bugly
    compile files('libs/commons-io-1.4.jar')
-    compile files('libs/locSDK_6.13.jar')
+//    compile files('libs/locSDK_6.13.jar')
+    compile files('libs/BaiduLBS_Android.jar')
    compile files('libs/TalkingDataAnalytics_V2.1.37.jar')
    compile files('libs/umeng_social_sdk.jar')
    compile 'de.greenrobot:eventbus:2.4.0'
@ -107,52 +110,47 @@ dependencies {
    //友盟微社区
    compile 'jp.wasabeef:picasso-transformations:2.1.0'
    //Picasso 显示圆形图片
-    compile 'com.android.support:design:23+'
+    compile 'com.android.support:design:23.3.0'
    compile 'com.github.bumptech.glide:glide:3.7.0'
    //Glide
    compile 'cn.bingoogolapple:bga-refreshlayout:1.1.7@aar'
    //下拉刷新
-    /** 阿里百川           */
-    //安全基础
-    compile name: 'securityguardaar3-5.1.81', ext: 'aar'
-    //    compile 'com.taobao.android:securityguardaar3:5.1.81@aar'
-    //UT
-    //    compile 'com.taobao.android:utdid4all:1.1.5.3_proguard@jar'
-    //    compile 'com.alibaba.mtl:app-monitor-sdk:2.5.1.3_for_bc_proguard@jar'
-    //登陆
-    compile 'com.ali.auth.sdk:alibabauth_core:1.1.4@jar'
-    compile 'com.ali.auth.sdk:alibabauth_ui:1.1.4@aar'
-    compile 'com.ali.auth.sdk:alibabauth_ext:1.1.4@jar'
-    //电商SDK
-    compile 'com.alibaba.sdk.android:alibc_trade_sdk:3.1.1.11@aar'
-    //Mtop网关
-    compile 'com.taobao.android:mtopsdk_allinone_open:1.2.2.4@jar'
-    //applink
-    compile 'com.taobao.android:alibc_applink:2.0.0.9@jar'
-    //支付宝
-    compile 'com.alibaba.alipay:alipaySingle:20160825@jar'
-    /** 阿里百川           */
    compile project(':JCVideo_Library')
    compile 'com.github.PhilJay:MPAndroidChart:v3.0.3'
    compile files('libs/mina-core-2.0.17.jar')
    compile files('libs/fastjson-1.1.34.android.jar')
-    compile 'com.aliyun.ams:alicloud-android-push:3.1.4'
+    compile 'com.aliyun.ams:alicloud-android-push:3.1.9.1'
    compile(name: 'alicloud-android-third-push-3.0.6', ext: 'aar')
-    //        compile 'com.p2p.core:p2p-core:0.4.4.9'
+//            compile 'com.p2p.core:p2p-core:0.4.4.9'
    compile(name: 'p2p-core-release', ext: 'aar')
    compile(name: 'pano-release', ext: 'aar')
-    compile(name: 'soundwave-release1', ext: 'aar')
+    compile(name: 'soundwave-release', ext: 'aar')
    compile 'com.libhttp:libhttp:v0.5.5'
-    compile 'com.jwkj:UDPUtilsLib:v1.1.1'
+    /*compile 'com.jwkj:UDPUtilsLib:v1.1.1'*/
 //UDP基础库（不可少）
-    compile 'com.jwkj:udpsender:v2.0.2'
+    /*compile 'com.jwkj:udpsender:v2.0.2'*/
    compile files('libs/javabase64.jar')
 //    compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
-    compile files('libs/xUtils-2.6.14.jar')
    compile files('libs/httpcore-4.4.13.jar')
    compile files('libs/httpclient-4.5.12.jar')
    compile 'com.zhy:autolayout:1.4.5'
    compile 'com.tencent.bugly:crashreport:latest.release'
    compile 'com.tencent.bugly:nativecrashreport:latest.release'
+
+    //UDP功能模块库
+    //UDP基础库（不可少）
+    compile 'com.jwkj:udpsender:v2.0.2'
+    compile(name: 'UDPUtilsLib-v1.1.1', ext: 'aar')
+//    compile 'com.github.jwkj:SoundWaveSender:v2.0.2'
+
+    //摇杆空间
+    compile 'com.github.kongqw:AndroidRocker:1.0.1'
+
+    compile 'com.aliyun.ams:alicloud-android-httpdns:2.1.1'
+
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'io.reactivex:rxjava:1.1.6'
+
+//    implementation 'com.github.EspressifApp:lib-esptouch-v2-android:2.2.1'
 }
 //apply plugin: 'com.getkeepsafe.dexcount'
--- a/local.properties
+++ b/local.properties
@ -1,11 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Oct 20 22:12:28 CST 2020
-sdk.dir=F\:\\androidsdk
+#Thu Sep 21 11:36:40 CST 2023
+sdk.dir=/Users/zau18/Library/Android/sdk
--- a/umeng_sharesdk_library/build.gradle
+++ b/umeng_sharesdk_library/build.gradle
@ -7,6 +7,9 @@ android {
    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
+        ndk {
+            abiFilters 'armeabi','arm64-v8a'
+        }
    }

    buildTypes {