Skip to content

Commit aedee26

Browse files
committed
修复因为format导致的闪退
1 parent ec51b4c commit aedee26

File tree

7 files changed

+24
-11
lines changed

7 files changed

+24
-11
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' // Add this line
1111

gradle.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
#
66
# Specifies the JVM arguments used for the daemon process.
77
# The setting is particularly useful for tweaking memory settings.
8-
# Default value: -Xmx10248m -XX:MaxPermSize=256m
8+
# Default value: -Xmx1024m -XX:MaxPermSize=256m
99
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1010
#
1111
# When configured, Gradle will run in incubating parallel mode.
1212
# This option should only be used with decoupled projects. More details, visit
1313
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1414
# org.gradle.parallel=true
15-
#Thu Dec 29 09:49:10 CST 2016
15+
#Fri Jun 23 10:54:06 CST 2017
16+
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 01 17:05:50 CST 2017
1+
#Fri Jun 23 10:58:51 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

router/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ group='com.github.campusappcn'
77

88
android {
99
compileSdkVersion 23
10-
buildToolsVersion "23.0.2"
10+
buildToolsVersion '25.0.0'
1111

1212

1313

router/src/main/java/cn/campusapp/router/Router.java

+15-3
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public static synchronized void initActivityRouter(Context context, String ... s
5353
}
5454

5555
public static boolean open(String url, Object ... params){
56-
String temp = String.format(Locale.ENGLISH, url, params);
56+
String temp = formatUrl(url, params);
5757
return RouterManager.getSingleton().open(temp);
5858
}
5959

6060
public static boolean open(Context context, String url, Object ... params){
61-
String temp = String.format(Locale.ENGLISH, url, params);
61+
String temp = formatUrl(url, params);
6262
return RouterManager.getSingleton().open(context, temp);
6363
}
6464

@@ -78,7 +78,7 @@ public static void setDebugMode(boolean debug){
7878
* @return
7979
*/
8080
public static IRoute getRoute(String url, Object ... params){
81-
String temp = String.format(Locale.ENGLISH, url, params);
81+
String temp = formatUrl(url, params);
8282
return RouterManager.getSingleton().getRoute(temp);
8383
}
8484

@@ -95,4 +95,16 @@ public static void setInterceptor(Interceptor interceptor){
9595
RouterManager.getSingleton().setInterceptor(interceptor);
9696
}
9797

98+
private static String formatUrl(String url, Object ... params) {
99+
String formatted = url;
100+
try {
101+
formatted = String.format(Locale.ENGLISH, url, params);
102+
} catch (Exception e) {
103+
Timber.e("ops", e);
104+
}
105+
106+
return formatted;
107+
108+
}
109+
98110
}

sample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22
apply plugin: 'com.neenbedankt.android-apt'
33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
applicationId "cn.campusapp.router.sample"

sample/src/main/java/cn/campusapp/router/sample/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void onClick(View v) {
117117
btn9.setOnClickListener(new View.OnClickListener() {
118118
@Override
119119
public void onClick(View v) {
120-
Router.open(MainActivity.this, "http://www.souhu.com");
120+
Router.open(MainActivity.this, "https://yue.laobai.com/react/search/?q=%E9%A1%BA%E4%B8%B0%E4%BC%98%E9%80%89");
121121
}
122122
});
123123

0 commit comments

Comments
 (0)