From 37b19503ed53d38d6ae31dc8222a2d7498eb964c Mon Sep 17 00:00:00 2001 From: LiuRuiXuan <1912386608@qq.com> Date: Sun, 12 Nov 2023 23:37:42 +0800 Subject: [PATCH] frontCode --- src/app/.idea/gradle.xml | 4 +- src/app/.idea/misc.xml | 3 +- src/app/.idea/vcs.xml | 2 +- src/app/build.gradle | 30 ++++- src/app/local.properties | 4 +- src/app/src/main/AndroidManifest.xml | 63 ++++++++- .../BottomNavigiationActivity.java | 11 +- .../HazardGarbageFragment.java | 2 +- .../KitchenGarbageFragment.java | 2 +- .../Buttonfragments/OtherGarbageFragment.java | 2 +- .../RecycleGarbageFragment.java | 3 +- src/app/src/main/res/drawable/button.xml | 28 +++- .../main/res/layout/bottom_navigiation.xml | 5 +- .../main/res/layout/fragment_dashboard.xml | 123 ++++++------------ src/app/src/main/res/layout/fragment_home.xml | 45 +++++-- .../res/layout/fragment_notifications.xml | 63 +++++---- .../src/main/res/layout/hazard_garbage.xml | 46 ++++++- .../src/main/res/layout/kitchen_garbage.xml | 46 ++++++- src/app/src/main/res/layout/other_garbage.xml | 48 ++++++- .../src/main/res/layout/recycle_garbage.xml | 51 +++++++- src/app/src/main/res/menu/bottom_nav_menu.xml | 5 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- .../res/mipmap-anydpi-v33/ic_launcher.xml | 6 +- .../main/res/navigation/mobile_navigation.xml | 17 ++- src/app/src/main/res/values/colors.xml | 5 + src/app/src/main/res/values/strings.xml | 2 +- src/app/src/main/res/values/themes.xml | 6 +- .../myapplication/ExampleUnitTest.java | 8 +- 29 files changed, 449 insertions(+), 189 deletions(-) diff --git a/src/app/.idea/gradle.xml b/src/app/.idea/gradle.xml index 3a3b909..f22a539 100644 --- a/src/app/.idea/gradle.xml +++ b/src/app/.idea/gradle.xml @@ -1,12 +1,12 @@ + diff --git a/src/app/.idea/misc.xml b/src/app/.idea/misc.xml index f45a3da..564b911 100644 --- a/src/app/.idea/misc.xml +++ b/src/app/.idea/misc.xml @@ -1,6 +1,7 @@ - + + diff --git a/src/app/.idea/vcs.xml b/src/app/.idea/vcs.xml index b2bdec2..6c0b863 100644 --- a/src/app/.idea/vcs.xml +++ b/src/app/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/app/build.gradle b/src/app/build.gradle index 70d909f..4452023 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -1,5 +1,6 @@ plugins { id 'com.android.application' + id "org.sonarqube" version "3.5.0.2730" } android { @@ -8,7 +9,7 @@ android { defaultConfig { applicationId "com.example.myapplication" - minSdk 24 + minSdk 26 targetSdk 33 versionCode 1 versionName "1.0" @@ -29,18 +30,41 @@ android { buildFeatures { viewBinding true } + + + sourceSets{ + main { + + //jni库的调用会到资源文件夹下libs里面找so文件 + jniLibs.srcDirs = ['libs'] + assets.srcDirs+=['src/main/com.example.myapplication/raw'] + + } + + } } dependencies { - + +// implementation 'com.tencent.map:tencent-map-vector-sdk:4.3.5' +// implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:8.7.5.1' + implementation 'com.github.JediBurrell:customFloatingActionButton:-SNAPSHOT' implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.tencent.map:tencent-map-nav-sdk:5.4.6.0' implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' implementation 'androidx.navigation:navigation-fragment:2.4.1' implementation 'androidx.navigation:navigation-ui:2.4.1' + implementation files('libs\\tencent-mapsdk-android-official-release.5.2.1.18c8cd09.jar') + implementation files('libs\\poi-3.12-android-a.jar') + implementation files('libs\\poi-ooxml-schemas-3.12-20150511-a.jar') testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' -} \ No newline at end of file + + +} + + diff --git a/src/app/local.properties b/src/app/local.properties index a5667c3..fd8c7d8 100644 --- a/src/app/local.properties +++ b/src/app/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Sep 25 09:53:48 CST 2023 -sdk.dir=E\:\\Android_SDK +#Fri Sep 29 04:34:54 CST 2023 +sdk.dir=F\:\\AndroidSDK\\AndroidSDK diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index 50765ac..3cc32ce 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -1,8 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java b/src/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java index d1afe50..76720f0 100644 --- a/src/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java +++ b/src/app/src/main/java/com/example/myapplication/BottomNavigiationActivity.java @@ -3,6 +3,7 @@ package com.example.myapplication; import android.media.Image; import android.os.Bundle; import android.util.Log; +import android.view.MenuItem; import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -11,6 +12,7 @@ import android.widget.ImageButton; import com.example.myapplication.ui.Buttonfragments.RecycleGarbageFragment; import com.google.android.material.bottomnavigation.BottomNavigationView; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.navigation.NavController; @@ -19,6 +21,7 @@ import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; import com.example.myapplication.databinding.BottomNavigiationBinding; +import com.google.android.material.bottomnavigation.LabelVisibilityMode; import java.util.List; @@ -28,18 +31,16 @@ public class BottomNavigiationActivity extends AppCompatActivity{ @Override protected void onCreate(Bundle savedInstanceState) { -// Log.d("wc","create"); super.onCreate(savedInstanceState); binding = BottomNavigiationBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); + this.getSupportActionBar().hide(); BottomNavigationView navView = findViewById(R.id.nav_view); - // Passing each menu ID as a set of Ids because each - // menu should be considered as top level destinations. AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder( - R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications) + R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications,R.id.navigation_quiz) .build(); + navView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_LABELED); NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_bottom_navigiation); - NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(binding.navView, navController); } } \ No newline at end of file diff --git a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java index 713a64f..4d81920 100644 --- a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java +++ b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/HazardGarbageFragment.java @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment; import com.example.myapplication.R; -public class HazardGarbageFragment extends Fragment { +public class HazardGarbageFragment extends Fragment {//有害垃圾介绍 public HazardGarbageFragment() { // Required empty public constructor diff --git a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java index 97dc149..45e694e 100644 --- a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java +++ b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/KitchenGarbageFragment.java @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment; import com.example.myapplication.R; -public class KitchenGarbageFragment extends Fragment { +public class KitchenGarbageFragment extends Fragment {//厨余垃圾介绍 public KitchenGarbageFragment() { // Required empty public constructor diff --git a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java index be60494..a5b10f4 100644 --- a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java +++ b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/OtherGarbageFragment.java @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment; import com.example.myapplication.R; -public class OtherGarbageFragment extends Fragment { +public class OtherGarbageFragment extends Fragment {//其他垃圾介绍 public OtherGarbageFragment() { // Required empty public constructor diff --git a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java index 5bbbcbc..e7e4393 100644 --- a/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java +++ b/src/app/src/main/java/com/example/myapplication/ui/Buttonfragments/RecycleGarbageFragment.java @@ -9,12 +9,11 @@ import androidx.fragment.app.Fragment; import com.example.myapplication.R; -public class RecycleGarbageFragment extends Fragment { +public class RecycleGarbageFragment extends Fragment {//可回收垃圾介绍 public RecycleGarbageFragment() { // Required empty public constructor } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/src/app/src/main/res/drawable/button.xml b/src/app/src/main/res/drawable/button.xml index 582cc5b..a6c2cc4 100644 --- a/src/app/src/main/res/drawable/button.xml +++ b/src/app/src/main/res/drawable/button.xml @@ -1,8 +1,28 @@ + - - + + + + + + + + + + + - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/res/layout/bottom_navigiation.xml b/src/app/src/main/res/layout/bottom_navigiation.xml index e17f876..8daa267 100644 --- a/src/app/src/main/res/layout/bottom_navigiation.xml +++ b/src/app/src/main/res/layout/bottom_navigiation.xml @@ -3,8 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="?attr/actionBarSize"> + android:layout_height="match_parent"> - - - - - - - - - - - - - - -