From 21b409e3484b29bf3fa56e5a02c82049414e9e7f Mon Sep 17 00:00:00 2001 From: guiying712 Date: Fri, 19 Jan 2018 13:50:12 +0800 Subject: [PATCH 01/11] =?UTF-8?q?1=EF=BC=9AAdd=20the=20JitPack=20repositor?= =?UTF-8?q?y=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- versions.gradle | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9b51cd5..3ee61c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,4 +23,4 @@ localGradlePluginVersion=3.0.1 # 每次更改“isModule”的值后，需要点击 "Sync Project" 按钮 # isModule是“集成开发模式”和“组件开发模式”的切换开关 -isModule=false +isModule=true diff --git a/versions.gradle b/versions.gradle index 3cd6235..e4663ed 100644 --- a/versions.gradle +++ b/versions.gradle @@ -110,17 +110,12 @@ ext.build_versions = build_versions def addRepos(RepositoryHandler handler) { - /*鍏徃浠撳簱*/ - handler.maven { - url "http://maven.hikvision.com.cn/nexus/content/groups/System-Android-down/" - credentials { - username "System-Android" - password "HikSysDeveloper123" - } - } - handler.google() handler.jcenter() + handler.mavenCentral() + //Add the JitPack repository + handler.maven { url "https://jitpack.io" } + handler.maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} } ext.addRepos = this.&addRepos \ No newline at end of file From 71d04d4e1b850366a9fcef22e4642ee32a214d1a Mon Sep 17 00:00:00 2001 From: guiying712 Date: Fri, 19 Jan 2018 13:53:21 +0800 Subject: [PATCH 02/11] =?UTF-8?q?1=EF=BC=9AAdd=20the=20JitPack=20repositor?= =?UTF-8?q?y=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3ee61c6..9b51cd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,4 +23,4 @@ localGradlePluginVersion=3.0.1 # 每次更改“isModule”的值后，需要点击 "Sync Project" 按钮 # isModule是“集成开发模式”和“组件开发模式”的切换开关 -isModule=true +isModule=false From 9cba1d8c9ebb58e6e85c60486c44a4b1816da11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Fri, 19 Jan 2018 13:55:19 +0800 Subject: [PATCH 03/11] Add the JitPack repository --- versions.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/versions.gradle b/versions.gradle index 2564818..4a8a289 100644 --- a/versions.gradle +++ b/versions.gradle @@ -112,6 +112,10 @@ ext.build_versions = build_versions def addRepos(RepositoryHandler handler) { handler.google() handler.jcenter() + handler.mavenCentral() + //Add the JitPack repository + handler.maven { url "https://jitpack.io" } + handler.maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} } ext.addRepos = this.&addRepos From 60147ff3ca0a26eb657b7b1b7b899e30e4ff2312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Fri, 26 Jan 2018 10:31:28 +0800 Subject: [PATCH 04/11] Update BaseActionBarActivity.java --- .../guiying/module/common/base/BaseActionBarActivity.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java index c32f18e..85c8570 100644 --- a/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java +++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java @@ -1,10 +1,3 @@ -/* - * @ProjectName: ISMS_Petrel_MCU - * @Copyright: 2017 HangZhou Hikvision System Technology Co., Ltd. All Right Reserved. - * @address: http://www.hikvision.com - * @Description: 鏈唴瀹逛粎闄愪簬鏉窞娴峰悍濞佽绯荤粺鎶鏈叕鏈夐檺鍙稿唴閮ㄤ娇鐢紝绂佹杞彂. - */ - package com.guiying.module.common.base; import android.os.Bundle; From 310cc39b0c07a90753cc42639767b724a14c84e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Sat, 3 Feb 2018 11:39:49 +0800 Subject: [PATCH 05/11] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 438a057..6510e50 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ Android椤圭洰缁勪欢鍖栫ず渚嬩唬鐮 +**澹版槑**锛氭鏂规鍙傜敤浜庡皬鍥綋灏忛」鐩娇鐢紙涓嶆秹鍙婅法閮ㄩ棬鎴栬法鍏徃锛夈 + **Android缁勪欢鍖栨柟妗**锛歨ttp://blog.csdn.net/guiying712/article/details/55213884 **Android缁勪欢鍖栦箣缁堟瀬鏂规**锛歨ttp://blog.csdn.net/guiying712/article/details/78057120 From fc8e0d117fced81950f5f7779932c8ef7e5163dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Tue, 27 Feb 2018 11:34:22 +0800 Subject: [PATCH 06/11] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 6510e50..438a057 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,6 @@ Android椤圭洰缁勪欢鍖栫ず渚嬩唬鐮 -**澹版槑**锛氭鏂规鍙傜敤浜庡皬鍥綋灏忛」鐩娇鐢紙涓嶆秹鍙婅法閮ㄩ棬鎴栬法鍏徃锛夈 - **Android缁勪欢鍖栨柟妗**锛歨ttp://blog.csdn.net/guiying712/article/details/55213884 **Android缁勪欢鍖栦箣缁堟瀬鏂规**锛歨ttp://blog.csdn.net/guiying712/article/details/78057120 From b12215432cf74e9647fddcd27fe1d5e4b893e545 Mon Sep 17 00:00:00 2001 From: guiying712 Date: Wed, 28 Feb 2018 14:46:16 +0800 Subject: [PATCH 07/11] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=93?= =?UTF-8?q?=E5=8C=85release=E8=84=9A=E6=9C=AC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module_girls/build.gradle | 3 +-- module_main/build.gradle | 3 +-- module_news/build.gradle | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/module_girls/build.gradle b/module_girls/build.gradle index d0662b8..7695843 100644 --- a/module_girls/build.gradle +++ b/module_girls/build.gradle @@ -40,11 +40,10 @@ android { buildTypes { release { - buildConfigField "boolean", "LOG_DEBUG", "true" + //buildConfigField "boolean", "LOG_DEBUG", "true" zipAlignEnabled false shrinkResources false minifyEnabled false - debuggable true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/module_main/build.gradle b/module_main/build.gradle index d0662b8..7695843 100644 --- a/module_main/build.gradle +++ b/module_main/build.gradle @@ -40,11 +40,10 @@ android { buildTypes { release { - buildConfigField "boolean", "LOG_DEBUG", "true" + //buildConfigField "boolean", "LOG_DEBUG", "true" zipAlignEnabled false shrinkResources false minifyEnabled false - debuggable true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/module_news/build.gradle b/module_news/build.gradle index d0662b8..7695843 100644 --- a/module_news/build.gradle +++ b/module_news/build.gradle @@ -40,11 +40,10 @@ android { buildTypes { release { - buildConfigField "boolean", "LOG_DEBUG", "true" + //buildConfigField "boolean", "LOG_DEBUG", "true" zipAlignEnabled false shrinkResources false minifyEnabled false - debuggable true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } From 1219951b677cac9ee81ce13ae22a117d85f25811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Wed, 28 Feb 2018 14:48:17 +0800 Subject: [PATCH 08/11] Update build.gradle --- module_news/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module_news/build.gradle b/module_news/build.gradle index d0662b8..7695843 100644 --- a/module_news/build.gradle +++ b/module_news/build.gradle @@ -40,11 +40,10 @@ android { buildTypes { release { - buildConfigField "boolean", "LOG_DEBUG", "true" + //buildConfigField "boolean", "LOG_DEBUG", "true" zipAlignEnabled false shrinkResources false minifyEnabled false - debuggable true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } From 88f0c49b78c4940dfe3b05b51c06e546ea09eb5b Mon Sep 17 00:00:00 2001 From: guiying712 Date: Thu, 1 Mar 2018 13:44:48 +0800 Subject: [PATCH 09/11] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=93?= =?UTF-8?q?=E5=8C=85release=E8=84=9A=E6=9C=AC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module_girls/build.gradle | 3 --- module_main/build.gradle | 3 --- module_news/build.gradle | 3 --- 3 files changed, 9 deletions(-) diff --git a/module_girls/build.gradle b/module_girls/build.gradle index 7695843..a1838bd 100644 --- a/module_girls/build.gradle +++ b/module_girls/build.gradle @@ -40,9 +40,6 @@ android { buildTypes { release { - //buildConfigField "boolean", "LOG_DEBUG", "true" - zipAlignEnabled false - shrinkResources false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/module_main/build.gradle b/module_main/build.gradle index 7695843..a1838bd 100644 --- a/module_main/build.gradle +++ b/module_main/build.gradle @@ -40,9 +40,6 @@ android { buildTypes { release { - //buildConfigField "boolean", "LOG_DEBUG", "true" - zipAlignEnabled false - shrinkResources false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/module_news/build.gradle b/module_news/build.gradle index 7695843..a1838bd 100644 --- a/module_news/build.gradle +++ b/module_news/build.gradle @@ -40,9 +40,6 @@ android { buildTypes { release { - //buildConfigField "boolean", "LOG_DEBUG", "true" - zipAlignEnabled false - shrinkResources false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } From 2f43b6d8f475eb43cb6cf2b122534e18d253a65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Tue, 6 Mar 2018 16:54:46 +0800 Subject: [PATCH 10/11] Update AndroidManifest.xml --- module_main/src/main/module/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module_main/src/main/module/AndroidManifest.xml b/module_main/src/main/module/AndroidManifest.xml index a5eb0d9..c9d51ec 100644 --- a/module_main/src/main/module/AndroidManifest.xml +++ b/module_main/src/main/module/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.guiying.module.main"> - \ No newline at end of file + From 494e7deda04ea1a9dc0bad006ca218c635a8957f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Mon, 12 Mar 2018 17:15:57 +0800 Subject: [PATCH 11/11] Update AndroidManifest.xml --- module_main/src/main/module/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_main/src/main/module/AndroidManifest.xml b/module_main/src/main/module/AndroidManifest.xml index c9d51ec..0443b12 100644 --- a/module_main/src/main/module/AndroidManifest.xml +++ b/module_main/src/main/module/AndroidManifest.xml @@ -9,7 +9,7 @@ android:label="@string/app_main" android:supportsRtl="true" android:theme="@style/AppTheme"> - +