Skip to content

Commit 4c6fab8

Browse files
committed
Merge branch 'master' into message_voice
2 parents 7e1c968 + 33427a5 commit 4c6fab8

2 files changed

Lines changed: 16 additions & 20 deletions

File tree

app/src/main/java/net/coding/program/project/ProjectListFragment.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.content.DialogInterface;
66
import android.content.Intent;
77
import android.support.v4.app.Fragment;
8+
import android.support.v4.app.FragmentActivity;
89
import android.support.v4.widget.SwipeRefreshLayout;
910
import android.view.View;
1011
import android.view.ViewGroup;
@@ -229,11 +230,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
229230
} else if (action.equals(InitProUtils.FLAG_UPDATE_DYNAMIC)) {
230231
int projectId = data.getIntExtra("projectId", 0);
231232
if (projectId != 0) {
232-
233233
Fragment parentFragment = getParentFragment();
234-
if (parentFragment instanceof UpdateData) { // TODO parentFragment 可能为null,因为parent被销毁了还没有恢复
234+
FragmentActivity activity = getActivity();
235+
if ((parentFragment instanceof UpdateData)
236+
&& (activity != null)) { // TODO parentFragment 可能为null,因为parent被销毁了还没有恢复
235237
((UpdateData) parentFragment).updateRead(projectId);
236-
UnreadNotify.update(getActivity());
238+
UnreadNotify.update(activity);
237239
}
238240
}
239241
}

app/src/main/java/net/coding/program/subject/SubjectSearchFragment.java

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package net.coding.program.subject;
22

3-
import android.text.Html;
43
import android.text.TextUtils;
54
import android.view.LayoutInflater;
65
import android.view.View;
7-
import android.view.ViewGroup;
86
import android.widget.AdapterView;
97
import android.widget.ListView;
10-
import android.widget.RelativeLayout;
118
import android.widget.TextView;
129

1310
import net.coding.program.R;
@@ -16,13 +13,11 @@
1613
import net.coding.program.common.network.BaseFragment;
1714
import net.coding.program.maopao.MaopaoDetailActivity_;
1815
import net.coding.program.model.Maopao;
19-
import net.coding.program.model.Subject;
2016
import net.coding.program.subject.adapter.SubjectSearchListAdapter;
2117

2218
import org.androidannotations.annotations.AfterViews;
2319
import org.androidannotations.annotations.EFragment;
2420
import org.androidannotations.annotations.ViewById;
25-
import org.apmem.tools.layouts.FlowLayout;
2621
import org.json.JSONArray;
2722
import org.json.JSONException;
2823
import org.json.JSONObject;
@@ -54,7 +49,16 @@ public class SubjectSearchFragment extends BaseFragment {
5449
// 当前的搜索条件
5550
private String mCondition = "";
5651
// 热门话题列表的数据
57-
private List<Maopao.MaopaoObject> maopaoObjectList = new ArrayList<Maopao.MaopaoObject>();
52+
private List<Maopao.MaopaoObject> maopaoObjectList = new ArrayList<>();
53+
private AdapterView.OnItemClickListener mSubjectItemClickListener = new AdapterView.OnItemClickListener() {
54+
@Override
55+
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
56+
int pos = position - listView.getHeaderViewsCount();
57+
if (pos >= 0 && pos < maopaoObjectList.size()) {
58+
MaopaoDetailActivity_.intent(getActivity()).mMaopaoObject(maopaoObjectList.get(pos)).start();
59+
}
60+
}
61+
};
5862

5963
public void updateData(String condition) {
6064
if (!mCondition.equals(condition)) {
@@ -84,7 +88,7 @@ void initSearchHeaderView() {
8488
private void searchMaopao() {
8589
if (!TextUtils.isEmpty(mCondition)) {
8690
showDialogLoading();
87-
getNetwork(searchUrl + mCondition, searchTag);
91+
getNetwork(searchUrl + Global.encodeUtf8(mCondition), searchTag);
8892
}
8993
}
9094

@@ -114,14 +118,4 @@ private void notifyDataSetChange() {
114118
}
115119
}
116120

117-
private AdapterView.OnItemClickListener mSubjectItemClickListener = new AdapterView.OnItemClickListener() {
118-
@Override
119-
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
120-
int pos = position - listView.getHeaderViewsCount();
121-
if (pos >= 0 && pos < maopaoObjectList.size()) {
122-
MaopaoDetailActivity_.intent(getActivity()).mMaopaoObject(maopaoObjectList.get(pos)).start();
123-
}
124-
}
125-
};
126-
127121
}

0 commit comments

Comments
 (0)