Skip to content

Commit 2adcb1c

Browse files
committed
[feat] Support Gemini 2 XL.
1 parent 881d913 commit 2adcb1c

File tree

114 files changed

+7010
-2735
lines changed

Some content is hidden

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

114 files changed

+7010
-2735
lines changed

example/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020
def dataFormat = format.format(new Date())
2121
dataFormat+="01"//01是当天得第几版。默认是第一版
2222
versionCode Integer.parseInt(project.hasProperty('JENKINS_BUILD_VERSION_CODE')?JENKINS_BUILD_VERSION_CODE:dataFormat)
23-
versionName project.hasProperty('JENKINS_BUILD_VERSION_NAME') ? JENKINS_BUILD_VERSION_NAME : "1.6.3"
23+
versionName project.hasProperty('JENKINS_BUILD_VERSION_NAME') ? JENKINS_BUILD_VERSION_NAME : "1.8.1"
2424

2525
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2626
externalNativeBuild {
@@ -98,6 +98,7 @@ dependencies {
9898
testImplementation 'junit:junit:4.13.2'
9999
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
100100
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
101+
implementation 'com.google.code.gson:gson:2.10.1'
101102

102103
implementation project(':obsensor_jni')
103104
}

example/src/main/AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
77
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
88
<uses-permission android:name="android.permission.CAMERA" />
9+
<uses-permission android:name="android.permission.INTERNET" />
910
<uses-feature android:name="android.hardware.usb.host" />
11+
<uses-feature
12+
android:name="android.hardware.camera"
13+
android:required="false" />
1014

1115
<application
1216
android:name=".application.MyApplication"
@@ -25,6 +29,7 @@
2529
<activity android:name=".activity.HelloOrbbecActivity" />
2630
<activity android:name=".activity.DepthViewerActivity" />
2731
<activity android:name=".activity.InfraredViewerActivity" />
32+
<activity android:name=".activity.DoubleIRViewerActivity" />
2833
<activity android:name=".activity.ColorViewerActivity" />
2934
<activity android:name=".activity.ImuActivity" />
3035
<activity android:name=".activity.DepthModeActivity" />

0 commit comments

Comments
 (0)