Skip to content

Commit d232a00

Browse files
committed
修复部分请求无法查看数据详情的bug ——by cwjfeifei
1 parent 0152a6f commit d232a00

File tree

7 files changed

+20
-14
lines changed

7 files changed

+20
-14
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
minSdkVersion 14
2727
targetSdkVersion 22
2828
versionCode 18
29-
versionName "2.4.18"
29+
versionName "2.4.21"
3030
// Enabling multidex support.
3131
multiDexEnabled true
3232
resConfigs "zh"

app/src/main/java/cn/darkal/networkdiagnosis/Activity/HarDetailActivity.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package cn.darkal.networkdiagnosis.Activity;
22

3-
import android.content.DialogInterface;
43
import android.content.Intent;
54
import android.os.Bundle;
65
import android.support.v7.app.ActionBar;
76
import android.support.v7.app.AlertDialog;
87
import android.support.v7.app.AppCompatActivity;
98
import android.support.v7.widget.Toolbar;
9+
import android.text.TextUtils;
1010
import android.view.LayoutInflater;
1111
import android.view.MenuItem;
1212
import android.view.View;
@@ -20,10 +20,6 @@
2020
import net.lightbody.bmp.core.har.HarRequest;
2121
import net.lightbody.bmp.core.har.HarResponse;
2222

23-
import java.net.URLDecoder;
24-
import java.net.URLEncoder;
25-
import java.nio.charset.Charset;
26-
2723
import butterknife.BindView;
2824
import butterknife.ButterKnife;
2925
import cn.darkal.networkdiagnosis.R;
@@ -122,19 +118,23 @@ public void initHarLog(int pos) {
122118
addItem("RedirectURL", harResponse.getRedirectURL());
123119
}
124120
if (harResponse.getContent().getText() != null && harResponse.getContent().getText().length() > 0) {
125-
addItem("Content", harResponse.getContent().getText(), pos);
121+
addContentItem("Content", harResponse.getContent().getText(), pos);
126122
}
127123

128124
}
129125

130-
public void addItem(String title, final String value, final int pos) {
126+
public void addContentItem(String title, final String value, final int pos) {
131127
View view = LayoutInflater.from(this).inflate(R.layout.item_detail, null);
132128

133129
TextView textView = (TextView) view.findViewById(R.id.tv_title);
134130
textView.setText(title);
135131

136132
TextView valueTextView = (TextView) view.findViewById(R.id.tv_value);
137-
valueTextView.setText(value.substring(0, value.length() > 50 ? 50 : value.length()));
133+
if (TextUtils.isEmpty(value)) {
134+
valueTextView.setText("");
135+
} else {
136+
valueTextView.setText(value.substring(0, value.length() > 50 ? 50 : value.length()));
137+
}
138138

139139
if (title.equals("Content")) {
140140
view.setOnClickListener(new View.OnClickListener() {
@@ -158,7 +158,11 @@ public void addItem(String title, final String value) {
158158
textView.setText(title);
159159

160160
TextView valueTextView = (TextView) view.findViewById(R.id.tv_value);
161-
valueTextView.setText(value.substring(0, value.length() > 50 ? 50 : value.length()));
161+
if (TextUtils.isEmpty(value)) {
162+
valueTextView.setText("");
163+
} else {
164+
valueTextView.setText(value.substring(0, value.length() > 50 ? 50 : value.length()));
165+
}
162166

163167
view.setOnClickListener(new View.OnClickListener() {
164168
@Override

app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
public class MainActivity extends AppCompatActivity implements BackHandledInterface {
9191
public final static String CODE_URL = "#";
9292
public final static String UPLOAD_URL = "#";
93-
public final static String HOME_URL = "http://www.qq.com";
93+
public final static String HOME_URL = "http://h5.darkal.cn/har/guide/widget.basic.html";
9494
public final static String GUIDE_URL = "http://h5.darkal.cn/har/guide/widget.guide.html";
9595

9696
public final static int TYPE_NONE = 0;

app/src/main/java/cn/darkal/networkdiagnosis/Fragment/PreviewFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ protected FilterResults performFiltering(CharSequence constraint) {
172172
@Override
173173
protected void publishResults(CharSequence constraint, FilterResults results) {
174174
harEntryList.clear();//清除原始数据
175-
harEntryList.addAll((List<HarEntry>) results.values);//将过滤结果添加到这个对象
175+
if(results.values instanceof List){
176+
harEntryList.addAll((List<HarEntry>) results.values);//将过滤结果添加到这个对象
177+
}
176178
if (results.count > 0) {
177179
previewAdapter.notifyDataSetChanged();//有关键字的时候刷新数据
178180
} else {

app/src/main/java/cn/darkal/networkdiagnosis/Fragment/WebViewFragment.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
9696

9797
isSetProxy = false;
9898

99+
urlText.setText(MainActivity.HOME_URL);
100+
99101
WebSettings webSettings = webView.getSettings();
100102
webSettings.setJavaScriptEnabled(true);
101103
webSettings.setAllowFileAccess(true);

app/src/main/res/layout-v21/fragment_webview.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
android:layout_toLeftOf="@id/bt_jump"
2929
android:layout_width="match_parent"
3030
android:layout_height="40dp"
31-
android:text="http://www.qq.com"
3231
android:textSize="14dp"
3332
android:inputType="textUri"
3433
app:clearButtonMode="whileEditing"/>

app/src/main/res/layout/fragment_webview.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
android:layout_toLeftOf="@id/bt_jump"
2828
android:layout_width="match_parent"
2929
android:layout_height="40dp"
30-
android:text="http://www.qq.com"
3130
android:inputType="textUri"
3231
app:clearButtonMode="whileEditing"/>
3332

0 commit comments

Comments
 (0)