root
/
pda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.2.93

This commit is contained in:
wangmi 2017-03-02 14:14:22 +08:00
parent a23f38ace4
commit a21e8a6594
13 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qy/src/main/java/com/qiyou/mb/android/beans/basic/Track_bean.java
View File

@ -66,7 +66,7 @@ public class Track_bean {
public String getName() { public String getName() {
if(TextUtils.isEmpty(name) && trackId>0) if(TextUtils.isEmpty(name) && trackId>0)
name ="No."+ trackId; name =/*"No."+*/ getType().toCHString() + trackId;
return name; return name;
} }

2
qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackStatics_fragment.java
View File

@ -220,7 +220,7 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio
notesMsg +="提示：左右滑动屏幕可以切换标签页面"; notesMsg +="提示：左右滑动屏幕可以切换标签页面";
} }
notesMsg =TextUtils.isEmpty(notesMsg)?"提示：运动汇总数据是对您全部运动记录的数据的汇总统计":notesMsg; notesMsg =TextUtils.isEmpty(notesMsg)?"运动数据汇总统计":notesMsg;
mNoteText.setText(notesMsg); mNoteText.setText(notesMsg);
} }

6
qy/src/main/java/com/qiyou/mb/android/ui/fragments/Track_fragment.java
View File

@ -107,13 +107,13 @@ public class Track_fragment extends TrackTabs_fragment implements IlocationFr
protected void initialViews(){ protected void initialViews(){
super.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) if(td_btnShowChartKm1!=null)
td_btnShowChartKm1.setOnClickListener(ButtonOnClickListener); 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) if(td_btnShowChartSpeed1!=null)
td_btnShowChartSpeed1.setOnClickListener(ButtonOnClickListener); 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) if(td_btnShowChartEle1!=null)
td_btnShowChartEle1.setOnClickListener(ButtonOnClickListener); td_btnShowChartEle1.setOnClickListener(ButtonOnClickListener);

6
qy/src/main/java/com/qiyou/mb/android/ui/fragments/TrackingBasic_fragment.java
View File

@ -385,9 +385,9 @@ mBaiduMap.setMyLocationData(locData);*/
protected Button td_btnShowChartKm; protected Button td_btnShowChartKm;
protected Button td_btnShowChartSpeed; protected Button td_btnShowChartSpeed;
protected Button td_btnShowChartEle; protected Button td_btnShowChartEle;
protected Button td_btnShowChartKm1; protected ImageButton td_btnShowChartKm1;
protected Button td_btnShowChartSpeed1; protected ImageButton td_btnShowChartSpeed1;
protected Button td_btnShowChartEle1; protected ImageButton td_btnShowChartEle1;
protected Button td_btn_export; protected Button td_btn_export;
protected Button btnSave; protected Button btnSave;
protected Button btnDel; protected Button btnDel;

4
qy/src/main/java/com/qiyou/mb/android/utils/Utils.java
View File

@ -1961,9 +1961,9 @@ public static ArrayList<Waypoint_bean> zipPathPoints( Track_bean track,int tar
String pathStyle ; String pathStyle ;
String format; String format;
// String staticMapUrl; // String staticMapUrl;
final int maxWidth=1024; final int maxWidth=1024/2;
String baiduUrl ="https://api.map.baidu.com/staticimage"; 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_WIDTH>0? QiYouConstant.PV_INT_SCREEN_WIDTH:720;
// width= QiYouConstant.PV_INT_SCREEN_HEIGHT>0? QiYouConstant.PV_INT_SCREEN_HEIGHT:540; // width= QiYouConstant.PV_INT_SCREEN_HEIGHT>0? QiYouConstant.PV_INT_SCREEN_HEIGHT:540;

BIN
qy/src/main/res/drawable-hdpi/icon_fullscreen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

2
qy/src/main/res/layout/cp_track_basic_ll.xml
View File

@ -318,7 +318,7 @@
<TextView <TextView
style="@style/ll_text_view_1" style="@style/ll_text_view_1"
android:text="@string/title_maxele" /> android:text="@string/title_topspd" />
<TextView <TextView
style="@style/ll_text_unit_vc" style="@style/ll_text_unit_vc"
android:text="@string/unit_speed" /> android:text="@string/unit_speed" />

3
qy/src/main/res/layout/gpx_detail_data.xml
View File

@ -66,8 +66,9 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginTop="-5dp" android:layout_marginTop="-5dp"
android:layout_marginBottom="-1dp" android:layout_marginBottom="-1dp"
android:scaleType="fitXY" android:scaleType="centerCrop"
/> />
<!-- android:scaleType="fitXY"-->
</LinearLayout> </LinearLayout>
<LinearLayout style ="@style/ll_line_1" <LinearLayout style ="@style/ll_line_1"
android:layout_height="wrap_content" android:layout_height="wrap_content"

3
qy/src/main/res/layout/gpx_lushu_data.xml
View File

@ -84,7 +84,8 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginBottom="-1dp" android:layout_marginBottom="-1dp"
android:layout_marginTop="-5dp" android:layout_marginTop="-5dp"
android:scaleType="fitXY" /> android:scaleType="centerCrop" />
<!--android:scaleType="fitXY"-->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

3
qy/src/main/res/layout/track_detail_data.xml
View File

@ -79,7 +79,8 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginBottom="-1dp" android:layout_marginBottom="-1dp"
android:layout_marginTop="-2dp" android:layout_marginTop="-2dp"
android:scaleType="fitXY" /> android:scaleType="centerCrop" />
<!--android:scaleType="fitXY"-->
<LinearLayout <LinearLayout
style="@style/ll_line_1" style="@style/ll_line_1"

4
qy/src/main/res/layout/track_list_detail.xml
View File

@ -164,8 +164,8 @@
android:id="@+id/trakList_staticMap" android:id="@+id/trakList_staticMap"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginTop="-5dp"
android:scaleType="fitXY" android:scaleType="centerCrop"
android:visibility="gone" /> android:visibility="gone" />
<!-- "centerCrop" --> <!-- "centerCrop" -->
</LinearLayout> </LinearLayout>

47
qy/src/main/res/layout/track_tabs.xml
View File

@ -132,14 +132,21 @@
<TextView <TextView
style="@style/ll_text_view_1" style="@style/ll_text_view_1"
android:text="高度变化图" /> android:text="高度图" />
<Button <ImageButton
android:id="@+id/td_btnShowChartEle1"
style="@style/button_top"
android:layout_width="20dp"
android:src="@drawable/icon_fullscreen"
/>
<!--<Button
android:id="@+id/td_btnShowChartEle1" android:id="@+id/td_btnShowChartEle1"
style="@style/button_top" style="@style/button_top"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:text="全屏" /> android:text="全屏" />-->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -153,14 +160,19 @@
<TextView <TextView
style="@style/ll_text_view_1" style="@style/ll_text_view_1"
android:text="时速变化图" /> android:text="时速图" />
<ImageButton
<Button
android:id="@+id/td_btnShowChartSpeed1" android:id="@+id/td_btnShowChartSpeed1"
style="@style/button_top" style="@style/button_top"
android:layout_width="45dp" android:layout_width="20dp"
android:layout_marginTop="2dp" android:src="@drawable/icon_fullscreen"
android:text="全屏" /> />
<!--<Button-->
<!--android:id="@+id/td_btnShowChartSpeed1"-->
<!--style="@style/button_top"-->
<!--android:layout_width="45dp"-->
<!--android:layout_marginTop="2dp"-->
<!--android:text="全屏" />-->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -174,14 +186,19 @@
<TextView <TextView
style="@style/ll_text_view_1" style="@style/ll_text_view_1"
android:text="配速变化图" /> android:text="配速图" />
<ImageButton
<Button
android:id="@+id/td_btnShowChartKm1" android:id="@+id/td_btnShowChartKm1"
style="@style/button_top" style="@style/button_top"
android:layout_width="45dp" android:layout_width="20dp"
android:layout_marginTop="2dp" android:src="@drawable/icon_fullscreen"
android:text="全屏" /> />
<!--<Button-->
<!--android:id="@+id/td_btnShowChartKm1"-->
<!--style="@style/button_top"-->
<!--android:layout_width="45dp"-->
<!--android:layout_marginTop="2dp"-->
<!--android:text="全屏" />-->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

1
qy/src/main/res/values/strings.xml
View File

@ -184,6 +184,7 @@
<string name="title_starttime">开始时间</string> <string name="title_starttime">开始时间</string>
<string name="title_currentele">当前高度</string> <string name="title_currentele">当前高度</string>
<string name="title_maxele">最高高度</string> <string name="title_maxele">最高高度</string>
<string name="title_topspd">最高速度</string>
<string name="title_burn">消耗热量</string> <string name="title_burn">消耗热量</string>
<string name="title_camer">拍照</string> <string name="title_camer">拍照</string>
<string name="title_avspeed">运动均速</string> <string name="title_avspeed">运动均速</string>