diff --git a/app/build.gradle b/app/build.gradle index e655a4f..63e84e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 1 - versionName "1.0.0" + versionName "1.1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -39,16 +39,16 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation 'androidx.preference:preference:1.1.1' - testImplementation 'junit:junit:4.12' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.google.android.material:material:1.2.1' + implementation 'com.android.volley:volley:1.1.1' + testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation files('libs/BaiduLBS_Android.jar') - implementation files('libs/Volley-1.0.19.jar') - implementation 'androidx.cardview:cardview:1.0.0' implementation files('libs/log4j-1.2.17.jar') } diff --git a/app/libs/Volley-1.0.19.jar b/app/libs/Volley-1.0.19.jar deleted file mode 100644 index fbcc9d0..0000000 Binary files a/app/libs/Volley-1.0.19.jar and /dev/null differ diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 117e316..9a0db6b 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index a7b1e07..218e0c7 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java b/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java index 3191092..7d476d7 100644 --- a/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java +++ b/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java @@ -12,10 +12,8 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.preference.PreferenceManager; -import android.view.Gravity; import android.view.View; import android.widget.Button; -import android.widget.Toast; import java.util.ArrayList; import java.util.Locale; diff --git a/app/src/main/java/com/zcshou/joystick/JoyStick.java b/app/src/main/java/com/zcshou/joystick/JoyStick.java index c473a06..8a7dcb0 100644 --- a/app/src/main/java/com/zcshou/joystick/JoyStick.java +++ b/app/src/main/java/com/zcshou/joystick/JoyStick.java @@ -1,9 +1,7 @@ package com.zcshou.joystick; import android.annotation.SuppressLint; -import android.app.Service; import android.content.Context; -import android.content.SharedPreferences; import android.graphics.PixelFormat; import android.os.Build; import android.os.CountDownTimer; @@ -17,9 +15,6 @@ import android.view.WindowManager; import android.widget.Button; import android.widget.ImageButton; import android.widget.LinearLayout; -import android.widget.Toast; - -import androidx.preference.PreferenceManager; import com.zcshou.gogogo.R; @@ -28,7 +23,7 @@ public class JoyStick extends View { private Context mContext; private WindowManager.LayoutParams mWindowParams; private WindowManager mWindowManager; - private LayoutInflater inflater; + private final LayoutInflater inflater; private View mJoystickView; private LinearLayout mLatLngView; private JoyStickClickListener mListener; @@ -228,7 +223,7 @@ public class JoyStick extends View { }); } - @SuppressLint("InflateParams") + @SuppressLint({"InflateParams", "ClickableViewAccessibility"}) private void initJoyStickLatLngView() { mLatLngView = (LinearLayout)inflater.inflate(R.layout.joystick_latlng, null); mLatLngView.setOnTouchListener(new JoyStickOnTouchListener());