From 2e0c8ed0b1b6f94104e5f5dbe847d35f2c94b6be Mon Sep 17 00:00:00 2001 From: Conley Owens Date: Wed, 27 May 2015 15:08:35 -0700 Subject: [PATCH] [android] Cleanup debug display This change: * Changes a few variable names to be more fitting * Sets all values in the adapter to avoid displaying recycled values * Reorganizes the metadata debug line so that scan time comes first --- .../physicalweb/NearbyBeaconsFragment.java | 40 ++++++++++++------- .../res/layout/list_item_nearby_beacon.xml | 4 +- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/NearbyBeaconsFragment.java b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/NearbyBeaconsFragment.java index 6b7e0d2e..0636b5be 100644 --- a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/NearbyBeaconsFragment.java +++ b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/NearbyBeaconsFragment.java @@ -92,7 +92,7 @@ public class NearbyBeaconsFragment extends ListFragment private SwipeRefreshWidget mSwipeRefreshWidget; private MdnsUrlDiscoverer mMdnsUrlDiscoverer; private SsdpUrlDiscoverer mSsdpUrlDiscoverer; - private boolean mDebugRangingViewEnabled = false; + private boolean mDebugViewEnabled = false; // Run when the SCAN_TIME_MILLIS has elapsed. private Runnable mScanTimeout = new Runnable() { @Override @@ -108,7 +108,7 @@ public void run() { }; private AdapterView.OnItemLongClickListener mAdapterViewItemLongClickListener = new AdapterView.OnItemLongClickListener() { public boolean onItemLongClick(AdapterView av, View v, int position, long id) { - mDebugRangingViewEnabled = !mDebugRangingViewEnabled; + mDebugViewEnabled = !mDebugViewEnabled; mNearbyDeviceAdapter.notifyDataSetChanged(); return true; } @@ -484,10 +484,12 @@ public View getView(int i, View view, ViewGroup viewGroup) { PwsClient.UrlMetadata urlMetadata = mUrlToUrlMetadata.get(url); // If the metadata exists if (urlMetadata != null) { + Log.d(TAG, url + " Metadata not null1"); // Set the title text titleTextView.setText(urlMetadata.title); // Set the url text - urlTextView.setText(urlMetadata.displayUrl); + //TODO: urlTextView.setText(urlMetadata.displayUrl); + urlTextView.setText(url); // Set the description text descriptionTextView.setText(urlMetadata.description); // Set the favicon image @@ -495,6 +497,7 @@ public View getView(int i, View view, ViewGroup viewGroup) { } // If metadata does not yet exist else { + Log.d(TAG, url + " Metadata null1"); // Clear the children views content (in case this is a recycled list item view) titleTextView.setText(""); iconImageView.setImageDrawable(null); @@ -505,8 +508,8 @@ public View getView(int i, View view, ViewGroup viewGroup) { } // If we should show the ranging data - if (mDebugRangingViewEnabled) { - updateRangingDebugView(url, view); + if (mDebugViewEnabled) { + updateDebugView(url, view); view.findViewById(R.id.ranging_debug_container).setVisibility(View.VISIBLE); view.findViewById(R.id.metadata_debug_container).setVisibility(View.VISIBLE); PwsClient.getInstance(getActivity()).useDevEndpoint(); @@ -521,7 +524,8 @@ public View getView(int i, View view, ViewGroup viewGroup) { return view; } - private void updateRangingDebugView(String url, View view) { + private void updateDebugView(String url, View view) { + // Ranging debug line String deviceAddress = mUrlToDeviceAddress.get(url); int txPower = mUrlToTxPower.get(url); @@ -545,25 +549,31 @@ private void updateRangingDebugView(String url, View view) { TextView regionView = (TextView) view.findViewById(R.id.ranging_debug_region); regionView.setText(regionString); + // Metadata debug line PwsClient.UrlMetadata metadata = mUrlToUrlMetadata.get(url); + + float scanTime = mUrlToScanTime.get(url) / 1000.0f; + String scanTimeString = getString(R.string.metadata_debug_scan_time_prefix) + + new DecimalFormat("##.##s").format(scanTime); + TextView scanTimeView = (TextView) view.findViewById(R.id.metadata_debug_scan_time); + scanTimeView.setText(scanTimeString); + + TextView rankView = (TextView) view.findViewById(R.id.metadata_debug_rank); + TextView pwsTripTimeView = (TextView) view.findViewById(R.id.metadata_debug_pws_trip_time); if (metadata != null) { + Log.d(TAG, url + " Metadata not null2"); float rank = metadata.rank; String rankString = getString(R.string.metadata_debug_rank_prefix) + new DecimalFormat("##.##").format(rank); - TextView rankView = (TextView) view.findViewById(R.id.metadata_debug_rank); rankView.setText(rankString); - float scanTime = mUrlToScanTime.get(url) / 1000.0f; - String scanTimeString = getString(R.string.metadata_debug_scan_time_prefix) - + new DecimalFormat("##.##s").format(scanTime); - TextView scanTimeView = (TextView) view.findViewById(R.id.metadata_debug_scan_time); - scanTimeView.setText(scanTimeString); - float pwsTripTime = mUrlToPwsTripTime.get(url) / 1000.0f; String pwsTripTimeString = "" + getString(R.string.metadata_debug_pws_trip_time_prefix) - + new DecimalFormat("##.##s").format(pwsTripTime); - TextView pwsTripTimeView = (TextView) view.findViewById(R.id.metadata_debug_pws_trip_time); + + new DecimalFormat("##.##s").format(pwsTripTime) + " " + url; pwsTripTimeView.setText(pwsTripTimeString); + } else { + rankView.setText(""); + pwsTripTimeView.setText(""); } } diff --git a/android/PhysicalWeb/app/src/main/res/layout/list_item_nearby_beacon.xml b/android/PhysicalWeb/app/src/main/res/layout/list_item_nearby_beacon.xml index 378f474d..79dfd340 100644 --- a/android/PhysicalWeb/app/src/main/res/layout/list_item_nearby_beacon.xml +++ b/android/PhysicalWeb/app/src/main/res/layout/list_item_nearby_beacon.xml @@ -133,14 +133,14 @@ android:layout_weight="1" android:textSize="16sp" android:textColor="#bbbbbb" - android:id="@+id/metadata_debug_rank"/> + android:id="@+id/metadata_debug_scan_time"/> + android:id="@+id/metadata_debug_rank"/>