Skip to content

Commit 1102fee

Browse files
thinaaronthinaaron
committed
html，txt，md 没有下载会先跳转到下载界面
1 parent 8569cde commit 1102fee

4 files changed

Lines changed: 42 additions & 24 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,10 +577,10 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
577577
AttachmentsActivity_.intent(AttachmentsActivity.this).mAttachmentFolderObject(data.folderObject).mProjectObjectId(mProjectObjectId).startForResult(ProjectAttachmentFragment.RESULT_REQUEST_FILES);
578578
} else if (data.isImage()) {
579579
AttachmentsPicDetailActivity_.intent(AttachmentsActivity.this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(data).fileList(getPicFiles()).startForResult(FILE_DELETE_CODE);
580-
} else if (data.isHtml() || data.isMd()) {
581-
AttachmentsHtmlDetailActivity_.intent(AttachmentsActivity.this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(data).startForResult(FILE_DELETE_CODE);
582-
} else if (data.isTxt()) {
583-
AttachmentsTextDetailActivity_.intent(AttachmentsActivity.this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(data).startForResult(FILE_DELETE_CODE);
580+
// } else if (data.isHtml() || data.isMd()) {
581+
// AttachmentsHtmlDetailActivity_.intent(AttachmentsActivity.this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(data).startForResult(FILE_DELETE_CODE);
582+
// } else if (data.isTxt()) {
583+
// AttachmentsTextDetailActivity_.intent(AttachmentsActivity.this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(data).startForResult(FILE_DELETE_CODE);
584584
} else {
585585
AttachmentsDownloadDetailActivity_.intent(AttachmentsActivity.this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(data).startForResult(FILE_DELETE_CODE);
586586
}

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,17 +222,32 @@ public void onClick(DialogInterface dialog, int which) {
222222

223223
@AfterViews
224224
protected final void initAttachmentsDownloadDetailActivity() {
225+
share = AttachmentsDownloadDetailActivity.this.getSharedPreferences(FileUtil.DOWNLOAD_SETTING, Context.MODE_PRIVATE);
226+
defaultPath = Environment.DIRECTORY_DOWNLOADS + File.separator + FileUtil.DOWNLOAD_FOLDER;
227+
228+
if (mAttachmentFileObject != null) {
229+
File file = FileUtil.getDestinationInExternalPublicDir(getFileDownloadPath(), mAttachmentFileObject.getSaveName());
230+
if (file.exists() && file.isFile()) {
231+
if (mAttachmentFileObject.isHtml() || mAttachmentFileObject.isMd()) {
232+
AttachmentsHtmlDetailActivity_.intent(this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(mAttachmentFileObject).start();
233+
finish();
234+
return;
235+
} else if (mAttachmentFileObject.isTxt()) {
236+
AttachmentsTextDetailActivity_.intent(this).mProjectObjectId(mProjectObjectId).mAttachmentFolderObject(mAttachmentFolderObject).mAttachmentFileObject(mAttachmentFileObject).start();
237+
finish();
238+
return;
239+
}
240+
}
241+
}
242+
225243
getSupportActionBar().setTitle(mAttachmentFileObject.getName());
226244
handler = new MyHandler();
227245
downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
228246
downloadManagerPro = new DownloadManagerPro(downloadManager);
229247

230248
completeReceiver = new CompleteReceiver();
231-
/** register download success broadcast **/
232249
registerReceiver(completeReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
233250

234-
share = AttachmentsDownloadDetailActivity.this.getSharedPreferences(FileUtil.DOWNLOAD_SETTING, Context.MODE_PRIVATE);
235-
defaultPath = Environment.DIRECTORY_DOWNLOADS + File.separator + FileUtil.DOWNLOAD_FOLDER;
236251

237252
downloadList = AttachmentsDownloadDetailActivity.this.getSharedPreferences(FileUtil.DOWNLOAD_LIST, Context.MODE_PRIVATE);
238253
downloadListEditor = downloadList.edit();
@@ -427,7 +442,10 @@ public void onPause() {
427442
@Override
428443
protected void onDestroy() {
429444
super.onDestroy();
430-
unregisterReceiver(completeReceiver);
445+
446+
if (completeReceiver != null) {
447+
unregisterReceiver(completeReceiver);
448+
}
431449
}
432450

433451
public void updateView() {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
import org.androidannotations.annotations.Click;
3838
import org.androidannotations.annotations.EFragment;
3939
import org.androidannotations.annotations.FragmentArg;
40+
import org.androidannotations.annotations.ItemClick;
41+
import org.androidannotations.annotations.ItemLongClick;
4042
import org.androidannotations.annotations.OnActivityResult;
4143
import org.androidannotations.annotations.OptionsMenu;
4244
import org.androidannotations.annotations.ViewById;
@@ -254,27 +256,25 @@ protected void init() {
254256
HOST_FILECOUNT = String.format(HOST_FILECOUNT, mProjectObject.getId());
255257
//mFootUpdate.init(listView, mInflater, this);
256258
listView.setAdapter(adapter);
257-
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
258-
@Override
259-
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
260-
//AttachmentsActivity_.intent(getActivity()).mAttachmentFolderObject(mData.get(position)).mProjectObjectId(mProjectObject.id).start();
261-
AttachmentsActivity_.intent(getActivity()).mAttachmentFolderObject(mData.get(position)).mProjectObjectId(mProjectObject.getId()).startForResult(RESULT_REQUEST_FILES);
262-
}
263-
});
264259

265-
listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
266-
@Override
267-
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
268-
//showButtomToast("rename");
269-
showPop(view, position);
270-
//doRename(position, mData.get(position));
271-
return true;
272-
}
273-
});
274260
getNetwork(HOST_FILECOUNT, HOST_FILECOUNT);
275261

276262
}
277263

264+
@ItemClick
265+
public void listViewItemClicked(int position) {
266+
AttachmentsActivity_.intent(getActivity())
267+
.mAttachmentFolderObject(mData.get(position))
268+
.mProjectObjectId(mProjectObject.getId())
269+
.startForResult(RESULT_REQUEST_FILES);
270+
271+
}
272+
273+
@ItemLongClick
274+
public void listViewItemLongClicked(int position) {
275+
showPop(listView, position);
276+
}
277+
278278
@OnActivityResult(RESULT_REQUEST_FILES)
279279
public void onFileResult(int resultCode, Intent data) {
280280
if (resultCode == Activity.RESULT_OK) {

‎app/src/main/res/drawable-xxhdpi/login_button_normal.9.png‎

-917 Bytes
Loading

0 commit comments

Comments
 (0)