Skip to content

Commit

Permalink
Completely reconstructed with the MVVM structure. Released v3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
woxingxiao committed Sep 13, 2018
1 parent fe57eab commit 1b22952
Show file tree
Hide file tree
Showing 259 changed files with 5,926 additions and 9,314 deletions.
4 changes: 2 additions & 2 deletions SlideBack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
provided "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
api fileTree(dir: 'libs', include: ['*.jar'])
compileOnly "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
// provided 'com.android.support:design:24.2.1'
}
109 changes: 66 additions & 43 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.xw.project.gracefulmovies"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 30
versionName "2.0.3"
versionCode 56
versionName "3.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand All @@ -18,12 +18,19 @@ android {
renderscriptSupportModeEnabled true

resConfigs "zh" // 仅支持中文

ndk {
abiFilters 'armeabi', 'armeabi-v7a', 'armeabi-v8a'//, 'x86'
}
}
dataBinding {
enabled = true
}
buildTypes {
release {
minifyEnabled true
zipAlignEnabled true
shrinkResources true
minifyEnabled false
zipAlignEnabled false
shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand All @@ -48,78 +55,94 @@ android {
}
// 编译选项
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
packagingOptions {
exclude 'META-INF/rxjava.properties'
}

// recommend
dexOptions {
jumboMode = true
android.applicationVariants.all { variant ->
variant.outputs.all { output ->
outputFileName = "jianyingxun-v" + variant.versionName + '_Build' + variant.versionCode + "_" + variant.buildType.name + '.apk'
}
}
}

andResGuard {
mappingFile = file("./resource_mapping.txt")
// mappingFile = file("./resource_mapping.txt")
mappingFile = null
use7zip = true
useSign = true
keepRoot = false
// 白名单
whiteList = [
"R.mipmap.ic_launcher", // ic_launcher
"R.style.primary*", // Colorful框架
"R.style.accent*", // Colorful框架
"R.mipmap.*", // ic_launcher
"R.id.*"
]
compressFilePattern = [
"*.png",
"*.jpg",
"*.jpeg",
"*.webp",
"resources.arsc"
"*.webp"
]
sevenzip {
artifact = 'com.tencent.mm:SevenZip:1.2.3'
artifact = 'com.tencent.mm:SevenZip:1.2.14'
//path = "/usr/local/bin/7za"
}
}

ext {
butter_knife_version = "8.8.1"
retrofit_version = "2.3.0"
arch = "1.1.1"
retrofit_version = "2.4.0"
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
compile "com.android.support:cardview-v7:$rootProject.ext.supportLibraryVersion"
testCompile 'junit:junit:4.12'
compile "com.jakewharton:butterknife:$butter_knife_version"
annotationProcessor "com.jakewharton:butterknife-compiler:$butter_knife_version"
compile 'com.github.bumptech.glide:glide:3.8.0'
compile 'io.reactivex:rxjava:1.3.0'
compile 'io.reactivex:rxandroid:1.2.1'
compile "com.squareup.retrofit2:retrofit:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
compile('com.github.ihsanbal:LoggingInterceptor:2.0.0') {
testImplementation 'junit:junit:4.12'

implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
implementation "com.android.support:cardview-v7:$rootProject.ext.supportLibraryVersion"
implementation "com.android.support:palette-v7:$rootProject.ext.supportLibraryVersion"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "android.arch.lifecycle:runtime:$arch"
implementation "android.arch.lifecycle:extensions:$arch"
implementation "android.arch.lifecycle:common-java8:$arch"
annotationProcessor "android.arch.lifecycle:compiler:$arch"
implementation "android.arch.persistence.room:runtime:$arch"
annotationProcessor "android.arch.persistence.room:compiler:$arch"
implementation "android.arch.persistence.room:rxjava2:$arch"

implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
implementation("com.squareup.retrofit2:retrofit:$retrofit_version") {
exclude group: 'io.reactivex.rxjava2'
}
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
implementation("com.squareup.retrofit2:adapter-rxjava2:$retrofit_version") {
exclude group: 'io.reactivex'
}
implementation('com.github.ihsanbal:LoggingInterceptor:2.0.7') {
exclude group: 'org.json', module: 'json'
}
compile('com.iarcuschin:simpleratingbar:0.1.5') {
implementation 'com.yanzhenjie:permission:2.0.0-rc12'
implementation('com.iarcuschin:simpleratingbar:0.1.5') {
exclude group: 'com.android.support'
exclude group: 'org.androidannotations'
}
compile 'com.xw.repo:bubbleseekbar:3.8@aar'
compile 'com.github.woxingxiao:VectorCompatTextView:2.5'
compile 'com.flaviofaria:kenburnsview:1.0.7'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile('com.yarolegovich:discrete-scrollview:1.3.0') {
implementation 'com.github.bumptech.glide:glide:3.8.0'
implementation 'com.xw.repo:bubbleseekbar:3.8@aar'
implementation 'com.github.woxingxiao:VectorCompatTextView:2.5'
implementation 'com.github.woxingxiao:BounceScrollView:1.1'
implementation 'com.tencent.bugly:crashreport_upgrade:1.3.5'
implementation('com.yarolegovich:discrete-scrollview:1.3.0') {
exclude group: 'com.android.support'
}
implementation 'com.github.chrisbanes:PhotoView:2.1.3'

compile project(':library')
compile project(':SlideBack')
}
implementation project(':SlideBack')
}
12 changes: 2 additions & 10 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@
public *;
}

# okhttp
-dontwarn okio.**
-keep class okio.** {*;}
-keep class com.squareup.wire.** {*;}

# retrofit
-dontwarn okio.**
-dontwarn javax.annotation.**
Expand All @@ -83,9 +78,6 @@
-dontwarn rx.**
-dontwarn rx.internal.util.**

# bugly
-dontwarn com.tencent.bugly.**
-keep public class com.tencent.bugly.**{*;}

# Model
-keep class com.xw.project.gracefulmovies.model.** { *; }
-keep class com.xw.project.gracefulmovies.data.ao.** { *; }
-keep class com.xw.project.gracefulmovies.data.db.entity.** { *; }
33 changes: 12 additions & 21 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,66 +9,57 @@
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<uses-permission android:name="android.permission.READ_LOGS"/>

<application
android:name=".GMApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/AppTheme">
<activity
android:name=".view.activity.SplashActivity"
android:screenOrientation="portrait">
android:name=".ui.activity.SplashActivity"
android:screenOrientation="portrait"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
android:name=".view.activity.MainActivity"
android:name=".ui.activity.MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
</activity>
<activity
android:name=".view.activity.ThemeActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".view.activity.AboutActivity"
android:name=".ui.activity.AboutActivity"
android:label="@string/title_activity_about"
android:screenOrientation="portrait"/>
<activity
android:name=".view.activity.SettingsActivity"
android:name=".ui.activity.SettingsActivity"
android:label="@string/settings"
android:screenOrientation="portrait"/>
<activity
android:name=".view.activity.MovieDetailActivity"
android:name=".ui.activity.MovieDetailActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".view.activity.OpenLicenseActivity"
android:name=".ui.activity.OpenLicenseActivity"
android:label="@string/open_source_permission"
android:screenOrientation="portrait"/>
<activity
android:name=".view.activity.WebActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".view.activity.BoxOfficeActivity"
android:name=".ui.activity.BoxOfficeActivity"
android:label="@string/box_office"
android:screenOrientation="portrait"/>
<activity
android:name=".view.activity.SearchActivity"
android:label="@string/search"
android:screenOrientation="portrait"/>

<service
android:name=".view.service.LocationService"
android:name=".service.LocationService"
android:exported="false"
android:stopWithTask="true">
</service>

</application>

</manifest>
Loading

0 comments on commit 1b22952

Please sign in to comment.