diff --git a/app/build.gradle b/app/build.gradle index c28c59b..46d9e9c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,13 +55,11 @@ android { lintOptions { abortOnError false } + buildToolsVersion '26.0.2' } dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - //application crash report - compile 'ch.acra:acra:4.9.2' - //https://github.com/ACRA/acra/wiki/BasicSetup //解决64K限制，方法数超过65535问题 compile 'com.android.support:multidex:1.0.1' if (isModule.toBoolean()) { diff --git a/app/src/main/java/com/chinasofti/rcs/MainApplication.java b/app/src/main/java/com/chinasofti/rcs/MainApplication.java index 5e49b63..1d8f7e1 100644 --- a/app/src/main/java/com/chinasofti/rcs/MainApplication.java +++ b/app/src/main/java/com/chinasofti/rcs/MainApplication.java @@ -2,27 +2,11 @@ import android.content.Context; import android.support.multidex.MultiDex; - import com.alibaba.android.arouter.launcher.ARouter; import com.chinasofti.common.base.BaseApplication; import static com.chinasofti.common.base.AppConst.IS_DEBUG; -//@ReportsCrashes( -// mailTo = "yeguoqiang6@outlook.com", -// mode = ReportingInteractionMode.DIALOG, -// customReportContent = { -// ReportField.APP_VERSION_NAME, -// ReportField.ANDROID_VERSION, -// ReportField.PHONE_MODEL, -// ReportField.CUSTOM_DATA, -// ReportField.BRAND, -// ReportField.STACK_TRACE, -// ReportField.LOGCAT, -// ReportField.USER_COMMENT}, -// resToastText = R.string.crash_toast_text, -// resDialogText = R.string.crash_dialog_text, -// resDialogTitle = R.string.crash_dialog_title) public class MainApplication extends BaseApplication { @@ -36,7 +20,6 @@ public void onCreate() { } ARouter.init(this); //崩溃日志记录初始化 -// ACRA.initWindowFeature(this); } diff --git a/build.gradle b/build.gradle index 8dba694..b9aef69 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' //$localGradlePluginVersion是gradle.properties中的数据 classpath "com.android.tools.build:gradle:$localGradlePluginVersion" @@ -27,6 +31,10 @@ allprojects { mavenCentral() //PersistentCookieJar needs maven { url "https://jitpack.io" } + maven { + url 'https://maven.google.com/' + name 'Google' + } } } @@ -53,7 +61,7 @@ ext { retrofitVersion = "2.3.0" cookieVersion = "v1.0.1" butterknifeVersion = "8.2.1" - dagger2Version = "2.6" + dagger2Version = "2.13" glideVersion = "3.7.0" fastjsonVersion = "1.1.64.android" greendaoVersion = "3.2.2" diff --git a/common/build.gradle b/common/build.gradle index 93693b3..bf90e93 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,8 +3,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jakewharton.butterknife' // greendao apply plugin: 'org.greenrobot.greendao' -// dagger2 -apply plugin: 'com.neenbedankt.android-apt' android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -43,6 +41,7 @@ android { abortOnError false } + buildToolsVersion '26.0.2' } dependencies { @@ -68,7 +67,7 @@ dependencies { annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknifeVersion" //Dagger2 - compile "com.google.dagger:dagger:$rootProject.dagger2Version" + annotationProcessor "com.google.dagger:dagger:$rootProject.dagger2Version" annotationProcessor "com.google.dagger:dagger-compiler:$rootProject.dagger2Version" //glide 可以其中网络请求改为okhttp diff --git a/gradle.properties b/gradle.properties index de3b2fb..de58623 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,10 +19,10 @@ org.gradle.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true # ΪԶ(ΪÿĵԻһ) -localBuildToolsVersion=26.0.1 +localBuildToolsVersion=26.0.2 # ֵһAndroidStudio汾һ localGradlePluginVersion=2.3.3 # ÿθġisModuleֵҪ "Sync Project" ť # isModuleǡɿģʽ͡ģʽл -isModule=false +isModule=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d2bf01b..338bdbe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 02 17:31:04 GMT+08:00 2017 +#Fri Aug 10 13:50:35 CST 2018 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.1-all.zip diff --git a/module_message/src/main/java/com/chinasofti/message/ui/activity/MessageActivity.java b/module_message/src/main/java/com/chinasofti/message/ui/activity/MessageActivity.java index 0c3dbb5..c81ea2c 100644 --- a/module_message/src/main/java/com/chinasofti/message/ui/activity/MessageActivity.java +++ b/module_message/src/main/java/com/chinasofti/message/ui/activity/MessageActivity.java @@ -2,6 +2,7 @@ import com.chinasofti.common.base.BaseActivity; import com.chinasofti.common.base.BasePresenter; +import com.chinasofti.message.R; public class MessageActivity extends BaseActivity { @@ -17,6 +18,6 @@ protected BasePresenter createPresenter() { @Override protected int provideContentViewId() { - return 0; + return R.layout.activity_message_layout; } } diff --git a/module_message/src/main/res/layout/activity_message_layout.xml b/module_message/src/main/res/layout/activity_message_layout.xml new file mode 100644 index 0000000..7a7bf7e --- /dev/null +++ b/module_message/src/main/res/layout/activity_message_layout.xml @@ -0,0 +1,15 @@ + + + + + +