diff --git a/qy/src/androidTest/java/com/qiyou/mb/android/test/TestGsonEnum.java b/qy/src/androidTest/java/com/qiyou/mb/android/test/TestGsonEnum.java deleted file mode 100644 index c629cfa..0000000 --- a/qy/src/androidTest/java/com/qiyou/mb/android/test/TestGsonEnum.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * - */ -package com.qiyou.mb.android.test; - -import org.junit.Test; - -import android.util.Log; - -import com.qiyou.mb.android.beans.basic.Track_bean; -import com.qiyou.mb.android.utils.Utils; -import com.qiyou.mb.android.utils.enums.TrackType; - -import junit.framework.TestCase; - -/** - * @author wangmi - * - */ -public class TestGsonEnum extends TestCase { - @Test - public void testToJson() { - - Track_bean tb = new Track_bean(); - - tb.setType(TrackType.DIVE); - - Log.d("test", "json is" + Utils.getGsonString(tb)); - - - - - } -} diff --git a/qy/src/main/AndroidManifest.xml b/qy/src/main/AndroidManifest.xml index 4f52a53..f2e9de6 100644 --- a/qy/src/main/AndroidManifest.xml +++ b/qy/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="46" + android:versionName="1.29.2" > - - - + + + - - + 20?loginUser.substring(0, 20):loginUser; loginTitle += ( app.user.getUserbean().getId()<=0?"":" ( " + loginUser +" )"); - loginItem.setTitle(loginTitle); + loginItem.setTitle(loginTitle);*/ return true; 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 318503d..7ae718a 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 @@ -83,7 +83,7 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio private TextView mftNoteText; private TextView mdetailNoteText; private ImageView imgBtnEditUser; - + private Button btnMoreHistory,btnMoreConfigure,btnMoreOffline; // private GraphicsOverlay gpFootPointsOverlay = null; @@ -1247,8 +1247,13 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio void setUserInfo(){ - if(activity.app.user.getUserbean().getId()<=0)return; - ((LinearLayout)vContainer.findViewById(R.id.ll_user_info)).setVisibility(View.VISIBLE); + ((LinearLayout)vContainer.findViewById(R.id.ll_user_info)).setVisibility(View.VISIBLE); + if(activity.app.user.getUserbean().getId()<=0){ + setUserLinkSpanTxt(((TextView) vContainer.findViewById(R.id.textview_user_name)),-1,"登录"); + ((TextView) vContainer.findViewById(R.id.textView_user_score)).setVisibility(View.GONE); + return; + } + setUserLinkSpanTxt(((TextView) vContainer.findViewById(R.id.textview_user_name)),activity.app.user.getUserbean().getId(),activity.app.user.getUserbean().getUserName()); // ((TextView) vContainer.findViewById(R.id.textview_user_name)).setText(activity.app.user.getUserbean().getUserName()/*.getAccount()*/); ((TextView) vContainer.findViewById(R.id.textView_user_score)).setText(activity.app.user.getUserbean().getScore()+""); @@ -1270,6 +1275,24 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio imgBtnEditUser= (ImageView)vContainer.findViewById(R.id.img_btnEdituser); imgBtnEditUser.setOnClickListener(ButtonOnClickListener); + + + btnMoreHistory =(Button)vContainer.findViewById(R.id.btn_more_history); + btnMoreHistory.setOnClickListener(ButtonOnClickListener); + + btnMoreConfigure =(Button)vContainer.findViewById(R.id.btn_more_configure); + btnMoreConfigure.setOnClickListener(ButtonOnClickListener); + + btnMoreOffline =(Button)vContainer.findViewById(R.id.btn_more_offlinemap); + btnMoreOffline.setOnClickListener(ButtonOnClickListener); + + + + + + + + // ll_myinfo= (LinearLayout)vContainer.findViewById(R.id.ll_myinfo); // ll_myinfo.setOnClickListener(ButtonOnClickListener); /* ll_newact= (LinearLayout)vContainer.findViewById(R.id.ll_newact); @@ -1328,15 +1351,21 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio if(tv==null){ continue; } - + tv.setPadding(2,0,0,5); if(i>0){ // tv.setTextColor( getResources().getColorStateList(R.color.lightslategrey)); tv.setTextColor( getResources().getColorStateList(R.color.darkgray)); -// tv.setTextSize(unSelectedSize); +// tv.setTextSize(14); // tabWidget.getChildAt(i).setBackgroundResource(R.color.lightgray); +// tv.setGravity(Gravity.CENTER_VERTICAL); +// tv.setBackgroundColor(Color.BLUE); + ImageView iv = new ImageView(activity); + iv.setScaleType(ImageView.ScaleType.CENTER); + if(i==1){ - ImageView iv = new ImageView(activity); - iv.setBackgroundResource(R.drawable.icon_chart); + +// iv.setBackgroundResource(R.drawable.icon_chart); + iv.setImageResource(R.drawable.icon_chart); try{ ((LinearLayout)tabWidget.getChildAt(i)).setGravity(Gravity.CENTER_VERTICAL); ((LinearLayout)tabWidget.getChildAt(i)).addView(iv,0); @@ -1344,26 +1373,27 @@ public class TrackStatics_fragment extends TrackMap_fragment implements Ilocatio } }else if(i==2){ - ImageView iv = new ImageView(activity); - iv.setBackgroundResource(R.drawable.icon_footmark); - +// ImageView iv = new ImageView(activity); +// iv.setBackgroundResource(R.drawable.icon_footmark); + iv.setImageResource(R.drawable.icon_footmark); try{ ((LinearLayout)tabWidget.getChildAt(i)).setGravity(Gravity.CENTER_VERTICAL); ((LinearLayout)tabWidget.getChildAt(i)).addView(iv,0); }catch(ClassCastException e){ } - }/*else if(i==3){ - ImageView iv = new ImageView(activity); - iv.setBackgroundResource(R.drawable.icon_light); - + } else if(i==3){ +// ImageView iv = new ImageView(activity); +// iv.setBackgroundResource(R.drawable.icon_wall); + iv.setPadding(0,0,4,0); + iv.setImageResource(R.drawable.icon_wall); try{ ((LinearLayout)tabWidget.getChildAt(i)).setGravity(Gravity.CENTER_VERTICAL); ((LinearLayout)tabWidget.getChildAt(i)).addView(iv,0); }catch(ClassCastException e){ } - }*/ + } }else{ 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 3af5c69..bd5329f 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 @@ -682,6 +682,9 @@ mBaiduMap.setMyLocationData(locData);*/ case R.id.user_abulm: { showPicPicker(); break; } case R.id.act_btn_share: { shareObj(); break; } case R.id.usr_btn_logout: { logout(); break; } + case R.id.btn_more_history:{activity.showLocalTrackList();break; } + case R.id.btn_more_configure:{activity. startPrefActivity(); break; } + case R.id.btn_more_offlinemap:{activity.showOffline();break;} } } @@ -2177,8 +2180,9 @@ mBaiduMap.setMyLocationData(locData);*/ - float avspeed=3600f*activity.app.mStatistics.getSumDist()/activity.app.mStatistics.getSumSportTime(); - avspeed =Float.isNaN(avspeed)||avspeed==0?15:avspeed; +// float avspeed=3600f*activity.app.mStatistics.getSumDist()/activity.app.mStatistics.getSumSportTime(); +// avspeed =Float.isNaN(avspeed)||avspeed==0?15:avspeed; + float avspeed= activity.app.getAVS(); /* float hours=mTrack_bean.getDistance()/1000/avspeed; float totalHours= (float) (hours*1.2f +((int)(hours*1.2/12))*12) ; diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java index 072a949..58aef27 100755 --- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java @@ -1001,9 +1001,19 @@ public class WebList_fragment extends TrackMap_fragment/* TrackList_fragment *// String.format("%.2f", tb.getDistance() / 1000)); // t.put("sportime", Utils.getTimeCnt(tb.getSportTime(), // true)); - t.put("sportime", Utils.getTimeCnt(tb.getTotalTime(), true)); + + + + float avs = tb.getType() == TrackType.GPX ? activity.app.getAVS() : tb.getAvs(); + + long sptime = tb.getType() ==TrackType.GPX ? (long)( tb.getDistance() / avs *3600) : tb.getTotalTime(); + t.put("sportime", Utils.getTimeCnt(sptime, true)); // t.put("avs", String.format("%.2f",tb.getAvs())); - t.put("avs", String.format("%.2f", tb.getTavs())); + t.put("avs", String.format("%.2f", avs)); + +// t.put("sportime", Utils.getTimeCnt(tb.getTotalTime(), true)); +// // t.put("avs", String.format("%.2f",tb.getAvs())); +// t.put("avs", String.format("%.2f", tb.getTavs())); t.put("cal", String.format("%.2f", tb.getBurn())); t.put("comment", tb.getComment()); t.put("desc", diff --git a/qy/src/main/res/layout/more_functions.xml b/qy/src/main/res/layout/more_functions.xml index e7d664c..9143334 100644 --- a/qy/src/main/res/layout/more_functions.xml +++ b/qy/src/main/res/layout/more_functions.xml @@ -30,27 +30,23 @@ android:padding="0dp" - +