diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 9a8b7e5..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index fe764d1..9603b78 100644 --- a/README.md +++ b/README.md @@ -11,22 +11,13 @@ - android.permission.WRITE_EXTERNAL_STORAGE 可选，用于保存下载文件，或者选取上传文件、自定义字体等。 - android.permission.CAMERA 可选，用于直接拍照上传图片。 -# Credits -- HiPDA简洁版 - https://bitbucket.org/jejer/hipda/ -- Android Iconics - https://github.com/mikepenz/Android-Iconics -- Android Priority Job Queue - https://github.com/yigit/android-priority-jobqueue -- android-filepicker - https://github.com/Angads25/android-filepicker -- android-job - https://github.com/evernote/android-job -- BubbleLayout - https://github.com/MasayukiSuda/BubbleLayout -- Calligraphy - https://github.com/chrisjenx/Calligraphy -- Crashlytics - https://try.crashlytics.com/ -- Emoji - https://github.com/vanniktech/Emoji -- Emoji Java - https://github.com/vdurmont/emoji-java -- EventBus - https://github.com/greenrobot/EventBus -- Glide - https://github.com/bumptech/glide -- Jsoup - http://jsoup.org/ -- MaterialDrawer - https://github.com/mikepenz/MaterialDrawer -- Matisse - https://github.com/zhihu/Matisse -- OkHttp - https://github.com/square/okhttp -- Spectrum - https://github.com/the-blue-alliance/spectrum -- Subsampling Scale Image View - https://github.com/davemorrissey/subsampling-scale-image-view +电脑论坛app是一款讨论电脑相关的电子产品的app， +app有很多创新功能，如搜索，悄悄话，信息提醒，查看新帖，我的帖子，我的收藏，浏览记录，保修参数配置等等。 +【搜索】，可以根据作者名字，在全论坛中搜索这个作者的相关文章 +【悄悄话】，给发贴的作者发送悄悄话，只有你们两个人能看到 +【信息提醒】，你的帖子有人评论了，会有信息提醒 +【查看新帖】，按发帖时间倒序显示最新的帖子 +【我的帖子】，查看你自己发出的帖子有哪些 +【我的收藏】，查看你收藏过的别人的帖子 +【浏览记录】，你曾经浏览过的帖子在这里出现 + diff --git a/app/build.gradle b/app/build.gradle index 23da64a..69be5e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ buildscript { } } apply plugin: 'com.android.application' -apply plugin: 'io.fabric' +//apply plugin: 'io.fabric' repositories { maven { url 'https://maven.fabric.io/public' } @@ -16,100 +16,112 @@ repositories { android { - compileSdkVersion rootProject.ext.compileSdkVersion as int - buildToolsVersion rootProject.ext.buildToolsVersion as String + compileSdkVersion 27 defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion as int - targetSdkVersion rootProject.ext.targetSdkVersion as int + applicationId "com.jx.luntan" +// applicationId "com.jz.cp132gfbsx" + minSdkVersion 16 + targetSdkVersion 27 + versionCode 2 + versionName "1.11" + + manifestPlaceholders = [ + "JPUSH_PKGNAME" : "com.jx.luntan", + "JPUSH_APPKEY": "72ac507ff5c8726f0d129a71", + "MAIN_ACTIVITY":"com.greenskinmonster.a51nb.ui.MainFrameActivity", + "LAUNCH_SCREEN":"launchimage", + "URL_DATA":"http://568568ew.com:9991,http://456kusda.com:9991,http://rut89677.com:9991,http://7735df88.com:9991" + ] + + ndk { + // 设置支持的SO库架构 + abiFilters 'armeabi' , 'armeabi-v7a', 'x86'//, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' + } + } + repositories{ + flatDir{ + dirs 'libs' + } } - buildTypes { release { - minifyEnabled true - shrinkResources false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - applicationVariants.all { variant -> - variant.outputs.each { output -> - output.outputFile = new File(output.outputFile.parent, - "51nb-release.apk" - ) - } - } } debug { - ext.enableCrashlytics = false + } } - lintOptions { + /*lintOptions { checkReleaseBuilds false // Or, if you prefer, you can continue to check for errors in release builds, // but continue the build even when errors are found: abortOnError false - } + }*/ } dependencies { - compile "com.android.support:appcompat-v7:$supportLibraryVersion" - compile "com.android.support:design:$supportLibraryVersion" - compile "com.android.support:preference-v7:$supportLibraryVersion" - compile "com.android.support:preference-v14:$supportLibraryVersion" + implementation "com.android.support:appcompat-v7:$supportLibraryVersion" + implementation "com.android.support:design:$supportLibraryVersion" + implementation "com.android.support:preference-v7:$supportLibraryVersion" + implementation "com.android.support:preference-v14:$supportLibraryVersion" - compile 'org.jsoup:jsoup:1.10.2' - compile('com.squareup.okhttp3:okhttp:3.8.1') + implementation 'org.jsoup:jsoup:1.10.2' + implementation('com.squareup.okhttp3:okhttp:3.8.1') - compile 'com.google.code.gson:gson:2.8.0' + implementation 'com.google.code.gson:gson:2.8.0' - compile 'com.github.bumptech.glide:glide:3.8.0' + implementation 'com.github.bumptech.glide:glide:3.8.0' //compile 'com.github.bumptech.glide:okhttp-integration:1.3.0' - compile 'com.birbit:android-priority-jobqueue:1.3.5' - compile 'org.greenrobot:eventbus:3.0.0' + implementation 'com.birbit:android-priority-jobqueue:1.3.5' + implementation 'org.greenrobot:eventbus:3.0.0' - compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' + implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' - compile('com.mikepenz:materialdrawer:5.9.3@aar') { + implementation('com.mikepenz:materialdrawer:5.9.3@aar') { transitive = true exclude group: 'com.android.support' } - compile 'com.mikepenz:google-material-typeface:2.2.0.2.original@aar' - compile 'com.mikepenz:fontawesome-typeface:4.6.0.2@aar' + implementation 'com.mikepenz:google-material-typeface:2.2.0.2.original@aar' + implementation 'com.mikepenz:fontawesome-typeface:4.6.0.2@aar' - compile('com.mikepenz:fastadapter:2.6.3@aar') { + implementation('com.mikepenz:fastadapter:2.6.3@aar') { transitive = true exclude group: 'com.android.support' } - compile 'com.mikepenz:fastadapter-commons:2.6.3@aar' - compile 'com.mikepenz:fastadapter-extensions:2.6.3@aar' - compile 'com.mikepenz:materialize:1.0.3@aar' + implementation 'com.mikepenz:fastadapter-commons:2.6.3@aar' + implementation 'com.mikepenz:fastadapter-extensions:2.6.3@aar' + implementation 'com.mikepenz:materialize:1.0.3@aar' - compile('com.thebluealliance:spectrum:0.7.1') { + implementation('com.thebluealliance:spectrum:0.7.1') { exclude group: 'org.greenrobot' exclude group: 'com.android.support' } - compile 'com.daasuu:BubbleLayout:1.1.1' - compile('com.vdurmont:emoji-java:3.1.3') { + implementation 'com.daasuu:BubbleLayout:1.1.1' + implementation('com.vdurmont:emoji-java:3.1.3') { exclude group: 'org.json', module: 'json' } - compile('com.zhihu.android:matisse:0.5.0-alpha4') { + implementation('com.zhihu.android:matisse:0.5.0-alpha4') { exclude group: 'com.android.support' } - compile 'com.evernote:android-job:1.1.11' + implementation 'com.evernote:android-job:1.1.11' - compile('com.afollestad.material-dialogs:core:0.9.4.7') { + implementation('com.afollestad.material-dialogs:core:0.9.4.7') { exclude group: 'com.android.support' } //compile fileTree(dir: 'libs', include: ['*.jar']) - compile(name: 'calligraphy-release-2.3.0', ext: 'aar') - compile(name: 'filepicker-release-1.1.1', ext: 'aar') - compile project(':emoji') + implementation(name: 'calligraphy-release-2.3.0', ext: 'aar') + implementation(name: 'filepicker-release-1.1.1', ext: 'aar') + implementation project(':emoji') - compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') { - transitive = true; - } + implementation(name: 'android-mastersdk-1.25',ext:'aar') + +// implementation('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') { +// transitive = true; +// } } \ No newline at end of file diff --git a/app/fabric.properties.example b/app/fabric.properties.example deleted file mode 100644 index 1341d51..0000000 --- a/app/fabric.properties.example +++ /dev/null @@ -1,2 +0,0 @@ -#use your own apiKey here -apiKey=0000000000000000000000000000000000000000 \ No newline at end of file diff --git a/app/libs/android-mastersdk-1.25.aar b/app/libs/android-mastersdk-1.25.aar new file mode 100644 index 0000000..8fa24a3 Binary files /dev/null and b/app/libs/android-mastersdk-1.25.aar differ diff --git a/app/proguard-android.txt b/app/proguard-android.txt deleted file mode 100644 index 5f25493..0000000 --- a/app/proguard-android.txt +++ /dev/null @@ -1,57 +0,0 @@ -# This is a configuration file for ProGuard. -# http://proguard.sourceforge.net/index.html#manual/usage.html - --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --verbose - -# Optimization is turned off by default. Dex does not like code run -# through the ProGuard optimize and preverify steps (and performs some -# of these optimizations on its own). --dontoptimize --dontpreverify -# Note that if you want to enable optimization, you cannot just -# include optimization flags in your own project configuration file; -# instead you will need to point to the -# "proguard-android-optimize.txt" file instead of this one from your -# project.properties file. - --keepattributes *Annotation* --keep public class com.google.vending.licensing.ILicensingService --keep public class com.android.vending.licensing.ILicensingService - -# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native --keepclasseswithmembernames class * { - native ; -} - -# 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); -} - --keepclassmembers class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator CREATOR; -} - --keepclassmembers class **.R$* { - public static ; -} - -# 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.** diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro deleted file mode 100644 index 2ac983e..0000000 --- a/app/proguard-rules.pro +++ /dev/null @@ -1,65 +0,0 @@ --keepattributes EnclosingMethod --keepattributes *Annotation* - --dontwarn okio.** --dontwarn javax.annotation.Nullable --dontwarn javax.annotation.ParametersAreNonnullByDefault - -#google stuff --dontwarn android.support.** --keep class android.support.v7.** { *; } --keep interface android.support.v7.** { *; } --keep class org.apache.http.** { *; } --dontwarn org.apache.http.** --dontwarn android.net.** - --keeppackagenames org.jsoup.nodes --keep public class org.jsoup.** { - public *; -} - --keep public class * implements com.bumptech.glide.module.GlideModule --keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** { - **[] $VALUES; - public *; -} - --keep class com.greenskinmonster.a51nb.** { *; } - -#Android-Iconics --keep class .R --keep class **.R$* { - ; -} - -#EventBus 3.x --keepclassmembers class ** { - @org.greenrobot.eventbus.Subscribe ; -} --keep enum org.greenrobot.eventbus.ThreadMode { *; } - -# Only required if you use AsyncExecutor --keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { - (java.lang.Throwable); -} - --keepattributes SourceFile,LineNumberTable --keep class com.crashlytics.** { *; } --dontwarn com.crashlytics.** - --keepclassmembers class * implements android.os.Parcelable { - static ** CREATOR; -} - -#Matisse --dontwarn com.squareup.picasso.** - -#evernote android job --dontwarn com.evernote.android.job.gcm.** --dontwarn com.evernote.android.job.util.GcmAvailableHelper - --keep public class com.evernote.android.job.v21.PlatformJobService --keep public class com.evernote.android.job.v14.PlatformAlarmService --keep public class com.evernote.android.job.v14.PlatformAlarmReceiver --keep public class com.evernote.android.job.JobBootReceiver --keep public class com.evernote.android.job.JobRescheduleService \ No newline at end of file diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..ddbc3f4 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ff1a0a1..db0596f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,7 @@ + > - + diff --git a/app/src/main/java/com/greenskinmonster/a51nb/ui/HiApplication.java b/app/src/main/java/com/greenskinmonster/a51nb/ui/HiApplication.java index d620833..b52fe27 100644 --- a/app/src/main/java/com/greenskinmonster/a51nb/ui/HiApplication.java +++ b/app/src/main/java/com/greenskinmonster/a51nb/ui/HiApplication.java @@ -5,7 +5,6 @@ import android.content.Context; import android.os.Bundle; -import com.crashlytics.android.Crashlytics; import com.evernote.android.job.JobManager; import com.greenskinmonster.a51nb.BuildConfig; import com.greenskinmonster.a51nb.R; @@ -15,7 +14,6 @@ import java.io.File; -import io.fabric.sdk.android.Fabric; import uk.co.chrisjenx.calligraphy.CalligraphyConfig; /** @@ -43,7 +41,6 @@ public void onCreate() { JobManager.create(this).addJobCreator(new NotiJobCreator()); if (!BuildConfig.DEBUG) - Fabric.with(this, new Crashlytics()); HiSettingsHelper.getInstance(); diff --git a/app/src/main/java/com/greenskinmonster/a51nb/ui/setting/AllForumsFragment.java b/app/src/main/java/com/greenskinmonster/a51nb/ui/setting/AllForumsFragment.java index a156f7c..7e68013 100644 --- a/app/src/main/java/com/greenskinmonster/a51nb/ui/setting/AllForumsFragment.java +++ b/app/src/main/java/com/greenskinmonster/a51nb/ui/setting/AllForumsFragment.java @@ -41,7 +41,6 @@ import java.util.Collections; import java.util.List; -import io.fabric.sdk.android.services.concurrency.AsyncTask; /** * Created by GreenSkinMonster on 2017-07-28. @@ -177,23 +176,23 @@ public void onRefresh() { if (!mSwipeLayout.isRefreshing()) mSwipeLayout.setRefreshing(true); - new AsyncTask>() { - - @Override - protected List doInBackground(Void... voids) { - return ForumParser.fetchAllForums(); - } - - @Override - protected void onPostExecute(List forums) { - mSwipeLayout.setRefreshing(false); - if (forums != null && forums.size() > 0) { - HiSettingsHelper.getInstance().setAllForums(forums); - addForums(); - mAdapter.notifyDataSetChanged(); - } - } - }.execute(); +// new AsyncTask>() { +// +// @Override +// protected List doInBackground(Void... voids) { +// return ForumParser.fetchAllForums(); +// } +// +// @Override +// protected void onPostExecute(List forums) { +// mSwipeLayout.setRefreshing(false); +// if (forums != null && forums.size() > 0) { +// HiSettingsHelper.getInstance().setAllForums(forums); +// addForums(); +// mAdapter.notifyDataSetChanged(); +// } +// } +// }.execute(); } diff --git a/app/src/main/res/drawable/launchimage.png b/app/src/main/res/drawable/launchimage.png new file mode 100644 index 0000000..887b8ed Binary files /dev/null and b/app/src/main/res/drawable/launchimage.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 62ad47b..ebf5a45 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index d2507f9..ebf5a45 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index a663ee1..ebf5a45 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index a0ee335..ebf5a45 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 22b4dee..ebf5a45 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ca1bcca..21d93b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - 51NB专门网 + 马经论坛 作者 ：绿皮怪兽 刷新 图片浏览 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 293a9ff..ce54f6b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -340,8 +340,8 @@ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 029baf8..5c7aa0f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,14 @@ buildscript { repositories { + maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() + google() + mavenCentral() + } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,7 +18,11 @@ buildscript { allprojects { repositories { + maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() + google() + mavenCentral() + flatDir { dirs 'libs' } diff --git a/emoji/build.gradle b/emoji/build.gradle index d76a2e5..a124081 100644 --- a/emoji/build.gradle +++ b/emoji/build.gradle @@ -1,18 +1,17 @@ apply plugin: 'com.android.library' android { - compileSdkVersion rootProject.ext.compileSdkVersion as int - buildToolsVersion rootProject.ext.buildToolsVersion as String + compileSdkVersion 27 defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion as int - targetSdkVersion rootProject.ext.targetSdkVersion as int + minSdkVersion 16 + targetSdkVersion 27 } resourcePrefix 'emoji' } dependencies { - compile "com.android.support:support-v4:$supportLibraryVersion" - compile "com.android.support:appcompat-v7:$supportLibraryVersion" + implementation "com.android.support:support-v4:$supportLibraryVersion" + implementation "com.android.support:appcompat-v7:$supportLibraryVersion" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 284e4ea..3e4b5cf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip