From a21e8a6594504d9e9757cbffeb7f3e4d557d7fbb Mon Sep 17 00:00:00 2001 From: wangmi Date: Thu, 2 Mar 2017 14:14:22 +0800 Subject: [PATCH] 1.2.93 --- .../mb/android/beans/basic/Track_bean.java | 2 +- .../ui/fragments/TrackStatics_fragment.java | 2 +- .../android/ui/fragments/Track_fragment.java | 6 +-- .../ui/fragments/TrackingBasic_fragment.java | 6 +-- .../com/qiyou/mb/android/utils/Utils.java | 4 +- .../res/drawable-hdpi/icon_fullscreen.png | Bin 0 -> 1255 bytes qy/src/main/res/layout/cp_track_basic_ll.xml | 2 +- qy/src/main/res/layout/gpx_detail_data.xml | 3 +- qy/src/main/res/layout/gpx_lushu_data.xml | 3 +- qy/src/main/res/layout/track_detail_data.xml | 3 +- qy/src/main/res/layout/track_list_detail.xml | 4 +- qy/src/main/res/layout/track_tabs.xml | 47 ++++++++++++------ qy/src/main/res/values/strings.xml | 1 + 13 files changed, 52 insertions(+), 31 deletions(-) create mode 100644 qy/src/main/res/drawable-hdpi/icon_fullscreen.png 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 0000000000000000000000000000000000000000..b44fc77bbe1b8a3ae62f804ab52a47f052241c5a GIT binary patch literal 1255 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e4&kwYomrGks@UY^2?hqHFi#i95Rc>$#*KRa46FqBhnq4$!UT^jn1 zuV*c9XmOp+>8kKCSY+CoNvZM+g67z`ncr2Y==EBXC4JPaduMY0S&2)k%8^pP?-akg ze`n*7!k`QL-ZdJ2;MJIRTBO0kkAcO4QSHEDv&IMdkFr(IGsFwDCJAq?ozNWpfaeF( z9mX3kq<>p)wG2LYjc;Fe$!o2Mc&5~4#!qwJCdgOtznK-T*w^oU;my%~?^eD2w_oNC z)AR#u9SsYwZ7&I0JL`u_uJY5kT~9ahREzTdp54{os7^>{RVCUK_S$r(#!zG4v>(u`HK5<;9!dFh5f5dEyJ%sY>Uc+Hi0+ zEI*L`beHJPX^R&p3r=KmVCnMGZc$=y-g*3riB+Mr5W`G&XD01^G0SwsG?h}BH=BJt zw*62SyW@eRiDn!B*L1F3>Z|P;H{to$Gc~GBQSt_=LYGS74y*JDZ`>***tN=8@R`Ol zJN3Sb1?P_~R%Cp3>MfIAf_lkVl5T>Kqcq{=QFpMVEO;jrt>~M-w^q6 z{QD%+c$7EgG*3%jGjV^=US{*I zZT}C7emE&Q|Gd6ef!%(Eu2bA)OSgsFEi_}V_1(>UBjfegn<-_t18@Ixmif{U{9x_1 z9dBopU40f}8Ew5`V(*r1j}E$SoOt%i_B!U0g=eP9PnQEFVbv1Xh?11Vl2ohYqEsNo zU}RuurfXoSYiJ%~Xli9>X=P}vZD3(#V4!)^UL8e4ZhlH;S|vz>v95u+u7Pogk)f4= znU#?lL_-TN6EHI{_=0RG&QB{TPb^Ah@XSq2PxVbq&rHr%FxNBCGt@Ox2sAWPsIV}L zH#1Q{*shRKQc_^0uU}qXu9peY1jIm1dih1^cW*BB0~#y=GB_loG&jl0$|XO!G&eP` z#L6lFsI-{DaQXk;`eSNXyJg1%`lrMt*K8C>)CN^Go!LGfTi6z0}0w z%FN{aJiWZs68+?qJl)LPbcA4Xo_=vrvc93Ap``_cG&a!#y7hc#U@Oon22WQ%mvv4F FO#lM0;)wtN literal 0 HcmV?d00001 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="高度图" /> -