~wjc/HDLPhotovoltaicDebugAPP.git

parent: 4db3692d | 补丁 | 提交 | ignore whitespace

wjc

3 天以前 8f4a21c13de88f6c34705f0660ec54ec5e032aa4

Merge branch 'master' into 2.0

1个文件已添加

2个文件已修改

	app/src/main/res/layout/item_plant_details.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	build.gradle	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	config.gradle	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/res/layout/item_plant_details.xml

@@ -375,4 +375,5 @@

    </RelativeLayout>

</com.hdl.photovoltaic.widget.SwipeLayout>
</com.hdl.photovoltaic.widget.SwipeLayout>


 build.gradle

@@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

apply from:"config.gradle"

buildscript {
    ext {

 config.gradle

New file
@@ -0,0 +1,9 @@
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

ext {
    //使用固定账号
    ALIYUN_USER_NAME = '5f0673aa7cd41782836e7d3e'
    ALIYUN_PASSWORD = 'lBNkb1So7zEY'
    BASE_URL = 'https://packages.aliyun.com'
}

			@@ -375,4 +375,5 @@

			</RelativeLayout>

			</com.hdl.photovoltaic.widget.SwipeLayout>
			</com.hdl.photovoltaic.widget.SwipeLayout>

			@@ -1,5 +1,5 @@
			// Top-level build file where you can add configuration options common to all sub-projects/modules.

			apply from:"config.gradle"

			buildscript {
			ext {

New file
			@@ -0,0 +1,9 @@
			Properties properties = new Properties()
			properties.load(project.rootProject.file('local.properties').newDataInputStream())

			ext {
			//使用固定账号
			ALIYUN_USER_NAME = '5f0673aa7cd41782836e7d3e'
			ALIYUN_PASSWORD = 'lBNkb1So7zEY'
			BASE_URL = 'https://packages.aliyun.com'
			}