diff --git a/qy/src/main/java/com/qiyou/mb/android/beans/basic/Track_bean.java b/qy/src/main/java/com/qiyou/mb/android/beans/basic/Track_bean.java index 63e8cf2..4ad46ef 100644 --- a/qy/src/main/java/com/qiyou/mb/android/beans/basic/Track_bean.java +++ b/qy/src/main/java/com/qiyou/mb/android/beans/basic/Track_bean.java @@ -66,7 +66,7 @@ public class Track_bean { public String getName() { if(TextUtils.isEmpty(name) && trackId>0) - name ="No."+ trackId; + name =/*"No."+*/ getType().toCHString() + trackId; return name; } diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java index 8cfecc2..1b69479 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java @@ -220,7 +220,7 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio notesMsg +="提示：左右滑动屏幕可以切换标签页面"; } - notesMsg =TextUtils.isEmpty(notesMsg)?"提示：运动汇总数据是对您全部运动记录的数据的汇总统计":notesMsg; + notesMsg =TextUtils.isEmpty(notesMsg)?"运动数据汇总统计":notesMsg; mNoteText.setText(notesMsg); } diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java index 200cf27..2ce1d87 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java @@ -107,13 +107,13 @@ public class Track_fragment extends TrackTabs_fragment implements IlocationFr protected void initialViews(){ super.initialViews(); - td_btnShowChartKm1 = (Button) vContainer.findViewById(R.id.td_btnShowChartKm1); + td_btnShowChartKm1 = (ImageButton) vContainer.findViewById(R.id.td_btnShowChartKm1); if(td_btnShowChartKm1!=null) td_btnShowChartKm1.setOnClickListener(ButtonOnClickListener); - td_btnShowChartSpeed1 = (Button) vContainer.findViewById(R.id.td_btnShowChartSpeed1); + td_btnShowChartSpeed1 = (ImageButton) vContainer.findViewById(R.id.td_btnShowChartSpeed1); if(td_btnShowChartSpeed1!=null) td_btnShowChartSpeed1.setOnClickListener(ButtonOnClickListener); - td_btnShowChartEle1 = (Button) vContainer.findViewById(R.id.td_btnShowChartEle1); + td_btnShowChartEle1 = (ImageButton) vContainer.findViewById(R.id.td_btnShowChartEle1); if(td_btnShowChartEle1!=null) td_btnShowChartEle1.setOnClickListener(ButtonOnClickListener); diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackingBasic_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackingBasic_fragment.java index 51e9eae..955f813 100755 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackingBasic_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackingBasic_fragment.java @@ -385,9 +385,9 @@ mBaiduMap.setMyLocationData(locData);*/ protected Button td_btnShowChartKm; protected Button td_btnShowChartSpeed; protected Button td_btnShowChartEle; - protected Button td_btnShowChartKm1; - protected Button td_btnShowChartSpeed1; - protected Button td_btnShowChartEle1; + protected ImageButton td_btnShowChartKm1; + protected ImageButton td_btnShowChartSpeed1; + protected ImageButton td_btnShowChartEle1; protected Button td_btn_export; protected Button btnSave; protected Button btnDel; diff --git a/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java b/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java index 7ec347b..803d4c8 100644 --- a/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java +++ b/qy/src/main/java/com/qiyou/mb/android/utils/Utils.java @@ -1961,9 +1961,9 @@ public static ArrayList zipPathPoints( Track_bean track,int tar String pathStyle ; String format; // String staticMapUrl; - final int maxWidth=1024; + final int maxWidth=1024/2; String baiduUrl ="https://api.map.baidu.com/staticimage"; - QLog.getLogger().i(dTAG, "screen width * height:" +QiYouConstant.PV_INT_SCREEN_WIDTH+"*"+QiYouConstant.PV_INT_SCREEN_HEIGHT); + QLog.getLogger().d(dTAG, "screen width * height:" +QiYouConstant.PV_INT_SCREEN_WIDTH+"*"+QiYouConstant.PV_INT_SCREEN_HEIGHT); width= QiYouConstant.PV_INT_SCREEN_WIDTH>0? QiYouConstant.PV_INT_SCREEN_WIDTH:720; // width= QiYouConstant.PV_INT_SCREEN_HEIGHT>0? QiYouConstant.PV_INT_SCREEN_HEIGHT:540; diff --git a/qy/src/main/res/drawable-hdpi/icon_fullscreen.png b/qy/src/main/res/drawable-hdpi/icon_fullscreen.png new file mode 100644 index 0000000..b44fc77 Binary files /dev/null and b/qy/src/main/res/drawable-hdpi/icon_fullscreen.png differ diff --git a/qy/src/main/res/layout/cp_track_basic_ll.xml b/qy/src/main/res/layout/cp_track_basic_ll.xml index b16f47b..ae5efae 100755 --- a/qy/src/main/res/layout/cp_track_basic_ll.xml +++ b/qy/src/main/res/layout/cp_track_basic_ll.xml @@ -318,7 +318,7 @@ + android:text="@string/title_topspd" /> diff --git a/qy/src/main/res/layout/gpx_detail_data.xml b/qy/src/main/res/layout/gpx_detail_data.xml index 7c09817..c9271d6 100755 --- a/qy/src/main/res/layout/gpx_detail_data.xml +++ b/qy/src/main/res/layout/gpx_detail_data.xml @@ -66,8 +66,9 @@ android:layout_height="fill_parent" android:layout_marginTop="-5dp" android:layout_marginBottom="-1dp" - android:scaleType="fitXY" + android:scaleType="centerCrop" /> + + android:scaleType="centerCrop" /> + + android:scaleType="centerCrop" /> + diff --git a/qy/src/main/res/layout/track_tabs.xml b/qy/src/main/res/layout/track_tabs.xml index 95f6845..9ffe30a 100755 --- a/qy/src/main/res/layout/track_tabs.xml +++ b/qy/src/main/res/layout/track_tabs.xml @@ -132,14 +132,21 @@ + android:text="高度图" /> -