Skip to content

Commit 0db1242

Browse files
author
JemyCheung
committed
reviewone[ci skip]
1 parent 5f0a43d commit 0db1242

File tree

7 files changed

+87
-32
lines changed

7 files changed

+87
-32
lines changed

‎library/src/main/java/com/qiniu/android/collect/UploadInfoElement.java‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import android.util.Log;
44

5+
import com.qiniu.android.http.ResponseInfo;
6+
57
import java.util.concurrent.atomic.AtomicLong;
68

79
public class UploadInfoElement {
@@ -500,4 +502,78 @@ public long getUp_time() {
500502
}
501503

502504
}
505+
506+
507+
public static String resultCode(int statuscode) {
508+
String result = "";
509+
switch (statuscode) {
510+
case 200:
511+
result = "ok";
512+
break;
513+
case ResponseInfo.NetworkError:
514+
result = "network_error";
515+
break;
516+
case ResponseInfo.Cancelled:
517+
result = "user_canceled";
518+
break;
519+
case ResponseInfo.InvalidFile:
520+
result = "invalid_file";
521+
break;
522+
case ResponseInfo.InvalidArgument:
523+
result = "zero_size_file";
524+
break;
525+
case ResponseInfo.InvalidToken:
526+
result = "invalid_args";
527+
break;
528+
case ResponseInfo.ZeroSizeFile:
529+
result = "zero_size_file";
530+
break;
531+
case ResponseInfo.Crc32NotMatch:
532+
result = "crc32_nomatch";
533+
break;
534+
case ResponseInfo.TimedOut:
535+
result = "timeout";
536+
break;
537+
case ResponseInfo.UnknownHost:
538+
result = "unknown_host";
539+
break;
540+
case ResponseInfo.CannotConnectToHost:
541+
result = "cannot_connect_to_host";
542+
break;
543+
case ResponseInfo.NetworkConnectionLost:
544+
result = "network_slow";
545+
break;
546+
547+
default:
548+
result = "unknown_error";
549+
}
550+
return result;
551+
}
552+
553+
public static String errorType(int statuscode) {
554+
String result = "";
555+
if (200 < statuscode && statuscode < 400) {
556+
return "response_error";
557+
}
558+
switch (statuscode) {
559+
case ResponseInfo.NetworkError:
560+
result = "network_error";
561+
break;
562+
case ResponseInfo.Cancelled:
563+
result = "user_canceled";
564+
break;
565+
case ResponseInfo.TimedOut:
566+
result = "timeout";
567+
break;
568+
case ResponseInfo.UnknownHost:
569+
result = "unknown_host";
570+
break;
571+
case ResponseInfo.CannotConnectToHost:
572+
result = "cannot_connect_to_host";
573+
break;
574+
default:
575+
result = "unknown_error";
576+
}
577+
return result;
578+
}
503579
}

‎library/src/main/java/com/qiniu/android/http/ResponseInfo.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,9 @@ public final class ResponseInfo {
3838
public static final int CannotConnectToHost = -1004;
3939
public static final int NetworkConnectionLost = -1005;
4040

41-
public static final int TransmissionError = -1006;
42-
public static final int ProxyError = -1007;
43-
public static final int SSLError = -1008;
44-
public static final int ParseError = -1009;
45-
//⽤用户劫持
46-
public static final int MailciousResponse = -1010;
47-
4841
// -->
4942
/**
50-
* 回复状态码"
43+
* 回复状态码
5144
*/
5245
public final int statusCode;
5346
/**
@@ -174,7 +167,7 @@ public String toRecordMsg() {
174167
logHandler.send("prefetched_ip_count", (long) resolveResults.size());
175168
}
176169
if (error != null) {
177-
logHandler.send("error_type", statusCode + "");
170+
logHandler.send("error_type", UploadInfoElement.errorType(statusCode));
178171
logHandler.send("error_description", error);
179172
}
180173

@@ -226,7 +219,7 @@ public static ResponseInfo zeroSize(final UpToken upToken) {
226219
}
227220

228221
public static ResponseInfo cancelled(final UpToken upToken) {
229-
return create(null, null, Cancelled, "", "", "", "", "", "", 80, -1, -1, "cancelled by user", upToken, 0);
222+
return create(null, null, Cancelled, "", "", "", "", "", "", 80, -1, -1, "cancelled by user", upToken, 0);
230223
}
231224

232225
public static ResponseInfo invalidArgument(String message, final UpToken upToken) {
@@ -238,11 +231,11 @@ public static ResponseInfo invalidToken(String message) {
238231
}
239232

240233
public static ResponseInfo fileError(Exception e, final UpToken upToken) {
241-
return create(null, null, InvalidFile, "", "", "", "", "", "", 80, 0, 0, e.getMessage(), upToken, 0);
234+
return create(null, null, InvalidFile, "", "", "", "", "", "", 80, 0, 0, e.getMessage(), upToken, 0);
242235
}
243236

244237
public static ResponseInfo networkError(int code, UpToken upToken) {
245-
return create(null, null, code, "", "", "", "", "", "", 80, 0, 0, "Network error during preQuery, Please check your network or " +
238+
return create(null, null, code, "", "", "", "", "", "", 80, 0, 0, "Network error during preQuery, Please check your network or " +
246239
"use http try again", upToken, 0);
247240
}
248241

‎library/src/main/java/com/qiniu/android/storage/FormUploader.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import com.qiniu.android.collect.LogHandler;
66
import com.qiniu.android.collect.UploadInfo;
7-
import com.qiniu.android.collect.UploadInfoElement;
87
import com.qiniu.android.collect.UploadInfoElementCollector;
98
import com.qiniu.android.http.Client;
109
import com.qiniu.android.http.CompletionHandler;

‎library/src/main/java/com/qiniu/android/storage/UpToken.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public final class UpToken {
1717
public final String token;
1818
public final String accessKey;
1919
private String returnUrl = null;
20-
private static boolean customRegion = false;
2120

2221
private UpToken(String returnUrl, String token, String accessKey) {
2322
this.returnUrl = returnUrl;
@@ -92,16 +91,7 @@ public static void setCurrent_region_id(LogHandler logHandler, String upHost) {
9291
} else if (Arrays.asList(FixedZone.arrayZoneAs0).contains(host)) {
9392
if (logHandler != null)
9493
logHandler.send("current_region_id", "as0");
95-
} else {
96-
customRegion = true;
9794
}
9895
}
9996

100-
public static boolean isCustomRegion() {
101-
return customRegion;
102-
}
103-
104-
public static void setCustomRegion(boolean customRegion) {
105-
UpToken.customRegion = customRegion;
106-
}
10797
}

‎library/src/main/java/com/qiniu/android/storage/UploadManager.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -343,23 +343,16 @@ public void complete(final String key, final ResponseInfo res, final JSONObject
343343
@Override
344344
public String toRecordMsg() {
345345
LogHandler logHandler = UploadInfoElementCollector.getUplogHandler(UploadInfo.getUploadQuality());
346-
logHandler.send("result", res.statusCode + "");
346+
logHandler.send("result", UploadInfoElement.resultCode(res.statusCode));
347347
logHandler.send("total_elapsed_time", after - before);
348348
logHandler.send("requests_counts", res.requests_count);
349349
logHandler.send("regions_counts", res.regions_count);
350350
logHandler.send("bytes_sent", res.bytes_sent);
351-
UpToken.setCurrent_region_id(null, res.host);
352-
if (!UpToken.isCustomRegion()) {//UC || 内置域名
353-
logHandler.send("cloud_type", "public");
354-
} else {
355-
logHandler.send("cloud_type", "private");
356-
}
357351

358352
logHandler.send("up_time", System.currentTimeMillis() / 1000);
359353
ResponseInfo.regions_count = 0L;
360354
ResponseInfo.requests_count = 0L;
361355
ResponseInfo.bytes_sent = 0L;
362-
UpToken.setCustomRegion(false);
363356

364357
UploadInfoElement.UploadQuality uploadQuality = (UploadInfoElement.UploadQuality) logHandler.getUploadInfo();
365358
String quality = Json.object2Json(uploadQuality);

‎library/src/main/java/com/qiniu/android/storage/UploadOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public UploadOptions(final Map<String, String> params, String mimeType, boolean
5858
netReadyCheckTime = Integer.parseInt(netCheckTime);
5959
}
6060
} catch (Exception e) {
61-
//额外添加参数只能放这，当用户未传netCheckTime这里比走进来
61+
//额外添加参数只能放这，当用户未传netCheckTime这里会走进来
6262
e.printStackTrace();
6363
}
6464
this.params = filterParam(params);

‎library/src/main/java/com/qiniu/android/utils/AndroidNetwork.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,22 @@ public static int getMobileDbm() {
145145
if (cellInfo instanceof CellInfoGsm) {
146146
CellSignalStrengthGsm cellSignalStrengthGsm = ((CellInfoGsm) cellInfo).getCellSignalStrength();
147147
dbm = cellSignalStrengthGsm.getDbm();
148+
break;
148149
} else if (cellInfo instanceof CellInfoCdma) {
149150
CellSignalStrengthCdma cellSignalStrengthCdma =
150151
((CellInfoCdma) cellInfo).getCellSignalStrength();
151152
dbm = cellSignalStrengthCdma.getDbm();
153+
break;
152154
} else if (cellInfo instanceof CellInfoLte) {
153155
CellSignalStrengthLte cellSignalStrengthLte = ((CellInfoLte) cellInfo).getCellSignalStrength();
154156
dbm = cellSignalStrengthLte.getDbm();
157+
break;
155158
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
156159
if (cellInfo instanceof CellInfoWcdma) {
157160
CellSignalStrengthWcdma cellSignalStrengthWcdma =
158161
((CellInfoWcdma) cellInfo).getCellSignalStrength();
159162
dbm = cellSignalStrengthWcdma.getDbm();
163+
break;
160164
}
161165
}
162166
}

0 commit comments

Comments
 (0)