update readMe

DaiYz · Dec 4, 2019 · 6fbdc06 · 6fbdc06
1 parent 5ec2b6c
commit 6fbdc06
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -3,23 +3,23 @@
 
 ## 截图
 <p>
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/find.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/find.png" width="250" height="444" />
 <img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/findBottom.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/topList.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/toplistBottom.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/topListDetail.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/Dj.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/djType.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/payQuality.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/mv.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/mvTop.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/mvPlay.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/mvFullScreen.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/mine.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/playlist.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/audioPlay.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/friends.png" width="250" height="444" />
-<img alt="NetEaseCloudMusic" src="https://raw.githubusercontent.com/DaiYz/NetEaseCloudMusic/master/screenshot/account.png" width="250" height="444" /></p>
+<img alt="NetEaseCloudMusic" src="./screenshot/topList.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/toplistBottom.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/topListDetail.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/Dj.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/djType.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/payQuality.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/mv.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/mvTop.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/mvPlay.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/mvFullScreen.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/mine.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/playlist.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/audioPlay.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/friends.png" width="250" height="444" />
+<img alt="NetEaseCloudMusic" src="./screenshot/account.png" width="250" height="444" /></p>
 
 ## 运行
 ```

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -93,6 +93,7 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -106,8 +107,11 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        renderscriptTargetApi 23
-        renderscriptSupportModeEnabled true
+       // renderscriptTargetApi 23
+       // renderscriptSupportModeEnabled true
+        ndk {
+           abiFilters "armeabi-v7a", "x86"
+       }
     }
     splits {
         abi {
@@ -117,10 +121,21 @@ android {
             include "armeabi-v7a", "x86", "arm64-v8a"
         }
     }
+
+    signingConfigs {
+         release {
+             storeFile file(MYAPP_RELEASE_STORE_FILE)
+             storePassword MYAPP_RELEASE_STORE_PASSWORD
+             keyAlias MYAPP_RELEASE_KEY_ALIAS
+             keyPassword MYAPP_RELEASE_KEY_PASSWORD
+         }
+    }
+
     buildTypes {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release
@@ -145,7 +160,7 @@ dependencies {
     implementation project(':react-native-sound')
     implementation project(':react-native-fs')
     implementation project(':react-native-audio')
-    implementation project(':lottie-react-native')
+//    implementation project(':lottie-react-native')
     implementation project(':react-native-vector-icons')
     implementation project(':react-native-svg')
     implementation project(':react-native-splash-screen')

diff --git a/android/app/src/main/java/com/easymusic/MainApplication.java b/android/app/src/main/java/com/easymusic/MainApplication.java
@@ -8,7 +8,7 @@
 import com.zmxv.RNSound.RNSoundPackage;
 import com.rnfs.RNFSPackage;
 import com.rnim.rn.audio.ReactNativeAudioPackage;
-import com.airbnb.android.react.lottie.LottiePackage;
+//import com.airbnb.android.react.lottie.LottiePackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.horcrux.svg.SvgPackage;
 import org.devio.rn.splashscreen.SplashScreenReactPackage;
@@ -39,7 +39,7 @@ protected List<ReactPackage> getPackages() {
             new RNSoundPackage(),
             new RNFSPackage(),
             new ReactNativeAudioPackage(),
-            new LottiePackage(),
+//            new LottiePackage(),
             new VectorIconsPackage(),
             new SvgPackage(),
             new SplashScreenReactPackage(),

diff --git a/android/build.gradle b/android/build.gradle
@@ -2,18 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.2"
+        buildToolsVersion = "27.0.3"
         minSdkVersion = 16
         compileSdkVersion = 28
-        targetSdkVersion = 27
-        supportLibVersion = "28.0.0"
+        targetSdkVersion = 26
+        supportLibVersion = "27.1.0"
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -34,6 +34,25 @@ allprojects {
 
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.7'
+    gradleVersion = '4.4'
     distributionUrl = distributionUrl.replace("bin", "all")
 }
+
+subprojects {
+    project.configurations.all {
+        afterEvaluate {project ->
+            if (project.hasProperty("android")) {
+                android {
+                    compileSdkVersion 26
+                    buildToolsVersion '26.0.2'
+                }
+            }
+        }
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'com.android.support'
+                    && !details.requested.name.contains('multidex') ) {
+                details.useVersion "26.0.2"
+            }
+        }
+    }
+}
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -16,3 +16,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+MYAPP_RELEASE_STORE_FILE=key-store
+MYAPP_RELEASE_KEY_ALIAS=key0
+MYAPP_RELEASE_STORE_PASSWORD=e5b58b6303b8fab282545f1ce167635c
+MYAPP_RELEASE_KEY_PASSWORD=ef39fbf69170b58787ce4e574db9d842
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions/gradle-4.7-all.zip
+distributionUrl=http://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -11,8 +11,8 @@ include ':react-native-fs'
 project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
 include ':react-native-audio'
 project(':react-native-audio').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-audio/android')
-include ':lottie-react-native'
-project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android')
+//include ':lottie-react-native'
+//project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android')
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 include ':react-native-svg'

diff --git a/package.json b/package.json
@@ -4,6 +4,9 @@
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
+    "bundle:android": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res",
+    "bundle:ios": "react-native bundle --entry-file='index.js' --bundle-output='./ios/dacsee/main.jsbundle' --dev=false --platform='ios' --assets-dest='./ios'",
+    "build:android": "cd android && npm run bundle:android && ./gradlew assembleRelease && mv ./app/build/outputs/apk/release/app-release.apk ~/Lib/Android/music/release.apk",
     "test": "jest"
   },
   "dependencies": {