fix bugs; clean code

Albresky · Jul 16, 2023 · ab0f6d1 · ab0f6d1
1 parent 63b0f23
commit ab0f6d1
Show file tree

Hide file tree

Showing 14 changed files with 231 additions and 278 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk 24
         targetSdk 33
         versionCode 2
-        versionName "0.0.3"
+        versionName "0.0.4_final"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,26 +23,31 @@
         <activity
             android:name=".UI.AboutActivity"
             android:exported="false"
-            android:screenOrientation="portrait " />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".UI.SettingsActivity"
             android:exported="false"
-            android:screenOrientation="portrait " />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
 
         <service
             android:name=".Service.MusicService"
             android:enabled="true"
             android:exported="false"
-            android:screenOrientation="portrait " />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
 
         <activity
             android:name=".UI.MusicPlayerActivity"
             android:exported="false"
-            android:screenOrientation="portrait " />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:screenOrientation="portrait ">
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -52,15 +57,18 @@
         <activity
             android:name=".UI.MusicActivity"
             android:exported="false"
-            android:screenOrientation="portrait " />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".UI.VideoActivity"
             android:exported="false"
-            android:screenOrientation="portrait " />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".UI.VideoPlayerActivity"
             android:exported="false"
-            android:screenOrientation="portrait " />
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/cn/albresky/splayer/Adapter/VideoAdapter.java b/app/src/main/java/cn/albresky/splayer/Adapter/VideoAdapter.java
@@ -10,7 +10,6 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -74,6 +73,12 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
 
         if (thumbnail == null) {
             holder.videoWarning.setVisibility(View.VISIBLE);
+            holder.videoThumbnail.setScaleType(ImageView.ScaleType.FIT_CENTER);
+            holder.videoThumbnail.setImageResource(R.drawable.baseline_video_half);
+        } else {
+            holder.videoWarning.setVisibility(View.GONE);
+            holder.videoThumbnail.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            holder.videoThumbnail.setImageBitmap(thumbnail);
         }
         holder.videoIndex.setText(String.valueOf(position + 1));
         holder.videoName.setText(video.getName());
@@ -82,9 +87,8 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         holder.videoResolution.setText(Converter.resolutionConvert(video.getWidth(), video.getHeight()));
         holder.videoDuration.setText(duration);
         holder.videoType.setText(video.getType());
-        holder.videoThumbnail.setImageBitmap(thumbnail);
+
         holder.itemView.setOnClickListener(v -> {
-            Toast.makeText(mContext, "点击了第" + position + "项", Toast.LENGTH_SHORT).show();
             onItemClickListener.onItemClick(v, position);
         });
     }

diff --git a/app/src/main/java/cn/albresky/splayer/MainActivity.java b/app/src/main/java/cn/albresky/splayer/MainActivity.java
@@ -45,16 +45,12 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Log.d(TAG, "onCreate() called");
         super.onCreate(savedInstanceState);
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
         setContentView(view);
 
-//        setSupportActionBar(binding.toolbar);
-
-        Log.d(TAG, "onCreate() called");
-
-
         checkPermissions();
 
         getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
@@ -80,8 +76,6 @@ protected void onCreate(Bundle savedInstanceState) {
             startActivity(intent);
             return true;
         });
-
-        // test zone end
     }
 
     private void checkPermissionsAndLaunch(@NonNull ActivityResultLauncher<Intent> launcher, @NonNull Intent intent) {
@@ -128,56 +122,11 @@ private void checkPermissions() {
             Intent intent = new Intent(getApplicationContext(), MusicActivity.class);
             checkPermissionsAndLaunch(launcher, intent);
         });
-//            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
-//                if (permissionGranted[PERMISSION_READ_EXTERNAL] && permissionGranted[PERMISSION_WRITE_EXTERNAL]) {
-//                    startActivity(new Intent(getApplicationContext(), MusicActivity.class));
-//                } else if (ContextCompat.checkSelfPermission(
-//                        getApplicationContext(), android.Manifest.permission.READ_EXTERNAL_STORAGE
-//                ) != PackageManager.PERMISSION_GRANTED) {
-//                    requestPermissions(new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE}, PERMISSION_READ_EXTERNAL);
-//                } else if (ContextCompat.checkSelfPermission(
-//                        getApplicationContext(), android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-//                ) != PackageManager.PERMISSION_GRANTED) {
-//                    requestPermissions(new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_WRITE_EXTERNAL);
-//                }
-//            } else {
-//                if (!Environment.isExternalStorageManager()) {
-//                    Toast.makeText(this, "请求所有文件访问权限", Toast.LENGTH_SHORT).show();
-//                    Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
-//                    launcher.launch(intent);
-//                } else {
-//                    Toast.makeText(this, "已获得所有文件访问权限", Toast.LENGTH_SHORT).show();
-//                    startActivity(new Intent(getApplicationContext(), MusicActivity.class));
-//                }
-//            }
 
         binding.btnVideo.setOnClickListener(v -> {
             Intent intent = new Intent(getApplicationContext(), VideoActivity.class);
             checkPermissionsAndLaunch(launcher, intent);
         });
-
-//            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
-//                if (permissionGranted[PERMISSION_READ_EXTERNAL] && permissionGranted[PERMISSION_WRITE_EXTERNAL]) {
-//                    startActivity(new Intent(getApplicationContext(), VideoActivity.class));
-//                } else if (ContextCompat.checkSelfPermission(
-//                        getApplicationContext(), android.Manifest.permission.READ_EXTERNAL_STORAGE
-//                ) != PackageManager.PERMISSION_GRANTED) {
-//                    requestPermissions(new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE}, PERMISSION_READ_EXTERNAL);
-//                } else if (ContextCompat.checkSelfPermission(
-//                        getApplicationContext(), android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-//                ) != PackageManager.PERMISSION_GRANTED) {
-//                    requestPermissions(new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_WRITE_EXTERNAL);
-//                }
-//            } else {
-//                if (!Environment.isExternalStorageManager()) {
-//                    Toast.makeText(this, "请求所有文件访问权限", Toast.LENGTH_SHORT).show();
-//                    Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
-//                    launcher.launch(intent);
-//                } else {
-//                    Toast.makeText(this, "已获得所有文件访问权限", Toast.LENGTH_SHORT).show();
-//                    startActivity(new Intent(getApplicationContext(), VideoActivity.class));
-//                }
-//            }
     }
 
 
@@ -204,6 +153,4 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             }
         }
     }
-
-
 }
diff --git a/app/src/main/java/cn/albresky/splayer/UI/MusicActivity.java b/app/src/main/java/cn/albresky/splayer/UI/MusicActivity.java
@@ -83,10 +83,6 @@ private void initView() {
         binding.btnPlay.setEnabled(false);
         binding.btnPlay.setOnClickListener(v -> {
             if (mContorller != null) {
-//                if (!mContorller.isPrepared()) {
-//                    Log.d(TAG, "initView:[btn_play clicked] [isPrepared=false] => playerStart(0)");
-//                    playerStart(0);
-//                } else
                 if (mContorller.isPlaying()) {
                     Log.d(TAG, "initView:[btn_play clicked] [isPlaying=true] => playerPause()");
                     playerPause();
@@ -139,8 +135,6 @@ private void initView() {
             Log.d(TAG, "initView: playerSongName clicked");
             startMusicPlayerActivity(mIndex);
         });
-
-
     }
 
     private void getMusicList() {
@@ -306,6 +300,4 @@ public void onServiceDisconnected(ComponentName name) {
             Log.d(TAG, "onServiceDisconnected: ");
         }
     }
-
-
 }
diff --git a/app/src/main/java/cn/albresky/splayer/UI/MusicPlayerActivity.java b/app/src/main/java/cn/albresky/splayer/UI/MusicPlayerActivity.java
@@ -88,8 +88,6 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initView() {
-//        binding.ivMusicCover.setImageBitmap(Converter.createBitmapWithScale(Converter.createBitmapWithNoScale(this, R.drawable.record), 512, 512, false));
-
         String jList = (String) getIntent().getSerializableExtra("songList");
         Gson gson = new Gson();
         mList = gson.fromJson(jList, new TypeToken<List<Song>>() {
@@ -154,13 +152,6 @@ private void initView() {
         binding.playNext.setOnClickListener(v -> {
             Log.d(TAG, "onClick: next");
             playNext();
-//            int nextIndex = songIndex >= mList.size() - 1 ? 0 : songIndex + 1;
-//            songIndex = nextIndex;
-//            song = mList.get(songIndex);
-//            mContorller.prepare(songIndex);
-//            mContorller.play();
-//            resetUI();
-//            startAnimation();
         });
 
         binding.playPrev.setOnClickListener(v -> {

diff --git a/app/src/main/java/cn/albresky/splayer/UI/SettingsActivity.java b/app/src/main/java/cn/albresky/splayer/UI/SettingsActivity.java
@@ -19,9 +19,7 @@ public class SettingsActivity extends AppCompatActivity {
 
     private final String TAG = "loadSettings";
     private ActivitySettingsBinding binding;
-
     private boolean enableDeepScan = false;
-
     private int scanDepth = 4;
 
 
@@ -34,12 +32,14 @@ protected void onCreate(Bundle savedInstanceState) {
         initView();
     }
 
+
     @Override
     protected void onDestroy() {
         Log.d(TAG, "onDestroy: ");
         super.onDestroy();
     }
 
+
     private void initView() {
         Log.d(TAG, "initView: ");
 
@@ -54,7 +54,6 @@ private void initView() {
             saveSettings();
         });
 
-
         binding.txtCache.setText(getTotalCacheSize());
 
         binding.btnClearCache.setOnClickListener(v -> {
@@ -79,6 +78,7 @@ private void initView() {
         });
     }
 
+
     private void loadSettings() {
         Log.d(TAG, "loadSettings: ");
         SharedPreferences sp = getSharedPreferences("settings", MODE_PRIVATE);
@@ -91,6 +91,7 @@ private void loadSettings() {
         binding.deepScan.setChecked(sp.getBoolean("enableDeepScan", false));
     }
 
+
     private void saveSettings() {
         Log.d(TAG, "saveSettings: ");
         SharedPreferences sp = getSharedPreferences("settings", MODE_PRIVATE);
@@ -100,6 +101,7 @@ private void saveSettings() {
         editor.apply();
     }
 
+
     public String getTotalCacheSize() {
         long cacheSize;
         try {
@@ -114,13 +116,15 @@ public String getTotalCacheSize() {
         return getFormatSize(cacheSize);
     }
 
+
     public String getFormatSize(long size) {
         long kb = size / 1024;
         int m = (int) (kb / 1024);
         int kbs = (int) (kb % 1024);
         return m + "." + kbs + "MB";
     }
 
+
     public long getFolderSize(File file) throws Exception {
         long size = 0;
         try {
@@ -139,8 +143,8 @@ public long getFolderSize(File file) throws Exception {
         return size;
     }
 
+
     public void clearAllCache() {
-        deleteDir(this.getCacheDir());
         if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
             if (deleteDir(this.getExternalCacheDir())) {
                 Log.d(TAG, "clearAllCache:  ");
@@ -150,19 +154,21 @@ public void clearAllCache() {
         }
     }
 
+
     private boolean deleteDir(File dir) {
         if (dir != null && dir.isDirectory()) {
             String[] children = dir.list();
-            for (int i = 0; i < children.length; i++) {
-                boolean success = deleteDir(new File(dir, children[i]));
+            for (String child : children) {
+                boolean success = deleteDir(new File(dir, child));
                 if (!success) {
                     return false;
                 }
             }
         }
-        return dir.delete();
+        return dir != null && dir.delete();
     }
 
+
     @Override
     public void finish() {
         Log.d(TAG, "finish: ");