Merge branch 'master' of github.com:Sensoro/SDK-Android

release v3.2.0

Author: VegeChou

Samples/Yunzi-Android/res/drawable-xxhdpi/yunzi_4aa.png

@@ -20,8 +20,8 @@
 
             <ImageView
                 android:id="@+id/fragment_detail_iv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
                 android:contentDescription="Beacon Image"
                 android:paddingBottom="@dimen/detail_img_padding_bottom"
                 android:paddingTop="@dimen/detail_img_padding_top" />

Samples/Yunzi-Android/res/layout/fragment_detail.xml

@@ -12,7 +12,7 @@
         android:layout_gravity="center_horizontal"
         android:background="@drawable/background_circle"
         android:gravity="center"
-        android:padding="@dimen/detail_grid_img_padding"                                 android:textColor="@color/black" />
+        android:padding="@dimen/detail_grid_img_padding"                                                 android:textColor="@color/black" />
 
     <TextView
         android:id="@+id/fragment_detail_grid_item_tv_name"

Samples/Yunzi-Android/res/layout/fragment_detail_grid_item.xml

@@ -24,6 +24,7 @@
     <string name="tips_tail">you will receive notifications.</string>
     <string name="a0">a0</string>
     <string name="b0">b0</string>
+    <string name="c0">c0</string>
     <string name="icon_fa_star">&#xf005;</string>
     <string name="icon_fa_map_marker">&#xf041;</string>
     <string name="icon_fa_cloud">&#xf0c2;</string>

Samples/Yunzi-Android/res/values/strings.xml

@@ -35,6 +35,7 @@ public class BeaconsFragment extends Fragment implements OnItemClickListener {
 
 	Bitmap b0Bitmap;
 	Bitmap a0Bitmap;
+	Bitmap c0Bitmap;
 
 	MainActivity activity;
 
@@ -103,6 +104,7 @@ private void initActionBar() {
 	private void initDrawable() {
 		a0Bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.yunzi_a0);
 		b0Bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.yunzi_b0);
+		c0Bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.yunzi_4aa);
 	}
 
 	@Override
@@ -179,6 +181,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
 				viewHolder.imageView.setImageBitmap(a0Bitmap);
 			} else if (model.equalsIgnoreCase(activity.getString(R.string.b0))) {
 				viewHolder.imageView.setImageBitmap(b0Bitmap);
+			} else if (model.equalsIgnoreCase(activity.getString(R.string.c0))) {
+				viewHolder.imageView.setImageBitmap(c0Bitmap);
 			}
 			/*
 			 * set id

Samples/Yunzi-Android/src/com/sensoro/experience/tool/BeaconsFragment.java

@@ -108,6 +108,8 @@ private void initYunzi() {
 			imageView.setImageResource(R.drawable.yunzi_a0);
 		} else if (model.equalsIgnoreCase(getString(R.string.b0))) {
 			imageView.setImageResource(R.drawable.yunzi_b0);
+		} else if (model.equalsIgnoreCase(getString(R.string.c0))) {
+			imageView.setImageResource(R.drawable.yunzi_4aa);
 		}
 		String id = String.format("ID:%04x-%04x", beacon.getMajor(), beacon.getMinor());
 		idTextView.setText(id);

Samples/Yunzi-Android/src/com/sensoro/experience/tool/DetailFragment.java

@@ -264,12 +264,11 @@ public void onUpdateBeacon(final ArrayList<Beacon> arg0) {
 						if (TextUtils.isEmpty(beaconFilter)) {
 							beacons.add(beacon);
 						} else {
-							String matckString = String.format(matchFormat, beacon.getSerialNumber(), beacon.getMajor(), beacon.getMinor());
-							if (matckString.contains(beaconFilter)) {
+							String matchString = String.format(matchFormat, beacon.getSerialNumber(), beacon.getMajor(), beacon.getMinor());
+							if (matchString.contains(beaconFilter)) {
 						beacons.add(beacon);
 					}
 				}
-
 					}
 				}
 				runOnUiThread(new Runnable() {
@@ -362,7 +361,8 @@ public void run() {
 				// Notification n = new Notification(R.drawable.ic_launcher,
 				// "Hello,there!", System.currentTimeMillis());
 				// n.flags = Notification.FLAG_AUTO_CANCEL;
-				// // n.flags = Notification.FLAG_NO_CLEAR; // ������֪ͨ����ɾ��
+				// // n.flags = Notification.FLAG_NO_CLEAR; //
+				// ������֪ͨ����ɾ��
 				// Intent i = new Intent(getApplicationContext(),
 				// MainActivity.class);
 				// i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |