Skip to content

Commit 74ee02c

Browse files
m4gr3dm4gr3d
committed
Merge pull request #1334 from ne0fhyk/3dr_services_client_lib_impl_update
3dr services client lib update
2 parents dd603df + df286dd commit 74ee02c

File tree

55 files changed

+1134
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1134
-791
lines changed

‎Android/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
43
package="org.droidplanner.android">
54

65
<supports-screens
@@ -50,7 +49,7 @@
5049
android:label="@string/app_title"
5150
android:theme="@style/CustomActionBarTheme"
5251
android:windowSoftInputMode="adjustPan"
53-
tools:replace="android:label">
52+
>
5453

5554
<!-- You must insert your own Google Maps for Android API v2 key in here. -->
5655
<meta-data

‎Android/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
compile 'com.android.support:cardview-v7:21.0.2'
1212
compile 'com.android.support:recyclerview-v7:21.0.2'
1313

14-
compile 'com.o3dr:3dr-services-lib:2.1.14'
14+
compile 'com.o3dr:3dr-services-lib:2.1.23'
1515

1616
compile files('libs/droneapi-java.jar')
1717
compile files('libs/j2xx.jar')
@@ -29,10 +29,15 @@ android {
2929
applicationId 'org.droidplanner.android'
3030
minSdkVersion 14
3131
targetSdkVersion 21
32-
versionCode 30010
32+
versionCode 30011
3333
versionName getGitVersion()
3434
}
3535

36+
compileOptions {
37+
sourceCompatibility JavaVersion.VERSION_1_7
38+
targetCompatibility JavaVersion.VERSION_1_7
39+
}
40+
3641
sourceSets {
3742
main {
3843
manifest.srcFile 'AndroidManifest.xml'

‎Android/res/layout/fragment_editor_detail_set_servo.xml‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,15 @@
9393
android:layout_height="wrap_content"
9494
android:orientation="vertical"
9595
android:text="@string/channel_label" />
96-
97-
<TextView
98-
style="@style/ModeDetailText"
99-
android:layout_width="wrap_content"
100-
android:layout_height="wrap_content"
101-
android:layout_gravity="left"
102-
android:text="@string/pwm"
103-
android:textAppearance="?android:attr/textAppearanceMedium" />
104-
105-
<EditText
106-
android:id="@+id/PwmEditText"
96+
97+
<org.droidplanner.android.widgets.spinnerWheel.CardWheelHorizontalView
98+
android:id="@+id/pwmPicker"
99+
style="@style/missionItemDetailCard"
107100
android:layout_width="match_parent"
108101
android:layout_height="wrap_content"
109-
android:inputType="number"
110-
android:imeOptions="actionDone"
111-
android:paddingLeft="16dp"
112-
android:paddingRight="16dp"
113-
/>
114-
102+
android:orientation="vertical"
103+
android:text="@string/pwm"/>
104+
115105
</LinearLayout>
116106

117107
</RelativeLayout>

‎Android/res/menu/menu_super_activiy.xml‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,36 @@
1414
/>
1515

1616
<item
17-
android:id="@+id/menu_send_mission"
17+
android:id="@+id/menu_upload_mission"
1818
app:showAsAction="never"
19-
android:title="@string/send_mission"/>
19+
android:title="@string/upload_mission"/>
2020
<item
21-
android:id="@+id/menu_load_mission"
21+
android:id="@+id/menu_download_mission"
2222
app:showAsAction="never"
23-
android:title="@string/load_mission"/>
24-
25-
<item
26-
android:id="@+id/menu_triggerCamera"
27-
app:showAsAction="never"
28-
android:title="Picture"/>
29-
<item
30-
android:id="@+id/menu_epm_release"
31-
app:showAsAction="never"
32-
android:title="Release"/>
23+
android:title="@string/download_mission"/>
24+
3325
<item
34-
android:id="@+id/menu_epm_grab"
35-
app:showAsAction="never"
36-
android:title="Grab"/>
26+
android:id="@+id/menu_advanced"
27+
android:enabled="false"
28+
android:visible="false"
29+
android:title="Advanced"
30+
app:showAsAction="never">
31+
<menu>
32+
<item
33+
android:id="@+id/menu_triggerCamera"
34+
app:showAsAction="never"
35+
android:title="Picture"/>
36+
<item
37+
android:id="@+id/menu_epm_release"
38+
app:showAsAction="never"
39+
android:title="Release"/>
40+
<item
41+
android:id="@+id/menu_epm_grab"
42+
app:showAsAction="never"
43+
android:title="Grab"/>
44+
</menu>
45+
</item>
46+
3747
</group>
3848

3949
<item

‎Android/res/values-de/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<string name="help">Hilfe</string>
1010
<string name="menu_drone_setup">Drohnen-Setup</string>
1111
<string name="editor">Editor</string>
12-
<string name="send_mission">Mission senden</string>
13-
<string name="load_mission">Mission laden</string>
12+
<string name="upload_mission">Mission senden</string>
13+
<string name="download_mission">Mission laden</string>
1414

1515
<!-- Drone Setup tabs -->
1616
<string name="screen_tuning">Tuning</string>

‎Android/res/values-it/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<string name="app_settings">Impostazioni App</string>
99
<string name="flight_data">Dati volo</string>
1010
<string name="editor">Editore</string>
11-
<string name="send_mission">Invia missione</string>
12-
<string name="load_mission">Carica missione</string>
11+
<string name="upload_mission">Invia missione</string>
12+
<string name="download_mission">Carica missione</string>
1313

1414
<!-- Drone Setup tabs -->
1515
<string name="screen_tuning">Messa a punto</string>

‎Android/res/values-zh-rCN/strings.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<string name="app_settings">应用设置</string>
1212
<string name="flight_data">飞行数据</string>
1313
<string name="editor">编辑器</string>
14-
<string name="send_mission">发送任务</string>
15-
<string name="load_mission">加载任务</string>
14+
<string name="upload_mission">发送任务</string>
15+
<string name="download_mission">加载任务</string>
1616

1717
<!-- Map related strings -->
1818
<string name="mapbox_id">ne0fhyk.ighceofk</string>
@@ -211,9 +211,6 @@
211211
<string name="waypointInfo_ROI">设置一个位置和高度来设定飞行器指向，瞄准可选的相机。</string>
212212
<string name="waypointInfo_SetJump">重复航点</string>
213213

214-
<!-- Custom waypoint info -->
215-
<string name="pwm">PWM：</string>
216-
217214
<!-- Waypoint editor -->
218215
<string name="editor_err_land_rtl_added">在LAND或RTL后无法添加新的航点</string>
219216
<string name="editor_info_window">距离：200m，飞行时间：3:30s</string>

‎Android/res/values-zh-rTW/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<string name="app_settings">App 設定</string>
99
<string name="flight_data">飛行數據</string>
1010
<string name="editor">編輯器</string>
11-
<string name="send_mission">發送任務</string>
12-
<string name="load_mission">載入任務</string>
11+
<string name="upload_mission">發送任務</string>
12+
<string name="download_mission">載入任務</string>
1313

1414
<!-- Drone Setup tabs -->
1515
<string name="screen_tuning">調整參數</string>

‎Android/res/values/preferences_keys.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ This file is used to store the preferences keys so that it's accessible and modi
1414
<string name="pref_connection_type_key">pref_connection_param_type</string>
1515
<string name="pref_map_type_key">pref_map_type</string>
1616
<string name="pref_advanced_use_offline_maps_key">pref_advanced_use_offline_maps</string>
17+
<string name="pref_advanced_menu_toggle_key">pref_advanced_menu_toggle</string>
1718
<string name="pref_baud_type_key">pref_baud_type</string>
1819
<string name="pref_server_ip_key">pref_server_ip</string>
1920
<string name="pref_server_port_key">pref_server_port</string>

‎Android/res/values/strings.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@
1111
<string name="app_settings">App Settings</string>
1212
<string name="flight_data">Flight Data</string>
1313
<string name="editor">Editor</string>
14-
<string name="send_mission">Send Mission</string>
15-
<string name="load_mission">Load Mission</string>
16-
17-
<!-- Map related strings -->
18-
<string name="mapbox_id">ne0fhyk.ighceofk</string>
14+
<string name="upload_mission">Upload Mission</string>
15+
<string name="download_mission">Download Mission</string>
1916

2017
<!-- Drone Setup tabs -->
2118
<string name="screen_tuning">Tuning</string>
@@ -212,7 +209,7 @@
212209
<string name="waypointInfo_SetJump">Repeat waypoint</string>
213210

214211
<!-- Custom waypoint info -->
215-
<string name="pwm">PWM:</string>
212+
<string name="pwm">PWM</string>
216213

217214
<!-- Waypoint editor -->
218215
<string name="editor_err_land_rtl_added">One cannot add new waypoints after LAND or RTL</string>
@@ -535,5 +532,7 @@
535532
dronie.</string>
536533
<string name="editor_multi_edit_no_waypoint_error">No waypoint(s) selected.</string>
537534
<string name="failed_start_calibration_message">Unable to start calibration!</string>
535+
<string name="pref_advanced_menu_title">Advanced Menu</string>
536+
<string name="pref_advanced_menu_summary">Enable advanced menu options.</string>
538537

539538
</resources>

0 commit comments

Comments
 (0)