From c62867d79620821dcc05179ab944d14e8a5b607d Mon Sep 17 00:00:00 2001 From: zhouxingrong Date: Thu, 31 Aug 2017 17:00:43 +0800 Subject: [PATCH 1/2] fix init 26.0.0 --- build.gradle | 8 ++++---- gradle.properties | 19 ++++++++++--------- module_app/build.gradle | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 3874a63..e3e72a4 100644 --- a/build.gradle +++ b/build.gradle @@ -31,20 +31,20 @@ task clean(type: Delete) { } // Define versions in a single place -//时间：2017.2.13；每次修改版本号都要添加修改时间 +//时间：2017.08.31；每次修改版本号都要添加修改时间 ext { // Sdk and tools //localBuildToolsVersion是gradle.properties中的数据 buildToolsVersion = localBuildToolsVersion - compileSdkVersion = 25 + compileSdkVersion = 26 minSdkVersion = 16 - targetSdkVersion = 25 + targetSdkVersion = 26 versionCode = 1 versionName = "1.0" javaVersion = JavaVersion.VERSION_1_8 // App dependencies version - supportLibraryVersion = "25.3.1" + supportLibraryVersion = "26.+" retrofitVersion = "2.1.0" glideVersion = "3.7.0" loggerVersion = "1.15" diff --git a/gradle.properties b/gradle.properties index d817325..c5d7fa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,28 +1,29 @@ # Project-wide Gradle settings. - +# # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override* # any settings specified in this file. - +# # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx2048m - +# # When configured, Gradle will run in incubating parallel mode. # 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.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true +# # ΪԶ(ΪÿĵԻһ) -localBuildToolsVersion=25.0.3 +localBuildToolsVersion=26.0.0 +# # ֵһAndroidStudio汾һ localGradlePluginVersion=2.3.3 - -# ÿθġisModuleֵҪ "Sync Project" ť -# isModuleǡɿģʽ͡ģʽл +# +# Each time you change the value of "isModule", you need to click the "Sync Now" button. isModule=false diff --git a/module_app/build.gradle b/module_app/build.gradle index 37c526b..470459f 100644 --- a/module_app/build.gradle +++ b/module_app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' static def buildTime() { - return new Date().format("yyyyMMdd"); + return new Date().format("yyyy-MM-dd"); } android { From 7793b8cc8a582ca40c048bee1f0ed0b46e877411 Mon Sep 17 00:00:00 2001 From: zhouxingrong Date: Thu, 31 Aug 2017 17:31:47 +0800 Subject: [PATCH 2/2] fix --- .../androidmodulepattern/MyApplication.java | 2 +- .../java/com/guiying/main/MainActivity.java | 8 ++++ .../src/main/res/layout/activity_main.xml | 40 +++++++++++++------ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java b/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java index 3415a6c..f218f94 100644 --- a/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java +++ b/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java @@ -24,7 +24,7 @@ * @name MyApplication */ @ReportsCrashes( - mailTo = "guiying705@Gmail.com", + mailTo = "jusenr@163.com", mode = ReportingInteractionMode.DIALOG, customReportContent = { ReportField.APP_VERSION_NAME, diff --git a/module_main/src/main/java/com/guiying/main/MainActivity.java b/module_main/src/main/java/com/guiying/main/MainActivity.java index dbcb530..95600c4 100644 --- a/module_main/src/main/java/com/guiying/main/MainActivity.java +++ b/module_main/src/main/java/com/guiying/main/MainActivity.java @@ -4,6 +4,7 @@ import android.view.KeyEvent; import android.view.View; import android.widget.Button; +import android.widget.TextView; import com.alibaba.android.arouter.launcher.ARouter; import com.guiying.common.base.BaseActivity; @@ -22,6 +23,8 @@ public class MainActivity extends BaseActivity implements View.OnClickListener { private long exitTime = 0; protected Button newsButton; protected Button girlsButton; + protected Button crashButton; + protected TextView tvCrash; @Override protected void onCreate(Bundle savedInstanceState) { @@ -31,6 +34,9 @@ protected void onCreate(Bundle savedInstanceState) { newsButton.setOnClickListener(MainActivity.this); girlsButton = (Button) findViewById(R.id.girls_button); girlsButton.setOnClickListener(MainActivity.this); + crashButton = (Button) findViewById(R.id.crash_button); + crashButton.setOnClickListener(MainActivity.this); + tvCrash = (TextView) findViewById(R.id.tv_crash); } @Override @@ -41,6 +47,8 @@ public void onClick(View view) { } else if (view.getId() == R.id.girls_button) { //跳转到GirlsActivity ARouter.getInstance().build("/girls/list").navigation(); + } else if (view.getId() == R.id.crash_button) { + tvCrash.setText(0000); } } diff --git a/module_main/src/main/res/layout/activity_main.xml b/module_main/src/main/res/layout/activity_main.xml index e5e21fe..2634cbf 100644 --- a/module_main/src/main/res/layout/activity_main.xml +++ b/module_main/src/main/res/layout/activity_main.xml @@ -1,25 +1,41 @@ + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/activity_main" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context="com.guiying.main.MainActivity">