diff --git a/ChangeLog.txt b/ChangeLog.txt index 5bbf7d1..00fff44 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,5 @@ +2017/09/05 + Update Android SDK, Add new API setAutoOff, the new API using for OEM customer for battery saving 2016/04/18 Rearrange the SDK Update iOS SDK, add get reader type API - FtGetCurrentReaderType. diff --git a/SDK/Android/BIN/FtBtDemo.apk b/SDK/Android/BIN/FtBtDemo.apk index 756de0d..ee09cf2 100644 Binary files a/SDK/Android/BIN/FtBtDemo.apk and b/SDK/Android/BIN/FtBtDemo.apk differ diff --git a/SDK/Android/Lib/bR301_v2.0.9_debug.jar b/SDK/Android/Lib/bR301_v2.0.9_debug.jar new file mode 100644 index 0000000..ab2efc5 Binary files /dev/null and b/SDK/Android/Lib/bR301_v2.0.9_debug.jar differ diff --git a/SDK/Android/Lib/bR301_v2.0.5_release.jar b/SDK/Android/Lib/bR301_v2.0.9_release.jar similarity index 62% rename from SDK/Android/Lib/bR301_v2.0.5_release.jar rename to SDK/Android/Lib/bR301_v2.0.9_release.jar index 141cfec..da0f5d6 100644 Binary files a/SDK/Android/Lib/bR301_v2.0.5_release.jar and b/SDK/Android/Lib/bR301_v2.0.9_release.jar differ diff --git a/SDK/Android/Readme.txt b/SDK/Android/Readme.txt index b3219b9..6e0023e 100644 --- a/SDK/Android/Readme.txt +++ b/SDK/Android/Readme.txt @@ -1,3 +1,5 @@ +2017/09/05 + Update Android SDK 2016/10/17 Fix auto PPS issue, update lib to 2.0.5 2016/01/07 diff --git a/SDK/Android/Sample code/Standard Sample code.7z.rev b/SDK/Android/Sample code/Standard Sample code.7z.rev deleted file mode 100644 index 31723a9..0000000 Binary files a/SDK/Android/Sample code/Standard Sample code.7z.rev and /dev/null differ diff --git a/SDK/Android/Sample code/Standard Sample code/.classpath b/SDK/Android/Sample code/Standard Sample code/.classpath index d57ec02..5176974 100644 --- a/SDK/Android/Sample code/Standard Sample code/.classpath +++ b/SDK/Android/Sample code/Standard Sample code/.classpath @@ -2,8 +2,8 @@ + - diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes.dex b/SDK/Android/Sample code/Standard Sample code/bin/classes.dex new file mode 100644 index 0000000..95fb0c8 Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/classes.dex differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$1.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$1.class index b3710f3..e3d5826 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$1.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$1.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$2.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$2.class index d9c5511..c181bbc 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$2.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$2.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$3.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$3.class index e88da74..ecddc5d 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$3.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$3.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$4.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$4.class index fb967b1..ee0bc28 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$4.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$4.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$5.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$5.class index 5101e42..ba1ea7b 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$5.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$5.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$6.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$6.class index 175718d..6d244eb 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$6.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$6.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$7.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$7.class index d7a289d..6e83e70 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$7.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth$7.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth.class index 5f2ee98..644ad7b 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/BlueTooth.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$id.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$id.class index 87d8900..5182c72 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$id.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$id.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$layout.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$layout.class index 1614f89..2dd35d7 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$layout.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$layout.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$menu.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$menu.class index 1002a2c..5f87602 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$menu.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$menu.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$string.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$string.class index f1db7f6..b598ed2 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$string.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$string.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$style.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$style.class index 6552530..b13e4ee 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$style.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/R$style.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/ft_reader.class b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/ft_reader.class index 7f004a6..378b7b3 100644 Binary files a/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/ft_reader.class and b/SDK/Android/Sample code/Standard Sample code/bin/classes/com/example/ftbtdemo/ft_reader.class differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/android-support-v4-1ec0a4f27a03f2ccd0d1575da38b58d5.jar b/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/android-support-v4-1ec0a4f27a03f2ccd0d1575da38b58d5.jar new file mode 100644 index 0000000..c1807c7 Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/android-support-v4-1ec0a4f27a03f2ccd0d1575da38b58d5.jar differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/bR301_v2.0.9_debug-0c960aa98ae2482edc9707e5c5d35650.jar b/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/bR301_v2.0.9_debug-0c960aa98ae2482edc9707e5c5d35650.jar new file mode 100644 index 0000000..5eab3eb Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/bR301_v2.0.9_debug-0c960aa98ae2482edc9707e5c5d35650.jar differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/bR301_v2.0.9_release-3fd9646e8472740400f25339138c513a.jar b/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/bR301_v2.0.9_release-3fd9646e8472740400f25339138c513a.jar new file mode 100644 index 0000000..6ab301a Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/dexedLibs/bR301_v2.0.9_release-3fd9646e8472740400f25339138c513a.jar differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/jarlist.cache b/SDK/Android/Sample code/Standard Sample code/bin/jarlist.cache new file mode 100644 index 0000000..0565465 --- /dev/null +++ b/SDK/Android/Sample code/Standard Sample code/bin/jarlist.cache @@ -0,0 +1,3 @@ +# cache for current jar dependency. DO NOT EDIT. +# format is +# Encoding is UTF-8 diff --git a/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-hdpi/ic_action_search.png b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-hdpi/ic_action_search.png new file mode 100644 index 0000000..ffec9be Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-hdpi/ic_action_search.png differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-hdpi/ic_launcher.png b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..2642d5d Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-hdpi/ic_launcher.png differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-ldpi/ic_launcher.png b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..28424c3 Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-ldpi/ic_launcher.png differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-mdpi/ic_action_search.png b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-mdpi/ic_action_search.png new file mode 100644 index 0000000..ce9399c Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-mdpi/ic_action_search.png differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-mdpi/ic_launcher.png b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..312d96f Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-mdpi/ic_launcher.png differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-xhdpi/ic_action_search.png b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-xhdpi/ic_action_search.png new file mode 100644 index 0000000..b2d7b2d Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-xhdpi/ic_action_search.png differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..2a66d4d Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/res/crunch/drawable-xhdpi/ic_launcher.png differ diff --git a/SDK/Android/Sample code/Standard Sample code/bin/resources.ap_ b/SDK/Android/Sample code/Standard Sample code/bin/resources.ap_ new file mode 100644 index 0000000..ede2496 Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/bin/resources.ap_ differ diff --git a/SDK/Android/Sample code/Standard Sample code/gen/com/example/ftbtdemo/R.java b/SDK/Android/Sample code/Standard Sample code/gen/com/example/ftbtdemo/R.java index a313073..bee0958 100644 --- a/SDK/Android/Sample code/Standard Sample code/gen/com/example/ftbtdemo/R.java +++ b/SDK/Android/Sample code/Standard Sample code/gen/com/example/ftbtdemo/R.java @@ -20,29 +20,30 @@ public static final class drawable { public static final int ic_launcher=0x7f020001; } public static final class id { - public static final int BExit=0x7f080012; + public static final int BExit=0x7f080013; public static final int BGetAtr=0x7f080007; public static final int BGetSerial=0x7f080009; public static final int BGetStatus=0x7f080008; public static final int BList=0x7f080001; public static final int BPowerOff=0x7f080006; public static final int BPowerOn=0x7f080005; - public static final int BReadFlash=0x7f08000f; - public static final int BSelectBlue=0x7f080015; - public static final int BSendCmd=0x7f08000c; - public static final int BSendData=0x7f08000a; - public static final int BWriteFlash=0x7f08000e; - public static final int BclearReceiveData=0x7f080011; + public static final int BReadFlash=0x7f080010; + public static final int BSelectBlue=0x7f080016; + public static final int BSendCmd=0x7f08000d; + public static final int BSendData=0x7f08000b; + public static final int BSetAutoOff=0x7f08000a; + public static final int BWriteFlash=0x7f08000f; + public static final int BclearReceiveData=0x7f080012; public static final int Bconnect=0x7f080003; public static final int BdisConnect=0x7f080004; - public static final int ESSreceive=0x7f080013; - public static final int ESendData=0x7f08000b; - public static final int EWriteFlash=0x7f080010; - public static final int Ereceive=0x7f080014; - public static final int deviceTextView=0x7f080016; - public static final int menu_settings=0x7f080017; + public static final int ESSreceive=0x7f080014; + public static final int ESendData=0x7f08000c; + public static final int EWriteFlash=0x7f080011; + public static final int Ereceive=0x7f080015; + public static final int deviceTextView=0x7f080017; + public static final int menu_settings=0x7f080018; public static final int spinner1=0x7f080002; - public static final int spinner2=0x7f08000d; + public static final int spinner2=0x7f08000e; public static final int textView2=0x7f080000; } public static final class layout { diff --git a/SDK/Android/Sample code/Standard Sample code/libs/bR301_v2.0.9_release.jar b/SDK/Android/Sample code/Standard Sample code/libs/bR301_v2.0.9_release.jar new file mode 100644 index 0000000..da0f5d6 Binary files /dev/null and b/SDK/Android/Sample code/Standard Sample code/libs/bR301_v2.0.9_release.jar differ diff --git a/SDK/Android/Sample code/Standard Sample code/project.properties b/SDK/Android/Sample code/Standard Sample code/project.properties index 0f507e5..4ab1256 100644 --- a/SDK/Android/Sample code/Standard Sample code/project.properties +++ b/SDK/Android/Sample code/Standard Sample code/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-12 +target=android-19 diff --git a/SDK/Android/Sample code/Standard Sample code/res/layout/activity_phone.xml b/SDK/Android/Sample code/Standard Sample code/res/layout/activity_phone.xml index 5e4b133..32f396f 100644 --- a/SDK/Android/Sample code/Standard Sample code/res/layout/activity_phone.xml +++ b/SDK/Android/Sample code/Standard Sample code/res/layout/activity_phone.xml @@ -93,7 +93,7 @@