Skip to content

Commit a3ddf02

Browse files
flutter uikit v10.0.0
1 parent 711fc70 commit a3ddf02

File tree

139 files changed

+4824
-3527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+4824
-3527
lines changed

im_demo/android/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
/caches
9+
/wrapper/dists
10+
/.tmp
11+
/native
12+
/kotlin-profile
13+
/daemon
814

915
# Remember to never publicly share your keystore.
1016
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app

im_demo/android/app/build.gradle

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,17 @@ if (keystorePropertiesFile.exists()) {
3939
android {
4040
compileSdkVersion 34
4141

42+
buildToolsVersion "34.0.0"
43+
44+
namespace 'com.netease.yunxin.app.flutter.im'
45+
46+
sourceSets {
47+
main.java.srcDirs += 'src/main/kotlin'
48+
}
49+
4250
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_1_8
44-
targetCompatibility JavaVersion.VERSION_1_8
51+
sourceCompatibility JavaVersion.VERSION_17
52+
targetCompatibility JavaVersion.VERSION_17
4553
}
4654
lintOptions {
4755
checkReleaseBuilds false
@@ -51,7 +59,7 @@ android {
5159
}
5260

5361
kotlinOptions {
54-
jvmTarget = '1.8'
62+
jvmTarget = '17'
5563
}
5664

5765
sourceSets {
@@ -61,7 +69,7 @@ android {
6169
defaultConfig {
6270
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
6371
applicationId "com.netease.yunxin.app.flutter.im"
64-
minSdkVersion 21
72+
minSdkVersion 24
6573
targetSdkVersion flutter.targetSdkVersion
6674
versionCode flutterVersionCode.toInteger()
6775
versionName flutterVersionName
@@ -88,7 +96,7 @@ android {
8896
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
8997
}
9098
debug {
91-
// TODO: Add your own signing config for the debug build.
99+
signingConfig signingConfigs.release
92100
}
93101
}
94102

@@ -117,11 +125,7 @@ dependencies {
117125
implementation 'com.google.code.gson:gson:2.9.0'
118126
implementation 'commons-codec:commons-codec:1.10'
119127
implementation 'androidx.annotation:annotation:1.3.0'
120-
implementation 'com.huawei.hms:push:6.5.0.300'
121-
implementation "com.huawei.agconnect:agconnect-core:1.6.5.300"
122-
//高德地图功能
123-
implementation 'com.amap.api:3dmap:9.8.3'
124-
//搜索功能
125-
implementation 'com.amap.api:search:9.7.0'
128+
implementation 'com.huawei.hms:push:6.10.0.300'
129+
implementation "com.huawei.agconnect:agconnect-core:1.7.2.300"
126130

127131
}
Binary file not shown.

im_demo/android/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@
164164
android:exported="false"
165165
android:screenOrientation="portrait"
166166
android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
167-
<!-- todo Vivo 推送配置-->
167+
168168
<meta-data
169169
android:name="com.vivo.push.api_key"
170-
android:value="yourVivoPushApiKey"/>
170+
android:value="496dab64d277a004ac9f5d8b0f53f951"/>
171171
<meta-data
172172
android:name="com.vivo.push.app_id"
173-
android:value="yourVivoPushAppId"/>
173+
android:value="105579057"/>
174174

175175
<receiver android:name="com.netease.nimlib.mixpush.vivo.VivoPushReceiver"
176176
android:exported="true">

im_demo/android/build.gradle

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
// found in the LICENSE file.
44

55
buildscript {
6-
ext.kotlin_version = '1.8.0'
6+
ext.kotlin_version = '1.9.0'
77
repositories {
88
google()
99
mavenCentral()
1010
maven {url 'https://developer.huawei.com/repo/'}
1111
}
1212

1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:7.2.2'
14+
classpath 'com.android.tools.build:gradle:8.5.1'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
classpath 'com.huawei.agconnect:agcp:1.6.5.300'
1717
}
@@ -29,6 +29,34 @@ rootProject.buildDir = '../build'
2929
subprojects {
3030
project.buildDir = "${rootProject.buildDir}/${project.name}"
3131
}
32+
subprojects {
33+
afterEvaluate { project ->
34+
if (project.plugins.hasPlugin("com.android.application") ||
35+
project.plugins.hasPlugin("com.android.library")) {
36+
project.android {
37+
compileSdkVersion 34
38+
buildToolsVersion "34.0.0"
39+
}
40+
}
41+
}}
42+
43+
subprojects {
44+
afterEvaluate { project ->
45+
if (project.hasProperty("android")) {
46+
android {
47+
compileSdkVersion 34
48+
compileOptions {
49+
sourceCompatibility JavaVersion.VERSION_17
50+
targetCompatibility JavaVersion.VERSION_17
51+
}
52+
}
53+
}
54+
project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
55+
kotlinOptions.jvmTarget = "17"
56+
}
57+
}
58+
}
59+
3260
subprojects {
3361
project.evaluationDependsOn(':app')
3462
}

im_demo/android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ org.gradle.jvmargs=-Xmx4096m
1111
--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
1212
android.useAndroidX=true
1313
android.enableJetifier=false
14+
apmsInstrumentationEnabled=false

im_demo/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
77
distributionPath=wrapper/dists
88
zipStoreBase=GRADLE_USER_HOME
99
zipStorePath=wrapper/dists
10-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
10+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

im_demo/android/release.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by a MIT license that can be
33
# found in the LICENSE file.
44

5-
storePassword=xxxx
6-
keyPassword=xxx
7-
keyAlias=xxx
8-
storeFile=xxx
5+
storePassword=netease.yunxin
6+
keyPassword=yunxin.app
7+
keyAlias=yunxin-app
8+
storeFile=../yunxin-app.jks

im_demo/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
source 'https://github.com/CocoaPods/Specs.git'

0 commit comments

Comments
 (0)