Updated dependencies, and uppgraded DJI SDK to 4.16.4, and updated text to Rosettadrone 3...
Esse commit está contido em:
gerado
+5
@@ -41,5 +41,10 @@
|
|||||||
<option name="name" value="maven" />
|
<option name="name" value="maven" />
|
||||||
<option name="url" value="https://maven.java.net/content/groups/public/" />
|
<option name="url" value="https://maven.java.net/content/groups/public/" />
|
||||||
</remote-repository>
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="MavenRepo" />
|
||||||
|
<option name="name" value="MavenRepo" />
|
||||||
|
<option name="url" value="https://repo.maven.apache.org/maven2/" />
|
||||||
|
</remote-repository>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
+34
-34
@@ -5,11 +5,11 @@ android {
|
|||||||
release {
|
release {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileSdkVersion 28
|
compileSdkVersion 33
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "sq.rogue.rosettadrone"
|
applicationId "sq.rogue.rosettadrone"
|
||||||
minSdkVersion 22
|
minSdkVersion 22
|
||||||
targetSdkVersion 28
|
targetSdkVersion 33
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName '5.2.0' // This is the one to modify...
|
versionName '5.2.0' // This is the one to modify...
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
@@ -17,7 +17,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
mavenCentral()
|
||||||
maven {
|
maven {
|
||||||
url "https://maven.java.net/content/groups/public/"
|
url "https://maven.java.net/content/groups/public/"
|
||||||
}
|
}
|
||||||
@@ -104,7 +104,7 @@ android {
|
|||||||
// ndkVersion '21.4.7075529'
|
// ndkVersion '21.4.7075529'
|
||||||
|
|
||||||
// We need to be restrict as we get error on newer versions...
|
// We need to be restrict as we get error on newer versions...
|
||||||
// buildToolsVersion '30.0.2'
|
// buildToolsVersion '30.0.2'
|
||||||
ndkVersion '22.0.7026061'
|
ndkVersion '22.0.7026061'
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -115,7 +115,7 @@ dependencies {
|
|||||||
})
|
})
|
||||||
implementation 'com.squareup:otto:1.3.8'
|
implementation 'com.squareup:otto:1.3.8'
|
||||||
|
|
||||||
implementation('com.dji:dji-sdk:4.16.1', {
|
implementation('com.dji:dji-sdk:4.16.4', {
|
||||||
/**
|
/**
|
||||||
* Uncomment the "library-anti-distortion" if your app does not need Anti Distortion for Mavic 2 Pro and Mavic 2 Zoom.
|
* Uncomment the "library-anti-distortion" if your app does not need Anti Distortion for Mavic 2 Pro and Mavic 2 Zoom.
|
||||||
* Uncomment the "fly-safe-database" if you need database for release, or we will download it when DJISDKManager.getInstance().registerApp
|
* Uncomment the "fly-safe-database" if you need database for release, or we will download it when DJISDKManager.getInstance().registerApp
|
||||||
@@ -125,42 +125,42 @@ dependencies {
|
|||||||
exclude module: 'library-anti-distortion'
|
exclude module: 'library-anti-distortion'
|
||||||
exclude module: 'fly-safe-database'
|
exclude module: 'fly-safe-database'
|
||||||
})
|
})
|
||||||
compileOnly 'com.dji:dji-sdk-provided:4.16.1'
|
compileOnly 'com.dji:dji-sdk-provided:4.16.4'
|
||||||
|
|
||||||
implementation 'com.dji:dji-uxsdk:4.16'
|
implementation 'com.dji:dji-uxsdk:4.16'
|
||||||
|
|
||||||
implementation 'androidx.annotation:annotation:1.3.0'
|
implementation 'androidx.annotation:annotation:1.5.0' // 1.2.0
|
||||||
implementation 'androidx.appcompat:appcompat:1.3.1'
|
implementation 'androidx.appcompat:appcompat:1.5.1' // 1.2.0
|
||||||
implementation 'androidx.preference:preference:1.2.0'
|
implementation 'androidx.preference:preference:1.2.0' // 1.1.1
|
||||||
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
|
implementation 'androidx.legacy:legacy-preference-v14:1.0.0' // 1.0.0
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // 2.0.4
|
||||||
implementation 'com.google.android.material:material:1.4.0'
|
implementation 'androidx.multidex:multidex:2.0.1' // 2.0.1
|
||||||
testImplementation 'junit:junit:4.13.2'
|
implementation 'androidx.recyclerview:recyclerview:1.3.0' // 1.1.0
|
||||||
testImplementation 'org.mockito:mockito-core:2.7.22'
|
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' // 2.2.0
|
||||||
testImplementation 'org.mockito:mockito-android:2.7.22'
|
|
||||||
implementation 'androidx.multidex:multidex:2.0.1'
|
|
||||||
|
|
||||||
implementation 'androidx.core:core:1.6.0'
|
testImplementation 'junit:junit:4.13.2' // 4.13.2
|
||||||
implementation 'androidx.recyclerview:recyclerview:1.2.1'
|
testImplementation 'org.mockito:mockito-core:2.7.22' // 2.7.22
|
||||||
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
|
testImplementation 'org.mockito:mockito-android:2.7.22' // 2.7.22
|
||||||
|
|
||||||
implementation 'com.google.android.gms:play-services-maps:18.0.2'
|
implementation 'com.google.android.material:material:1.6.0' // 1.3.0
|
||||||
implementation 'com.google.android.gms:play-services-basement:18.0.2'
|
implementation 'com.google.android.gms:play-services-maps:18.1.0' // 17.0.0
|
||||||
implementation 'com.google.android.gms:play-services-base:18.0.1'
|
implementation 'com.google.android.gms:play-services-basement:18.1.0' // 17.6.0
|
||||||
implementation 'com.google.android.gms:play-services-gcm:17.0.0'
|
implementation 'com.google.android.gms:play-services-base:18.2.0' // 17.6.0
|
||||||
implementation 'com.google.android.gms:play-services-location:19.0.1'
|
implementation 'com.google.android.gms:play-services-gcm:17.0.0' // 17.0.0
|
||||||
|
implementation 'com.google.android.gms:play-services-location:21.0.1' // 18.0.0
|
||||||
|
implementation 'com.google.maps:google-maps-services:0.18.0' // 0.18.0
|
||||||
|
|
||||||
implementation 'com.google.maps:google-maps-services:0.18.0'
|
implementation 'com.jakewharton:butterknife:10.2.3' // 10.2.3
|
||||||
|
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // 10.2.3
|
||||||
|
implementation 'androidx.core:core:1.9.0' // 1.3.2
|
||||||
|
implementation 'androidx.core:core-ktx:1.9.0' // 1.3.2
|
||||||
|
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0' // 2.3.1
|
||||||
|
|
||||||
implementation 'com.jakewharton:butterknife:10.2.3'
|
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31' // 1.4.31
|
||||||
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
|
|
||||||
implementation 'androidx.core:core-ktx:1.6.0'
|
|
||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
|
|
||||||
|
|
||||||
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31'
|
implementation 'javax.mail:mail:1.4.7' // 1.4.7
|
||||||
|
// exclude 'javax.activation:activation:1.1'
|
||||||
implementation 'javax.mail:mail:1.4.7'
|
// implementation 'com.sun.mail:android-activation:1.6.6'
|
||||||
// exclude 'javax.activation:activation:1.1'
|
|
||||||
// implementation 'com.sun.mail:android-activation:1.6.6'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,8 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name="sq.rogue.rosettadrone.ConnectionActivity"
|
android:name="sq.rogue.rosettadrone.ConnectionActivity"
|
||||||
android:launchMode="singleTop"
|
android:launchMode="singleTop"
|
||||||
android:configChanges="orientation|screenSize">
|
android:configChanges="orientation|screenSize"
|
||||||
|
android:exported="true">
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
@@ -72,7 +73,8 @@
|
|||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name="sq.rogue.rosettadrone.MainActivity"
|
<activity android:name="sq.rogue.rosettadrone.MainActivity"
|
||||||
android:configChanges="orientation|screenSize">
|
android:configChanges="orientation|screenSize"
|
||||||
|
android:exported="true">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
|
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|||||||
@@ -321,7 +321,7 @@ public class ConnectionActivity extends Activity implements View.OnClickListener
|
|||||||
((TextView) findViewById(R.id.textView3)).setText(version);
|
((TextView) findViewById(R.id.textView3)).setText(version);
|
||||||
|
|
||||||
sharedPreferences = android.preference.PreferenceManager.getDefaultSharedPreferences(this);
|
sharedPreferences = android.preference.PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
CustomName = sharedPreferences.getString("pref_app_name", "RosettaDrone 2"); //+"RosettaDrone 2";
|
CustomName = sharedPreferences.getString("pref_app_name", "RosettaDrone 3"); //+"RosettaDrone 2";
|
||||||
if (CustomName.length() > 0)
|
if (CustomName.length() > 0)
|
||||||
((TextView) findViewById(R.id.textView)).setText(CustomName);
|
((TextView) findViewById(R.id.textView)).setText(CustomName);
|
||||||
|
|
||||||
|
|||||||
@@ -510,6 +510,16 @@ public class DummyProduct extends Aircraft {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
public void setPropellerCoverLimitEnabled(boolean b, @Nullable CommonCallbacks.CompletionCallback completionCallback) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void getPropellerCoverLimitEnabled(@NonNull CommonCallbacks.CompletionCallbackWith<Boolean> completionCallbackWith) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public boolean isFlightAssistantSupported() {
|
public boolean isFlightAssistantSupported() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public class VideoService extends Service implements NativeHelper.NativeDataList
|
|||||||
@RequiresApi(api = Build.VERSION_CODES.O)
|
@RequiresApi(api = Build.VERSION_CODES.O)
|
||||||
private String createNotificationChannel() {
|
private String createNotificationChannel() {
|
||||||
String channelID = "video_service";
|
String channelID = "video_service";
|
||||||
String channelName = "RosettaDrone 2 Video Service";
|
String channelName = "RosettaDrone 3 Video Service";
|
||||||
NotificationChannel chan = new NotificationChannel(channelID, channelName, NotificationManager.IMPORTANCE_DEFAULT);
|
NotificationChannel chan = new NotificationChannel(channelID, channelName, NotificationManager.IMPORTANCE_DEFAULT);
|
||||||
chan.setLightColor(Color.BLUE);
|
chan.setLightColor(Color.BLUE);
|
||||||
chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
|
chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
android:id="@+id/textView"
|
android:id="@+id/textView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Rosetta Drone 2"
|
android:text="Rosetta Drone 3"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||||
android:textColor="@color/colorWhite"
|
android:textColor="@color/colorWhite"
|
||||||
@@ -224,7 +224,7 @@
|
|||||||
android:layout_height="70dp"
|
android:layout_height="70dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:scaleType="fitXY"
|
android:scaleType="fitXY"
|
||||||
android:background="@drawable/logo"
|
android:background="@drawable/esmart"
|
||||||
android:textColor="@color/colorWhite"
|
android:textColor="@color/colorWhite"
|
||||||
android:textSize="20dp" />
|
android:textSize="20dp" />
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">Rosetta Drone 2</string>
|
<string name="app_name">Rosetta Drone 3</string>
|
||||||
|
|
||||||
<!-- Drone -->
|
<!-- Drone -->
|
||||||
<string name="pref_drone_id">ID</string>
|
<string name="pref_drone_id">ID</string>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
android:title="App Name">
|
android:title="App Name">
|
||||||
|
|
||||||
<androidx.preference.EditTextPreference
|
<androidx.preference.EditTextPreference
|
||||||
android:defaultValue="RosettaDrone 2"
|
android:defaultValue="RosettaDrone 3"
|
||||||
android:key="pref_app_name"
|
android:key="pref_app_name"
|
||||||
android:title="@string/pref_app" />
|
android:title="@string/pref_app" />
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|||||||
Referência em uma Nova Issue
Bloquear um usuário