Commit d3129c5

committed

Merge remote-tracking branch 'origin/master'

# Conflicts: # module_news/build.gradle

2 parents 88f0c49 + 1219951 commit d3129c5Copy full SHA for d3129c5

File tree

-16

lines changed

-16

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,12 @@ Android项目组件化示例代码`
`21`	`21`
`22`	`22`	`2. Android组件化方案已经支持 Fragment组件化,使用方法请下载Demo查看;`
`23`	`23`
`24`		`-3. 目前Android组件化方案还没有写完,后续会继续更新,完善组件化方案。`
`25`		`-`
`26`		`-4. 本项目已适配Android Studio 3.0.1版本(Google仓库会带来一定影响)`
	`24`	`+3. 本项目已适配Android Studio 3.0.1版本(Google仓库会带来一定影响)`
`27`	`25`
`28`	`26`
`29`	`27`	`## 集成开发模式和组件开发模式转换`
`30`	`28`
`31`		`-**1、首先打开Android项目的 gradle.properties 文件,然后将 isModule 改为你需要的开发模式,`
	`29`	`+**1、首先打开Android项目的 gradle.properties 文件,然后将 isModule 改为你需要的开发模式(true/false),`
`32`	`30`	`然后点击 "Sync Project" 按钮同步项目;**`
`33`	`31`
`34`	`32`	`2、![Image](/screenshots/develper.PNG) 在运行之前,请先按照图中选择一个能够运行的组件;`
`@@ -71,4 +69,4 @@ Android项目组件化示例代码`
`71`	`69`	`distributed under the License is distributed on an "AS IS" BASIS,`
`72`	`70`	`WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`
`73`	`71`	`See the License for the specific language governing permissions and`
`74`		`- limitations under the License.`
	`72`	`+ limitations under the License.`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,3 @@`
`1`		`-/*`
`2`		`- * @ProjectName: ISMS_Petrel_MCU`
`3`		`- * @Copyright: 2017 HangZhou Hikvision System Technology Co., Ltd. All Right Reserved.`
`4`		`- * @address: http://www.hikvision.com`
`5`		`- * @Description: 本内容仅限于杭州海康威视系统技术公有限司内部使用,禁止转发.`
`6`		`- */`
`7`		`-`
`8`	`1`	`package com.guiying.module.common.base;`
`9`	`2`
`10`	`3`	`import android.os.Bundle;`

Lines changed: 4 additions & 3 deletions

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -118,4 +118,4 @@ def addRepos(RepositoryHandler handler) {`
`118`	`118`	`handler.maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}`
`119`	`119`	`}`
`120`	`120`
`121`		`-ext.addRepos = this.&addRepos`
	`121`	`+ext.addRepos = this.&addRepos`

Comments

(0)