add init submodule scripts

README.md

@@ -19,9 +19,8 @@
 * 通过gradle文件内的resValue/buildConfigField/manifestPlaceHolder方式实现编译期间修改，具体情况请参考``./build.gradle``和``./app/build.gradle``配置
 
 ### 拉取代码步骤
-1. 拉取主项目代码: `git clone -b master git@gitlab.ghzhushou.com:halo/assistant-android.git`
-2. 初始化公用类库: `git submodule init && git submodule update`
+1. 拉取主项目代码: `git clone -b dev git@gitlab.ghzhushou.com:halo/assistant-android.git`
+2. 初始化公用类库: `bash ./scripts/init_submodules.sh`
 
 ### submodule管理方式(只拉取master)
-* 拉取子模块代码：`git submodule foreach git pull origin master`
 * 提交代码，需要cd到submodule文件夹去做修改

gradle.properties

@@ -1,55 +1,49 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # 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.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # 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.parallel=true
-android.useDeprecatedNdk=true
-org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
-
-MIPUSH_APPID=2882303761517352993
-MIPUSH_APPKEY=5451735292993
-WECHAT_APPID=wx3ffd0785fad18396
-WECHAT_SECRET=368b49e8471857575a033b206218f9fb
+# org.gradle.parallel=true
+#Wed Jul 19 10:16:09 CST 2017
+MESSAGE_HOST=http\://message.ghzs666.com/v1d0/
 TENCENT_APPID=1104659243
-WEIBO_APPKEY=1723629218
-MTA_APPKEY=APV567FTBS7J
-TD_APPID=81DB144D555386A38A70B833537EC256
-UMENG_APPKEY=585a29fa8f4a9d327600023e
-UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9
-
-DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6
+systemProp.http.proxyHost=127.0.0.1
+DEV_LIBAO_HOST=http\://dev.libao.ghzs666.com/v1d2/
 DEBUG_UMENG_MESSAGE_SECRET=ca08596492f8a7fde2ab48dceab8c1f3
-DEBUG_MIPUSH_APPID=2882303761517564447
+DEV_MESSAGE_HOST=http\://dev.message.ghzs666.com/v1d1/
 DEBUG_MIPUSH_APPKEY=5761756481447
-
-HOST=http://api.ghzs666.com/v2d6/
-USER_HOST=http://user.ghzs666.com/v1d2/
-COMMENT_HOST=http://comment.ghzs666.com/v1d2/
-LIBAO_HOST=http://libao.ghzs666.com/v1d2/
-MESSAGE_HOST=http://message.ghzs666.com/v1d0/
-DATA_HOST=http://data.ghzs666.com/
-USERSEA_HOST=http://usersea.ghzs666.com/
-
-DEV_HOST=http://dev.api.ghzs666.com/v2d6/
-DEV_USER_HOST=http://dev.user.ghzs666.com/v1d2/
-DEV_COMMENT_HOST=http://dev.comment.ghzs666.com/v1d2/
-DEV_LIBAO_HOST=http://dev.libao.ghzs666.com/v1d2/
-DEV_MESSAGE_HOST=http://dev.message.ghzs666.com/v1d1/
-DEV_DATA_HOST=http://data.ghzs666.com/
-DEV_USERSEA_HOST=http://dev.usersea.ghzs666.com/v1d0/
-
-# for apkChannelPackage
+WEIBO_APPKEY=1723629218
+USERSEA_HOST=http\://usersea.ghzs666.com/
+UMENG_MESSAGE_SECRET=8bcce6bed547ee624f5c2cc64d39a9e9
 channel_file=channel.txt
+USER_HOST=http\://user.ghzs666.com/v1d2/
+org.gradle.parallel=true
+DEBUG_UMENG_APPKEY=58e5b0b9c62dca35a00005e6
+MIPUSH_APPID=2882303761517352993
+WECHAT_SECRET=368b49e8471857575a033b206218f9fb
+DEV_USERSEA_HOST=http\://dev.usersea.ghzs666.com/v1d0/
+org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
+android.useDeprecatedNdk=true
+WECHAT_APPID=wx3ffd0785fad18396
+DEV_USER_HOST=http\://dev.user.ghzs666.com/v1d2/
+DATA_HOST=http\://data.ghzs666.com/
+LIBAO_HOST=http\://libao.ghzs666.com/v1d2/
+MIPUSH_APPKEY=5451735292993
+DEV_DATA_HOST=http\://data.ghzs666.com/
+DEBUG_MIPUSH_APPID=2882303761517564447
+COMMENT_HOST=http\://comment.ghzs666.com/v1d2/
+TD_APPID=81DB144D555386A38A70B833537EC256
+MTA_APPKEY=APV567FTBS7J
+HOST=http\://api.ghzs666.com/v2d6/
+DEV_COMMENT_HOST=http\://dev.comment.ghzs666.com/v1d2/
+systemProp.http.proxyPort=8888
+DEV_HOST=http\://dev.api.ghzs666.com/v2d6/
+UMENG_APPKEY=585a29fa8f4a9d327600023e

scripts/init_submodules.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# *****************************************************************************
+# @author CsHeng
+# @2017.7.18 初始版本
+#
+#   初始化git submodule
+#
+# *****************************************************************************
+
+# get current shell absolute dir
+CWD=$(cd "$(dirname "$0")"; pwd)
+
+git submodule init
+git submodule update
+git submodule foreach git checkout master
+git submodule foreach git pull