Merge branch 'master' of http://47.100.14.92:8929/sikang/lib_base

update money format

build.gradle

@@ -43,7 +43,7 @@ repositories {
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar',"*.aar"])
+    api fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
     // noinspection GradleCompatible
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
@@ -66,7 +66,11 @@ dependencies {
 
 //  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'
 
     //QMUI

script/release_builder.sh

@@ -3,8 +3,14 @@ echo "2、渠道包（有权限）"
 echo -n "选择打包方式："
 read action
 
+. ../../gradle.properties
+#同盾插拔
+./sdk_manager.py ${td_mode} "TD"
+
 cd garble
+#四大组件混淆
 ./rename_project.sh
+#代码结构混淆
 ./insert.py
 
 cd ../../../

script/sdk_manager.py

@@ -46,6 +46,18 @@ def open_sdk(path, sdk):
 
 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"):
     directory = os.path.join(os.getcwd(), root)
     for file in files:

src/main/java/com/common/fragment/RegionFragment.java

@@ -47,7 +47,7 @@ public class RegionFragment extends BaseFragment {
             return (province == null ? "" : province) + " " +
                     (city == null ? "" : city) + " " +
                     (district == null ? "" : district) + " " +
-                    (district == null ? "" : district);
+                    (area == null ? "" : area);
         }
     }