调整配置文件

秋逸 · 秋逸 · commit 533bd8acfd35 · 2018-06-12T13:16:23.000+08:00
diff --git a/RxArcGisKit/build.gradle b/RxArcGisKit/build.gradle
@@ -19,7 +19,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
diff --git a/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/tool/RxArcGisMapTool.java b/RxArcGisKit/src/main/java/com/vondear/rxarcgiskit/tool/RxArcGisMapTool.java
@@ -57,22 +57,14 @@ public class RxArcGisMapTool {
      *
      * @param mMapView 地图容器
      */
-    public static void initAcrMap(final Context mContext,final MapView mMapView, final TextView mTvPlottingScale) {
+    public static void initAcrMap(final Context mContext, final MapView mMapView, final TextView mTvPlottingScale) {
         ArcGISRuntimeEnvironment.setLicense("runtimelite,1000,rud5954166547,none,2K0RJAY3FLGP9KB10136");
 
         mMapView.addMapScaleChangedListener(new MapScaleChangedListener() {
             @Override
             public void mapScaleChanged(MapScaleChangedEvent mapScaleChangedEvent) {
                 double s = (int) RxMapTool.screenPixelToMetre(RxImageTool.dp2px(30) * 1.5, mapScaleChangedEvent.getSource().getMapScale(), mContext);
-
-                String str;
-                if (s > 1000) {
-                    str = s / 1000 + "千米";
-                } else {
-                    str = s + "米";
-                }
-
-                mTvPlottingScale.setText(str);
+                mTvPlottingScale.setText(RxDataTool.changeDistance(s));
             }
         });
     }
diff --git a/RxDemo/build.gradle b/RxDemo/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.vondear.rxdemo"
         minSdkVersion 16
diff --git a/RxFeature/build.gradle b/RxFeature/build.gradle
@@ -17,7 +17,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '27.0.3'
 }
 
 dependencies {
diff --git a/RxKit/build.gradle b/RxKit/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 16
diff --git a/RxKit/src/main/java/com/vondear/rxtool/RxConstants.java b/RxKit/src/main/java/com/vondear/rxtool/RxConstants.java
@@ -1,5 +1,7 @@
 package com.vondear.rxtool;
 
+import java.text.DecimalFormat;
+
 /**
  *
  * @author vondear
@@ -69,4 +71,17 @@ public class RxConstants {
     //百度地图APP 包名
     public static final String BAIDU_PACKAGE_NAME = "com.baidu.BaiduMap";
 
+    /**
+     * 速度格式化
+     */
+    public static final DecimalFormat FORMAT_ONE = new DecimalFormat("#.#");
+    /**
+     * 距离格式化
+     */
+    public static final DecimalFormat FORMAT_TWO = new DecimalFormat("#.##");
+    /**
+     * 速度格式化
+     */
+    public static final DecimalFormat FORMAT_THREE = new DecimalFormat("#.###");
+
 }
diff --git a/RxKit/src/main/java/com/vondear/rxtool/RxDataTool.java b/RxKit/src/main/java/com/vondear/rxtool/RxDataTool.java
@@ -940,6 +940,14 @@ public static String getPercentValue(double value) {
         return getPercentValue(result, 2);
     }
 
+    public static String changeDistance(double length) {
+        if (length < 1000) {
+            return RxConstants.FORMAT_TWO.format(length) + "米";
+        } else {
+            return RxConstants.FORMAT_TWO.format(length / 1000) + "千米";
+        }
+    }
+
     /**
      * outputStream转inputStream
      *
diff --git a/RxUI/build.gradle b/RxUI/build.gradle
@@ -17,7 +17,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '27.0.3'
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+        google()
         jcenter()
         mavenCentral()
-        google()
+        maven { url "https://jitpack.io" }
+        maven { url 'https://esri.bintray.com/arcgis' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha11'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
@@ -20,6 +22,7 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url "https://jitpack.io" }
+        maven { url 'https://esri.bintray.com/arcgis' }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':RxDemo', ':RxKit', ':RxResource', ':RxUI', ':RxFeature'
+include ':RxDemo', ':RxKit', ':RxUI', ':RxFeature', ':RxArcGisKit'

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ android {`
`19`	`19`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`20`	`20`	`}`
`21`	`21`	`}`
`22`		`-`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ android {`
`17`	`17`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`18`	`18`	`}`
`19`	`19`	`}`
`20`		`- buildToolsVersion '27.0.3'`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -940,6 +940,14 @@ public static String getPercentValue(double value) {`
`940`	`940`	`return getPercentValue(result, 2);`
`941`	`941`	`}`
`942`	`942`
	`943`	`+ public static String changeDistance(double length) {`
	`944`	`+ if (length < 1000) {`
	`945`	`+ return RxConstants.FORMAT_TWO.format(length) + "米";`
	`946`	`+ } else {`
	`947`	`+ return RxConstants.FORMAT_TWO.format(length / 1000) + "千米";`
	`948`	`+ }`
	`949`	`+ }`
	`950`	`+`
`943`	`951`	`/**`
`944`	`952`	`* outputStream转inputStream`
`945`	`953`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include ':RxDemo', ':RxKit', ':RxResource', ':RxUI', ':RxFeature'`
	`1`	`+include ':RxDemo', ':RxKit', ':RxUI', ':RxFeature', ':RxArcGisKit'`