Skip to content

Commit

Permalink
Recheck the project can run on Android Studio,and fix some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Dong authored and Dong committed Mar 2, 2016
1 parent c77aa26 commit 5ae1aa6
Show file tree
Hide file tree
Showing 116 changed files with 139 additions and 102 deletions.
Binary file modified ...s/Android Studio Examples/BLEController/.gradle/2.2.1/taskArtifacts/cache.properties.lock
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLEController/.gradle/2.2.1/taskArtifacts/fileHashes.bin
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLEController/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
View file
Binary file not shown.
Binary file modified ...es/Android Studio Examples/BLEController/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLEController/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
View file
Binary file not shown.
14 changes: 14 additions & 0 deletions Examples/Android Studio Examples/BLEController/build/intermediates/dex-cache/cache.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<items version="2" >

<item
jar="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/libs/android-support-v4.jar"
jumboMode="false"
revision="20.0.0"
sha1="b9c504522d97f64025c387493d3989e52bc617bd">
<dex dex="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/android-support-v4-9f82e0ddaed439db97b72f78afadfa89d48c5906.jar" />
</item>
<item
jar="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/libs/nineoldandroids-2.4.0.jar"
jumboMode="false"
revision="20.0.0"
sha1="59f19e43354d32de831379c23ce03bb259a4c2b7">
<dex dex="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/nineoldandroids-2.4.0-2da6885b380eef415e120d13860c07bc0d588cb4.jar" />
</item>
<item
jar="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/libs/nineoldandroids-2.4.0.jar"
jumboMode="false"
revision="20.0.0"
sha1="59f19e43354d32de831379c23ce03bb259a4c2b7">
<dex dex="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/build/intermediates/pre-dexed/debug/nineoldandroids-2.4.0-6259de167fef15a1b68c0574aac529da7cd12f83.jar" />
</item>
<item
jar="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/libs/android-support-v4.jar"
jumboMode="false"
Expand Down
2 changes: 1 addition & 1 deletion ...tudio Examples/BLEController/build/intermediates/incremental/mergeAssets/debug/merger.xml
View file
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/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/assets"/></dataSet><dataSet config="debug"><source path="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/build-types/debug/assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/assets"/></dataSet><dataSet config="debug"><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/build-types/debug/assets"/></dataSet></merger>
2 changes: 1 addition & 1 deletion ... Examples/BLEController/build/intermediates/incremental/mergeAssets/test/debug/merger.xml
View file
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/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/src/androidTest/assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/src/androidTest/assets"/></dataSet></merger>
8 changes: 4 additions & 4 deletions ...io Examples/BLEController/build/intermediates/incremental/mergeResources/debug/merger.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...amples/BLEController/build/intermediates/incremental/mergeResources/test/debug/merger.xml
View file
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/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/src/androidTest/res"/><source path="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/build/generated/res/rs/test/debug"/><source path="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLEController/build/generated/res/generated/test/debug"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="main"><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/src/androidTest/res"/><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/build/generated/res/rs/test/debug"/><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLEController/build/generated/res/generated/test/debug"/></dataSet><mergedItems/></merger>
Binary file modified Examples/Android Studio Examples/BLEController/build/intermediates/model_data.bin
View file
Binary file not shown.
Binary file renamed ...a222b16342ba08c9648a01afd8224ba18963c.jar → ...2e0ddaed439db97b72f78afadfa89d48c5906.jar
View file
Binary file not shown.
Binary file renamed ...6885b380eef415e120d13860c07bc0d588cb4.jar → ...9de167fef15a1b68c0574aac529da7cd12f83.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_bottom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_bottom.xml -->
</set><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_bottom.xml -->
2 changes: 1 addition & 1 deletion ...d Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<!-- <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" /> -->
</set>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_left.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_left.xml -->
2 changes: 1 addition & 1 deletion ... Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
android:duration="@android:integer/config_mediumAnimTime"/>
<!-- <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" /> -->
</set><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_right.xml -->
</set><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_right.xml -->
2 changes: 1 addition & 1 deletion ...id Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_in_from_top.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<alpha android:fromAlpha="0.0" android:toAlpha="1.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_top.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_in_from_top.xml -->
2 changes: 1 addition & 1 deletion ... Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_bottom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
android:duration="@android:integer/config_mediumAnimTime"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_bottom.xml -->
</set><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_bottom.xml -->
2 changes: 1 addition & 1 deletion ...id Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<!-- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime" /> -->
</set>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_left.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_left.xml -->
2 changes: 1 addition & 1 deletion ...d Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
android:duration="@android:integer/config_mediumAnimTime"/>
<!-- <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime" /> -->
</set><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_right.xml -->
</set><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_right.xml -->
2 changes: 1 addition & 1 deletion ...oid Studio Examples/BLEController/build/intermediates/res/debug/anim/slide_out_to_top.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<alpha android:fromAlpha="1.0" android:toAlpha="0.0"
android:duration="@android:integer/config_mediumAnimTime" />
</set>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_top.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/anim/slide_out_to_top.xml -->
2 changes: 1 addition & 1 deletion ...d Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_clicked.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
android:bottom="5dp"
/>
</shape>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/drawable/button_clicked.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/drawable/button_clicked.xml -->
2 changes: 1 addition & 1 deletion ... Studio Examples/BLEController/build/intermediates/res/debug/drawable/button_selector.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@


</selector>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/drawable/button_selector.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/drawable/button_selector.xml -->
2 changes: 1 addition & 1 deletion ...amples/BLEController/build/intermediates/res/debug/drawable/mainpage_listview_item_bg.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
android:top="5dp"
android:bottom="5dp"
/>
</shape><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/drawable/mainpage_listview_item_bg.xml -->
</shape><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/drawable/mainpage_listview_item_bg.xml -->
2 changes: 1 addition & 1 deletion ...Android Studio Examples/BLEController/build/intermediates/res/debug/layout/action_bar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
android:text=""
android:textColor="#FFF" />

</RelativeLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/action_bar.xml -->
</RelativeLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/action_bar.xml -->
2 changes: 1 addition & 1 deletion ...Studio Examples/BLEController/build/intermediates/res/debug/layout/activity_main_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
android:layout_height="match_parent"
tools:context=".MainPage"
tools:ignore="MergeRootFrame" />
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_main_page.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_main_page.xml -->
2 changes: 1 addition & 1 deletion ...dio Examples/BLEController/build/intermediates/res/debug/layout/activity_standardview.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@
-->


</LinearLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_standardview.xml -->
</LinearLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_standardview.xml -->
2 changes: 1 addition & 1 deletion ...xamples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
android:layout_height="match_parent"
android:layout_below="@id/headview_area"
/>
</LinearLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_standardview_pins.xml -->
</LinearLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_standardview_pins.xml -->
2 changes: 1 addition & 1 deletion ...ples/BLEController/build/intermediates/res/debug/layout/activity_standardview_pins_ex.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
android:id="@+id/pins_list"
/>
</ScrollView>
</LinearLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_standardview_pins_ex.xml -->
</LinearLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/activity_standardview_pins_ex.xml -->
2 changes: 1 addition & 1 deletion ...d Studio Examples/BLEController/build/intermediates/res/debug/layout/main_page_layout.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
</LinearLayout>
</LinearLayout>

</RelativeLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/main_page_layout.xml -->
</RelativeLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/main_page_layout.xml -->
2 changes: 1 addition & 1 deletion ...o Examples/BLEController/build/intermediates/res/debug/layout/main_page_listview_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
android:layout_height="wrap_content"
android:visibility="gone"
/>
</RelativeLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/main_page_listview_item.xml -->
</RelativeLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/main_page_listview_item.xml -->
2 changes: 1 addition & 1 deletion ...d Studio Examples/BLEController/build/intermediates/res/debug/layout/refreshlist_head.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@
android:layout_height="wrap_content"
android:visibility="gone" />

</LinearLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/refreshlist_head.xml -->
</LinearLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/refreshlist_head.xml -->
2 changes: 1 addition & 1 deletion ... Studio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
android:gravity="center"
android:visibility="gone" />

</LinearLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/standardview_item.xml -->
</LinearLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/standardview_item.xml -->
2 changes: 1 addition & 1 deletion ...udio Examples/BLEController/build/intermediates/res/debug/layout/standardview_item_ex.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@
android:max="255"
android:visibility="gone" />

</RelativeLayout><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/layout/standardview_item_ex.xml -->
</RelativeLayout><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/layout/standardview_item_ex.xml -->
2 changes: 1 addition & 1 deletion ...d Studio Examples/BLEController/build/intermediates/res/debug/menu/activity_main_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
android:title="@string/menu_settings"/>


</menu><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/menu/activity_main_page.xml -->
</menu><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/menu/activity_main_page.xml -->
2 changes: 1 addition & 1 deletion ...tudio Examples/BLEController/build/intermediates/res/debug/menu/activity_standardview.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
android:icon="@drawable/remove_icon"
android:title="@string/menu_add"/>

</menu><!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/menu/activity_standardview.xml -->
</menu><!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/menu/activity_standardview.xml -->
2 changes: 1 addition & 1 deletion ...Android Studio Examples/BLEController/build/intermediates/res/debug/values-v11/values.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/values-v11/styles.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/values-v11/styles.xml -->
<eat-comment/>
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<!-- API 11 theme customizations can go here. -->
Expand Down
2 changes: 1 addition & 1 deletion ...Android Studio Examples/BLEController/build/intermediates/res/debug/values-v14/values.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/values-v14/styles.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/values-v14/styles.xml -->
<eat-comment/>
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
Expand Down
6 changes: 3 additions & 3 deletions ...les/Android Studio Examples/BLEController/build/intermediates/res/debug/values/values.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/values/colors.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/values/colors.xml -->
<eat-comment/>
<color name="black">#000000</color>
<color name="blue">#33b6ea</color>
<color name="gold">#b89766</color>
<color name="transparent">#00000000</color>
<color name="white">#ffffff</color>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/values/strings.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/values/strings.xml -->
<eat-comment/>
<string name="addpage_name">Add</string>
<string name="app_name">BLE Controller</string>
Expand All @@ -33,7 +33,7 @@
<string name="title_section2">Custom1</string>
<string name="title_section3">Custom2</string>
<string name="version_name">1.0</string>
<!-- From: file:/Users/Dong/Desktop/redbear_github/Examples/Android%20Studio%20Examples/BLEController/res/values/styles.xml -->
<!-- From: file:/Users/dong/Documents/github/Android/Examples/Android%20Studio%20Examples/BLEController/res/values/styles.xml -->
<eat-comment/>
<style name="AppBaseTheme" parent="android:Theme.Light">
<!--
Expand Down
Binary file modified ...Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug-unaligned.apk
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLEController/build/outputs/apk/BLEController-debug.apk
View file
Binary file not shown.
18 changes: 10 additions & 8 deletions ...ples/Android Studio Examples/BLEController/src/com/redbear/redbearbleclient/MainPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,15 +409,17 @@ void addDevice(final Device mDevice) {
for (Device mTemp : mArrayList) {
if (mTemp.address.equals(mDevice.address)) {
mTemp.rssi = mDevice.rssi;
getActivity().runOnUiThread(new Runnable() {
try {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
if (adapter != null) {
adapter.notifyDataSetChanged();
}
}
});
}catch (Exception e){}

@Override
public void run() {
if (adapter != null) {
adapter.notifyDataSetChanged();
}
}
});
return;
}
}
Expand Down
Binary file modified Examples/Android Studio Examples/BLESelect/.gradle/2.2.1/taskArtifacts/cache.properties.lock
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLESelect/.gradle/2.2.1/taskArtifacts/fileHashes.bin
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLESelect/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLESelect/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
View file
Binary file not shown.
Binary file modified Examples/Android Studio Examples/BLESelect/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
View file
Binary file not shown.
7 changes: 7 additions & 0 deletions Examples/Android Studio Examples/BLESelect/build/intermediates/dex-cache/cache.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<items version="2" >

<item
jar="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLESelect/libs/android-support-v4.jar"
jumboMode="false"
revision="20.0.0"
sha1="4a6be13368bb64c5a0b0460632d228a1a915f58f">
<dex dex="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLESelect/build/intermediates/pre-dexed/debug/android-support-v4-0488db73d233cf09127c1db0e9775000b82e5434.jar" />
</item>
<item
jar="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLESelect/libs/android-support-v4.jar"
jumboMode="false"
Expand Down
2 changes: 1 addition & 1 deletion ...id Studio Examples/BLESelect/build/intermediates/incremental/mergeAssets/debug/merger.xml
View file
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/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLESelect/assets"/></dataSet><dataSet config="debug"><source path="/Users/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLESelect/build-types/debug/assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLESelect/assets"/></dataSet><dataSet config="debug"><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLESelect/build-types/debug/assets"/></dataSet></merger>
2 changes: 1 addition & 1 deletion ...udio Examples/BLESelect/build/intermediates/incremental/mergeAssets/test/debug/merger.xml
View file
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/Dong/Desktop/redbear_github/Examples/Android Studio Examples/BLESelect/src/androidTest/assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/Users/dong/Documents/github/Android/Examples/Android Studio Examples/BLESelect/src/androidTest/assets"/></dataSet></merger>
Loading

0 comments on commit 5ae1aa6

Please sign in to comment.