Browse Source

app/src/main/java/com/hicorenational/antifraud/MainActivity.java fix error

liuyuqi-dellpc 1 year ago
parent
commit
41ee4d8e69

+ 4 - 4
app/build.gradle

@@ -30,12 +30,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.5.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     implementation 'androidx.navigation:navigation-fragment:2.3.1'
     implementation 'androidx.navigation:navigation-ui:2.3.1'

+ 60 - 2
app/src/main/AndroidManifest.xml

@@ -1,20 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.hicorenational.antifraud">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
+<!--    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"/>-->
+<!--    <uses-permission android:name="android.permission.READ_CALL_LOG"/>-->
+<!--    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>-->
+<!--    <uses-permission android:name="android.permission.READ_CONTACTS"/>-->
+<!--    <uses-permission android:name="android.permission.VIBRATE"/>-->
+<!--    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>-->
+<!--    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
+<!--    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->
+<!--    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>-->
+<!--    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>-->
+<!--    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW"/>-->
+<!--    <uses-permission android:name="android.permission.RECEIVE_SMS"/>-->
+<!--    <uses-permission android:name="android.permission.READ_SMS"/>-->
+<!--    <uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
+<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
+<!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>-->
+<!--    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>-->
+<!--    <uses-permission android:name="android.permission.WAKE_LOCK"/>-->
+<!--    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_ADDED"/>-->
+<!--    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_CHANGED"/>-->
+<!--    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_INSTALL"/>-->
+<!--    <uses-permission android:name="android.permission.BROADCAST_PACKAGE_REPLACED"/>-->
+<!--    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"-->
+<!--        tools:ignore="ProtectedPermissions" />-->
+<!--    <uses-permission android:name="android.permission.WRITE_SETTINGS"-->
+<!--        tools:ignore="ProtectedPermissions" />-->
+<!--    <uses-permission android:name="android.permission.INTERNET"/>-->
+<!--    <uses-permission android:name="android.permission.CAMERA"/>-->
+<!--    <uses-permission android:name="android.permission.GET_TASKS"/>-->
+<!--    <uses-permission android:name="android.permission.READ_LOGS"-->
+<!--        tools:ignore="ProtectedPermissions" />-->
+<!--    <uses-permission android:name="android.permission.REORDER_TASKS"/>-->
+<!--    <uses-feature android:name="android.hardware.camera"/>-->
+<!--    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>-->
+<!--    <uses-feature android:name="android.hardware.camera.flash"/>-->
+<!--    <uses-permission android:name="com.hicorenational.antifraud.permission.ANTI_VIRUS"/>-->
+<!--    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>-->
+<!--    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>-->
+<!--    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>-->
+<!--    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>-->
+<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>-->
+<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>-->
+<!--    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>-->
+<!--    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>-->
+<!--    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>-->
+<!--    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>-->
+<!--    <uses-permission android:name="android.permission.READ_APN_SETTINGS"/>-->
+<!--    <uses-permission android:name="android.permission.BROADCAST_STICKY"/>-->
+<!--    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>-->
+<!--    <uses-permission android:name="com.hicorenational.antifraud.permission.TMF_SHARK"/>-->
+<!--    <uses-permission android:name="com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE"/>-->
+<!--    <uses-permission android:name="com.heytap.mcs.permission.RECIEVE_MCS_MESSAGE"/>-->
+<!--    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON"/>-->
+<!--    <uses-permission android:name="com.hicorenational.antifraud.permission.MIPUSH_RECEIVE"/>-->
+<!--    -->
     <application
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Antifraud">
+
         <activity
             android:name=".views.SplashActivity"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

+ 20 - 21
app/src/main/java/com/hicorenational/antifraud/MainActivity.java

@@ -3,7 +3,6 @@ package com.hicorenational.antifraud;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -11,34 +10,34 @@ import com.hicorenational.antifraud.views.fragment.DashboardFragment;
 import com.hicorenational.antifraud.views.fragment.HomeFragment;
 import com.hicorenational.antifraud.views.fragment.MineFragment;
 
+import java.util.Objects;
+
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getSupportActionBar().hide();
+        Objects.requireNonNull(getSupportActionBar()).hide();
         setContentView(R.layout.activity_main);
-        BottomNavigationView navigationView = findViewById(R.id.nav_view);
 
-        navigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
-            @Override
-            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                resetIcon(navigationView);
-                if (item.getItemId() == R.id.navigation_home) {
-                    item.setIcon(R.drawable.ic_home_seled);
-                    getSupportFragmentManager().beginTransaction().replace(R.id.navigation_home, new HomeFragment()).commit();
-                    return true;
-                } else if (item.getItemId() == R.id.navigation_dashboard) {
-                    item.setIcon(R.drawable.ic_dashboard_seled);
-                    getSupportFragmentManager().beginTransaction().replace(R.id.navigation_dashboard, new DashboardFragment()).commit();
-                    return true;
-                } else if (item.getItemId() == R.id.navigation_notifications) {
-                    item.setIcon(R.drawable.ic_mine_seled);
-                    getSupportFragmentManager().beginTransaction().replace(R.id.navigation_notifications, new MineFragment()).commit();
-                    return true;
-                }
-                return false;
+        BottomNavigationView navigationView = findViewById(R.id.nav_view);
+        //        监听事件
+        navigationView.setOnItemSelectedListener(item -> {
+            resetIcon(navigationView);
+            if (item.getItemId() == R.id.navigation_home) {
+                item.setIcon(R.drawable.ic_home_seled);
+                getSupportFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new HomeFragment()).commit();
+                return true;
+            } else if (item.getItemId() == R.id.navigation_dashboard) {
+                item.setIcon(R.drawable.ic_dashboard_seled);
+                getSupportFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new DashboardFragment()).commit();
+                return true;
+            } else if (item.getItemId() == R.id.navigation_notifications) {
+                item.setIcon(R.drawable.ic_mine_seled);
+                getSupportFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new MineFragment()).commit();
+                return true;
             }
+            return false;
         });
     }
 

+ 3 - 1
app/src/main/java/com/hicorenational/antifraud/views/SplashActivity.java

@@ -7,6 +7,8 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import com.hicorenational.antifraud.MainActivity;
 import com.hicorenational.antifraud.R;
+
+import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -21,7 +23,7 @@ public class SplashActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash);
-        getSupportActionBar().hide();
+        Objects.requireNonNull(getSupportActionBar()).hide();
         mContext = this;
         goMainActivity();
     }

+ 1 - 2
app/src/main/res/layout/fragment_home.xml

@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/homeback"
-    >
+    android:background="@color/homeback">
 
     <ScrollView
         android:layout_width="match_parent"