build 45,v2.91
This commit is contained in:
		
							parent
							
								
									642034b8a5
								
							
						
					
					
						commit
						85ee867eb8
					
				
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							|  | @ -48,7 +48,7 @@ dependencies { | ||||||
|     compile files('libs/umeng-update-v2.6.0.1.jar') |     compile files('libs/umeng-update-v2.6.0.1.jar') | ||||||
|     compile files('libs/umeng_social_sdk.jar') |     compile files('libs/umeng_social_sdk.jar') | ||||||
|     compile files('libs/universal-image-loader-1.9.2.jar') |     compile files('libs/universal-image-loader-1.9.2.jar') | ||||||
|     compile files('libs/utdid4all-1.0.4.jar') | //    compile files('libs/utdid4all-1.0.4.jar') | ||||||
|     compile 'com.google.code.gson:gson:2.8.0' |     compile 'com.google.code.gson:gson:2.8.0' | ||||||
|     compile project(':PushSDK') |     compile project(':PushSDK') | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -191,6 +191,27 @@ | ||||||
| -dontwarn com.tencent.weibo.sdk.** | -dontwarn com.tencent.weibo.sdk.** | ||||||
| -dontwarn com.facebook.** | -dontwarn com.facebook.** | ||||||
| 
 | 
 | ||||||
|  |  -dontwarn com.taobao.** | ||||||
|  |  -dontwarn anet.channel.** | ||||||
|  |  -dontwarn anetwork.channel.** | ||||||
|  |  -dontwarn org.android.** | ||||||
|  |  -dontwarn org.apache.thrift.** | ||||||
|  |  -dontwarn com.xiaomi.** | ||||||
|  |  -dontwarn com.huawei.** | ||||||
|  |  -keep class com.taobao.** {*;} | ||||||
|  |  -keep class org.android.** {*;} | ||||||
|  |  -keep class anet.channel.** {*;} | ||||||
|  |  -keep class com.umeng.** {*;} | ||||||
|  |  -keep class com.xiaomi.** {*;} | ||||||
|  |  -keep class com.huawei.** {*;} | ||||||
|  |  -keep class org.apache.thrift.** {*;} | ||||||
|  | 
 | ||||||
|  |  -keep class com.alibaba.sdk.android.**{*;} | ||||||
|  |  -keep class com.ut.**{*;} | ||||||
|  |  -keep class com.ta.**{*;} | ||||||
|  |  -keep public class **.R$*{ | ||||||
|  |     public static final int *; | ||||||
|  |  } | ||||||
| #-libraryjars libs/SocialSDK_QQZone_2.jar | #-libraryjars libs/SocialSDK_QQZone_2.jar | ||||||
| 
 | 
 | ||||||
| -keep enum com.facebook.** | -keep enum com.facebook.** | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ | ||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
|     package="com.qiyou.mb.android" |     package="com.qiyou.mb.android" | ||||||
| 	xmlns:tools="http://schemas.android.com/tools" | 	xmlns:tools="http://schemas.android.com/tools" | ||||||
|     android:versionCode="44" |     android:versionCode="45" | ||||||
|     android:versionName="1.29.1" > |     android:versionName="1.29.1" > | ||||||
| 
 | 
 | ||||||
|     <uses-sdk |     <uses-sdk | ||||||
|  | @ -63,18 +63,18 @@ | ||||||
| 	    android:value="AIzaSyBAey0WNbuvc2WeEbCOsGEpp2WW0iw77u0"   | 	    android:value="AIzaSyBAey0WNbuvc2WeEbCOsGEpp2WW0iw77u0"   | ||||||
| 	    /> | 	    /> | ||||||
|         <!-- release --> |         <!-- release --> | ||||||
| 	     <!--<meta-data--> | 	     <meta-data | ||||||
| 	            <!--android:name="com.baidu.lbsapi.API_KEY" --> | 	            android:name="com.baidu.lbsapi.API_KEY" | ||||||
| 	           <!--android:value="rI4GlZIZcFv5fB5qxotyrW9f"--> | 	           android:value="rI4GlZIZcFv5fB5qxotyrW9f" | ||||||
|              <!--/>         --> |              /> | ||||||
|           |           | ||||||
|           |           | ||||||
|         <!-- home --> |         <!-- home --> | ||||||
| 
 | 
 | ||||||
|               <meta-data |               <!--<meta-data--> | ||||||
| 	            android:name="com.baidu.lbsapi.API_KEY"  | 	            <!--android:name="com.baidu.lbsapi.API_KEY" --> | ||||||
| 	             android:value="4lcFzBPFbukDG9DulM4qjjaI"  | 	             <!--android:value="4lcFzBPFbukDG9DulM4qjjaI" --> | ||||||
| 	             />    | 	             <!--/>   --> | ||||||
|             |             | ||||||
|             <!-- office --> |             <!-- office --> | ||||||
|                  <!--  <meta-data |                  <!--  <meta-data | ||||||
|  | @ -161,7 +161,7 @@ | ||||||
| 
 | 
 | ||||||
| 		<meta-data | 		<meta-data | ||||||
| 			android:name="UMENG_CHANNEL" | 			android:name="UMENG_CHANNEL" | ||||||
| 			android:value="i7lv" > | 			android:value="pp" > | ||||||
| 		</meta-data> | 		</meta-data> | ||||||
| 
 | 
 | ||||||
| 	      <activity android:name="com.umeng.socialize.view.ShareActivity" | 	      <activity android:name="com.umeng.socialize.view.ShareActivity" | ||||||
|  |  | ||||||
|  | @ -239,7 +239,7 @@ public class MainActivity extends Activity_qiyouBase { | ||||||
| 	    com.umeng.socialize.utils.Log.LOG = QiYouConstant.DEVELOPER_MODE;  | 	    com.umeng.socialize.utils.Log.LOG = QiYouConstant.DEVELOPER_MODE;  | ||||||
|         String key ="550aa4e4fd98c5a25c000284" ; //old "4eaee02c527015373b000003" |         String key ="550aa4e4fd98c5a25c000284" ; //old "4eaee02c527015373b000003" | ||||||
| 	   if (!QiYouConstant.DEVELOPER_MODE){ | 	   if (!QiYouConstant.DEVELOPER_MODE){ | ||||||
| 		   UMAnalyticsConfig config = new  UMAnalyticsConfig(this,key , "i7lv");  | 		   UMAnalyticsConfig config = new  UMAnalyticsConfig(this,key , "pp"); | ||||||
| 		   MobclickAgent. startWithConfigure(config); | 		   MobclickAgent. startWithConfigure(config); | ||||||
| 		   MobclickAgent.openActivityDurationTrack(false); | 		   MobclickAgent.openActivityDurationTrack(false); | ||||||
| 	   } | 	   } | ||||||
|  |  | ||||||
|  | @ -82,7 +82,7 @@ public class CompositDrawableView extends ScrollView{ | ||||||
|      	tv.setBottom(2); |      	tv.setBottom(2); | ||||||
| // 		tv.setPadding(2, -5, -5, 6); | // 		tv.setPadding(2, -5, -5, 6); | ||||||
|  		tv.setGravity(Gravity.CENTER); |  		tv.setGravity(Gravity.CENTER); | ||||||
|  		tv.setId(10); | // 		tv.setId(10); | ||||||
| // 		tv.setBackgroundColor(Color.GREEN); | // 		tv.setBackgroundColor(Color.GREEN); | ||||||
| // 		tv.setCompoundDrawables( getResources().getDrawable(R.drawable.icon_pass),null, null  ,null); | // 		tv.setCompoundDrawables( getResources().getDrawable(R.drawable.icon_pass),null, null  ,null); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,20 +1,8 @@ | ||||||
| package com.qiyou.mb.android.utils; | package com.qiyou.mb.android.utils; | ||||||
| 
 | 
 | ||||||
| import com.qiyou.mb.android.R; |  | ||||||
| import com.qiyou.mb.android.utils.image.QimageView; |  | ||||||
| 
 |  | ||||||
| import android.R.color; |  | ||||||
| import android.annotation.TargetApi; |  | ||||||
| import android.content.Context; | import android.content.Context; | ||||||
| import android.graphics.Bitmap; |  | ||||||
| import android.graphics.Color; | import android.graphics.Color; | ||||||
| import android.graphics.drawable.Drawable; |  | ||||||
| import android.os.Build; |  | ||||||
| import android.view.Gravity; | import android.view.Gravity; | ||||||
| import android.view.LayoutInflater; |  | ||||||
| import android.view.View; |  | ||||||
| import android.view.ViewGroup; |  | ||||||
| import android.widget.EditText; |  | ||||||
| import android.widget.ImageView; | import android.widget.ImageView; | ||||||
| import android.widget.LinearLayout; | import android.widget.LinearLayout; | ||||||
| import android.widget.TextView; | import android.widget.TextView; | ||||||
|  | @ -27,19 +15,19 @@ public class TextDrawableView extends LinearLayout{ | ||||||
| 		super(context); | 		super(context); | ||||||
| 		this.setOrientation(VERTICAL); | 		this.setOrientation(VERTICAL); | ||||||
| 		getTv(context,text,12); | 		getTv(context,text,12); | ||||||
| 		tv.setPadding(-5, -5, -5, 2); | //		tv.setPadding(-5.0, -5.0, -5.0, 2); | ||||||
| 		tv.setBackgroundColor(Color.RED); | 		tv.setBackgroundColor(Color.RED); | ||||||
| 		tv.setTextColor(Color.WHITE); | 		tv.setTextColor(Color.WHITE); | ||||||
| 		tv.setGravity(Gravity.CENTER); | 		tv.setGravity(Gravity.CENTER); | ||||||
| 		this.addView(tv, new LayoutParams(width,height)); | 		this.addView(tv, new LayoutParams(width,height)); | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	 | 	/* | ||||||
| 	@TargetApi(Build.VERSION_CODES.HONEYCOMB) | 	@TargetApi(Build.VERSION_CODES.HONEYCOMB) | ||||||
| 	public TextDrawableView(Context context, String text,int textSize,boolean hasMsg,float bear,int width,int height) { | 	public TextDrawableView(Context context, String text,int textSize,boolean hasMsg,float bear,int width,int height) { | ||||||
| 		super(context); | 		super(context); | ||||||
| 		  | 		  | ||||||
| 	/*	 LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); | 	*//*	 LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); | ||||||
|     	 View layout = inflater.inflate(R.layout.live_share_point, |     	 View layout = inflater.inflate(R.layout.live_share_point, | ||||||
|     	                                (ViewGroup) this); |     	                                (ViewGroup) this); | ||||||
|     	 ImageView image = (ImageView) layout.findViewById(R.id.img_direction);  |     	 ImageView image = (ImageView) layout.findViewById(R.id.img_direction);  | ||||||
|  | @ -51,7 +39,7 @@ public class TextDrawableView extends LinearLayout{ | ||||||
|  		tv.setTextColor(Color.RED); |  		tv.setTextColor(Color.RED); | ||||||
|   		tv.setPadding(2, -5, -5, 6); |   		tv.setPadding(2, -5, -5, 6); | ||||||
|   		tv.setGravity(Gravity.CENTER); |   		tv.setGravity(Gravity.CENTER); | ||||||
|   		*/ |   		*//* | ||||||
|   		 |   		 | ||||||
|   		 |   		 | ||||||
| 	 this.setOrientation(LinearLayout.VERTICAL); | 	 this.setOrientation(LinearLayout.VERTICAL); | ||||||
|  | @ -71,7 +59,7 @@ public class TextDrawableView extends LinearLayout{ | ||||||
| //		tv.setBackgroundResource(getResources().getDrawable(R.drawable.icon_waypoint)); | //		tv.setBackgroundResource(getResources().getDrawable(R.drawable.icon_waypoint)); | ||||||
| // 		tv.setBackgroundResource( R.drawable.icon_textbox); | // 		tv.setBackgroundResource( R.drawable.icon_textbox); | ||||||
| 		tv.setTextColor(Color.RED); | 		tv.setTextColor(Color.RED); | ||||||
|  		tv.setPadding(2, -5, -5, 6); |  		tv.setPadding(2.0, -5.0, -5.0, 6.0); | ||||||
|  		tv.setGravity(Gravity.CENTER); |  		tv.setGravity(Gravity.CENTER); | ||||||
|  		tv.setId(10); |  		tv.setId(10); | ||||||
|  		tv.setCompoundDrawables( getResources().getDrawable(R.drawable.icon_pass),null, null  ,null); |  		tv.setCompoundDrawables( getResources().getDrawable(R.drawable.icon_pass),null, null  ,null); | ||||||
|  | @ -83,15 +71,15 @@ public class TextDrawableView extends LinearLayout{ | ||||||
| // 		android.view.ViewGroup.LayoutParams | // 		android.view.ViewGroup.LayoutParams | ||||||
|  		this.addView(tv,0, new android.view.ViewGroup.LayoutParams(width,height)); |  		this.addView(tv,0, new android.view.ViewGroup.LayoutParams(width,height)); | ||||||
| // 		this.addView(tv, new LayoutParams(   LayoutParams.WRAP_CONTENT,LayoutParams.WRAP_CONTENT)); | // 		this.addView(tv, new LayoutParams(   LayoutParams.WRAP_CONTENT,LayoutParams.WRAP_CONTENT)); | ||||||
| /* 		TextView msg = new TextView(context); | *//* 		TextView msg = new TextView(context); | ||||||
|  		msg.setText("something to say"); |  		msg.setText("something to say"); | ||||||
|  		msg.setBackgroundResource(R.drawable.icon_waypoint); |  		msg.setBackgroundResource(R.drawable.icon_waypoint); | ||||||
|  		this.addView(msg, new LayoutParams(   LayoutParams.WRAP_CONTENT,LayoutParams.WRAP_CONTENT));*/ |  		this.addView(msg, new LayoutParams(   LayoutParams.WRAP_CONTENT,LayoutParams.WRAP_CONTENT));*//* | ||||||
|  		this.addView(image,1, new android.view.ViewGroup.LayoutParams(   android.view.ViewGroup.LayoutParams.WRAP_CONTENT,android.view.ViewGroup.LayoutParams.WRAP_CONTENT)); |  		this.addView(image,1, new android.view.ViewGroup.LayoutParams(   android.view.ViewGroup.LayoutParams.WRAP_CONTENT,android.view.ViewGroup.LayoutParams.WRAP_CONTENT)); | ||||||
|  	     |  	     | ||||||
|  		 |  		 | ||||||
| 	} | 	} | ||||||
| 	 | 	*/ | ||||||
| 	public void reWriteText(String text){ | 	public void reWriteText(String text){ | ||||||
| 		tv.setText(text); | 		tv.setText(text); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | @ -32,11 +32,13 @@ | ||||||
| 									        /> | 									        /> | ||||||
| 								       <TextView   style ="@style/ll_title_text_wrap"   | 								       <TextView   style ="@style/ll_title_text_wrap"   | ||||||
| 								           android:gravity="right" | 								           android:gravity="right" | ||||||
|  | 										   android:layout_marginRight="0dp" | ||||||
| 								          android:text="#"  /> | 								          android:text="#"  /> | ||||||
| 
 | 
 | ||||||
| 								       <TextView   style ="@style/ll_title_text_wrap" | 								       <TextView   style ="@style/ll_title_text_wrap" | ||||||
| 								        android:id="@+id/td_textView_TrackID" | 								        android:id="@+id/td_textView_TrackID" | ||||||
| 								         android:gravity="left" | 								         android:gravity="left" | ||||||
|  | 										   android:layout_marginLeft="0dp" | ||||||
| 			 					         android:text="未上传" | 			 					         android:text="未上传" | ||||||
| 								        /> | 								        /> | ||||||
| 								     | 								     | ||||||
|  |  | ||||||
|  | @ -61,12 +61,14 @@ | ||||||
|                 <TextView |                 <TextView | ||||||
|                     style="@style/ll_title_text_wrap" |                     style="@style/ll_title_text_wrap" | ||||||
|                     android:gravity="right" |                     android:gravity="right" | ||||||
|  |                     android:layout_marginRight="0dp" | ||||||
|                     android:text="#"  /> |                     android:text="#"  /> | ||||||
| 
 | 
 | ||||||
|                 <TextView |                 <TextView | ||||||
|                     android:id="@+id/td_textView_TrackID" |                     android:id="@+id/td_textView_TrackID" | ||||||
|                     style="@style/ll_title_text_wrap" |                     style="@style/ll_title_text_wrap" | ||||||
|                     android:gravity="left" |                     android:gravity="left" | ||||||
|  |                     android:layout_marginLeft="0dp" | ||||||
|                     android:text="未上传"   /> |                     android:text="未上传"   /> | ||||||
|             </LinearLayout> |             </LinearLayout> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -36,13 +36,19 @@ | ||||||
|         <TextView |         <TextView | ||||||
|             style="@style/ll_title_text_wrap" |             style="@style/ll_title_text_wrap" | ||||||
|             android:gravity="right" |             android:gravity="right" | ||||||
|             android:text="#" /> |             android:text="#" | ||||||
|  |             android:layout_marginRight="0dp" | ||||||
|  | 
 | ||||||
|  |             /> | ||||||
| 
 | 
 | ||||||
|         <TextView |         <TextView | ||||||
|             android:id="@+id/td_textView_TrackID" |             android:id="@+id/td_textView_TrackID" | ||||||
|             style="@style/ll_title_text_wrap" |             style="@style/ll_title_text_wrap" | ||||||
|             android:gravity="left" |             android:gravity="left" | ||||||
|             android:text="_" /> |             android:text="_" | ||||||
|  |             android:layout_marginLeft="0dp" | ||||||
|  | 
 | ||||||
|  |             /> | ||||||
|     </LinearLayout> |     </LinearLayout> | ||||||
| 
 | 
 | ||||||
|     <LinearLayout |     <LinearLayout | ||||||
|  |  | ||||||
|  | @ -1,14 +1,14 @@ | ||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <resources> | <resources   xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> | ||||||
| 
 | 
 | ||||||
|     <string name="app_name">爱骑驴</string> |     <string name="app_name" translatable="false">爱骑驴</string> | ||||||
|     <string name="title_activity_main">爱骑驴</string> |     <string name="title_activity_main">爱骑驴</string> | ||||||
| 
 | 
 | ||||||
|    <string name="viewpager_indicator">%1$d/%2$d</string> |    <string name="viewpager_indicator">%1$d/%2$d</string> | ||||||
|    <string name="sp_type_prompt">请选择运动分类</string>   |    <string name="sp_type_prompt">请选择运动分类</string>   | ||||||
|    <string name="sp_date_prompt">请选择时间范围</string> |    <string name="sp_date_prompt">请选择时间范围</string> | ||||||
|       <string name="sp_webinput_prompt">请选择查询类型</string>   |       <string name="sp_webinput_prompt">请选择查询类型</string>   | ||||||
|  <string name="common_query">查询</string> |  <string name="common_query" translatable="false">查询</string> | ||||||
|   |   | ||||||
|  <string-array name="routeType"> |  <string-array name="routeType"> | ||||||
| 		<item>骑行</item> | 		<item>骑行</item> | ||||||
|  | @ -62,7 +62,7 @@ | ||||||
| 		<item>gpx</item>  | 		<item>gpx</item>  | ||||||
| 	    </string-array>  | 	    </string-array>  | ||||||
| 	 | 	 | ||||||
|     	<string name="blankValue">"       "</string> |     	<string name="blankValue" translatable="false">"       "</string> | ||||||
|     	<string name="zeroValue">0</string> |     	<string name="zeroValue">0</string> | ||||||
|     	 <string name="doubleZeroValue">0.0</string> |     	 <string name="doubleZeroValue">0.0</string> | ||||||
|     	 <string name="timeZeroValue">00:00:00</string> |     	 <string name="timeZeroValue">00:00:00</string> | ||||||
|  | @ -70,9 +70,9 @@ | ||||||
|   |   | ||||||
|     	<string name="noSatliteDesc">定位成功后将自动开始</string> |     	<string name="noSatliteDesc">定位成功后将自动开始</string> | ||||||
|     	<string name="unvailableValue">--</string> |     	<string name="unvailableValue">--</string> | ||||||
|     	<string name="GPSOFF">请开启GPS </string> |     	<string name="GPSOFF" translatable="false">请开启GPS </string> | ||||||
|     	<string name="enableGPS">请开启手机GPS以接受定位信号</string> |     	<string name="enableGPS">请开启手机GPS以接受定位信号</string> | ||||||
|     	<string name="GPSNotPermited">无GPS权限 </string> |     	<string name="GPSNotPermited" translatable="false">无GPS权限 </string> | ||||||
|     	<string name="permitGPS">请给予爱骑驴访问GPS的权限</string> |     	<string name="permitGPS">请给予爱骑驴访问GPS的权限</string> | ||||||
|      |      | ||||||
|     	    <!-- query head --> |     	    <!-- query head --> | ||||||
|  | @ -90,17 +90,17 @@ | ||||||
|     	   |     	   | ||||||
|     <!-- main ui --> |     <!-- main ui --> | ||||||
|     <!--string name="bottom_home">我</string --> |     <!--string name="bottom_home">我</string --> | ||||||
|     <string name="bottom_tracking">运动中</string> |     <string name="bottom_tracking" translatable="false">运动中</string> | ||||||
|     <string name="bottom_new_track">新运动</string> |     <string name="bottom_new_track" translatable="false">新运动</string> | ||||||
|     <string name="bottom_navi">导航中</string> |     <string name="bottom_navi" translatable="false">导航中</string> | ||||||
|     <string name="bottom_camera">拍照</string> |     <string name="bottom_camera" translatable="false">拍照</string> | ||||||
|     <string name="bottom_web">云端</string> |     <string name="bottom_web" translatable="false">云端</string> | ||||||
|     <string name="bottom_me">我的</string> |     <string name="bottom_me" translatable="false">我的</string> | ||||||
|      <string name="bottom_list">历史</string> |      <string name="bottom_list" translatable="false">历史</string> | ||||||
|       <string name="bottom_note">话说</string> |       <string name="bottom_note" translatable="false">话说</string> | ||||||
|         <string name="swipe_to_refresh">下拉刷新</string> |         <string name="swipe_to_refresh">下拉刷新</string> | ||||||
|     <string name="bottom_longway">长途</string> |     <string name="bottom_longway" translatable="false">长途</string> | ||||||
|     <string name="choose_text">选择</string> |     <string name="choose_text" translatable="false">选择</string> | ||||||
|     <!-- track basic --> |     <!-- track basic --> | ||||||
|     <string name="tracking_auto_pause">自动暂停</string> |     <string name="tracking_auto_pause">自动暂停</string> | ||||||
|     <string name="tracking_pause">已暂停记录</string> |     <string name="tracking_pause">已暂停记录</string> | ||||||
|  | @ -160,17 +160,17 @@ | ||||||
|        <string name="frg_noteEdit">编辑说说</string> |        <string name="frg_noteEdit">编辑说说</string> | ||||||
|      |      | ||||||
|      <!-- action menu --> |      <!-- action menu --> | ||||||
|      <string name="action_settings">设置</string> |      <string name="action_settings" translatable="false">设置</string> | ||||||
|      <string name="action_offline">离线地图</string> |      <string name="action_offline" translatable="false">离线地图</string> | ||||||
|      <string name="action_main">首页</string> |      <string name="action_main" translatable="false">首页</string> | ||||||
|      <string name="action_about">关于爱骑驴</string> |      <string name="action_about" translatable="false">关于爱骑驴</string> | ||||||
|      <string name="action_exit">退出</string>  |      <string name="action_exit" translatable="false">退出</string> | ||||||
|      <string name="action_route">语音路书</string> |      <string name="action_route" translatable="false">语音路书</string> | ||||||
|      <string name="action_navi">导航</string> |      <string name="action_navi" translatable="false">导航</string> | ||||||
|      <string name="action_login">登录</string>  |      <string name="action_login" translatable="false">登录</string> | ||||||
|      <string name="action_regist">注册</string> |      <string name="action_regist" translatable="false">注册</string> | ||||||
|      <string name="action_web">爱骑驴云端</string> |      <string name="action_web" translatable="false">爱骑驴云端</string> | ||||||
|     <string name="action_history">我的记录</string>  |     <string name="action_history" translatable="false">我的记录</string> | ||||||
|      <!-- welcome activity --> |      <!-- welcome activity --> | ||||||
|      <string name="i7lv_signature">绿色出行,快乐运动,爱骑驴</string> |      <string name="i7lv_signature">绿色出行,快乐运动,爱骑驴</string> | ||||||
|      <!-- text title  --> |      <!-- text title  --> | ||||||
|  | @ -198,10 +198,10 @@ | ||||||
|        <string name="title_maxEle">最高高度</string> |        <string name="title_maxEle">最高高度</string> | ||||||
|         <string name="title_minEle">最低高度</string>   |         <string name="title_minEle">最低高度</string>   | ||||||
|   <!-- about title  -->  |   <!-- about title  -->  | ||||||
|      <string name="about_welcome">欢迎使用爱骑驴运动软件! </string> |      <string name="about_welcome" translatable="false">欢迎使用爱骑驴运动软件! </string> | ||||||
|      <string name="about_version">当前版本:</string> |      <string name="about_version" translatable="false">当前版本:</string> | ||||||
|      <string name="about_author">\n作者: 米高</string> |      <string name="about_author" translatable="false">\n作者: 米高</string> | ||||||
|      <string name="about_contact">驴友交流   爱骑驴贴吧  QQ群 171403504 \n爱骑驴官网:www.i7lv.com</string> |      <string name="about_contact" translatable="false">驴友交流   爱骑驴贴吧  QQ群 171403504 \n爱骑驴官网:www.i7lv.com</string> | ||||||
|      <string name="title_activity_about">关于爱骑驴</string> |      <string name="title_activity_about">关于爱骑驴</string> | ||||||
|      <string name="title_activity_speedkm">运动图表</string> |      <string name="title_activity_speedkm">运动图表</string> | ||||||
|      <string name="title_activity_welcome">爱骑驴</string> |      <string name="title_activity_welcome">爱骑驴</string> | ||||||
|  | @ -246,7 +246,7 @@ | ||||||
|          <string name="query_lable_bbs_note"> 说说查询</string> |          <string name="query_lable_bbs_note"> 说说查询</string> | ||||||
|         <string name="note_cate">说说分类</string> |         <string name="note_cate">说说分类</string> | ||||||
|        <string name="query_lable_web_note"> 按地区等参数查询骑友分享的轨迹路线</string> |        <string name="query_lable_web_note"> 按地区等参数查询骑友分享的轨迹路线</string> | ||||||
|        <string name="act_lable_roadbook_note"> 活动路书列表,新加入的路书会显示在直播地图上</string> |        <string name="act_lable_roadbook_note" translatable="false"> 活动路书列表,新加入的路书会显示在直播地图上</string> | ||||||
|        <string name="query_lable_web_mine">我的云端记录,在记录编辑页面可设置记录是否公开可见</string> |        <string name="query_lable_web_mine">我的云端记录,在记录编辑页面可设置记录是否公开可见</string> | ||||||
|       <!-- lushu --> |       <!-- lushu --> | ||||||
|        <string name="note_start">提示:计算路径并保存后可以进行离线导航</string> |        <string name="note_start">提示:计算路径并保存后可以进行离线导航</string> | ||||||
|  | @ -267,57 +267,57 @@ | ||||||
|     <string name="name">用户名</string> |     <string name="name">用户名</string> | ||||||
|     <string name="email">邮箱</string> |     <string name="email">邮箱</string> | ||||||
|     <string name="pwd">密码</string> |     <string name="pwd">密码</string> | ||||||
| 	<string name="btnRegister">注册</string> | 	<string name="btnRegister" translatable="false">注册</string> | ||||||
| 	<!-- statistics  --> | 	<!-- statistics  --> | ||||||
| 	<string name="sports_trend">运动趋势</string> | 	<string name="sports_trend">运动趋势</string> | ||||||
| 	<string name="distance_speed">概略图</string> | 	<string name="distance_speed">概略图</string> | ||||||
|  	<string name="note_detail">运动数据明细,可以按时间和运动类型查看您的详细运动数据 </string> |  	<string name="note_detail">运动数据明细,可以按时间和运动类型查看您的详细运动数据 </string> | ||||||
| 	<!-- activity  --> | 	<!-- activity  --> | ||||||
| 	 <string name="act_title">活动标题</string> | 	 <string name="act_title" translatable="false">活动标题</string> | ||||||
| 	 <string name="act_creator">发起人员</string> | 	 <string name="act_creator" translatable="false">发起人员</string> | ||||||
| 	 <string name="act_svrNo">活动编号</string> | 	 <string name="act_svrNo" translatable="false">活动编号</string> | ||||||
| 	 <string name="memberCnt">人数</string> | 	 <string name="memberCnt">人数</string> | ||||||
| 	 <string name="act_desc">活动说明</string> | 	 <string name="act_desc" translatable="false">活动说明</string> | ||||||
| 	 <string name="act_dibiao">附近地标</string> | 	 <string name="act_dibiao" translatable="false">附近地标</string> | ||||||
| 	  <string name="act_startDate">开始时间</string> | 	  <string name="act_startDate" translatable="false">开始时间</string> | ||||||
| 	 <string name="act_endDate">结束时间</string> | 	 <string name="act_endDate" translatable="false">结束时间</string> | ||||||
| 	 <string name="act_starttime">开始时间</string> | 	 <string name="act_starttime" translatable="false">开始时间</string> | ||||||
| 	 <string name="act_endtime">结束时间</string> | 	 <string name="act_endtime" translatable="false">结束时间</string> | ||||||
| 	 <string name="act_isrepeat">活动周期</string> | 	 <string name="act_isrepeat" translatable="false">活动周期</string> | ||||||
| 	 <string name="act_multi">定期活动</string> | 	 <string name="act_multi" translatable="false">定期活动</string> | ||||||
| 	 <string name="act_single">单次活动</string> | 	 <string name="act_single" translatable="false">单次活动</string> | ||||||
| 	 <!-- <string name="act_public">单次活动</string> -->  | 	 <!-- <string name="act_public">单次活动</string> -->  | ||||||
| 	 <string name="act_startGeo">开始地点</string> | 	 <string name="act_startGeo" translatable="false">开始地点</string> | ||||||
| 	 <string name="act_endGeo">结束地点</string> | 	 <string name="act_endGeo" translatable="false">结束地点</string> | ||||||
| 	 <string name="act_levelstars">活动难度</string> | 	 <string name="act_levelstars" translatable="false">活动难度</string> | ||||||
| 	 <string name="act_public">开放</string> | 	 <string name="act_public" translatable="false">开放</string> | ||||||
| 	 <string name="act_cycle">圈内</string> | 	 <string name="act_cycle" translatable="false">圈内</string> | ||||||
| 	 <string name="act_more"> > </string> | 	 <string name="act_more" translatable="false"> > </string> | ||||||
| 	 <string name="act_share"><a href='http:www.i7lv.com'>分享</a></string> | 	 <string name="act_share" translatable="false"><a href='http:www.i7lv.com'>分享</a></string> | ||||||
| 	 <string name="act_type_public">自由加入</string> | 	 <string name="act_type_public" translatable="false">自由加入</string> | ||||||
| 	 <string name="act_type_cycle">圈内活动</string> | 	 <string name="act_type_cycle" translatable="false">圈内活动</string> | ||||||
| 	 <string name="act_type_private">私有活动</string> | 	 <string name="act_type_private" translatable="false">私有活动</string> | ||||||
| 	  | 	  | ||||||
| 	 <string name="act_membercnt">活动人数</string> | 	 <string name="act_membercnt" translatable="false">活动人数</string> | ||||||
| 	 <string name="act_members">活动成员</string> | 	 <string name="act_members" translatable="false">活动成员</string> | ||||||
| 	 <string name="act_status">活动状态</string> | 	 <string name="act_status" translatable="false">活动状态</string> | ||||||
| 	 <string name="act_type">活动类型</string> | 	 <string name="act_type" translatable="false">活动类型</string> | ||||||
| 	 <string name="act_roadbook">路书编号</string> | 	 <string name="act_roadbook" translatable="false">路书编号</string> | ||||||
| 	  <string name="act_loadroadbook">添加</string> | 	  <string name="act_loadroadbook" translatable="false">添加</string> | ||||||
| 	    <string name="act_removeroadbook">移除</string> | 	    <string name="act_removeroadbook" translatable="false">移除</string> | ||||||
| 	  <string name="act_pick_confirm">确定</string> | 	  <string name="act_pick_confirm" translatable="false">确定</string> | ||||||
| 	 <string name="act_distance">里程(km)</string> | 	 <string name="act_distance" translatable="false">里程(km)</string> | ||||||
| 	 <string name="act_time">时间</string> | 	 <string name="act_time" translatable="false">时间</string> | ||||||
| 	<string name="act_speed">均速(km/h)</string> | 	<string name="act_speed" translatable="false">均速(km/h)</string> | ||||||
| 	<string name="act_lead">领队</string> | 	<string name="act_lead" translatable="false">领队</string> | ||||||
| 	<string name="act_tail">收尾</string> | 	<string name="act_tail" translatable="false">收尾</string> | ||||||
| 	<string name="act_save">保存</string> | 	<string name="act_save" translatable="false">保存</string> | ||||||
| 	<string name="act_join">加入</string> | 	<string name="act_join" translatable="false">加入</string> | ||||||
| 	<string name="act_left">退出</string> | 	<string name="act_left" translatable="false">退出</string> | ||||||
| 	<string name="act_joinInprogress">待同意</string> | 	<string name="act_joinInprogress" translatable="false">待同意</string> | ||||||
| 	<string name="act_submit">提交</string> | 	<string name="act_submit" translatable="false">提交</string> | ||||||
| 	<string name="act_update">更新</string> | 	<string name="act_update" translatable="false">更新</string> | ||||||
| 	<string name="act_refresh">刷新</string> | 	<string name="act_refresh" translatable="false">刷新</string> | ||||||
|     <string name="logout">注销</string>      |     <string name="logout">注销</string>      | ||||||
| 	<!-- group/team --> | 	<!-- group/team --> | ||||||
| 	 | 	 | ||||||
|  | @ -332,10 +332,10 @@ | ||||||
| 	<!-- user profile --> | 	<!-- user profile --> | ||||||
| 	<string name="user_account">账号</string> | 	<string name="user_account">账号</string> | ||||||
| 	<!-- bbs --> | 	<!-- bbs --> | ||||||
| 	 <string name="bbs_main_top">总置顶</string> | 	 <string name="bbs_main_top" translatable="false">总置顶</string> | ||||||
| 	 <string name="bbs_cate_top">版块置顶</string> | 	 <string name="bbs_cate_top" translatable="false">版块置顶</string> | ||||||
| 	 <string name="bbs_top">置顶</string> | 	 <string name="bbs_top" translatable="false">置顶</string> | ||||||
|  	<string name="bbs_noreply">禁止回复</string>	 |  	<string name="bbs_noreply" translatable="false">禁止回复</string> | ||||||
| 	<!-- date --> | 	<!-- date --> | ||||||
| 	<string name="day1">周一</string> | 	<string name="day1">周一</string> | ||||||
| 	<string name="day2">周二</string> | 	<string name="day2">周二</string> | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| <resources> | <resources   xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> | ||||||
| 
 | 
 | ||||||
|     <string name="title_activity_settings">设置</string> |     <string name="title_activity_settings">设置</string> | ||||||
| 
 | 
 | ||||||
|  | @ -8,11 +8,11 @@ | ||||||
|     <!-- Example General settings --> |     <!-- Example General settings --> | ||||||
|     |     | ||||||
|   |   | ||||||
|     <string name="PRF_DESC_WPS_SAVE_ALL">是否保留所有的路点到数据库,默认false.</string> |     <string name="PRF_DESC_WPS_SAVE_ALL" translatable="false">是否保留所有的路点到数据库,默认false.</string> | ||||||
|         <string name="isWPsSaveAll">保留所有路点</string> |         <string name="isWPsSaveAll">保留所有路点</string> | ||||||
|          |          | ||||||
|      <string name="playback_Interval">记录回放帧速</string>   |      <string name="playback_Interval">记录回放帧速</string>   | ||||||
|     <string name="GPS_Request_Interval">卫星定位请求频率</string>     |     <string name="GPS_Request_Interval" translatable="false">卫星定位请求频率</string> | ||||||
|     <string name="pref_description_save_power">是否启用变频模式,默认允许</string> |     <string name="pref_description_save_power">是否启用变频模式,默认允许</string> | ||||||
|     <string name="isSavePower">智能调节频率以节省电力</string> |     <string name="isSavePower">智能调节频率以节省电力</string> | ||||||
|      |      | ||||||
|  | @ -47,7 +47,7 @@ | ||||||
|     <string name="pref_description_live"> 位置共享设定</string> |     <string name="pref_description_live"> 位置共享设定</string> | ||||||
|     <string name="desc_live_location">是否启用位置共享,默认开启</string> |     <string name="desc_live_location">是否启用位置共享,默认开启</string> | ||||||
|     <string name="isLiveLocaiton">运动时通过网络分享自己的位置</string> |     <string name="isLiveLocaiton">运动时通过网络分享自己的位置</string> | ||||||
|     <string name="LIVE_Request_Interval">位置数据发送间隔</string> |     <string name="LIVE_Request_Interval" translatable="false">位置数据发送间隔</string> | ||||||
|       <string-array name="pref_LIVE_Request_Interval_titles"> |       <string-array name="pref_LIVE_Request_Interval_titles"> | ||||||
|         <item>1分钟</item> |         <item>1分钟</item> | ||||||
|         <item>2分钟</item> |         <item>2分钟</item> | ||||||
|  | @ -65,7 +65,7 @@ | ||||||
|         <item>600000</item> |         <item>600000</item> | ||||||
|      </string-array> |      </string-array> | ||||||
|       |       | ||||||
|    <string name="LIVE_Request_Term">位置数据有效期</string> |    <string name="LIVE_Request_Term" translatable="false">位置数据有效期</string> | ||||||
|       |       | ||||||
|       |       | ||||||
|     <string-array name="pref_LIVE_Request_Term_titles"> |     <string-array name="pref_LIVE_Request_Term_titles"> | ||||||
|  | @ -125,11 +125,11 @@ | ||||||
|      |      | ||||||
|     <!-- road bear point wps calculation     --> |     <!-- road bear point wps calculation     --> | ||||||
|        <string name="pref_RoadBear_cateTitle">转弯路点计算参数设定</string> |        <string name="pref_RoadBear_cateTitle">转弯路点计算参数设定</string> | ||||||
|       <string name="WPS_count_bear">计算转弯路点数</string> |       <string name="WPS_count_bear" translatable="false">计算转弯路点数</string> | ||||||
|       <string name="pref_angle_bear">计算转弯角度</string> |       <string name="pref_angle_bear">计算转弯角度</string> | ||||||
|       <string name="pref_default_angle_bear">20</string>   |       <string name="pref_default_angle_bear">20</string>   | ||||||
|       <string name="PRF_DESC_ONE_SHOT_BEAR">是否计算方向变化非线性连续的拐点,默认false.</string> |       <string name="PRF_DESC_ONE_SHOT_BEAR" translatable="false">是否计算方向变化非线性连续的拐点,默认false.</string> | ||||||
|       <string name="PRF_DESC_SPEAK_KM">每运动一公里播报语音播报当前运动数据</string> |       <string name="PRF_DESC_SPEAK_KM" translatable="false">每运动一公里播报语音播报当前运动数据</string> | ||||||
|       <string name="speak_km">语音播报运动数据</string> |       <string name="speak_km">语音播报运动数据</string> | ||||||
|   <string-array name="pref_WPS_count_Bear_titles"> |   <string-array name="pref_WPS_count_Bear_titles"> | ||||||
|         <item>2</item> |         <item>2</item> | ||||||
|  | @ -147,7 +147,7 @@ | ||||||
|     </string-array>  |     </string-array>  | ||||||
|   |   | ||||||
|  <!-- wps save percent -->  |  <!-- wps save percent -->  | ||||||
|   <string name="WPS_Keep_percent">WPS 保留百分比</string>   |   <string name="WPS_Keep_percent" translatable="false">WPS 保留百分比</string> | ||||||
|   <string-array name="pref_WPS_Keep_percent_titles"> |   <string-array name="pref_WPS_Keep_percent_titles"> | ||||||
|         <item>100%</item> |         <item>100%</item> | ||||||
|         <item>50%</item> |         <item>50%</item> | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| <?xml version="1.0" encoding="utf-8" standalone="no"?> | <?xml version="1.0" encoding="utf-8" standalone="no"?> | ||||||
| <resources> | <resources  xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> | ||||||
| 
 | 
 | ||||||
|     <color name="tb_munion_item_force">#e3e3e3</color> |     <color name="tb_munion_item_force">#e3e3e3</color> | ||||||
|     <string name="tb_munion_tip_download_prefix">正在下载:</string> |     <string name="tb_munion_tip_download_prefix">正在下载:</string> | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <resources> | <resources    xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> | ||||||
|     <string name="umeng_common_action_info_exist">The app is already in downloading list.</string> |     <string name="umeng_common_action_info_exist">The app is already in downloading list.</string> | ||||||
|     <string name="umeng_common_info_interrupt">dowload interrupted.</string> |     <string name="umeng_common_info_interrupt">dowload interrupted.</string> | ||||||
|     <string name="umeng_common_action_pause">Pause</string> |     <string name="umeng_common_action_pause">Pause</string> | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| <?xml version="1.0" encoding="utf-8" standalone="no"?> | <?xml version="1.0" encoding="utf-8" standalone="no"?> | ||||||
| <resources> | <resources   xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> | ||||||
| 
 | 
 | ||||||
|     <string name="pull_to_refresh_pull_label" translatable="false">向下拉动可以刷新</string> |     <string name="pull_to_refresh_pull_label" translatable="false">向下拉动可以刷新</string> | ||||||
|     <string name="pull_to_refresh_release_label" translatable="false">松开可以刷新</string> |     <string name="pull_to_refresh_release_label" translatable="false">松开可以刷新</string> | ||||||
|  | @ -68,6 +68,6 @@ | ||||||
|     <string name="umeng_socialize_send_btn_str">发送</string> |     <string name="umeng_socialize_send_btn_str">发送</string> | ||||||
|     <string name="umeng_socialize_img_des"></string> |     <string name="umeng_socialize_img_des"></string> | ||||||
|     <string name="umeng_socialize_share">分享</string> |     <string name="umeng_socialize_share">分享</string> | ||||||
|     <string name="com_facebook_loading">Loading...</string> |     <string name="com_facebook_loading" translatable="false">Loading...</string> | ||||||
| 
 | 
 | ||||||
| </resources> | </resources> | ||||||
|  | @ -14,6 +14,6 @@ | ||||||
| 	<string name="UMIgnore">Ingore this</string> | 	<string name="UMIgnore">Ingore this</string> | ||||||
| 	<string name="UMToast_IsUpdating">Updating....</string> | 	<string name="UMToast_IsUpdating">Updating....</string> | ||||||
| 	<string name="UMDialog_InstallAPK">The lastest version has been downloaded, install now ?</string> | 	<string name="UMDialog_InstallAPK">The lastest version has been downloaded, install now ?</string> | ||||||
| 	<string name="UMUpdateCheck">2.6.0.1.20150312</string> | 	<string name="UMUpdateCheck" translatable="false">2.6.0.1.20150312</string> | ||||||
|      |      | ||||||
| </resources> | </resources> | ||||||
		Loading…
	
		Reference in New Issue