Skip to content

Commit b2f3abc

Browse files
committed
修复崩溃的问题
1 parent 35b6cee commit b2f3abc

6 files changed

Lines changed: 19 additions & 7 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@ fastlane/screenshots
7373
fastlane/test_output
7474
fastlane/readme.md
7575

76+
/config.gradle
77+
sample/bugly/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ C++ port of ZXing for Android
99
### 使用
1010
在gradle中:
1111
``` groovy
12-
implementation 'me.devilsen:CZXing:0.9.7'
12+
implementation 'me.devilsen:CZXing:0.9.8'
1313
```
1414
建议加入abiFilters
1515
```gradle

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ buildscript {
3030
classpath 'com.android.tools.build:gradle:3.5.2'
3131
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
3232
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
33+
classpath 'com.tencent.bugly:symtabfileuploader:2.2.1'
3334
// NOTE: Do not place your application dependencies here; they belong
3435
// in the individual module build.gradle files
3536
}

czxing/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
minSdkVersion rootProject.ext.minSdkVersion
88
targetSdkVersion rootProject.ext.targetSdkVersion
99
versionCode 20
10-
versionName "0.9.7"
10+
versionName "0.9.8"
1111

1212
externalNativeBuild {
1313
cmake {

czxing/src/main/cpp/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include_directories(zxing)
1414
include_directories(include)
1515
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}")
1616

17-
add_compile_options(czxing "-O1" "-fPIC")
17+
#add_compile_options(czxing "-O1" "-fPIC")
1818

1919
# 静态方式导入库
2020
add_library(opencv_core STATIC IMPORTED)
@@ -36,9 +36,9 @@ set_target_properties(tegra_hal PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}
3636
#set_target_properties(opencv_java4 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libopencv_java4.so)
3737

3838
# 导入zbar
39-
add_library(iconv SHARED IMPORTED)
39+
#add_library(iconv SHARED IMPORTED)
4040
add_library(zbar_core SHARED IMPORTED)
41-
set_target_properties(iconv PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libiconv.so)
41+
#set_target_properties(iconv PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libiconv.so)
4242
set_target_properties(zbar_core PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libzbarjni.so)
4343

4444
find_library(
@@ -49,7 +49,7 @@ target_link_libraries(
4949
czxing
5050
ZXingCore
5151

52-
iconv
52+
# iconv
5353
zbar_core
5454

5555
opencv_imgproc

sample/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'bugly'
3+
apply from: "../config.gradle"
4+
5+
// 如初次运行,请把此处注释掉
6+
bugly {
7+
// debug = true
8+
appId = buglyAppId
9+
appKey = buglyAppKey
10+
}
211

312
android {
413
compileSdkVersion rootProject.ext.compileSdkVersion
@@ -49,7 +58,7 @@ dependencies {
4958

5059
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3'
5160
// implementation project(':czxing')
52-
implementation 'me.devilsen:CZXing:0.9.7'
61+
implementation 'me.devilsen:CZXing:0.9.8'
5362

5463
implementation rootProject.ext.appcompat
5564
testImplementation rootProject.ext.junit

0 commit comments

Comments
 (0)