Skip to content

Commit 5bf39ac

Browse files
thinaaronthinaaron
committed
不显示图片
任务的webview不能显示文档图片，其实是要设置hosts
1 parent a33e03c commit 5bf39ac

19 files changed

Lines changed: 231 additions & 103 deletions

‎app/src/main/java/net/coding/program/LoginActivity.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
267267
MyApp.sUserObject = user;
268268
AccountInfo.saveReloginInfo(this, user.email, user.global_key);
269269

270-
syncCookie();
270+
Global.syncCookie(this);
271271

272272
finish();
273273
startActivity(new Intent(LoginActivity.this, MainActivity_.class));
@@ -312,22 +312,6 @@ void editName(boolean hasFocus) {
312312
getNetwork(String.format(HOST_USER, global), HOST_USER_RELOGIN);
313313
}
314314

315-
public void syncCookie() {
316-
PersistentCookieStore cookieStore = new PersistentCookieStore(this);
317-
List<Cookie> cookies = cookieStore.getCookies();
318-
319-
CookieManager cookieManager = CookieManager.getInstance();
320-
321-
for (int i = 0; i < cookies.size(); i++) {
322-
Cookie eachCookie = cookies.get(i);
323-
String cookieString = eachCookie.getName() + "=" + eachCookie.getValue();
324-
cookieManager.setCookie(Global.HOST, cookieString);
325-
}
326-
327-
CookieSyncManager.createInstance(this);
328-
CookieSyncManager.getInstance().sync();
329-
}
330-
331315
TextWatcher textWatcher = new SimpleTextWatcher() {
332316
@Override
333317
public void afterTextChanged(Editable s) {

‎app/src/main/java/net/coding/program/RegisterActivity.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
147147
MyApp.sUserObject = user;
148148
AccountInfo.saveReloginInfo(this, user.email, user.global_key);
149149

150-
syncCookie();
150+
Global.syncCookie(this);
151151

152152
setResult(RESULT_OK);
153153
finish();
@@ -201,22 +201,6 @@ private void upateLoginButton() {
201201
loginButton.setEnabled(true);
202202
}
203203

204-
public void syncCookie() {
205-
PersistentCookieStore cookieStore = new PersistentCookieStore(this);
206-
List<Cookie> cookies = cookieStore.getCookies();
207-
208-
CookieManager cookieManager = CookieManager.getInstance();
209-
210-
for (int i = 0; i < cookies.size(); i++) {
211-
Cookie eachCookie = cookies.get(i);
212-
String cookieString = eachCookie.getName() + "=" + eachCookie.getValue();
213-
cookieManager.setCookie(Global.HOST, cookieString);
214-
}
215-
216-
CookieSyncManager.createInstance(this);
217-
CookieSyncManager.getInstance().sync();
218-
}
219-
220204
private void downloadValifyPhoto() {
221205
String host = Global.HOST + "/api/getCaptcha";
222206
AsyncHttpClient client = MyAsyncHttpClient.createClient(this);

‎app/src/main/java/net/coding/program/common/Global.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@
2121
import android.view.View;
2222
import android.view.ViewGroup;
2323
import android.view.inputmethod.InputMethodManager;
24+
import android.webkit.CookieManager;
25+
import android.webkit.CookieSyncManager;
2426
import android.widget.ImageView;
2527

28+
import com.loopj.android.http.PersistentCookieStore;
29+
2630
import net.coding.program.MyApp;
2731
import net.coding.program.common.htmltext.GrayQuoteSpan;
2832
import net.coding.program.common.htmltext.URLSpanNoUnderline;
2933

34+
import org.apache.http.cookie.Cookie;
3035
import org.json.JSONException;
3136
import org.json.JSONObject;
3237
import org.xml.sax.XMLReader;
@@ -39,6 +44,7 @@
3944
import java.text.SimpleDateFormat;
4045
import java.util.ArrayList;
4146
import java.util.Calendar;
47+
import java.util.List;
4248

4349
/**
4450
* Created by cc191954 on 14-8-233.
@@ -76,6 +82,38 @@ public static void errorLog(Exception e) {
7682
Log.e("", "" + e);
7783
}
7884

85+
// public static void syncCookie(Context context) {
86+
// CookieSyncManager.createInstance(context);
87+
// CookieManager cookieManager = CookieManager.getInstance();
88+
//
89+
// PersistentCookieStore myCookieStore = new PersistentCookieStore(context);
90+
// List<Cookie> cookies = myCookieStore.getCookies();
91+
// for (Cookie eachCookie : cookies) {
92+
// String cookieString = eachCookie.getName() + "=" + eachCookie.getValue();
93+
// cookieManager.setCookie(Global.HOST, cookieString);
94+
// }
95+
//
96+
// CookieSyncManager.getInstance().sync();
97+
// }
98+
99+
100+
public static void syncCookie(Context context) {
101+
PersistentCookieStore cookieStore = new PersistentCookieStore(context);
102+
List<Cookie> cookies = cookieStore.getCookies();
103+
104+
CookieManager cookieManager = CookieManager.getInstance();
105+
106+
for (int i = 0; i < cookies.size(); i++) {
107+
Cookie eachCookie = cookies.get(i);
108+
String cookieString = eachCookie.getName() + "=" + eachCookie.getValue();
109+
cookieManager.setCookie(Global.HOST, cookieString);
110+
}
111+
112+
CookieSyncManager.createInstance(context);
113+
CookieSyncManager.getInstance().sync();
114+
115+
}
116+
79117
public static void copy(Context context, String content) {
80118
ClipboardManager cmb = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
81119
cmb.setText(content);

‎app/src/main/java/net/coding/program/message/TouchLinearLayout.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Created by chaochen on 15/2/9.
1212
*/
13-
class TouchLinearLayout extends LinearLayout {
13+
public class TouchLinearLayout extends LinearLayout {
1414

1515
private long pressTime = 0;
1616
private int action;

‎app/src/main/java/net/coding/program/message/UsersListFragment.java‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,11 @@ void initData() {
124124

125125
mUpdateAll = true;
126126
loadMore();
127+
}
128+
129+
@Override
130+
public void onStart() {
131+
super.onStart();
127132

128133
getNetwork(HOST_UNREAD_AT, HOST_UNREAD_AT);
129134
getNetwork(HOST_UNREAD_COMMENT, HOST_UNREAD_COMMENT);
@@ -267,21 +272,24 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
267272
} else if (tag.equals(HOST_MARK_AT)) {
268273
if (code == 0) {
269274
UnreadNotify.displayNotify(badgeAt, Unread.countToString(0));
270-
UnreadNotify.update(getActivity());
271275
}
272276

277+
UnreadNotify.update(getActivity());
278+
273279
} else if (tag.equals(HOST_MARK_COMMENT)) {
274280
if (code == 0) {
275281
UnreadNotify.displayNotify(badgeComment, Unread.countToString(0));
276-
UnreadNotify.update(getActivity());
277282
}
278283

284+
UnreadNotify.update(getActivity());
285+
279286
} else if (tag.equals(HOST_MARK_SYSTEM)) {
280287
if (code == 0) {
281288
UnreadNotify.displayNotify(badgeSystem, Unread.countToString(0));
282-
UnreadNotify.update(getActivity());
283289
}
284290

291+
UnreadNotify.update(getActivity());
292+
285293
} else if (tag.equals(HOST_MARK_MESSAGE)) {
286294
if (code == 0) {
287295
mData.get(pos).unreadCount = 0;
@@ -302,12 +310,15 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
302310
switch (requestCode) {
303311
case 0:
304312
postNetwork(HOST_MARK_AT, new RequestParams(), HOST_MARK_AT);
313+
UnreadNotify.displayNotify(badgeAt, Unread.countToString(0));
305314
break;
306315
case 1:
307316
postNetwork(HOST_MARK_COMMENT, new RequestParams(), HOST_MARK_COMMENT);
317+
UnreadNotify.displayNotify(badgeComment, Unread.countToString(0));
308318
break;
309319
case 4:
310320
postNetwork(HOST_MARK_SYSTEM, new RequestParams(), HOST_MARK_SYSTEM);
321+
UnreadNotify.displayNotify(badgeSystem, Unread.countToString(0));
311322
break;
312323
}
313324
}

‎app/src/main/java/net/coding/program/project/detail/AttachmentsPicDetailActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void init() {
148148

149149
share = AttachmentsPicDetailActivity.this.getSharedPreferences(FileUtil.DOWNLOAD_SETTING, Context.MODE_PRIVATE);
150150
defaultPath = Environment.DIRECTORY_DOWNLOADS + File.separator + FileUtil.DOWNLOAD_FOLDER;
151-
client = MyAsyncHttpClient.createClient(AttachmentsPicDetailActivity.this);
151+
client = MyAsyncHttpClient.createClient(this);
152152

153153
picCache = new HashMap<String, AttachmentFileObject>();
154154

‎app/src/main/java/net/coding/program/project/detail/ProjectGitFragment.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
* Created by yangzhen on 2014/10/25.
3434
*/
3535
@EFragment(R.layout.common_refresh_listview)
36-
//@OptionsMenu(R.menu.project_attachment_folder)
3736
public class ProjectGitFragment extends RefreshBaseFragment implements FootUpdate.LoadMore {
3837

3938
public static final String MASTER = "master";

‎app/src/main/java/net/coding/program/project/detail/ProjectGitFragmentMain.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ public class ProjectGitFragmentMain extends ProjectGitFragment {
4848
@ViewById
4949
View expandableIndicator;
5050

51+
// 父类已经使用了 init，子类就不能再用这个名字，否则 init 会调用两次
5152
@AfterViews
5253
protected void init2() {
54+
setHasOptionsMenu(true);
55+
5356
String urlBranches = String.format(HOST_LIST_BRANCHES, mProjectObject.owner_user_name, mProjectObject.name);
5457
getNetwork(urlBranches, HOST_LIST_BRANCHES);
5558

‎app/src/main/java/net/coding/program/project/detail/TopicListDetailActivity.java‎

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44
import android.app.AlertDialog;
55
import android.content.DialogInterface;
66
import android.content.Intent;
7+
import android.graphics.Rect;
78
import android.text.Html;
9+
import android.view.Gravity;
810
import android.view.Menu;
911
import android.view.View;
1012
import android.view.ViewGroup;
13+
import android.view.Window;
1114
import android.webkit.WebView;
15+
import android.widget.AdapterView;
1216
import android.widget.BaseAdapter;
1317
import android.widget.EditText;
1418
import android.widget.ImageView;
@@ -21,6 +25,7 @@
2125
import net.coding.program.MyApp;
2226
import net.coding.program.R;
2327
import net.coding.program.common.CustomDialog;
28+
import net.coding.program.common.DialogUtil;
2429
import net.coding.program.common.Global;
2530
import net.coding.program.common.MyImageGetter;
2631
import net.coding.program.common.StartActivity;
@@ -123,13 +128,63 @@ void onResultAt(int requestCode, Intent data) {
123128

124129
@Override
125130
public boolean onCreateOptionsMenu(Menu menu) {
126-
if (owerGlobar.equals(MyApp.sUserObject.global_key)) {
127-
getMenuInflater().inflate(R.menu.topic_detail, menu);
128-
}
131+
getMenuInflater().inflate(R.menu.topic_detail, menu);
129132

130133
return super.onCreateOptionsMenu(menu);
131134
}
132135

136+
@OptionsItem
137+
void action_more() {
138+
showRightTopPop();
139+
}
140+
141+
private DialogUtil.RightTopPopupWindow mRightTopPopupWindow = null;
142+
143+
private void initRightTopPop() {
144+
if (mRightTopPopupWindow == null) {
145+
ArrayList<DialogUtil.RightTopPopupItem> popupItemArrayList = new ArrayList();
146+
DialogUtil.RightTopPopupItem downloadItem = new DialogUtil.RightTopPopupItem(getString(R.string.copy_link), R.drawable.ic_menu_link);
147+
popupItemArrayList.add(downloadItem);
148+
if (owerGlobar.equals(MyApp.sUserObject.global_key)) {
149+
DialogUtil.RightTopPopupItem deleteItem = new DialogUtil.RightTopPopupItem(getString(R.string.delete_topic), R.drawable.ic_menu_delete_selector);
150+
popupItemArrayList.add(deleteItem);
151+
}
152+
mRightTopPopupWindow = DialogUtil.initRightTopPopupWindow(this, popupItemArrayList, onRightTopPopupItemClickListener);
153+
}
154+
}
155+
156+
private void showRightTopPop() {
157+
initRightTopPop();
158+
159+
mRightTopPopupWindow.adapter.notifyDataSetChanged();
160+
161+
Rect rectgle = new Rect();
162+
Window window = getWindow();
163+
window.getDecorView().getWindowVisibleDisplayFrame(rectgle);
164+
int StatusBarHeight = rectgle.top;
165+
int contentViewTop =
166+
window.findViewById(Window.ID_ANDROID_CONTENT).getTop();
167+
//int TitleBarHeight= contentViewTop - StatusBarHeight;
168+
mRightTopPopupWindow.adapter.notifyDataSetChanged();
169+
mRightTopPopupWindow.setAnimationStyle(android.R.style.Animation_Dialog);
170+
mRightTopPopupWindow.showAtLocation(listView, Gravity.TOP | Gravity.RIGHT, 0, contentViewTop);
171+
}
172+
173+
private AdapterView.OnItemClickListener onRightTopPopupItemClickListener = new AdapterView.OnItemClickListener() {
174+
@Override
175+
public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
176+
switch (position) {
177+
case 0:
178+
action_copy();
179+
break;
180+
case 1:
181+
action_delete();
182+
break;
183+
}
184+
mRightTopPopupWindow.dismiss();
185+
}
186+
};
187+
133188
@Override
134189
public void onBackPressed() {
135190
if (mResultData.getIntExtra("child_count", -1) == -1) {
@@ -143,8 +198,8 @@ public void onBackPressed() {
143198

144199
final String HOST_MAOPAO_DELETE = Global.HOST + "/api/topic/%s";
145200

146-
@OptionsItem(R.id.action_delete)
147-
void menuDeleteTopic() {
201+
@OptionsItem
202+
void action_delete() {
148203
showDialog("讨论", "删除讨论?", new DialogInterface.OnClickListener() {
149204
@Override
150205
public void onClick(DialogInterface dialog, int which) {
@@ -153,6 +208,13 @@ public void onClick(DialogInterface dialog, int which) {
153208
});
154209
}
155210

211+
void action_copy() {
212+
final String urlTemplate = Global.HOST + "/u/%s/p/%s/topic/%d";
213+
String url = String.format(urlTemplate, topicObject.project.owner_user_name, topicObject.project.name, topicObject.id);
214+
Global.copy(this, url);
215+
showButtomToast("已复制 " + url);
216+
}
217+
156218
private TextView textViewCommentCount;
157219

158220
void updateDisplayCommentCount() {
@@ -190,7 +252,7 @@ private void updateHeadData() {
190252
webView.setWebViewClient(new MaopaoDetailActivity.CustomWebViewClient(this));
191253

192254
webView.getSettings().setDefaultTextEncodingName("UTF-8");
193-
webView.loadDataWithBaseURL(null, bubble.replace("${webview_content}", topicObject.content), "text/html", "UTF-8", null);
255+
webView.loadDataWithBaseURL(Global.HOST, bubble.replace("${webview_content}", topicObject.content), "text/html", "UTF-8", null);
194256

195257
textViewCommentCount = (TextView) head.findViewById(R.id.commentCount);
196258
updateDisplayCommentCount();

0 commit comments

Comments
 (0)