v3.2

OpenSourceWear · Aug 18, 2021 · b69fb34 · b69fb34
1 parent 2daa631
commit b69fb34
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 9 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "cn.wearbbs.music"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 8
-        versionName "3.1"
+        versionCode 9
+        versionName "3.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -49,4 +49,8 @@ dependencies {
     implementation 'cn.carbs.android:ExpandableTextView:1.0.3'
     implementation 'me.panpf:sketch:2.7.1'
     implementation 'com.google.zxing:core:3.4.0'
+
+    def appCenterSdkVersion = '4.1.0'
+    implementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
+    implementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
 }
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 8,
-      "versionName": "3.1",
+      "versionCode": 9,
+      "versionName": "3.2",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
         tools:ignore="ScopedStorage" />
 
     <application
+        android:name=".application.MainApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"

diff --git a/app/src/main/java/cn/wearbbs/music/application/MainApplication.java b/app/src/main/java/cn/wearbbs/music/application/MainApplication.java
@@ -0,0 +1,21 @@
+package cn.wearbbs.music.application;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+
+import com.microsoft.appcenter.AppCenter;
+import com.microsoft.appcenter.analytics.Analytics;
+import com.microsoft.appcenter.crashes.Crashes;
+
+/**
+ * @author JackuXL
+ */
+public class MainApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        AppCenter.start(this, "2d48333f-2592-446d-a227-7102be9ab4dd", Analytics.class, Crashes.class);
+    }
+
+}
diff --git a/app/src/main/java/cn/wearbbs/music/fragment/LyricsFragment.java b/app/src/main/java/cn/wearbbs/music/fragment/LyricsFragment.java
@@ -54,6 +54,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
             musicIndex = getArguments().getInt("musicIndex");
             local = getArguments().getBoolean("local");
             lrcView = view.findViewById(R.id.lv_main);
+            lrcView.setDraggable(true, (lrcView, time) -> {
+                PlayerFragment.seekTo(time);
+                return true;
+            });
             updateLyric(requireContext());
             new Thread(){
                 @Override

diff --git a/app/src/main/java/cn/wearbbs/music/fragment/PlayerFragment.java b/app/src/main/java/cn/wearbbs/music/fragment/PlayerFragment.java
@@ -37,7 +37,7 @@
 public class PlayerFragment extends Fragment {
     private static JSONArray data;
     private static int musicIndex;
-    private static MusicPlayerService.MyBinder binder;
+    public static MusicPlayerService.MyBinder binder;
     private boolean local;
     public static int order = 0;
     public static final int PLAY_ORDER = 0,
@@ -338,4 +338,8 @@ public static void setPlayOrder(int orderId){
     public static int getPlayOrder(){
         return order;
     }
+
+    public static void seekTo(long time){
+        binder.seekTo(time);
+    }
 }
diff --git a/app/src/main/java/cn/wearbbs/music/service/MusicPlayerService.java b/app/src/main/java/cn/wearbbs/music/service/MusicPlayerService.java
@@ -206,5 +206,12 @@ public void setPlayOrder(int orderId){
                     break;
             }
         }
+
+        public void seekTo(long time){
+            if(mMediaPlayer!=null){
+                mMediaPlayer.seekTo((int)time);
+            }
+
+        }
     }
 }
diff --git a/app/src/main/java/cn/wearbbs/music/ui/AboutActivity.java b/app/src/main/java/cn/wearbbs/music/ui/AboutActivity.java
@@ -33,4 +33,7 @@ public void onClick(View view) {
         }
 
     }
+    public void crash(View view){
+        findViewById(R.id.iv_thumb).setVisibility(View.VISIBLE);
+    }
 }
diff --git a/app/src/main/java/cn/wearbbs/music/ui/AddMusicActivity.java b/app/src/main/java/cn/wearbbs/music/ui/AddMusicActivity.java
@@ -4,6 +4,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
@@ -57,6 +58,9 @@ public void onClick(View view){
             case R.id.main_title:
                 finish();
                 break;
+            case R.id.tv_path:
+                startActivity(new Intent(AddMusicActivity.this,QRCodeActivity.class).putExtra("url", String.format("%s\n%s\n%s", getString(R.string.musicRoot), getString(R.string.lyricsRoot),getString(R.string.coverRoot))));
+                break;
         }
     }
 

diff --git a/app/src/main/java/cn/wearbbs/music/ui/MainActivity.java b/app/src/main/java/cn/wearbbs/music/ui/MainActivity.java
@@ -9,6 +9,10 @@
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.viewpager2.widget.ViewPager2;
 
+import com.microsoft.appcenter.AppCenter;
+import com.microsoft.appcenter.analytics.Analytics;
+import com.microsoft.appcenter.crashes.Crashes;
+
 import api.MusicApi;
 import cn.wearbbs.music.R;
 import cn.wearbbs.music.adapter.ViewPagerAdapter;
@@ -27,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
             NetWorkUtil.setDomain("https://music.wearbbs.cn");
         }
         else{
-            NetWorkUtil.setDomain("https://netease-cloud-music-api-dun-nine.vercel.app");
+            NetWorkUtil.setDomain("https://netease-cloud-music-api-jackuxl.vercel.app");
         }
 
         if (SharedPreferencesUtil.getBoolean("dark", false, this)) {
@@ -90,4 +94,5 @@ public void hideTip() {
         findViewById(R.id.tv_tip_background).setVisibility(View.GONE);
         findViewById(R.id.ll_tip).setVisibility(View.GONE);
     }
+
 }
diff --git a/app/src/main/java/cn/wearbbs/music/ui/SettingsActivity.java b/app/src/main/java/cn/wearbbs/music/ui/SettingsActivity.java
@@ -6,9 +6,11 @@
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import cn.wearbbs.music.R;
+import util.NetWorkUtil;
 
 /**
  * 设置
@@ -60,6 +62,19 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 startActivity(new Intent(getActivity(), OpenSourceActivity.class));
                 return true;
             });
+
+            findPreference("server").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    if(newValue.equals("vercel")){
+                        NetWorkUtil.setDomain("https://netease-cloud-music-api-jackuxl.vercel.app");
+                    }
+                    else{
+                        NetWorkUtil.setDomain("https://music.wearbbs.cn");
+                    }
+                    return true;
+                }
+            });
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_addmusic.xml b/app/src/main/res/layout/activity_addmusic.xml
@@ -44,6 +44,18 @@
 
         </RelativeLayout>
 
+        <TextView
+            android:id="@+id/tv_path"
+            android:layout_width="match_parent"
+            android:layout_height="25dp"
+            android:background="#BF2175F3"
+            android:gravity="center"
+            android:onClick="onClick"
+            android:text="@string/path_hint"
+            android:textColor="#FFFFFF"
+            android:textSize="10sp"
+            tools:ignore="SmallSp,TextContrastCheck,TouchTargetSizeCheck" />
+
         <LinearLayout
             android:id="@+id/ll_ftp"
             android:layout_width="match_parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -96,4 +96,9 @@
     <string name="send">发送</string>
     <string name="server">服务器偏好</string>
     <string name="noLogin">未登录</string>
+    <string name="path_hint"><![CDATA[储存位置 >]]></string>
+    <string name="musicRoot">音乐储存位置：\n/storage/emulated/0/Android/data/cn.wearbbs.music/files/download/music/</string>
+    <string name="lyricsRoot">歌词储存位置：\n/storage/emulated/0/Android/data/cn.wearbbs.music/files/download/lrc/</string>
+    <string name="coverRoot">封面储存位置：\n/storage/emulated/0/Android/data/cn.wearbbs.music/files/download/cover/</string>
+
 </resources>
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,7 @@ public void onClick(View view) { @@
             }
         }
+        public void crash(View view){
+            findViewById(R.id.iv_thumb).setVisibility(View.VISIBLE);
+        }
     }