Skip to content

Commit

Permalink
update demo apk
Browse files Browse the repository at this point in the history
  • Loading branch information
a1anwang committed Jul 24, 2018
1 parent 7047dd5 commit d26969e
Show file tree
Hide file tree
Showing 277 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
minSdkVersion 18
targetSdkVersion 26
versionCode 1
versionName "1.0.6"
versionName "1.0.7"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ public final class BuildConfig {
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0.6";
public static final String VERSION_NAME = "1.0.7";
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config=":okble-lib"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/okble-lib/build/intermediates/bundles/debug/assets"/></dataSet><dataSet config="main"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/src/main/assets"/><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/build/generated/assets/shaders/debug"/></dataSet><dataSet config="debug"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/src/debug/assets"/></dataSet></merger>
<merger version="3"><dataSet config=":okble-lib"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/okble-lib/build/intermediates/bundles/debug/assets"/></dataSet><dataSet config="main"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/src/main/assets"/><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/build/generated/assets/shaders/debug"/></dataSet><dataSet config="debug"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/src/debug/assets"/></dataSet></merger>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/src/main/jniLibs"/></dataSet><dataSet config="debug"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/src/debug/jniLibs"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/src/main/jniLibs"/></dataSet><dataSet config="debug"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/src/debug/jniLibs"/></dataSet></merger>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/src/main/shaders"/></dataSet><dataSet config="debug"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/src/debug/shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/src/main/shaders"/></dataSet><dataSet config="debug"><source path="/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/src/debug/shaders"/></dataSet></merger>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Thu Jul 19 10:13:43 CST 2018
base.0=/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/build/intermediates/transforms/dexMerger/debug/0
#Tue Jul 24 13:19:57 CST 2018
base.0=/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/build/intermediates/transforms/dexMerger/debug/0
path.0=classes.dex
renamed.0=classes.dex
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Internal package file, do not edit.
#Thu Jul 19 10:13:44 CST 2018
#Tue Jul 24 13:19:58 CST 2018
0.baseType=DIRECTORY
0.base=/Users/smartwallit/Desktop/Alan_project/MyBleSDK/android/OKBLE-master/app/build/intermediates/transforms/dexMerger/debug/0
0.base=/Users/smartwallit/Desktop/Alan_project/MyBleSDK/okble/app/build/intermediates/transforms/dexMerger/debug/0
0.path=classes.dex
0.set=DEX
count=1
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.a1anwang.okble_demo"
android:versionCode="1"
android:versionName="1.0.6" >
android:versionName="1.0.7" >

<uses-sdk
android:minSdkVersion="18"
Expand Down
Binary file modified app/build/intermediates/res/debug/resources-debug.ap_
Binary file not shown.
Binary file modified app/build/intermediates/transforms/dexBuilder/debug/21.jar
Binary file not shown.
Binary file modified app/build/intermediates/transforms/dexBuilder/debug/22.jar
Binary file not shown.
Binary file modified app/build/intermediates/transforms/dexBuilder/debug/23.jar
Binary file not shown.
Binary file modified app/build/intermediates/transforms/dexBuilder/debug/24.jar
Binary file not shown.
Binary file modified app/build/intermediates/transforms/dexBuilder/debug/25.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-5","index":0,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-alpha-5","index":1,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.gyf.barlibrary:barlibrary:2.3.0","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.github.pinguo-zhouwei:CustomPopwindow:2.1.1","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"me.grantland:autofittextview:0.2.1","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:appcompat-v7:26.1.0","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout:1.1.0","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.google.android:flexbox:1.0.0","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout-solver:1.1.0","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:animated-vector-drawable:26.1.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-vector-drawable:26.1.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:26.1.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:26.1.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:26.1.0","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:26.1.0","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:26.1.0","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:26.1.0","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:26.1.0","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.0.0","index":19,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.0.0","index":20,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-0","index":21,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-1","index":22,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-2","index":23,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-3","index":24,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-4","index":25,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"79dd7a8efe87498577a7134e9983cc3ade6b0236","index":26,"scopes":["PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true}]
[{"name":"com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-5","index":0,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-alpha-5","index":1,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.gyf.barlibrary:barlibrary:2.3.0","index":2,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.github.pinguo-zhouwei:CustomPopwindow:2.1.1","index":3,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"me.grantland:autofittextview:0.2.1","index":4,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:appcompat-v7:26.1.0","index":5,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout:1.1.0","index":6,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.google.android:flexbox:1.0.0","index":7,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support.constraint:constraint-layout-solver:1.1.0","index":8,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:animated-vector-drawable:26.1.0","index":9,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-vector-drawable:26.1.0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-v4:26.1.0","index":11,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-media-compat:26.1.0","index":12,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-fragment:26.1.0","index":13,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-utils:26.1.0","index":14,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-core-ui:26.1.0","index":15,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-compat:26.1.0","index":16,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"com.android.support:support-annotations:26.1.0","index":17,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:runtime:1.0.0","index":18,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.lifecycle:common:1.0.0","index":19,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"android.arch.core:common:1.0.0","index":20,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-0","index":21,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-1","index":22,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-2","index":23,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-3","index":24,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":":okble-lib-4","index":25,"scopes":["SUB_PROJECTS"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"79dd7a8efe87498577a7134e9983cc3ade6b0236","index":26,"scopes":["PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":false},{"name":"e5bd6c96c5a6f946ed48d5b5950d644c18a132fe","index":27,"scopes":["PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true}]
Binary file modified app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"resources","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["RESOURCES"],"format":"JAR","present":true}]
[{"name":"resources","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["RESOURCES"],"format":"JAR","present":true}]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"resources","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":false}]
[{"name":"resources","index":1,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":false}]
Binary file modified app/build/outputs/apk/debug/app-debug.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion okble-lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
minSdkVersion 18
targetSdkVersion 26
versionCode 3
versionName "1.0.6"
versionName "1.0.7"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand Down

0 comments on commit d26969e

Please sign in to comment.