移除qq音乐

caiyonglong · Dec 19, 2018 · 9b98fdb · 9b98fdb
1 parent 1c8a8e7
commit 9b98fdb
Show file tree

Hide file tree

Showing 21 changed files with 162 additions and 510 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "com.cyl.musiclake"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 26
-        versionName "4.1.9.1"
+        versionCode 27
+        versionName "4.2.0"
         multiDexEnabled true
         android.compileOptions.sourceCompatibility 1.8
         android.compileOptions.targetCompatibility 1.8

diff --git a/app/src/main/java/com/cyl/musiclake/ui/main/MainActivity.java b/app/src/main/java/com/cyl/musiclake/ui/main/MainActivity.java
@@ -157,16 +157,16 @@ private void initNavView() {
             mBindNeteaseView.setVisibility(View.GONE);
             NavigationHelper.INSTANCE.navigateFragment(this, new BindLoginFragment());
         });
-        mShowBindIv.setOnClickListener(view -> {
-            if (!isUp) {
-                mBindNeteaseView.setVisibility(View.VISIBLE);
-                mShowBindIv.setImageResource(R.drawable.ic_arrow_drop_up);
-            } else {
-                mBindNeteaseView.setVisibility(View.GONE);
-                mShowBindIv.setImageResource(R.drawable.ic_arrow_drop_down);
-            }
-            isUp = !isUp;
-        });
+//        mShowBindIv.setOnClickListener(view -> {
+//            if (!isUp) {
+//                mBindNeteaseView.setVisibility(View.VISIBLE);
+//                mShowBindIv.setImageResource(R.drawable.ic_arrow_drop_up);
+//            } else {
+//                mBindNeteaseView.setVisibility(View.GONE);
+//                mShowBindIv.setImageResource(R.drawable.ic_arrow_drop_down);
+//            }
+//            isUp = !isUp;
+//        });
 
     }
 
@@ -389,15 +389,15 @@ private void setUserStatusInfo(Boolean isLogin, User user) {
             CoverLoader.loadImageView(this, url, R.drawable.ic_account_circle, mAvatarIcon);
             mName.setText(user.getNick());
             mLoginTv.setVisibility(View.GONE);
-            mShowBindIv.setVisibility(View.VISIBLE);
+//            mShowBindIv.setVisibility(View.VISIBLE);
             mNavigationView.getMenu().findItem(R.id.nav_login_status).setTitle(getResources().getString(R.string.logout_hint))
                     .setIcon(R.drawable.ic_exit);
         } else {
             MusicApp.socketManager.toggleSocket(false);
             mAvatarIcon.setImageResource(R.drawable.ic_account_circle);
             mName.setText(getResources().getString(R.string.app_name));
             mLoginTv.setVisibility(View.GONE);
-            mShowBindIv.setVisibility(View.GONE);
+//            mShowBindIv.setVisibility(View.GONE);
             mNavigationView.getMenu().findItem(R.id.nav_login_status).setTitle(getResources().getString(R.string.login_hint))
                     .setIcon(R.drawable.ic_exit);
 
@@ -514,4 +514,5 @@ private void initCountDownView() {
             }
         });
     }
+
 }
diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/charts/fragment/ChartsDetailFragment.kt b/app/src/main/java/com/cyl/musiclake/ui/music/charts/fragment/ChartsDetailFragment.kt
@@ -53,7 +53,7 @@ class ChartsDetailFragment : BaseLazyFragment<OnlinePlaylistPresenter>(), Online
         showLoading()
         when (chartsType) {
             Constants.BAIDU -> mPresenter?.loadBaiDuPlaylist()
-            Constants.QQ -> mPresenter?.loadQQList()
+//            Constants.QQ -> mPresenter?.loadQQList()
             Constants.NETEASE -> mPresenter?.loadTopList()
         }
     }

diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/charts/fragment/ChartsFragment.java b/app/src/main/java/com/cyl/musiclake/ui/music/charts/fragment/ChartsFragment.java
@@ -50,7 +50,7 @@ public int getLayoutId() {
     public void initViews() {
         PageAdapter adapter = new PageAdapter(getChildFragmentManager());
         adapter.addFragment(ChartsDetailFragment.Companion.newInstance(Constants.BAIDU), "百度音乐榜单");
-        adapter.addFragment(ChartsDetailFragment.Companion.newInstance(Constants.QQ), "qq音乐榜单");
+//        adapter.addFragment(ChartsDetailFragment.Companion.newInstance(Constants.QQ), "qq音乐榜单");
         adapter.addFragment(ChartsDetailFragment.Companion.newInstance(Constants.NETEASE), "网易云音乐榜单");
         mViewpager.setAdapter(adapter);
         mTabLayout.setupWithViewPager(mViewpager);

diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/importplaylist/ImportPlaylistActivity.kt b/app/src/main/java/com/cyl/musiclake/ui/music/importplaylist/ImportPlaylistActivity.kt
@@ -100,17 +100,17 @@ class ImportPlaylistActivity : BaseActivity<BasePresenter<BaseContract.BaseView>
                     val id = link.substring(len, len + link.substring(len).indexOf("/"))
                     importMusic(Constants.NETEASE, id)
                 }
-                link.contains("y.qq.com") -> {
-                    val len = link.lastIndexOf("id=") + "id=".length
-
-                    val idString = link.substring(len)
-                    val id = if (idString.indexOf("&") > 0) {
-                        link.substring(len, len + link.substring(len).indexOf("&")).trim()
-                    } else {
-                        idString
-                    }
-                    importMusic(Constants.QQ, id)
-                }
+//                link.contains("y.qq.com") -> {
+//                    val len = link.lastIndexOf("id=") + "id=".length
+//
+//                    val idString = link.substring(len)
+//                    val id = if (idString.indexOf("&") > 0) {
+//                        link.substring(len, len + link.substring(len).indexOf("&")).trim()
+//                    } else {
+//                        idString
+//                    }
+//                    importMusic(Constants.QQ, id)
+//                }
                 link.contains("www.xiami.com") -> {
                     val len = link.lastIndexOf("collect/") + "collect/".length
                     val end = if (link.indexOf("?") == -1) link.indexOf("(") else link.indexOf("?")

diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/search/SearchActivity.kt b/app/src/main/java/com/cyl/musiclake/ui/music/search/SearchActivity.kt
@@ -211,9 +211,9 @@ class SearchActivity : BaseActivity<SearchPresenter>(), SearchContract.View {
             R.id.menu_filter_baidu -> {
                 changeFilter(item, SearchEngine.Filter.BAIDU)
             }
-            R.id.menu_filter_qq -> {
-                changeFilter(item, SearchEngine.Filter.QQ)
-            }
+//            R.id.menu_filter_qq -> {
+//                changeFilter(item, SearchEngine.Filter.QQ)
+//            }
             R.id.menu_filter_xiami -> {
                 changeFilter(item, SearchEngine.Filter.XIAMI)
             }
@@ -364,7 +364,7 @@ class SearchActivity : BaseActivity<SearchPresenter>(), SearchContract.View {
         filter[SearchEngine.Filter.CP] = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("key_search_filter_cp", true)
         filter[SearchEngine.Filter.REPEAT] = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("key_search_filter_repeat", true)
 
-        menu.findItem(R.id.menu_filter_qq).isChecked = filter[SearchEngine.Filter.QQ] ?: true
+//        menu.findItem(R.id.menu_filter_qq).isChecked = filter[SearchEngine.Filter.QQ] ?: true
         menu.findItem(R.id.menu_filter_xiami).isChecked = filter[SearchEngine.Filter.XIAMI] ?: true
         menu.findItem(R.id.menu_filter_netease).isChecked = filter[SearchEngine.Filter.NETEASE] ?: true
         menu.findItem(R.id.menu_filter_baidu).isChecked = filter[SearchEngine.Filter.BAIDU] ?: true

diff --git a/app/src/main/java/com/cyl/musiclake/ui/music/search/SearchPresenter.kt b/app/src/main/java/com/cyl/musiclake/ui/music/search/SearchPresenter.kt
@@ -60,7 +60,7 @@ constructor() : BasePresenter<SearchContract.View>(), SearchContract.Presenter {
         mView?.showLoading()
         val observable = Observable.mergeDelayError(
                 BaiduApiServiceImpl.getSearchMusicInfo(key, limit, page),
-                MusicApiServiceImpl.searchMusic(key, SearchEngine.Filter.QQ, limit, page),
+//                MusicApiServiceImpl.searchMusic(key, SearchEngine.Filter.QQ, limit, page),
                 MusicApiServiceImpl.searchMusic(key, SearchEngine.Filter.XIAMI, limit, page),
                 MusicApiServiceImpl.searchMusic(key, SearchEngine.Filter.NETEASE, limit, page))
 //                Function4<MutableList<Music>, MutableList<Music>, MutableList<Music>, MutableList<Music>, MutableList<Music>> { t1, t2, t3, t4 ->

diff --git a/app/src/main/java/com/cyl/musiclake/ui/settings/AboutActivity.java b/app/src/main/java/com/cyl/musiclake/ui/settings/AboutActivity.java
@@ -82,6 +82,11 @@ void toUpdate() {
         Beta.checkUpgrade();
     }
 
+    @OnClick(R.id.email_feedback)
+    void toEmailFeedback() {
+        Tools.INSTANCE.feeback(this);
+    }
+
     @Override
     protected int getLayoutResID() {
         return R.layout.activity_about;

diff --git a/app/src/main/res/drawable-xhdpi/donate_alipay.webp b/app/src/main/res/drawable-xhdpi/donate_alipay.webp
diff --git a/app/src/main/res/drawable-xhdpi/donate_wechat.webp b/app/src/main/res/drawable-xhdpi/donate_wechat.webp
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -22,6 +22,7 @@
             <include layout="@layout/card_about_1" />
 
             <include layout="@layout/card_about_2" />
+            <!--<include layout="@layout/card_about_3" />-->
 
         </LinearLayout>
     </android.support.v4.widget.NestedScrollView>

diff --git a/app/src/main/res/layout/card_about_2.xml b/app/src/main/res/layout/card_about_2.xml
@@ -5,10 +5,7 @@
     android:id="@+id/card_about_2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="32dp"
-    android:layout_marginEnd="@dimen/dp_8"
-    android:layout_marginStart="@dimen/dp_8"
-    android:layout_marginTop="@dimen/dp_8"
+    android:layout_margin="@dimen/dp_8"
     android:background="@color/white"
     card_view:cardCornerRadius="2dp"
     card_view:cardElevation="2dp">
@@ -156,6 +153,28 @@
                 android:textColor="@color/black"
                 tools:text="0" />
         </LinearLayout>
+        <LinearLayout
+            android:id="@+id/email_feedback"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:focusable="true">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/text_margin"
+                android:src="@drawable/ic_feedback" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/text_margin"
+                android:text="@string/about_feedback" />
+
+        </LinearLayout>
 
 
         <!--<LinearLayout-->

diff --git a/app/src/main/res/layout/card_about_3.xml b/app/src/main/res/layout/card_about_3.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/card_about_2"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="32dp"
+    android:layout_marginTop="@dimen/dp_8"
+    android:layout_marginEnd="@dimen/dp_8"
+    android:layout_marginStart="@dimen/dp_8"
+    android:background="@color/white"
+    card_view:cardCornerRadius="2dp"
+    card_view:cardElevation="2dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_card_about_2_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/text_margin"
+            android:text="支持与捐赠"
+            android:textColor="@color/colorAccent"
+            android:textStyle="bold" />
+
+        <View
+            android:id="@+id/view_card_about_2_line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/main_background" />
+
+        <LinearLayout
+            android:id="@+id/cardEmailView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:clickable="true"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_weight="1"
+                android:layout_width="@dimen/dp_120"
+                android:layout_height="@dimen/dp_120"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/text_margin"
+                android:src="@drawable/donate_alipay" />
+
+            <ImageView
+                android:layout_weight="1"
+                android:layout_width="@dimen/dp_120"
+                android:layout_height="@dimen/dp_120"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/text_margin"
+                android:src="@drawable/donate_wechat" />
+
+        </LinearLayout>
+
+
+        <!--<LinearLayout-->
+        <!--android:id="@+id/ll_card_about_source_licenses"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:background="?android:selectableItemBackground"-->
+        <!--android:clickable="true"-->
+        <!--android:orientation="horizontal">-->
+
+        <!--<ImageView-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_gravity="center_vertical"-->
+        <!--android:layout_margin="@dimen/text_margin"-->
+        <!--android:src="@drawable/ic_copyright_black_24dp" />-->
+
+        <!--<TextView-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_gravity="center_vertical"-->
+        <!--android:layout_margin="@dimen/text_margin"-->
+        <!--android:text="@string/about_source_licenses"-->
+        <!--android:textStyle="italic" />-->
+        <!--</LinearLayout>-->
+
+    </LinearLayout>
+</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/frag_discover.xml b/app/src/main/res/layout/frag_discover.xml
@@ -66,6 +66,7 @@
                             android:background="?android:attr/selectableItemBackgroundBorderless"
                             android:drawableTop="@drawable/ic_supervisor_account"
                             android:gravity="center"
+                            android:visibility="gone"
                             android:text="@string/all_artist" />
 
                         <TextView

diff --git a/app/src/main/res/menu/menu_all.xml b/app/src/main/res/menu/menu_all.xml
@@ -45,10 +45,10 @@
                 android:id="@+id/nav_menu_about"
                 android:icon="@drawable/ic_about"
                 android:title="@string/pref_title_about" />
-            <item
-                android:id="@+id/nav_menu_feedback"
-                android:icon="@drawable/ic_feedback"
-                android:title="@string/about_feedback" />
+            <!--<item-->
+                <!--android:id="@+id/nav_menu_feedback"-->
+                <!--android:icon="@drawable/ic_feedback"-->
+                <!--android:title="@string/about_feedback" />-->
             <item
                 android:id="@+id/nav_menu_setting"
                 android:icon="@mipmap/icon_setting"

diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
@@ -18,10 +18,10 @@
             <group
                 android:id="@+id/search_filter_group"
                 android:checkableBehavior="all">
-                <item
-                    android:id="@+id/menu_filter_qq"
-                    android:checked="true"
-                    android:title="@string/qq" />
+                <!--<item-->
+                    <!--android:id="@+id/menu_filter_qq"-->
+                    <!--android:checked="true"-->
+                    <!--android:title="@string/qq" />-->
                 <item
                     android:id="@+id/menu_filter_xiami"
                     android:checked="true"

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml