Skip to content

Commit f70dc59

Browse files
matrixcloudmatrixcloud
committed
精简部分代码
1 parent cc29760 commit f70dc59

File tree

6 files changed

+28
-58
lines changed

6 files changed

+28
-58
lines changed

‎src/com/dreamteam/app/commons/ItemListEntityParser.java

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.io.FileNotFoundException;
44
import java.io.IOException;
55
import java.io.InputStream;
6-
import java.io.InputStreamReader;
76
import java.util.ArrayList;
87

98
import javax.xml.parsers.ParserConfigurationException;
@@ -54,7 +53,7 @@ public void startElement(String uri, String localName, String qName,
5453
Attributes attributes) throws SAXException
5554
{
5655
sb.setLength(0);
57-
if(localName.trim().equalsIgnoreCase("item"))
56+
if(localName.equalsIgnoreCase("item"))
5857
{
5958
feedItem = new FeedItem();
6059
items.add(feedItem);
@@ -69,40 +68,31 @@ public void endElement(String uri, String localName, String qName)
6968
throws SAXException
7069
{
7170
String content = sb.toString();
72-
Log.d(qName, content);
73-
if(!isFeedLink && localName.trim().equalsIgnoreCase("link"))
71+
if(!isFeedLink && localName.equalsIgnoreCase("link"))
7472
{
7573
feedItem.setLink(content);
7674
}
77-
if(!isFeedTitle && localName.trim().equalsIgnoreCase("title"))
75+
if(!isFeedTitle && localName.equalsIgnoreCase("title"))
7876
{
7977
feedItem.setTitle(content);
8078
return;
8179
}
82-
if(!isFeedDesc && localName.trim().equalsIgnoreCase("description"))
80+
if(!isFeedDesc && (localName.equalsIgnoreCase("description") || localName.equalsIgnoreCase("content:encoded")))
8381
{
84-
feedItem.setDescription(content);
82+
feedItem.setContent(content);
8583
ArrayList<String> srcs = HtmlFilter.getImageSrcs(content);
8684
if(!srcs.isEmpty())
8785
feedItem.setFirstImageUrl(srcs.get(0));
8886
feedItem.setImageUrls(srcs);
8987
isFeedDesc = false;
9088
return;
9189
}
92-
if(localName.trim().equalsIgnoreCase("pubDate"))
90+
if(localName.equalsIgnoreCase("pubDate"))
9391
{
9492
content = DateUtils.rfcNormalDate(content);
9593
if(feedItem != null)
9694
feedItem.setPubdate(content);
9795
}
98-
if(localName.trim().equalsIgnoreCase("content:encoded"))
99-
{
100-
feedItem.setContentEncoded(content);
101-
ArrayList<String> srcs = HtmlFilter.getImageSrcs(content);
102-
if(!srcs.isEmpty())
103-
feedItem.setFirstImageUrl(srcs.get(0));
104-
feedItem.setImageUrls(srcs);
105-
}
10696
}
10797

10898
@Override

‎src/com/dreamteam/app/entity/FeedItem.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
public class FeedItem implements Serializable
1717
{
1818
private String title;
19-
private String description;
19+
private String content;
2020
private String link;
2121
private String pubdate;
2222
private String category;
2323
private String firstImageUrl;
24-
private String contentEncoded;
2524
private boolean readed = false;
2625
private boolean favorite = false;
2726
private ArrayList<String> imageUrls = new ArrayList<String>();
@@ -44,14 +43,6 @@ public void setTitle(String title)
4443
{
4544
this.title = title;
4645
}
47-
public String getDescription()
48-
{
49-
return description;
50-
}
51-
public void setDescription(String description)
52-
{
53-
this.description = description;
54-
}
5546
public String getLink()
5647
{
5748
return link;
@@ -76,14 +67,6 @@ public void setCategory(String category)
7667
{
7768
this.category = category;
7869
}
79-
public String getContentEncoded()
80-
{
81-
return contentEncoded;
82-
}
83-
public void setContentEncoded(String contentEncoded)
84-
{
85-
this.contentEncoded = contentEncoded;
86-
}
8770
public ArrayList<String> getImageUrls()
8871
{
8972
return imageUrls;
@@ -108,5 +91,11 @@ public void setFavorite(boolean favorite)
10891
{
10992
this.favorite = favorite;
11093
}
94+
public String getContent() {
95+
return content;
96+
}
97+
public void setContent(String content) {
98+
this.content = content;
99+
}
111100

112101
}

‎src/com/dreamteam/app/ui/FavoriteItemList.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,11 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
5252
{
5353
FeedItem item = items.get(position);
5454
String title = item.getTitle();
55-
String contentEncoded = item.getContentEncoded();
55+
String content = item.getContent();
5656
String pubdate = item.getPubdate();
57-
if(contentEncoded != null && contentEncoded.length() != 0)
57+
if(content != null && content.length() != 0)
5858
{
59-
intent.putExtra("item_detail", contentEncoded);
60-
}
61-
else
62-
{
63-
intent.putExtra("item_detail", items.get(position).getDescription());
59+
intent.putExtra("item_detail", content);
6460
}
6561
intent.putExtra("title", title);
6662
intent.putExtra("pubdate", pubdate);
@@ -94,7 +90,7 @@ private void initData()
9490
String itemDetail = cursor.getString(cursor.getColumnIndex("item_detail"));
9591
item.setTitle(title);
9692
item.setPubdate(pubdate);
97-
item.setDescription(itemDetail);
93+
item.setContent(itemDetail);
9894
items.add(item);
9995
cursor.moveToNext();
10096
}

‎src/com/dreamteam/app/ui/ItemDetail.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.os.Handler;
1313
import android.os.Message;
1414
import android.support.v4.app.FragmentActivity;
15+
import android.util.Log;
1516
import android.view.View;
1617
import android.view.View.OnClickListener;
1718
import android.webkit.WebSettings.LayoutAlgorithm;
@@ -46,7 +47,6 @@ public class ItemDetail extends FragmentActivity
4647
private ImageButton shareBtn;
4748
private ImageButton commentBtn;
4849
private TextView countTv;//评论列表
49-
// private TextView topTitleTv;
5050
private static WebView mWebView;
5151
private String sectionTitle;
5252
private String sectionUrl;
@@ -124,7 +124,6 @@ private void initView()
124124

125125
isFavorite = getIntent().getBooleanExtra("is_favorite", false);
126126
setContentView(R.layout.feed_item_detail);
127-
// topTitleTv = (TextView) findViewById(R.id.fid_top_title);
128127
shareBtn = (ImageButton) findViewById(R.id.fid_btn_share);
129128
shareBtn.setOnClickListener(new OnClickListener(){
130129
@Override
@@ -139,6 +138,7 @@ public void onClick(View v)
139138
@Override
140139
public void onClick(View v)
141140
{
141+
mController.setShareContent(title + "原文链接:" + link);
142142
mController.openComment(ItemDetail.this, false);
143143
}
144144
});
@@ -209,23 +209,23 @@ private void loadData()
209209
sectionTitle = intent.getStringExtra("section_title");
210210
sectionUrl = intent.getStringExtra("section_url");
211211
firstImgUrl = intent.getStringExtra("first_img_url");
212-
// topTitleTv.setText(sectionTitle);
213212

214213
StringBuffer sb = new StringBuffer();
215214
title = intent.getStringExtra("title");
216215
pubdate = intent.getStringExtra("pubdate");
217216
itemDetail = intent.getStringExtra("item_detail");
217+
Log.e("ItemDetail", itemDetail);
218218
link = intent.getStringExtra("link");
219219
//过滤style
220220
itemDetail = itemDetail.replaceAll(HtmlFilter.regexpForStyle, "");
221221
//过滤img宽和高
222222
itemDetail = itemDetail.replaceAll("(<img[^>]*?)\\s+width\\s*=\\s*\\S+", "$1");
223223
itemDetail = itemDetail.replaceAll(
224224
"(<img[^>]*?)\\s+height\\s*=\\s*\\S+", "$1");
225-
//图片双击
226-
itemDetail = itemDetail.replaceAll("(<img[^>]+src=\")(\\S+)\"",
227-
"$1$2\" onClick=\"javascript:mWebViewImageListener.onImageClick('$2')\"");
228-
mWebView.addJavascriptInterface(this, "mWebViewImageListener");
225+
// //图片双击
226+
// itemDetail = itemDetail.replaceAll("(<img[^>]+src=\")(\\S+)\"",
227+
// "$1$2\" onClick=\"javascript:mWebViewImageListener.onImageClick('$2')\"");
228+
// mWebView.addJavascriptInterface(this, "mWebViewImageListener");
229229
//是否加载图片
230230
SharedPreferences pref = AppContext.getPrefrences(this);
231231
if(!pref.getBoolean("pref_imageLoad", false))

‎src/com/dreamteam/app/ui/ItemList.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import android.os.AsyncTask;
1515
import android.os.Bundle;
1616
import android.os.RemoteException;
17-
import android.util.Log;
1817
import android.view.View;
1918
import android.view.View.OnClickListener;
2019
import android.widget.AdapterView;
@@ -128,7 +127,6 @@ public void onSpeakPaused() throws RemoteException
128127
@Override
129128
public void onSpeakBegin() throws RemoteException
130129
{
131-
Log.d(tag, "------------->>onSpeakBegin");
132130
}
133131

134132
@Override
@@ -237,17 +235,13 @@ public void run()
237235
}.start();
238236
}
239237
String title = item.getTitle();
240-
String contentEncoded = item.getContentEncoded();
238+
String contentEncoded = item.getContent();
241239
String pubdate = item.getPubdate();
242240
boolean isFavorite = item.isFavorite();
243241
String firstImgUrl = item.getFirstImageUrl();
244242
if (contentEncoded != null && contentEncoded.length() != 0)
245243
{
246244
intent.putExtra("item_detail", contentEncoded);
247-
} else
248-
{
249-
intent.putExtra("item_detail", mItems.get(position - 1)
250-
.getDescription());
251245
}
252246
intent.putExtra("section_title", sectionTitle);
253247
intent.putExtra("section_url", sectionUrl);
@@ -284,7 +278,7 @@ private void initData()
284278
for (int i = 0, n = mItems.size(); i < n; i++)
285279
{
286280
FeedItem item = mItems.get(i);
287-
String input = item.getTitle() + item.getDescription();
281+
String input = item.getTitle() + item.getContent();
288282
speechTextList.add(HtmlFilter.filterHtml(input));
289283
}
290284
}

‎src/com/dreamteam/app/ui/Main.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected void onCreate(Bundle savedInstanceState)
8383
initPathMenu();
8484
initPager();
8585
initBroadcast();
86-
checkDeprecated();
86+
// checkDeprecated();
8787
}
8888

8989
private void initBroadcast()
@@ -383,6 +383,7 @@ public void onItemClick(AdapterView<?> parent, View view,
383383
Section section = (Section) adapter.getItem(position);
384384
String title = section.getTitle();
385385
String url = section.getUrl();
386+
Log.d(tag, url);
386387
//初始intent
387388
mIntent = new Intent();
388389
mIntent.putExtra("section_title", title);

0 commit comments

Comments
 (0)