From 764f24d57e299775a17435d554f6444f2b720bbd Mon Sep 17 00:00:00 2001 From: duanwencheng <765928881@qq.com> Date: Mon, 25 May 2015 22:13:10 +0800 Subject: [PATCH 1/2] add BaiduMapManager.java --- .../mapexplorer/maps/BaiduMapManager.java | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 src/com/yuneec/android/mapexplorer/maps/BaiduMapManager.java diff --git a/src/com/yuneec/android/mapexplorer/maps/BaiduMapManager.java b/src/com/yuneec/android/mapexplorer/maps/BaiduMapManager.java new file mode 100644 index 0000000..fc0ee8c --- /dev/null +++ b/src/com/yuneec/android/mapexplorer/maps/BaiduMapManager.java @@ -0,0 +1,138 @@ +package com.yuneec.android.mapexplorer.maps; + +import android.content.SharedPreferences; + +import com.baidu.location.BDLocation; +import com.baidu.location.BDLocationListener; +import com.baidu.location.LocationClient; +import com.baidu.location.LocationClientOption; +import com.baidu.location.LocationClientOption.LocationMode; +import com.baidu.mapapi.map.BaiduMap; +import com.baidu.mapapi.map.MapStatus; +import com.baidu.mapapi.map.MapStatusUpdate; +import com.baidu.mapapi.map.MapStatusUpdateFactory; +import com.baidu.mapapi.map.MapView; +import com.baidu.mapapi.map.MyLocationData; +import com.baidu.mapapi.model.LatLng; +import com.yuneec.android.mapexplorer.entity.LatLongInfo; +import com.yuneec.android.mapexplorer.settings.MyApplication; + +public class BaiduMapManager { + + private static BaiduMapManager baiduMapManager = null; + private static MapView mapView; + private static BaiduMap baiduMap; + public static BaiduMap getBaiduMap() { + return baiduMap; + } + + private MapStatus mapStatus; + private MapStatusUpdate mapStatusUpdate; + + public BDLocationListener myLocationListener = new MyLocationListener();// 定位的回调接口 + private LatLng currentLatLng;//当前坐标 + private double currentLatitude; + private double currentlongitude; + private BaiduMapManager() { + super(); + } + public static BaiduMapManager getInstance(MapView mapView) { + if (baiduMapManager == null) { + baiduMapManager = new BaiduMapManager(); + BaiduMapManager.mapView = mapView; + baiduMap=mapView.getMap(); + mapView.showZoomControls(false);// 不显示缩放控件 + } + return baiduMapManager; + } + + + public LatLng getmCurrentLatLng() { + return currentLatLng; + } + + public double getmCurrentatitude() { + return currentLatitude; + } + + public double getmCurrentlongitude() { + return currentlongitude; + } + + + /** + * 定位 + * @param locationClient 定位的核心类 + */ + public void goToMyLocation(LocationClient locationClient) { + // 设置是否允许定位图层,只有先允许定位图层后设置定位数据才会生效 + baiduMap.setMyLocationEnabled(true); + baiduMap.setMapType(BaiduMap.MAP_TYPE_SATELLITE); + setLocationClient(locationClient); + updateBaiduMap(currentLatLng); + } + + + /** + * 设置LocationClient数据 + * @param LocationClient + */ + public void setLocationClient(LocationClient locationClient) { + // 使用LocationClientOption类. + LocationClientOption option = new LocationClientOption(); + option.setLocationMode(LocationMode.Hight_Accuracy);// 设置定位模式 + option.setCoorType("bd09ll");// 返回的定位结果是百度经纬度,默认值gcj02 + option.setScanSpan(3000);// 设置发起定位请求的间隔时间为3000ms + option.setIsNeedAddress(true);// 返回的定位结果包含地址信息 + option.setNeedDeviceDirect(true);// 返回的定位结果包含手机机头的方向 + option.setOpenGps(true); + locationClient.setLocOption(option); + locationClient.registerLocationListener(myLocationListener); + locationClient.start(); + } + + /** + * 刷新地图 + * @param latLng + */ + public void updateBaiduMap(LatLng latLng) { + // 获得地图的当前状态的信息 + mapStatus = new MapStatus.Builder().zoom(18).target(latLng).build(); + // 设置地图将要变成的状态 + mapStatusUpdate = MapStatusUpdateFactory.newMapStatus(mapStatus); + baiduMap.animateMapStatus(mapStatusUpdate);// 设置地图的变化 + + } + + + + public class MyLocationListener implements BDLocationListener { + + + @Override + public void onReceiveLocation(BDLocation location) { + if (location == null || mapView == null) + return; + + currentLatitude = location.getLatitude(); + currentlongitude = location.getLongitude(); + currentLatLng = new LatLng(location.getLatitude(), + location.getLongitude()); + + SharedPreferences.Editor sharedata = MyApplication.getInstance().getContext().getSharedPreferences("data", 0).edit(); + sharedata.putString("oldLat",String.valueOf(currentLatitude)); + sharedata.putString("oldLng",String.valueOf(currentlongitude)); + sharedata.commit(); + + // 构造定位数据 + MyLocationData locData = new MyLocationData.Builder() + .accuracy(location.getRadius()) + .latitude(currentLatitude) + .longitude(currentlongitude) + .build(); + baiduMap.setMyLocationData(locData);// 设置定位数据 + } + } + + +} From fb31b08ff45dd0147fd7b3eab9c99122a23e9fe6 Mon Sep 17 00:00:00 2001 From: duanwencheng <765928881@qq.com> Date: Tue, 26 May 2015 08:52:11 +0800 Subject: [PATCH 2/2] baidu map example --- AndroidManifest.xml | 50 +- project.properties | 3 +- res/layout/activity_main.xml | 187 ++- res/menu/main.xml | 11 +- res/values-v11/styles.xml | 2 +- res/values-v14/styles.xml | 2 +- res/values/colors.xml | 137 +- res/values/dimens.xml | 353 ++++- res/values/strings.xml | 1342 ++++++++++++++++- res/values/styles.xml | 514 ++++++- .../android/mapexplorer/SharedPreference.java | 4 + .../mapexplorer/base/BaseActivity.java | 28 +- .../mapexplorer/library/AlertDialog.java | 1 + .../mapexplorer/settings/MyApplication.java | 2 + .../android/mapexplorer/util/TimeUtil.java | 1 + 15 files changed, 2582 insertions(+), 55 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6f935fb..c14754e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,23 +5,65 @@ android:versionName="1.0" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:name=".activity.MapActivity" + android:configChanges="keyboard|keyboardHidden|orientation|screenSize" + android:label="@string/app_name" + android:screenOrientation="sensorLandscape" + android:windowSoftInputMode="adjustPan" > + - + \ No newline at end of file diff --git a/project.properties b/project.properties index cac0d3f..4ab1256 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-20 -android.library.reference.1=../appcompat_v7 +target=android-19 diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 6480542..bcb3634 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,12 +1,191 @@ + + android:background="@drawable/fpv_bg" + android:splitMotionEvents="false" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_centerInParent="true" + android:text="FPS" + android:textColor="@android:color/holo_red_light" + android:textSize="14.0sp" + android:visibility="gone" /> - + \ No newline at end of file diff --git a/res/menu/main.xml b/res/menu/main.xml index a36dbd0..898b1dc 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -1,12 +1,5 @@ - + - + diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml index a4a95bc..3c02242 100644 --- a/res/values-v11/styles.xml +++ b/res/values-v11/styles.xml @@ -4,7 +4,7 @@ Base application theme for API 11+. This theme completely replaces AppBaseTheme from res/values/styles.xml on API 11+ devices. --> - diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml index 664f4f1..a91fd03 100644 --- a/res/values-v14/styles.xml +++ b/res/values-v14/styles.xml @@ -5,7 +5,7 @@ AppBaseTheme from BOTH res/values/styles.xml and res/values-v11/styles.xml on API 14+ devices. --> - diff --git a/res/values/colors.xml b/res/values/colors.xml index 7c79612..1b0a4f3 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -11,10 +11,143 @@ #80FFFFFF #40FFFFFF #1AFFFFFF - #FF0000 - #72B588 #F97C00 + @android:color/white + @android:color/white + #ffaaaaaa + @android:color/white + #ff737373 + @android:color/white + #ffaaaaaa + #ff737373 + #ffdd4b39 + #ffd2d2d2 + #77ffffff + #ff33e5b5 + #ff27ae60 + #ff00d3e0 + #cc000000 + #ffc4cedd + #ffffffff + #7fffffff + #ff00d3e0 + #ffcc005b + #ff530528 + #ff59c728 + #ff0586ff + #ffffa800 + #ffa7ff34 + #ffaba199 + #b200ae39 + #0d1eff00 + #00000000 + #ff27ae60 + #cc000000 + #ffffffff + #77ffffff + #ffc4cedd + #4c000000 + #77000000 + #cc000000 + #ff00d3e0 + #ffcc005b + #ff530528 + #ff59c728 + #ff0586ff + #ffffbacc + #ffaba199 + #b200ae39 + #0d1eff00 + #ffff0000 + #4cff0000 + #ff000000 + #ff00d8ff + #b2000000 + #ffc4c4c4 + #fffe0100 + #ee000000 + #ff72ff00 + #ff5e5e5e + #fffff000 + #ffffea00 + #ffaeb9c4 + #ff12ff00 + #ff616161 + #ff00d8ff + #ff72fa00 + #33ffffff + #4cffffff + #ff00d8ff + #ff5e5e5e + #ff797979 + #ff242424 + #ff373737 + #ff00d8ff + #ff828282 + #ff00ff00 + #ffb9b9b9 + #ffefefef + #ff02aaff + #ff1ac1ff + #ff8b8b8b + #ff47900d + #ffdbdddc + #99ff0000 + #ff129c27 + #ffffffff + #00ffffff + #3f00aeff + #ff06ece0 + #ff565656 + #ffc3c3c3 + #ff00d8ff + #7700d8ff + #33000000 + #ffc0c0c0 + #19ffffff + #ffbfbfbf + #ff717171 + #99000000 + #ff00d8ff + #ff626262 + #ffcf9e0a + #ffe72b2b + #ff478f0d + #ffffc000 + #ff8e6b00 + #ff00a1d9 + #ff0185b3 + #ffa1a1a1 + #ff008fea + #ff2ecc71 + #ff242424 + #ff767676 + #3f242424 + #ffde424e + #ffdadada + #ff498e1d + #ffe42e33 + #ff2e93e9 + #ff525252 + #ffffffff + #26ffffff + #008e8f8c + #ff8e8f8c + #4400d8ff + #00000000 + #ffd7d7d7 + #ff008fea + #ff2a5d95 + #33000000 + #ffffcc00 + #ff3fb9d6 + #ffe72b2b + #ffe9ad0a + #ff57e72b + #ff24d9ff + #ff8bc46c + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3bf6bca..b46e9c8 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -1,10 +1,347 @@ + - - - 16dp - 16dp - - 8dp - - + 20.0sp + 18.0sp + 16.0sp + 14.0sp + 10.0sp + 20.0dip + 40.0dip + 15.0dip + 4.0dip + 148.0dip + 221.0dip + 70.0dip + 73.0dip + 50.0dip + 96.0dip + 100.0dip + 2.0dip + 2.0dip + 300.0dip + 270.0dip + 120.0dip + 40.0dip + 93.0dip + 90.0dip + 65.0dip + 60.0dip + 14.0dip + 5.0dip + 30.0dip + 10.0dip + 20.0dip + 8.0dip + 55.0dip + 49.0dip + 202.0dip + 6.0dip + 30.0dip + 166.0dip + 104.0dip + 60.0dip + 8.0dip + 12.0dip + 10.0dip + 16.0dip + 14.0dip + 24.0dip + 26.0dip + 18.0dip + 24.0dip + 50.0dip + 12.0dip + 5.0dip + 12.0dip + 45.0dip + 32.0dip + 260.0dip + 134.0dip + 20.0dip + 364.0dip + 116.0dip + 240.0dip + 340.0dip + 280.0dip + 380.0dip + 4.0dip + 40.0dip + 35.0dip + 55.0dip + 80.0dip + 100.0dip + 35.0dip + 60.0dip + 100.0dip + 180.0dip + 16.0dip + 16.0dip + 10.0sp + 10.0dip + 12.0dip + 100.0dip + 4.0dip + 24.0dip + 12.0dip + 130.0dip + -130.0dip + 2.0dip + 50.0dip + 20.0dip + 4.0dip + 50.0dip + 50.0dip + 206.0dip + 98.0dip + 160.0dip + 90.0dip + 100.0dip + 40.0dip + 8.0dip + 10.0dip + 5.0dip + 5.0dip + 8.0dip + 14.0dip + 140.0dip + 12.0dip + 170.0dip + 70.0dip + 12.0sp + 14.0sp + 100.0dip + 56.0dip + 60.0dip + 36.0dip + 6.0dip + 42.0dip + 170.0dip + 40.0dip + 60.0dip + 46.0dip + 4.0dip + 110.0dip + 30.0dip + 48.0dip + 53.0dip + 31.0dip + 29.0dip + 26.0dip + 77.0dip + 66.0dip + 6.0dip + 40.0dip + 44.0dip + 28.0dip + 86.0dip + 56.0dip + 152.0dip + 12.0dip + 50.0dip + 6.0dip + 18.0dip + 24.0dip + 64.0dip + 54.0dip + 136.0dip + 0.0dip + 0.0dip + 3.0dip + 44.0dip + 21.0dip + 82.0dip + 55.0dip + 113.0dip + 100.0dip + 133.0dip + 0.0dip + 10.0dip + 8.0dip + 52.0dip + 32.0dip + 94.0dip + 68.0dip + 124.0dip + 110.0dip + 139.0dip + 13.0dip + 60.0dip + 130.0dip + 150.0dip + 54.0dip + 12.0dip + 6.0dip + 16.0dip + 10.0dip + 1.0px + 100.0dip + 50.0dip + 65.0dip + 24.0dip + 35.0dip + 33.0dip + 36.0dip + 101.0dip + 57.0dip + 54.0dip + 62.0dip + 87.0dip + 2.0dip + -3.0dip + 70.0dip + 50.0dip + 40.0dip + 60.0dip + 3.0dip + 6.0dip + 14.0dip + 23.0dip + 62.0dip + 64.0dip + 32.0dip + 230.0dip + 60.0dip + 4.0dip + 25.0dip + 12.0dip + 200.0dip + 120.0dip + 4.0dip + 2.0dip + 30.0dip + 10.0dip + 13.0dip + 65.0dip + 65.0dip + 40.0dip + 17.0dip + 20.0dip + 10.0dip + 40.0dip + 20.0dip + 20.0dip + 10.0dip + 3.0dip + 5.0dip + 42.0dip + 35.0dip + 80.0dip + 32.0dip + 16.0dip + 230.0dip + 180.0dip + 190.0dip + 38.0dip + 20.0dip + 20.0dip + 6.0dip + 10.0dip + 25.0dip + 50.0dip + 1.0dip + 85.0dip + 24.0dip + 60.0dip + 35.0dip + 20.0dip + 140.0dip + 120.0dip + 30.0dip + 180.0dip + 14.0dip + 60.0dip + 32.0dip + 10.0dip + 4.0dip + 8.0dip + 8.0dip + 12.0dip + 10.0dip + 16.0dip + 12.0dip + 20.0dip + 22.0dip + 18.0dip + 20.0dip + 10.0dip + 50.0dip + 10.0dip + -122.0dip + 210.0dip + 30.0dip + 4.0dip + -157.0dip + 140.0dip + 14.0dip + 5.0dip + 34.0dip + -40.0dip + -10.0dip + 200.0dip + 70.0dip + 6.0dip + 12.0dip + -134.0dip + -134.0dip + 20.0dip + 20.0dip + 7.0dip + 18.0dip + 115.0dip + 140.0dip + 100.0dip + 150.0dip + 5.0dip + 180.0dip + 30.0dip + 55.0dip + 30.0dip + 22.0dip + 80.0dip + 10.0dip + 30.0dip + 30.0dip + 100.0dip + 35.0dip + 35.0dip + 100.0dip + 8.0dip + 8.0dip + 4.0dip + 65.0dip + 8.0dip + 25.0dip + 30.0dip + 65.0dip + 50.0dip + 45.0dip + 45.0dip + 50.0dip + 55.0dip + 110.0dip + 20.0dip + 60.0dip + 50.0dip + 66.0dip + 33.0dip + 40.0dip + 140.0dip + 80.0dip + 360.0dip + 105.0dip + 83.0dip + 101.0dip + 35.0dip + 140.0dip + 120.0dip + 91.0dip + 18.0dip + 20.0dip + 5.0dip + -22.0dip + -14.0dip + 10.0dip + 130.0dip + 360.0dip + 12.0dip diff --git a/res/values/strings.xml b/res/values/strings.xml index 82b2c7d..c97bd37 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -55,8 +55,6 @@ Reset Format SDcard About - Share this App - Share To ... Copyright (C) 2014-2015 Yuneec.Inc. All Rights Reserved. Set successfully Setup failed @@ -103,13 +101,1339 @@ User Resource Study Manual + Get Google Play services + "This app won't run without Google Play services, which are missing from your phone." + "This app won't run without Google Play services, which are missing from your tablet." + Get Google Play services + Enable Google Play services + "This app won't work unless you enable Google Play services." + Enable Google Play services + Update Google Play services + "This app won't run unless you update Google Play services." + Network Error + A data connection is required to connect to Google Play services. + Invalid Account + The specified account does not exist on this device. Please choose a different account. + Unknown issue with Google Play services. + Google Play services + Google Play services, which some of your applications rely on, is not supported by your device. Please contact the manufacturer for assistance. + The date on the device appears to be incorrect. Please check the date on the device. + Update + Sign in + Sign in with Google + An application attempted to use a bad version of Google Play Services. + An application requires Google Play Services to be enabled. + An application requires installation of Google Play Services. + An application requires an update for Google Play Services. + Google Play services error + Requested by %1$s + Powered by Google + Fast + Slow + Mid + FRONT + BACK + LEFT + RIGHT + Pause + Cancel Mission + Continue + Go Home + Take off + Connection Broken + GS failed to open. Retrying + "Switch To GPS mode +(Ready to fly mode)" + Unknown Error code=%d. Contact DJI Technical Support + Mission Upload Failed. Check Network + %s Failed. Motors not Spinning + %s Failed. GPS not Ready + %s Failed. Command Timeout + Waypoint %d Uploading + Mission Download Failed, retrying + Waypoint %d Downloading + Mission Complete + No More Waypoints Available + Flight Paths Cannot Cross Restricted Areas + Waypoint Out of Bounds + Maximum Flight Distance %d%s Exceeded + Delete all Waypoints? + Go Home? + Cancel Mission? + Power Below 30%. Takeoff Prevented + Power Below 30%. Go-Home? + Power Below 50%. Fly Cautiously + Poor GPS Signal. Switch to Transmitter Control + Point + Meter + Feet + MANUAL + GPS + ATTI + HOVER + WAYPOINT + GOHOME + TAKEOFF + LANDING + N/A + Vision Direction + Height + Direction + GO + DONE + Battery Communication Error. Fly Carefully + Standard + Hybrid + Satellite + Warning + Ground Station Is Forbidden In China + Back + min + 0min + Go Home In 10 Seconds + Go Home In %d Seconds + Cancel + Go Home + If you cancel, there may not be enough battery power to return to the home point! + Latitude + Lontitude + Invalid Waypoint Coordinate + Waypoint Coordinate too far away from Home Point + Waypoints cannot be set in a restricted area + Pull to refresh… + Release to refresh… + Loading… + Pull up to refresh + @string/pull_to_refresh_release_label + @string/pull_to_refresh_refreshing_label + 应用授权 + http://www.shareSDK.cn + 分享图片 + 目前您的微信版本过低或未安装微信,需要安装微信才能使用 + Google+ 版本过低或者没有安装,需要升级或安装Google+才能使用! + QQ 版本过低或者没有安装,需要升级或安装QQ才能使用! + Pinterest版本过低或者没有安装,需要升级或安装Pinterest才能使用! + Instagram版本过低或者没有安装,需要升级或安装Instagram才能使用! + 目前您的易信版本过低或未安装易信,需要安装易信才能使用 + 目前您的Line版本过低或未安装易信,需要安装Line才能使用 + 新浪微博 + 腾讯微博 + QQ空间 + 微信好友 + 微信朋友圈 + 微信收藏 + Facebook + Twitter + 人人网 + 开心网 + 邮件 + 信息 + 搜狐微博 + 搜狐随身看 + 网易微博 + 豆瓣 + 有道云笔记 + 印象笔记 + 领英 + Google+ + FourSquare + QQ + Pinterest + Flickr + Tumblr + Dropbox + VK + Instagram + 易信 + 易信朋友圈 + 明道 + Line + 分享到QQ空间 + 分享到QQ + 网页分享 + 分享到明道 + 来自%s的分享 + 请改用“登录”按钮 + 1.0.1 + Version:  + Debug:  + www.dji.com + Inspire1@dji.com + 400–700–0303 + www.dji.com/product/inspire-1 + Back + Home + Search + Share + Download + Info + Comment + Praise + Like + Look + Edit + Delete + Upload + Settings + ON + OFF + Nothing + Off + Tips + Warning + Cancel + OK + OK + Deleting… + s + Save + Choose Date + %1$d/%2$d + %1$d KB/S + current:%1$d/%2$d, %3$d%% updating, please wait + Download failed, please retry + Retry + Select + Done + Next + The device has no browser to view the webpage! + @string/app_on + @string/app_off + CAMERA + MAP + ASSISTANT + USER CENTER + ACADEMY + DJI STORE + Press again to exit the application + SERVICE + DJI 7x24 SERVICE + Tel + Mail + Live800 + You can reach us by the above three ways. We are ready to serve you and answer any questions you may have about your Product. + DJI Product Technical Support + Issure Description + Name:  + Location:  + Product Serial Number:  + Brief description of your issue:  + "Name:  +Location:  +Product Serial Number:  +Brief description of your issue: " + North America + +1(818)235–0789 + Office hours:Mon–Fri  9:00–17:00  PST + EU Member Countries + +49(0)9747–9304200 + Office hours:Mon–Fri  9:00–17:00  Central Europe Time + China + 400–700–0303 + Office hours:Mon–Fri  9:00–18:00  Beijing Time + Slave Request Gimbal Control + Slave Name:%1$s + Refuse + Agree + Are you sure you want to upgrade the firmware? + Update + Update Complete + Firmware update error, please try again + Load Camera Settings Complete + Load Camera Settings Failed + Sync Camera Time Complete + Sync Camera Time Failed + Set Center-Weighted Averaging Metering Failed + Set Average Metering Failed + Set Spot Metering Failed + The password is invalid + Master refused + Slave controller limit reached + Response Timeout + Request Gimbal Control + The current controller has gimbal control + Gimbal Control Request Successful + You can control the direction of gimbal, take photos or videos, and set the gimbal to free mode. + Password must be 4 numbers + Slow + Fast + Take Photo + Record Video + PlayBack + Remote Controller Calibration + Stick Channel + Down + Up + Turn Left + Turn Right + Left + Right + Forward + Backward + Gimbal Wheel + Up + Down + Calibrate + Put the sticks in the center position before pressing Start. When calibrating, strictly follow the prompts, otherwise calibration may fail. + Put the sticks in the center position and press Start to begin calibration. + Push all sticks throughout their maximum range and repeat several times. Then press Finish to complete the calibration. + Push all sticks throughout their maximum range and repeat several times. Then press Finish to complete the calibration. + Start + Finish + Home point recorded + Please turn on GPS + Clear Guides + Please keep the aircraft stationary and horizontal during calibration, or recalibration may be required. + Please keep the aircraft stationary and horizontal during calibration, or recalibration may be required. Calibration will take 5 to 10 minutes, please wait for it to complete. + Please keep the main controller stationary and horizontal during calibration, or it may not fly properly and you will have to repeat the advanced calibration. + IMU error. Please contact DJI support or your local dealer. + Calibration required. Please tap the button to continue. + Calibration not required. + Calibration OK + Idle + Ready + Calibrating + Basic Calibration in Progress + Error + Finished + Step 1 + Step 2 + Advanced Calibration in Progress + The system is overheated + The system is too cold + The system is overheated + The system is too cold + Flash error + IMU has been moved + Unknown error + Tap the advanced calibration button to calibrate the IMU. + Channel + Rssi(dBm) + Nothing + Aircraft Battery + Voltage + Remaining Power + Total Capacity + Battery Life + Times Charged + Error Info + Low Battery Warning + Critical Battery Warning + %1$d%% + %1$d mAH + %.2f V + %1$d mA + Current + Serial Number + Manufacture Date + Temperature + %1$02dm%2$02ds + %1$02dh%2$02dm%3$02ds + %.2fV + %s °C + Flight Time + Time to Discharge + %d Days + History Status + Battery History + Current Status + Record %1$d + Connection OK! + Invalid Battery + Battery Connection Broken + Discharge overcurrent + Discharge overcurrent + Battery overheated + Battery critically overheated + Battery temperature low + Battery temperature critically low + Short circuit +  Battery cell voltage insufficient +  Battery cell damaged + Watchdog reset + self-discharge in storage + Battery replaced + Battery not replaced + OFF + N/A + %1$02d:%2$02d:%3$02d + H:%.1f M + D:%.1f M + V.S:%.1f M/S + H.S:%.1f M/S + H:%.1f FT + D:%.1f FT + V.S:%.1f MPH + H.S:%.1f MPH + H:N/A + D:N/A + V.S:N/A + H.S:N/A + %d° + %.1f M + %.1f FT + %1$d%% + Gimbal Roll Adjust + The aircraft will go to an altitude of %1$d%2$s, and then go home. + The aircraft will go home at an altitude of %1$d%2$s. + Distance:%1$d%2$s + Cancel Landing + Cancel Takeoff + Aircraft will go home after %1d  seconds. + Go home power limit reached. The aircraft will adjust its altitude according to your Failsafe Settings, and then go to the Home Point. + Go home power limit reached. The aircraft will adjust its altitude according to your Failsafe Settings, and then go to the Home Point. + Cancel Go Home + USB debugging is disabled. Please enable it first. + Beginner Mode + "Because Beginner Mode is active, an altitude and distance limit of 30 meters (98 feet) will be imposed on your flight. + +Beginner Mode can be turned off in the MC Settings" + EV %1$s + ISO %1$s + OK + color: + Manual + Atti + Landing + Takeoff + Go Home + GPS + Joystick + Navi + ClickGo + Save + Unsafe + P-Atti + P-OPTI + P-GPS + VPS + CL + HL + PL + SD Card OK + NO SD Card + SD Card Full + Slow SD Card + Invalid SD Card + SD Card Write Protected + SD Card Not Formatted + SD Card Formatting + SD Card Invalid + SD Card Busy + SD Card Unknown Error + SD Card Initializing + Operation Timeout + Operation Before + Operation Not Supported + Unknown Error + Operation Not Available + No SD Card Detected + SD Card Is Full + SD Card Error + Camera System Error + Disconnected + Flight Error + No Error! + No Error + Configuration Error + Parameter Settings Error + Low Voltage + Invalid Serial No. + Critically Low Voltage + IMU Exception + WR Error A + WR Error B + WR Parameter Error + X1 Connection Error + X2 Connection Error + Low Voltage + PMU Error + Transmitter Connection Error + Compass Error + Stack Error + CPU Error + Sensor Error + Calibration Required + Compass Calibration Required + TeleController Error + Invalid Battery + Battery Connection Error + Unknown Error + Safe to fly (GPS) + Ready to fly (non-GPS) + Ready to fly (non-GPS) + Weak image transmission signal + Weak remote controller signal + Aircraft warming up + Compass error + Low battery + Critically low battery + Remote controller battery low + No signal + Disconnected + Low battery, aircraft landing + Critically low voltage, aircraft landing + Critically low battery, aircraft landing + Go home failed + Low battery, aircraft going home:%s + Signal lost, aircraft going home + Signal lost + Going home:%s + Orientation Lock + Home Lock + Point Of Interest Lock + Limit Lock + IOC Settings + (%1$.1f - %2$.1f) + Operating as Mode %d + Reset + "This will lock the current nose direction to the remote control in the positive direction for all around. + +Click \"Reset\" to re-set the direction of the head lock." + (1~2M) + (1~100M) + (2~50M) + (2~100M) + Calibrate Compass + Reset All Settings + Unlock Motor + Enter Travel Mode + Exit Travel Mode + Calib + Advanced Settings + Only advanced users should modify these settings. Make changes with extreme caution. + Gain + Failsafe Mode + Gain Settings + Advanced Failsafe Settings + Sensors + Go to Home Altitude + Hover + Alt Go-Home + (20~500M) + Modifying this altitude will affect Failsafe Mode and Go to Home. The aircraft will go to the altitude listed here and go to the home point. + Go to Home Heading + Forwards + Backwards + Advanced Settings are for advanced users only, please be careful when changing. + Only advanced users should modify these settings. Any changes will affect aircraft attitude and gain. Make adjustments with extreme caution. + Pitch + Advanced Gain + (50%~200%) + Roll + Gyro Gain + (50%~200%) + Yaw + Vertical + (50%~200%) + Enable force transform + Basic Gain + Atti Gain + Gyroscope (degree/s) + Acceleration (g) + Compass + Information + IMU Calibration + Check IMU + Basic + Advanced + Gyro Temp: + Heating Power: + x + y + z + Mod + Basic Status: + Advanced Status: + Enable IOC + Enable Multiple Mode + Reset IOC + Are you sure you want to reset the angle? + General Settings + Minimum Altitude (ground avoidance) + Avoid Group Altitude + Maximum Altitude + Maximum Altitude + Distance Limit + Beginner Mode + For safety reasons, you cannot activate Beginner Mode after takeoff. + Maximum Flight Distance + Height + Distance + Units of Measurement + Imperial + Metric + Basic + Mode + Professional + General + Beginner Mode + M + FT + Please enter a valid number + MC Settings + UNITS + CAMERA + Auto ISO Maximum Value + Camera Connect Status + Reset Camera Settings + Format SD Card + GIMBAL + Rotation Range + Yaw + Pitch + Speed Coefficient + No Blocking Mode + OTHER + Tutorial + Rate + About + Dynamic Home Point Reset Every: + Confirm Reset Camera Settings? + Format SD Card? + Show Grid + Grid Lines + Grid + Diagonals + Quick Review + Adjust Gimbal Roll + Gimbal Auto Calibration + MAP + Show Flight Route + Clear Flight Route + Check that aircraft is level and nothing is obstructing the gimbal/’s range of motion. Press OK to begin auto calibration. + Confirm Clear Flight Route? + Reset Camera Settings Complete + Reset Camera Settings Failed + SD Card Formatting Complete + SD Card Formatting Failed + NTSC/PAL + PAL + NTSC + Switching between NTSC/PAL will restart the camera + Are you sure you want to set %1$s mode? + Calibrate Map Coordinates (For China Mainland) + Video Caption + (Disable In Record Status) + About + VERSION + App + Main Controller + Camera + Gimbal + Air OFDM + Center board + Wi-Fi + Remote Controller + Battery + Air Encoder + Ground Encoder + CONTACT + Website + Email + Phone + Live Chat + "Copyright@2006–2014 DJI–INNOVATIONS. +All Rights Reserved" + No application can do it! + Suggestions + Hi,DJI! + Loader:%1$s + Firmware:%1$s + Image Transmission Settings + Screen Choice + Distance priority + Screen priority + Channel + Stable Quality + Unstable Quality + channel 13–20 ISM + Current Channel + Image Transmission Quality + Auto + Custom + Select Channel + Channel %d + Applying settings, please wait + Low + High + Dual Output + Display OSD on HDMI Output + RC Settings + Master + Slave + Monitor + RC Battery + RC Name + Connection Password + Open slave function + Request Permission + Searching + SLAVE RC LIST + CONNECT RC + Master and Slave + Set RC Function + Change RC Function? + MASTER RC LIST + Please input password + RC Mode Settings + Master Stick Mode + Are you sure you want to change the mode? + Custom Stick Mode + Slave Permissions + Gimbal Speed Settings + Status + RC Control Settings + Please turn off the power of the aircraft,then calibrate the remote controller. + Custom Buttons + C1 + C2 + You can customize the C1 and C2 buttons on the back of the remote controller. + Stick Mode + Linking Remote Controllers + Stick EXP Curve + Gimbal Wheel Speed + Default stick mode is Mode 2. Changing stick modes alters the way the aircraft is controlled. Do not change unless you are familiar with a different mode. + Camera Setting + Reset Gimbal Yaw + Cache Live Video + Switch Gimbal Mode + Switch GS/FPV + Clear Flight Route + Confirm + Cancel + Battery Info + Gimbal Pitch/Yaw + Undefined + Confirm Frequency Settings? + Setting Frequency,Timeout After %1$d Seconds + Please press the frequency button on the aircraft to finish the linking + Linking completed, cannot cancel + Finished linking + Link Remote Controller Frequency Timeout + Default + Custom + Mode 1 + Mode 2 + Mode 3 + Custom + Up + Dowm + Left + Right + Forward + Backward + Turn left + Turn right + Pitch Up + Pitch Down + Yaw Left + Yaw Right + Roll Clockwise + Roll Counter-clockwise + Gimbal Speed + Throttle EXP Curve + Yaw EXP Curve + Please complete all settings before saving + Delete this image + Delete these files + Delete this video + %1$s/%2$s + %1$d/%2$d + %1$d selected + %1$sX + SD Card removed + SD Card error + SD Card empty + Downloading file, please wait + Updating now, please wait + Downloading the files + The file already exists + Landing gear status unknown + Landing gear lowered + Landing gear lowering + Landing gear raised + Landing gear raising + Landing gear paused + Critical low battery warning successfully set + Vision Positioning enabled + Interval is %1$.1f-%2$.1f%3$s. + Adjust Gimbal Roll + Adjust Gimbal Roll + The battery is running low + The battery is running low, you need to go home! + The battery is critically low! + The battery is critically low, you need to go home! + Gimbal Follow Mode Enabled + Gimbal will point in the direction of the aircraft nose + Gimbal FPV Mode Enabled + The gimbal will follow the direction and roll of the aircraft for an FPV experience. + Gimbal Free Mode Enable + Gimbal will not move with the aircraft, ideal for two controllers + Reset Gimbal Yaw Enable + Gimbal will return to center + Bring aircraft home + Watch the aircraft location on the map and monitor the aircraft battery + Set current aircraft position as Home Point + Set current aircraft position as Home Point + Set current RC location as the Home Point + Flight mode is set to Atti + Please set flight mode to GPS for safe flight + Home Point set + Home Point set to aircraft position + Home Point not set successfully + Home Point set to RC position + Home Point not set successfully + FPV + Follow + Free + Center camera + Abnormal Compass or GPS signal, aircraft is switched to ATTI mode now + Low power, aircraft will go home + Critically low power, the aircraft will land now + Low power, going home + Critically low power, the aircraft will land now + Low voltage, going home + Critically low voltage, the aircraft will land now + Critically low voltage, the aircraft will land now + Go to Home button pressed + Motors started + Remote control auto takeoff started + Remote control auto landing started + Going home + Landing + Taking off + Signal lost, aircraft going home + API automatic takeoff + API automatic landing + API automatic go home + Low altitude warning, landing gear will automatically lower and land + You are in a no-fly zone, auto landing now + Maximum flight distance reached, adjust it in MC Settings if needed + Maximum flight altitude reached, adjust it in MC Settings if needed + Takeoff? + "Ensure it's safe to takeoff. The aircraft will go to an elevation of %s and hover." + Slide to takeoff + Go home and land? + The aircraft will adjust its nose direction and altitude according to your Failsafe Settings, and then go to the Home Point. + Dynamic Home Point Range + Home Point will be set to follow the remote controller, constantly updating automatically as you move this distance. + Cancel Go Home? + Be sure you want to cancel go Home. + Land aircraft now? + Aircraft will land at its current location. Be sure landing area is clear. + Go Home + Takeoff + Land the aircraft + Cancel Go Home + "Home Point will be set to the Remote-Controller's position." + Slide to go home + "(Current height won't be recorded)" + The aircraft will go to an altitude of %1$.1fm(%2$.1fft), and then go to the Home Point. + The aircraft will go to the Home Point at an altitude of %1$.1fm(%2$.1fft) + Home Point will be set to the aircraft’s current position. When required, it will return to this point at minimum altitude of %1$.1fm(%2$.1fft) according to your Failsafe settings. + Land the aircraft successfully + Land the aricraft failed + Takeoff successfully + Takeoff failed + Go Home successfully + Go Home failed + Cancel go Home successfully + Cancel go Home failed + Cancel land successfully + Cancel land failed + Aircraft Status + Compass + Flight Mode + Remote Controller Mode + Landing Gear Status + Aircraft Battery + Remote Controller Battery + Remaining SD Card Capacity + Aircraft Battery Temperature + Complete + Normal + Calibrating your compass is crucial for the safe operation of your aircraft, please calibrate now. Be sure there are no magnets or metal objects near the compass. + Compass abnormal + "Compass error, do not fly. Please check the following: +1. Be sure there are no magnets or metal objects near the compass. Note: The ground or nearby walls may contain some metal. Please change your location and try to fly again. +2. If the compass has not been calibrated, please calibrate it now." + Aircraft is initializing, please wait for a moment + Aircraft has completed initialization + %1$dMB + Mode 2 + Mode 1 + Mode 3 + Customize Mode + Calibrate + Format + Calibrate the compass now. Be sure there are no magnets or metal objects near the compass. + The operation will be restored to all the flight control parameters to the initial state, please confirm whether you want to perform this operation? + Are you sure to unlock the motors? + The aircraft will transform into Travel Mode for easy transport. Please remove the gimbal and camera before continuing. + Unable to enter Travel Mode. Place the aircraft on a flat, hard surface, and remove the gimbal. Then try again. + Entering travel mode, please wait. + Compass calibration complete + Compass calibration failed + Beginner mode enabled + Beginner mode disabled + "For safe flight, the aircraft's maximum height is set to %1$d%2$s, and maximum distance is set to %3$d%4$s. +(you may change this in the general settings)" + For safe flight, only fly when there is a stable GPS signal. + Step 1: Make sure no magnets or metal objects are near the compass, from the ground 1.5m(4.9ft). Rotate aircraft 360 degrees horizontally + Step 2: Make sure no magnets or metal objects are near the compass, from the ground 1.5m(4.9ft). Face the nose down, then rotate aircraft 360 degrees again + Cancel Calibration + Check for Updates + Updates Required + No Updates REquired + Overall Status + Normal + Abnormal + ISO + Shutter + EV + Auto + Manual + Fn + Image Format + Video Format + White Balance + Anti-Flicker + Image Size + Video Size + Style + Color + Format SD + Slide left to hide + Slide right to show + AE + Advanced Mode On + Advanced Mode Off + RAW + JPEG + JPEG+RAW + J+R + MOV + MP4 + Auto + Sunny + Cloudy + Incandescent + Neon + Custom + Auto + 60Hz + 50Hz + Small 16:9 + Medium 16:9 + Big 16:9 + Standard + Portrait + Landscape + Neutral + Vivid + Soft + Custom + Sharpness + Contrast + Saturation + Color Tone + %dK + None + LOG + Art + Black White + Vivid + Film + Beach + Dream + Classic + Nostalgia + Nostalgia + Inverse + Punk + Pop Art + Wedding + Keyhole + Miniature + Canvas + WaterColor + Delta + DK79 + Vision4 + Vision6 + VisionX + The network is unvaliable + Activating, please wait a moment + Activation Successful + Activation Failed, Please Retry + Invalid Device + Activate Later + Activate Now + Back + Continue + ACTIVATE YOUR INSPIRE  + 1 + Type a Name for Your Aircraft + You must activate your Inspire 1 the first time you connect it to the app. This will also activate your 1-year warranty. + CUSTOMIZE YOUR SETTINGS + The stick mode governs the way you control the aircraft. The default is Mode 2. Please ensure you are familiar with your chosen stick mode. + Mode 2 + Other Mode + Metric + Imperial + PAL + NTSC + BEGINNER MODE + It is highly recommended that you fly in beginner mode if this is your first time flying. In this mode, the aircraft will not takeoff without a GPS signal, and the flight altitude is limited to 30 M(98 ft) and distance is limited to 30 M(98 ft). + Turn On + Turn Off + CONFIRM YOUR ACCOUNT + "Your aircraft's information will be bound to this account, and this is the proof of your warranty. Confirm the email address is correct." + Email is incorrect, go back + Register your DJI account + Access these services after signing in with your DJI account + Assistant + User Center + Zone + SPYPIXEL + E-mail + Password + Confirm Password + SIGN UP + SIGN IN + Forgot password? + Please enter a valid email address + Please enter a valid email address + The password is invalid, it should be 6–20 characters long + Passwords do not match. Please re-enter + The network is unvaliable + Sign in failed, please retry! + Sign up failed, please retry! + The password is invalid + The email address you have entered is already registered + Sign In… + Sign Up… + Unknown Error + Forgot Password + TITLE + OK + Cancel + ISO + ISO-auto + SHUTTER + EXP + %1$s: %2$s + set %s failed + P + M + S + SCN + Contrast + ISO + White Balance + Scene + Continuous + Digital Filter + Metering + Exposure Compensation + Image Format + Anti-flicker + Image Size + Image Quality + Video Format + Video Format + Video Quality + Sharpness + Saturation + Tonal + Shutter + %s°C + %s km/h + North + Northeast + East + Southeast + South + Southwest + West + Northwest + DJI Store + CreateDJI + Album + Flight Record + Shop + Me + No more data here! + Authentication failed, please sign in with your DJI account. + Sign In + Input what you want to search + No Items Selected! + Cloud data fail! + No Albums + Loading + Edit Album Fail! + "The format can't be shared!" + Edit Name + Save + Select Region + Gender + Male + Female + Prefer not to say + Prefer not to say + Edit Mobile + Set Password + Current password: + New password: + Confirm password: + Mail + Facebook + Dropbox + Tumblr + Weibo + Twitter + Instagram + Pinterest + Wechat + Youku + Youtube + Vimeo + Install the YouKu app. + Install the YouTube app. + None of your installed apps can share pictures! + Share + Created: + Device: + Dimensions: + Device Manufacturer: + Aperture: + Exposure: + Exposure Speed: + ISO: + Location + My Profile + User Name + Region + Gender + Birthday + Email + Mobile + Edit Profile + Junior Pilot + My Aircraft + First Name + Last Name + City + State + Country + Are you sure to logout? + Capture + Gallery + Logout… + Device Name + Linking Email + Activation Date + Serial Number + Firmware Version + IP Address + App Version + Product Type + Date + Time + Total Time + Total Distance + Flight Times + Last Location + Last Flight + Pilot Level + Favorite + Location + Mileage + Max H + Capture + Video + Moment + %1$02dm%2$02ds + %.1fm + %.1fft + "%1$s +%2$s" + %1$dMin + No Flight Records + Synchronizing Flight Records…%1$d%% + Synchronizing flight records failed! + Synchronizing flight records completed! + N/A + No GPS + Map Loading + Academy + Manuals + Manual + Videos + "The file doesn't exist, please download again!" + Downloaded + Download + Download File %s failed, please retry! + Academy data failed! + Location + Max Height + Upload + File Uploading + File Uploaded + Done + Done + Cancel + Title + Description + Tags + Privacy + Share Activity + Set Password + Upload failed + Upload started + A video is uploading, please wait for the upload to complete or choose another platform. + SkyPixel + Contrast + ISO + White Balance + Scene Mode + Photo Mode + Digital Filter + Metering Mode + Exposure Compensation + Image Format + Anti-Flicker + Image Size + Image Quality + Video Size + Video Format + Video Quality + Sharpness + Saturation + Tone + Shutter + Single Shot + Triple Shots + Five Shots + Seven Shots + AEB Triple Shot + AEB Five Shot + Timer + 5s Timer + 7s Timer + 10s Timer + 30s Timer + 60s Timer + USB Connected + USB Disconnected + Slave Requests Gimbal Control + Slave Name:%s + Agree + Update Firmware to the latest version + Upgrading, please wait + Update + Update Completed, the aircraft will restart in %d seconds! + Firmware update error, please retry! + New firmware detected, verifying firmware… + Firmware is the latest version + Firmware update cancelled + Firmware error! + Firmware update timeout! + Gimbal gyroscope error + Gimbal pitch error + Gimbal roll error + Gimbal yaw error + Gimbal cannot receive MC data + Gyroscope error + Accelerate error + Compass error + Barometer error + Aircraft GPS error + SD RW error + Remote Controller FPGA error + Remote Controller transmitter error + Remote Controller battery error + Remote Controller GPS error + Remote Controller encryption error + Remote Controller is not calibrated + Remote Controller battery low + Aircraft need upgrade + Camera need upgrade + Battery need upgrade + RC need upgrade + Gimbal need upgrade + Remote controller has not been used for 10 minutes + Battery discharge overcurrent + Battery discharge overheated + Low temperature environment, battery not suitable for flight + Battery connection to center board failed + GPS connection to center board failed + MC connection to center board failed + Camera upgrade error + Camera sensor error + Camera overheated + Video decoder encryption error + Deserializer disconnected + Compass error, calibrate before takeoff + Connected to PC, cannot takeoff + Motors locked, unlock in MC Settings + Aircraft its outside set distance limit, cannot takeoff + IMU calibration required, calibrate before takeoff + IMU module SN error, cannot takeoff + IMU warming up, wait before takeoff + Compass calibrating, cannot takeoff + Attitude error, cannot takeoff + In Beginner Mode, cannot takeoff without GPS + Battery error, replace the battery before takeoff + Battery communication error, cannot takeoff + Voltage is very low, cannot takeoff + Severely low battery power, cannot takeoff + Main controller voltage too low, cannot takeoff + Insufficient voltage, cannot takeoff + Battery power insufficient, cannot takeoff + Battery not ready, cannot takeoff + In Simulator Mode, cannot takeoff + In Travel Mode, cannot takeoff + The aircraft is tilted, cannot takeoff + The aircraft has not been activated, cannot takeoff + You are in a no-fly zone,Take off prohibited + You are in a no-fly zone,Auto landing now + You are in a no-fly zone + "You are approaching a no-fly zone + Fly cautiously" + You are in a restricted area + Touch a no-fly zone + Master Downloading, Please wait + Please enable IOC mode in the MC Settings + Firmware may not be compatible + Firmware not compatible, please update the firmware. + Firmware is required to upgrade + "1. If the aircraft is locked before upgrade, it will be unlocked after upgrade. + 2. Download the latest firmware from http://www.dji.com/product/inspire-1/download, unzip the file, and put the bin file into SD Card. + 3. Insert SD card to the Camera. + 4. Power on aircraft to auto upgrade, App can help to show the upgrade progress if connected. + 5. If Remote Controller is required to upgrade as well, please use the USB cable to connect the RC with the Camera, wait around 30 seconds to start the auto upgrade until the sound stop, and then restart the Remote Controller. +" + Note + Channel 1–32 correspond to the frequency of 2.28 ~ 2.59 GHz, please choose it according to local procedures and regulations of permission, DJI Innovations accepts no liability for damage(s) or injured incurred directly or indirectly from the use of custom channels. Please read all the related manuals carefully. + No image is available, aircraft will go home in:%d seconds. Confirm? + Go Home Now + Connect the app to the Internet to fetch latest firmware info? + No, Thanks + Update Now + "DJI is pleased to announce an 24H to 7 service for our Inspire 1 customers, starting from Jan 5th,2015. You can then reach us via: + +1.Live800 live-chat http://www.dji.com/product/inspire-1 + +Please leave your name, contact number, location by clicking the live-chat button, our service team will call you back within 15 minutes. + +2.Email to Inspire1@dji.com + +Send an email containing your name, contact number and location, our service team will call you back within 20 minutes." + Your App must be updated to the latest version. + Update Now + New firmware upgrade package is available and required to mandatory upgrade, if you are not convenient to do so, please do it in next %d days. Otherwise, the drone will be locked until the firmwares are upgraded. - - Message - QQ - Qzone - WeiBo - WeChat - Moments + diff --git a/res/values/styles.xml b/res/values/styles.xml index c967cb2..408e8d0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -4,7 +4,7 @@ Base application theme, dependent on API level. This theme is replaced by AppBaseTheme from res/values-vXX/styles.xml on newer devices. --> - - @@ -106,5 +108,511 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/com/yuneec/android/mapexplorer/SharedPreference.java b/src/com/yuneec/android/mapexplorer/SharedPreference.java index e515fe0..b5696e7 100644 --- a/src/com/yuneec/android/mapexplorer/SharedPreference.java +++ b/src/com/yuneec/android/mapexplorer/SharedPreference.java @@ -25,6 +25,8 @@ public class SharedPreference { private static final String USER_INFO_APPROVE_STATUS = "approveStatus"; private static final String USER_INFO_SCORE = "score"; private static final String USER_INFO_ADDRESS = "address"; + + @@ -47,6 +49,7 @@ public static final UserInfo getUserInfo(Context context) { user.setApproveStatus(sharedPreferences.getString(USER_INFO_APPROVE_STATUS, "0")); user.setScore(sharedPreferences.getString(USER_INFO_SCORE, "0")); user.setAddress(sharedPreferences.getString(USER_INFO_ADDRESS, "")); + return user; } @@ -69,6 +72,7 @@ public static final void setUserInfo(Context context, UserInfo user) { editor.putString(USER_INFO_APPROVE_STATUS,user.getApproveStatus()); editor.putString(USER_INFO_SCORE,user.getScore()); editor.putString(USER_INFO_ADDRESS,user.getAddress()); + editor.commit(); } diff --git a/src/com/yuneec/android/mapexplorer/base/BaseActivity.java b/src/com/yuneec/android/mapexplorer/base/BaseActivity.java index 9eb1ed5..9057aec 100644 --- a/src/com/yuneec/android/mapexplorer/base/BaseActivity.java +++ b/src/com/yuneec/android/mapexplorer/base/BaseActivity.java @@ -2,18 +2,10 @@ -import com.nostra13.universalimageloader.core.DisplayImageOptions; -import com.nostra13.universalimageloader.core.assist.ImageScaleType; -import com.nostra13.universalimageloader.core.display.BitmapDisplayer; -import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; -import com.yuneec.android.mapexplorer.ConstantValue; -import com.yuneec.android.mapexplorer.R; -import com.yuneec.android.mapexplorer.library.ProgressDialog; -import com.yuneec.android.mapexplorer.manager.ViewManager; -import com.yuneec.android.mapexplorer.settings.MyApplication; - import android.app.Activity; import android.content.Context; +import android.content.Intent; +import android.graphics.Bitmap; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -23,8 +15,16 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.Toast; -import android.content.Intent; -import android.graphics.Bitmap; + +import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.assist.ImageScaleType; +import com.nostra13.universalimageloader.core.display.BitmapDisplayer; +import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; +import com.yuneec.android.mapexplorer.ConstantValue; +import com.yuneec.android.mapexplorer.R; +import com.yuneec.android.mapexplorer.library.ProgressDialog; +import com.yuneec.android.mapexplorer.manager.ViewManager; +import com.yuneec.android.mapexplorer.settings.MyApplication; /** @@ -256,4 +256,8 @@ public void onBackPressed() { // overridePendingTransition(R.anim.right2left_enter,R.anim.left2right_exit); } + + + + } diff --git a/src/com/yuneec/android/mapexplorer/library/AlertDialog.java b/src/com/yuneec/android/mapexplorer/library/AlertDialog.java index 13da287..878883b 100644 --- a/src/com/yuneec/android/mapexplorer/library/AlertDialog.java +++ b/src/com/yuneec/android/mapexplorer/library/AlertDialog.java @@ -3,6 +3,7 @@ + import com.yuneec.android.mapexplorer.R; import android.content.Context; diff --git a/src/com/yuneec/android/mapexplorer/settings/MyApplication.java b/src/com/yuneec/android/mapexplorer/settings/MyApplication.java index c360e13..4d6ef34 100644 --- a/src/com/yuneec/android/mapexplorer/settings/MyApplication.java +++ b/src/com/yuneec/android/mapexplorer/settings/MyApplication.java @@ -3,6 +3,7 @@ import java.io.File; import java.util.LinkedList; +import com.baidu.mapapi.SDKInitializer; import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiscCache; import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator; import com.nostra13.universalimageloader.cache.memory.impl.LruMemoryCache; @@ -42,6 +43,7 @@ public class MyApplication extends Application { @Override public void onCreate() { super.onCreate(); + SDKInitializer.initialize(this); instance = this; mActivityList = new LinkedList(); context = getApplicationContext(); diff --git a/src/com/yuneec/android/mapexplorer/util/TimeUtil.java b/src/com/yuneec/android/mapexplorer/util/TimeUtil.java index 8b17c0f..89ad1f8 100644 --- a/src/com/yuneec/android/mapexplorer/util/TimeUtil.java +++ b/src/com/yuneec/android/mapexplorer/util/TimeUtil.java @@ -7,6 +7,7 @@ import java.util.Calendar; import java.util.Date; + import android.content.Context; import android.text.TextUtils;