diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/build.gradle b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/build.gradle index 30937674804e84a41f4814d611aaf6c4ce65c2e7..f54d7560e136817acf9fc42860b585257be2652b 100644 --- a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/build.gradle +++ b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/build.gradle @@ -20,7 +20,6 @@ android { externalNativeBuild { cmake { cppFlags "-std=c++1z -fPIC -fno-rtti -Werror -Wreturn-type -Wformat -fexceptions" - // cppFlags "-std=c++1z -fPIC -fno-rtti -Wreturn-type -Wformat -fexceptions" cppFlags "-DBUILD_UNITY_PLUGIN" arguments "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" arguments "-DANDROID_STL=c++_static" @@ -110,23 +109,13 @@ repositories { } dependencies { - // 导入lib下面的所有jar依赖 - implementation fileTree(include: ['*.jar'], dir: 'libs') - // 导入lib下面的所有aar依赖 - implementation fileTree(include: ['*.aar'], dir: 'libs') + // 导入lib下面的所有jar,aar依赖 + implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs') // support库对应的依赖 implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'com.tencent:mmkv:1.3.9' - implementation 'com.android.support:multidex:1.0.3' - implementation 'com.squareup.retrofit2:retrofit:2.3.0' - implementation 'com.squareup.retrofit2:converter-gson:2.5.0' - implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' - implementation 'com.squareup.retrofit2:converter-scalars:2.5.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' - implementation 'io.reactivex.rxjava2:rxjava:2.1.7' - implementation 'com.google.code.gson:gson:2.8.2' + implementation 'androidx.annotation:annotation:1.9.1' } diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/adapter-rxjava2-2.5.0.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/adapter-rxjava2-2.5.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..cf6c93446a6366afb9e788710a49d0fdf49bba7e Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/adapter-rxjava2-2.5.0.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/converter-gson-2.5.0.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/converter-gson-2.5.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..12159836ef8f5eef01a7aee0c338988bbdcc0bcc Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/converter-gson-2.5.0.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/converter-scalars-2.5.0.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/converter-scalars-2.5.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..c294a9121d906d7e66a06bc8d7bc9ff34c7c6962 Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/converter-scalars-2.5.0.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/gson-2.8.2.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/gson-2.8.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..d0d030c6371cb44e7caee238f7bf148c7732ce28 Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/gson-2.8.2.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/logging-interceptor-3.9.1.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/logging-interceptor-3.9.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..04b4874c3199bf8e0e69bfcec51ad26edfdc93b1 Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/logging-interceptor-3.9.1.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/okhttp-3.12.0.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/okhttp-3.12.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..85fe71170ace6dc8efbf9d6e27ba0d3b942a4e70 Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/okhttp-3.12.0.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/okio-1.13.0.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/okio-1.13.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..02c302f82e2aa3c73614418b206503e5df1cc25d Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/okio-1.13.0.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/reactive-streams-1.0.1.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/reactive-streams-1.0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..65f4ba446b5c0e90ef16f5f36a37260ed9bcfe1c Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/reactive-streams-1.0.1.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/retrofit-2.5.0.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/retrofit-2.5.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..13dce3c498201e5fac44877da7af715ed3ee6c87 Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/retrofit-2.5.0.jar differ diff --git a/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/rxjava-2.1.7.jar b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/rxjava-2.1.7.jar new file mode 100644 index 0000000000000000000000000000000000000000..58b62073a828d19527436bdc78932c4fe2322d41 Binary files /dev/null and b/CloudPhoneClient/VideoEngine/CloudPhoneUI/app/libs/rxjava-2.1.7.jar differ