Skip to content

Commit

Permalink
update tp 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yemingm committed Jun 13, 2018
1 parent 663507f commit 261b5d4
Show file tree
Hide file tree
Showing 581 changed files with 11,921 additions and 5,690 deletions.
1 change: 1 addition & 0 deletions app/.gitignore
@@ -0,0 +1 @@
/build
80 changes: 44 additions & 36 deletions app/build.gradle 100644 → 100755
@@ -1,36 +1,44 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "26.0.2"

defaultConfig {
applicationId "com.upyun.shortvideo"
minSdkVersion 18
targetSdkVersion 22
}

buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
}
}
defaultConfig {
ndk {
abiFilters "armeabi", "armeabi-v7a"
}
}
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:recyclerview-v7:25.1.1'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
compile 'com.upyun:upyun-android-sdk:2.0.4'
// compile files('libs/TuSDKCore-2.8.3.jar')
// compile files('libs/TuSDKFace-1.0.0.jar')
// compile files('libs/TuSDKVideo-1.8.0.jar')
// compile files('libs/bugly_crash_release_2.6.5.jar')
compile project(':upplayer')
}
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "26.0.2"
defaultConfig {
applicationId "com.upyun.shortvideo"
minSdkVersion 18
targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
//Zipalign优化
// zipAlignEnabled true
// 移除无用的resource文件
// shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
lintOptions {
checkReleaseBuilds false
abortOnError false
}
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
compile files('libs/bugly_crash_release_2.6.5.jar')
compile 'com.github.bumptech.glide:glide:3.7.0'
compile files('libs/TuSDKVideo-2.0.0.jar')
compile files('libs/TuSDKCore-2.9.1.jar')
compile files('libs/TuSDKFace-2.0.0.jar')
compile 'com.android.support:recyclerview-v7:26.0.1'
implementation 'com.android.support:appcompat-v7:26.0.1'
implementation project(':upplayer')
}
Binary file renamed app/libs/TuSDKCore-2.9.0.jar → app/libs/TuSDKCore-2.9.1.jar 100644 → 100755
Binary file not shown.
Binary file removed app/libs/TuSDKFace-1.0.0.jar
Binary file not shown.
Binary file added app/libs/TuSDKFace-2.0.0.jar
Binary file not shown.
Binary file removed app/libs/TuSDKVideo-1.11.0.jar
Binary file not shown.
Binary file added app/libs/TuSDKVideo-2.0.0.jar
Binary file not shown.
Empty file modified app/libs/bugly_crash_release_2.6.5.jar 100644 → 100755
Empty file.
Binary file added app/libs/universal-image-loader-1.9.4.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions app/lint.xml

This file was deleted.

65 changes: 35 additions & 30 deletions app/proguard-project.txt → app/proguard-rules.pro 100644 → 100755
Expand Up @@ -18,7 +18,6 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

-keepattributes Signature
-keepattributes *Annotation*
-keepattributes InnerClasses
Expand All @@ -29,9 +28,9 @@
<fields>;
}

# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
-keepclasseswithmembernames class * {
native <methods>;
# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
-keepclasseswithmembernames class * {
native <methods>;
}

-keepclassmembers class * implements java.io.Serializable {
Expand All @@ -42,41 +41,47 @@
java.lang.Object readResolve();
}

# keep setters in Views so that animations can still work.
# see http://proguard.sourceforge.net/manual/examples.html#beans
-keepclassmembers public class * extends android.view.View {
void set*(***);
*** get*();
}
# We want to keep methods in Activity that could be used in the XML attribute onClick
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}
# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
-keep class * implements android.os.Parcelable {
public static final android.os.Parcelable$Creator *;
# keep setters in Views so that animations can still work.
# see http://proguard.sourceforge.net/manual/examples.html#beans
-keepclassmembers public class * extends android.view.View {
void set*(***);
*** get*();
}

# We want to keep methods in Activity that could be used in the XML attribute onClick
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}

# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}

-keep class * implements android.os.Parcelable {
public static final android.os.Parcelable$Creator *;
}



-verbose
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*

# The support library contains references to newer platform versions.
# Don't warn about those in case this app is linking against an older
# platform version. We know about them, and they are safe.

# The support library contains references to newer platform versions.
# Don't warn about those in case this app is linking against an older
# platform version. We know about them, and they are safe.
-dontwarn android.support.**
-dontwarn org.apache.commons.**
-dontwarn com.nostra13.**
-dontwarn org.lasque.**

-keep class org.apache.commons.**{ *; }

-keep class org.lasque.tusdk.**{public *; protected *; }
-keep class org.lasque.tusdk.core.utils.image.GifHelper{ *; }
-keep class org.lasque.tusdk.core.utils.image.GifHelper{ *; }
-keep class com.nineoldandroids.**{ *; }

# 解决此类问题:Error: Can't find common super class of...
-dontoptimize
-dontpreverify
@@ -0,0 +1,26 @@
package com.example.app;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumentation test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.example.app", appContext.getPackageName());
}
}

0 comments on commit 261b5d4

Please sign in to comment.