|
@@ -31,7 +31,6 @@ import java.util.Map;
|
31
|
31
|
* Http请求的工具类
|
32
|
32
|
*
|
33
|
33
|
* @author suming
|
34
|
|
- *
|
35
|
34
|
*/
|
36
|
35
|
public class HttpUtl {
|
37
|
36
|
|
|
@@ -40,11 +39,12 @@ public class HttpUtl {
|
40
|
39
|
|
41
|
40
|
public interface CallBack {
|
42
|
41
|
void onRequestComplete(int cmd, String result, Object orgs);
|
|
42
|
+
|
43
|
43
|
void onRequestError(int cmd, String result, Object orgs);
|
44
|
44
|
}
|
45
|
45
|
|
46
|
46
|
|
47
|
|
- public static String token;
|
|
47
|
+ public static String token = null;
|
48
|
48
|
|
49
|
49
|
/**
|
50
|
50
|
* 异步的Get请求
|
|
@@ -67,7 +67,9 @@ public class HttpUtl {
|
67
|
67
|
}
|
68
|
68
|
}
|
69
|
69
|
|
70
|
|
- };
|
|
70
|
+ }
|
|
71
|
+
|
|
72
|
+ ;
|
71
|
73
|
}.start();
|
72
|
74
|
}
|
73
|
75
|
|
|
@@ -93,7 +95,9 @@ public class HttpUtl {
|
93
|
95
|
callBack.onRequestError(cmd, e.toString(), orgs);
|
94
|
96
|
}
|
95
|
97
|
}
|
96
|
|
- };
|
|
98
|
+ }
|
|
99
|
+
|
|
100
|
+ ;
|
97
|
101
|
}.start();
|
98
|
102
|
|
99
|
103
|
}
|
|
@@ -128,7 +132,7 @@ public class HttpUtl {
|
128
|
132
|
conn.setRequestProperty("connection", "Keep-Alive");
|
129
|
133
|
conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
|
130
|
134
|
conn.setRequestProperty("charset", "utf-8");
|
131
|
|
- if(token != null) {
|
|
135
|
+ if (token != null) {
|
132
|
136
|
conn.setRequestProperty("X-Auth-Token", token);
|
133
|
137
|
}
|
134
|
138
|
int retCode = conn.getResponseCode();
|
|
@@ -152,8 +156,10 @@ public class HttpUtl {
|
152
|
156
|
Log.i("http", baos.toString());
|
153
|
157
|
}
|
154
|
158
|
return baos.toString();
|
155
|
|
- } else {
|
|
159
|
+ } else if (retCode == 401) {
|
156
|
160
|
checkTokenFailed(retCode);
|
|
161
|
+ return "";
|
|
162
|
+ } else {
|
157
|
163
|
throw new RuntimeException(" responseCode :" + retCode);
|
158
|
164
|
}
|
159
|
165
|
|
|
@@ -177,31 +183,29 @@ public class HttpUtl {
|
177
|
183
|
}
|
178
|
184
|
|
179
|
185
|
static void checkTokenFailed(int code) {
|
180
|
|
- if(code == 401) {
|
|
186
|
+ if (code == 401) {
|
181
|
187
|
UIUtl.toastI("Token 失效");
|
182
|
|
-
|
183
|
|
- if(ActivityMgr.topActivity != null) {
|
184
|
|
- SipEngine.getInstance().onLine = false;
|
185
|
|
- SipEngine.getInstance().isRelogin = true;
|
|
188
|
+ token = null;
|
|
189
|
+ ActivityMgr.hideAll();
|
|
190
|
+ SipEngine.getInstance().onLine = false;
|
|
191
|
+ SipEngine.getInstance().isRelogin = true;
|
186
|
192
|
// SipEngine.getInstance().Unregister();
|
187
|
193
|
// SipEngine.getInstance().stop();
|
188
|
|
- Intent intent = new Intent(App.getContext(), LoginActivity.class);
|
189
|
|
- Bundle bundle = new Bundle();
|
190
|
|
- bundle.putBoolean("donotAutoLogin", true);
|
191
|
|
- intent.putExtras(bundle);
|
192
|
|
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
193
|
|
- ActivityMgr.topActivity.startActivity(intent);
|
194
|
|
- }
|
|
194
|
+ Intent intent = new Intent(App.getContext(), LoginActivity.class);
|
|
195
|
+ Bundle bundle = new Bundle();
|
|
196
|
+ bundle.putBoolean("donotAutoLogin", true);
|
|
197
|
+ intent.putExtras(bundle);
|
|
198
|
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
199
|
+// ActivityMgr.topActivity.startActivity(intent);
|
|
200
|
+ App.getInstance().startActivity(intent);
|
195
|
201
|
}
|
196
|
202
|
}
|
197
|
203
|
|
198
|
204
|
/**
|
199
|
205
|
* 向指定 URL 发送POST方法的请求
|
200
|
206
|
*
|
201
|
|
- * @param url
|
202
|
|
- * 发送请求的 URL
|
203
|
|
- * @param param
|
204
|
|
- * 请求参数,请求参数应该是 name1=value1&name2=value2 的形式。
|
|
207
|
+ * @param url 发送请求的 URL
|
|
208
|
+ * @param param 请求参数,请求参数应该是 name1=value1&name2=value2 的形式。
|
205
|
209
|
* @return 所代表远程资源的响应结果
|
206
|
210
|
* @throws Exception
|
207
|
211
|
*/
|
|
@@ -219,7 +223,7 @@ public class HttpUtl {
|
219
|
223
|
conn.setRequestMethod("POST");
|
220
|
224
|
conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
|
221
|
225
|
conn.setRequestProperty("charset", "utf-8");
|
222
|
|
- if(token != null) {
|
|
226
|
+ if (token != null) {
|
223
|
227
|
conn.setRequestProperty("X-Auth-Token", token);
|
224
|
228
|
}
|
225
|
229
|
conn.setUseCaches(false);
|
|
@@ -243,8 +247,8 @@ public class HttpUtl {
|
243
|
247
|
while ((line = in.readLine()) != null) {
|
244
|
248
|
result += line;
|
245
|
249
|
}
|
246
|
|
- if (result .equals("{}")){
|
247
|
|
- result = conn.getResponseCode()+"";
|
|
250
|
+ if (result.equals("{}")) {
|
|
251
|
+ result = conn.getResponseCode() + "";
|
248
|
252
|
}
|
249
|
253
|
|
250
|
254
|
int retCode = conn.getResponseCode();
|
|
@@ -266,7 +270,7 @@ public class HttpUtl {
|
266
|
270
|
ex.printStackTrace();
|
267
|
271
|
}
|
268
|
272
|
}
|
269
|
|
- if (result==null&&result.equals("")) {
|
|
273
|
+ if (result == null && result.equals("")) {
|
270
|
274
|
Log.i("http", "result为空");
|
271
|
275
|
} else {
|
272
|
276
|
Log.i("http", result);
|
|
@@ -301,7 +305,7 @@ public class HttpUtl {
|
301
|
305
|
conn.setRequestProperty("connection", "keep-alive");
|
302
|
306
|
conn.setRequestProperty("Charsert", "UTF-8");
|
303
|
307
|
conn.setRequestProperty("Content-Type", MULTIPART_FROM_DATA + ";boundary=" + BOUNDARY);
|
304
|
|
- if(token != null) {
|
|
308
|
+ if (token != null) {
|
305
|
309
|
conn.setRequestProperty("X-Auth-Token", token);
|
306
|
310
|
}
|
307
|
311
|
// 首先组拼文本类型的参数
|