Commit 48d8bc65 by sikang

update

parent 7f80a13e
...@@ -43,7 +43,7 @@ repositories { ...@@ -43,7 +43,7 @@ repositories {
} }
dependencies { dependencies {
api fileTree(dir: 'libs', include: ['*.jar',"*.aar"]) api fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
// noinspection GradleCompatible // noinspection GradleCompatible
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
...@@ -66,7 +66,11 @@ dependencies { ...@@ -66,7 +66,11 @@ dependencies {
// api 'me.jessyan:autosize:1.0.6' // api 'me.jessyan:autosize:1.0.6'
//同盾 //同盾
//SDK-TD-START
api(name: 'android_spirit-20190220-2.0.0.1', ext: 'aar')
//SDK-TD-END
api 'com.alibaba:fastjson:1.1.58.android' api 'com.alibaba:fastjson:1.1.58.android'
//QMUI //QMUI
......
...@@ -46,6 +46,18 @@ def open_sdk(path, sdk): ...@@ -46,6 +46,18 @@ def open_sdk(path, sdk):
print ("params "+sys.argv[1] + " "+sys.argv[2]) print ("params "+sys.argv[1] + " "+sys.argv[2])
lib_base_gradle = "../build.gradle"
if sys.argv[1] == 'open':
open_sdk(lib_base_gradle, sys.argv[2])
else:
close_sdk(lib_base_gradle, sys.argv[2])
app_build_gradle = "../../app/build.gradle"
if sys.argv[1] == 'open':
open_sdk(app_build_gradle, sys.argv[2])
else:
close_sdk(app_build_gradle, sys.argv[2])
for root, dirs, files in os.walk("../../app/src/main"): for root, dirs, files in os.walk("../../app/src/main"):
directory = os.path.join(os.getcwd(), root) directory = os.path.join(os.getcwd(), root)
for file in files: for file in files:
......
...@@ -47,7 +47,7 @@ public class RegionFragment extends BaseFragment { ...@@ -47,7 +47,7 @@ public class RegionFragment extends BaseFragment {
return (province == null ? "" : province) + " " + return (province == null ? "" : province) + " " +
(city == null ? "" : city) + " " + (city == null ? "" : city) + " " +
(district == null ? "" : district) + " " + (district == null ? "" : district) + " " +
(district == null ? "" : district); (area == null ? "" : area);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment