From 1c5059ddfefde56c53061713dbf1f03ef102e490 Mon Sep 17 00:00:00 2001 From: Elvis Date: Mon, 25 Feb 2019 10:43:40 +0800 Subject: [PATCH] 下载文件UI更新 --- C5/app/src/main/java/com/sunvote/xpadapp/fragments/DownloadFragment.java | 5 +++++ C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java | 8 ++++++++ C5/app/src/main/res/drawable/back.xml | 9 +++++++++ C5/app/src/main/res/drawable/download_connect.xml | 15 +++++++++++++++ C5/app/src/main/res/drawable/download_fail.xml | 9 +++++++++ C5/app/src/main/res/drawable/page_frist.xml | 8 ++++---- C5/app/src/main/res/layout/fragment_admin.xml | 6 +++--- C5/app/src/main/res/layout/fragment_multi_content_detail.xml | 89 ++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- C5/app/src/main/res/layout/fragment_multi_title.xml | 1 - C5/app/src/main/res/layout/fragment_signin_result_vote.xml | 12 +++++++++++- C5/app/src/main/res/layout/list_multi_title_item.xml | 10 +++++----- 11 files changed, 115 insertions(+), 57 deletions(-) create mode 100644 C5/app/src/main/res/drawable/back.xml create mode 100644 C5/app/src/main/res/drawable/download_connect.xml create mode 100644 C5/app/src/main/res/drawable/download_fail.xml diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/DownloadFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/DownloadFragment.java index 4577640..6b42434 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/DownloadFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/DownloadFragment.java @@ -119,6 +119,7 @@ public class DownloadFragment extends BaseFragment implements FileReciverInterfa case msgConnectError: stopDownload(); if(isUiActive) { + download_img.setImageResource(R.drawable.download_fail); tv.setText(getString(R.string.connect_server_fail)); } break; @@ -156,16 +157,19 @@ public class DownloadFragment extends BaseFragment implements FileReciverInterfa case msgDownloadDataError: if(isUiActive) { if(++downloadRetryCount >= 3){//重试 n 次 + download_img.setImageResource(R.drawable.download_fail); tv.setText(getString(R.string.download_fail)); break; } stopDownload(); + download_img.setImageResource(R.drawable.download_connect); tv.setText(getString(R.string.download_retry)); getMeetingFilesFromServer(); } break; case msgOnUnzipError: Log.d(TAG, "handleMessage: msgOnUnzipError"); + download_img.setImageResource(R.drawable.download_fail); tv.setText(getString(R.string.unzip_error)); Toast.makeText(mMainActivity,getString(R.string.unzip_error),Toast.LENGTH_LONG).show(); isFinishDownload = true; @@ -198,6 +202,7 @@ public class DownloadFragment extends BaseFragment implements FileReciverInterfa private void connectServer() { if(isUiActive) { + download_img.setImageResource(R.drawable.download_connect); tv.setText(getString(R.string.connect_server_ing)); } LogUtil.d(TAG, getString(R.string.connect_server_ing)); diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java index 84d044b..9523cca 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java @@ -23,9 +23,17 @@ public class SinginResultFragment extends BaseFragment { TextView shidaoresult = view.findViewById(R.id.shidaoresult); TextView yingdaoresult = view.findViewById(R.id.yingdaoresult); TextView weidaoresult = view.findViewById(R.id.weidaoresult); + TextView result = view.findViewById(R.id.result); shidaoresult.setText("" + resultInfo.num3); yingdaoresult.setText("" + resultInfo.num2); weidaoresult.setText("" + resultInfo.num1); + if ((resultInfo.bits & 0xF) == 0xF) { + result.setText(""); + } else if ((resultInfo.bits & 0xF) == 0) { + result.setText(R.string.bufuherenshu); + } else { + result.setText(R.string.fuherenshu); + } return view; } diff --git a/C5/app/src/main/res/drawable/back.xml b/C5/app/src/main/res/drawable/back.xml new file mode 100644 index 0000000..21389d8 --- /dev/null +++ b/C5/app/src/main/res/drawable/back.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/C5/app/src/main/res/drawable/download_connect.xml b/C5/app/src/main/res/drawable/download_connect.xml new file mode 100644 index 0000000..4b44ee1 --- /dev/null +++ b/C5/app/src/main/res/drawable/download_connect.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/C5/app/src/main/res/drawable/download_fail.xml b/C5/app/src/main/res/drawable/download_fail.xml new file mode 100644 index 0000000..5d8b5a3 --- /dev/null +++ b/C5/app/src/main/res/drawable/download_fail.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/C5/app/src/main/res/drawable/page_frist.xml b/C5/app/src/main/res/drawable/page_frist.xml index 1b32533..1049ef9 100644 --- a/C5/app/src/main/res/drawable/page_frist.xml +++ b/C5/app/src/main/res/drawable/page_frist.xml @@ -1,13 +1,13 @@ + android:pathData="M0.5 3.5H103.9V99.9H0.5V3.5Z" /> diff --git a/C5/app/src/main/res/layout/fragment_admin.xml b/C5/app/src/main/res/layout/fragment_admin.xml index 56b293a..62ec13a 100644 --- a/C5/app/src/main/res/layout/fragment_admin.xml +++ b/C5/app/src/main/res/layout/fragment_admin.xml @@ -77,11 +77,11 @@ + android:background="@drawable/back" /> diff --git a/C5/app/src/main/res/layout/fragment_multi_content_detail.xml b/C5/app/src/main/res/layout/fragment_multi_content_detail.xml index f45838b..63ebbc0 100644 --- a/C5/app/src/main/res/layout/fragment_multi_content_detail.xml +++ b/C5/app/src/main/res/layout/fragment_multi_content_detail.xml @@ -2,45 +2,51 @@ + android:background="@color/votebakground"> + android:background="#AC1007" + android:orientation="horizontal" + android:paddingBottom="20dp" + android:paddingLeft="20dp" + android:paddingTop="20dp" + android:paddingRight="80dp"> + android:textColor="@color/white" + android:textSize="@dimen/big_text_p4" + android:textStyle="bold" />