From 75386c2931d2f32b3ce31014577a2a101accbe25 Mon Sep 17 00:00:00 2001 From: Elvis Date: Mon, 25 Feb 2019 15:09:40 +0800 Subject: [PATCH] 选举结果UI修改 --- C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java | 2 ++ C5/app/src/main/java/com/sunvote/xpadapp/fragments/MeetingWelcomeFragment.java | 5 ++++- C5/app/src/main/java/com/sunvote/xpadapp/fragments/NoFileFragment.java | 3 ++- C5/app/src/main/java/com/sunvote/xpadapp/fragments/OnLineFragment.java | 2 ++ C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java | 30 ++++++++++++++++-------------- C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java | 3 ++- C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java | 5 +++++ C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java | 2 ++ C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java | 9 ++++++++- C5/app/src/main/res/layout/fragment_multi_title.xml | 2 +- C5/app/src/main/res/layout/fragment_result_election.xml | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------- C5/app/src/main/res/layout/list_result_election_item.xml | 43 +++++++++++++++---------------------------- C5/app/src/main/res/values/color.xml | 4 +++- 13 files changed, 157 insertions(+), 128 deletions(-) diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java index af98bf8..6c66eea 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java @@ -10,6 +10,7 @@ import android.content.BroadcastReceiver; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; +import android.graphics.Color; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -546,6 +547,7 @@ public class MainActivity extends BaseActivity implements ComListener { } private void hideResultFragment() { + setBackgroundColor(Color.parseColor("#720600")); if (resultFragment == null) { return; } diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MeetingWelcomeFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MeetingWelcomeFragment.java index 036f578..1595b6e 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MeetingWelcomeFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MeetingWelcomeFragment.java @@ -1,11 +1,13 @@ package com.sunvote.xpadapp.fragments; import com.sunvote.util.LogUtil; +import com.sunvote.xpadapp.MainActivity; import com.sunvote.xpadapp.R; import com.sunvote.xpadapp.base.SuperBaseFragment; import android.app.FragmentManager; import android.app.FragmentTransaction; +import android.graphics.Color; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -24,7 +26,7 @@ public class MeetingWelcomeFragment extends SuperBaseFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { LogUtil.d("MeetingWelcome", "onCreateView"); View view = inflater.inflate(R.layout.fragment_welcome, container, false); - + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#720600")); tv = (TextView) view.findViewById(R.id.welcome_title); @@ -73,6 +75,7 @@ public class MeetingWelcomeFragment extends SuperBaseFragment { @Override public void onResume() { super.onResume(); + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#720600")); isAttach = true; } diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/NoFileFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/NoFileFragment.java index 5f51093..f06f724 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/NoFileFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/NoFileFragment.java @@ -1,6 +1,7 @@ package com.sunvote.xpadapp.fragments; import com.sunvote.util.LogUtil; +import com.sunvote.xpadapp.MainActivity; import com.sunvote.xpadapp.R; import android.app.Activity; @@ -29,7 +30,7 @@ public class NoFileFragment extends Fragment { View view = inflater.inflate(R.layout.fragment_no_file, container, false); tv = (TextView) view.findViewById(R.id.fragment_no_file_title); - + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#450603")); // String sname = mMainActivity.meetingInfo.meetingTitle; tv.setText(String.format( getString(R.string.no_file_tips),meetingId)); diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/OnLineFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/OnLineFragment.java index a452810..8f6779b 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/OnLineFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/OnLineFragment.java @@ -8,6 +8,7 @@ import com.sunvote.xpadapp.base.BaseFragment; import android.app.Fragment; import android.app.FragmentManager; import android.app.FragmentTransaction; +import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -31,6 +32,7 @@ public class OnLineFragment extends Fragment { View adminView = (View)view.findViewById(R.id.fragment_online_btn_admin); tvtitle.setText(getString(R.string.sunvote_system)); + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#720600")); adminView.setOnClickListener(new OnClickListener() { diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java index 1facf6d..cff1d80 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; +import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; import android.util.DisplayMetrics; @@ -72,6 +73,7 @@ public class ResultElectionFragment extends BaseFragment { ; } }); + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160")); initData(); initView(); ImageButton btnBack = (ImageButton) view.findViewById(R.id.fragment_result_election_btn_back); @@ -118,21 +120,21 @@ public class ResultElectionFragment extends BaseFragment { TextView tvOppose= (TextView) view.findViewById(R.id.fragment_result_election_oppose_num); TextView tvAbstant= (TextView) view.findViewById(R.id.fragment_result_election_abstant_num); TextView tvIndexName= (TextView) view.findViewById(R.id.fragment_result_election_num); - TextView tv_to_be= (TextView) view.findViewById(R.id.tv_to_be); - TextView tv_to= (TextView) view.findViewById(R.id.tv_to); + TextView tv_to_be= (TextView) view.findViewById(R.id.yingdaoresult); + TextView tv_to= (TextView) view.findViewById(R.id.shidaoresult); if(goToBe!=0xff && goToBe!=0xffff){ tv_to_be.setVisibility(View.VISIBLE); - tv_to_be.setText(getString(R.string.yindao)+goToBe); + tv_to_be.setText("" + goToBe); }else{ - tv_to_be.setVisibility(View.INVISIBLE); + tv_to_be.setVisibility(View.GONE); } if(goTo!=0xff && goTo!=0xffff){ tv_to.setVisibility(View.VISIBLE); - tv_to.setText(getString(R.string.shidao)+goTo); + tv_to.setText("" + goTo); }else{ - tv_to.setVisibility(View.INVISIBLE); + tv_to.setVisibility(View.GONE); } if(indexNameModel==0){ @@ -152,15 +154,15 @@ public class ResultElectionFragment extends BaseFragment { }else if(resultSelectModel==1){ tvAgree.setVisibility(View.VISIBLE); tvOppose.setVisibility(View.VISIBLE); - tvAbstant.setVisibility(View.INVISIBLE); + tvAbstant.setVisibility(View.GONE); }else if(resultSelectModel==2){ tvAgree.setVisibility(View.VISIBLE); - tvOppose.setVisibility(View.INVISIBLE); + tvOppose.setVisibility(View.GONE); tvAbstant.setVisibility(View.VISIBLE); }else if(resultSelectModel==3){ tvAgree.setVisibility(View.VISIBLE); - tvOppose.setVisibility(View.INVISIBLE); - tvAbstant.setVisibility(View.INVISIBLE); + tvOppose.setVisibility(View.GONE); + tvAbstant.setVisibility(View.GONE); } listview = (ListView) view.findViewById(R.id.fragment_result_election_list); } @@ -394,15 +396,15 @@ public class ResultElectionFragment extends BaseFragment { }else if(resultSelectModel==1){ holder.tvAgree.setVisibility(View.VISIBLE); holder.tvOppose.setVisibility(View.VISIBLE); - holder.tvAbstant.setVisibility(View.INVISIBLE); + holder.tvAbstant.setVisibility(View.GONE); }else if(resultSelectModel==2){ holder.tvAgree.setVisibility(View.VISIBLE); - holder.tvOppose.setVisibility(View.INVISIBLE); + holder.tvOppose.setVisibility(View.GONE); holder.tvAbstant.setVisibility(View.VISIBLE); }else if(resultSelectModel==3){ holder.tvAgree.setVisibility(View.VISIBLE); - holder.tvOppose.setVisibility(View.INVISIBLE); - holder.tvAbstant.setVisibility(View.INVISIBLE); + holder.tvOppose.setVisibility(View.GONE); + holder.tvAbstant.setVisibility(View.GONE); } ResultItem it = aryList.get(position); holder.tvNum.setText(String.valueOf(it.nameIndex)); diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java index 0054465..0ee459a 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java @@ -11,6 +11,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.sunvote.util.LogUtil; +import com.sunvote.xpadapp.MainActivity; import com.sunvote.xpadapp.R; import com.sunvote.xpadapp.base.BaseFragment; import com.sunvote.xpadcomm.XPadApiInterface; @@ -85,7 +86,7 @@ public class ResultVoteFragment extends BaseFragment { shidaoresult = root.findViewById(R.id.shidaoresult); fragmentResultMemo = root.findViewById(R.id.fragment_result_memo); fragmentMemo = root.findViewById(R.id.fragment_memo); - + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160")); tResult = root.findViewById(R.id.t_result); dResult = root.findViewById(R.id.d_result); pResult = root.findViewById(R.id.p_result); 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 9523cca..d3d0fd7 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 @@ -1,15 +1,19 @@ package com.sunvote.xpadapp.fragments; +import android.graphics.Color; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.sunvote.xpadapp.MainActivity; import com.sunvote.xpadapp.R; import com.sunvote.xpadapp.base.BaseFragment; import com.sunvote.xpadcomm.XPadApiInterface.VoteInfo; +import org.apache.tools.ant.Main; + public class SinginResultFragment extends BaseFragment { private VoteInfo.ResultInfo resultInfo; @@ -27,6 +31,7 @@ public class SinginResultFragment extends BaseFragment { shidaoresult.setText("" + resultInfo.num3); yingdaoresult.setText("" + resultInfo.num2); weidaoresult.setText("" + resultInfo.num1); + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160")); if ((resultInfo.bits & 0xF) == 0xF) { result.setText(""); } else if ((resultInfo.bits & 0xF) == 0) { diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java index f95f4d9..d0f018b 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java @@ -3,6 +3,7 @@ package com.sunvote.xpadapp.fragments; import android.annotation.TargetApi; import android.app.FragmentManager; import android.app.FragmentTransaction; +import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -126,6 +127,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa votetype = view.findViewById(R.id.votetype); initOptions(); mact = (MainActivity) getActivity(); + mact.setBackgroundColor(Color.parseColor("#450603")); view.setOnClickListener(new OnClickListener() { @Override diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java index 3864dd4..8bc4f87 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java @@ -130,6 +130,9 @@ public class UserResultVoteFragment extends BaseFragment { } private void setView(int pos, int digiters, int bitNum, int type) { + tResult.removeAllViews(); + dResult.removeAllViews(); + pResult.removeAllViews(); LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.WRAP_CONTENT,1.0f); for(int i = 1; i <= options.length ; i++) { if (options.length >= i) { @@ -161,7 +164,11 @@ public class UserResultVoteFragment extends BaseFragment { if (notVote != 0xff) { tResult.addView(createView(getString(R.string.weian), Color.YELLOW), lp); dResult.addView(createView("" + notVote, Color.WHITE), lp); - pResult.addView(createView("0%", Color.WHITE), lp); + if ((fenmu > 0 && fenmu != 0xff)) { + pResult.addView(createView("0%", Color.WHITE), lp); + }else{ + pResult.setVisibility(View.GONE); + } } } public static String formatDoubleToString(double value, Integer digits, boolean remove) { diff --git a/C5/app/src/main/res/layout/fragment_multi_title.xml b/C5/app/src/main/res/layout/fragment_multi_title.xml index 0812b11..ba921af 100644 --- a/C5/app/src/main/res/layout/fragment_multi_title.xml +++ b/C5/app/src/main/res/layout/fragment_multi_title.xml @@ -8,7 +8,7 @@ android:id="@+id/line_panel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/red" + android:background="#AC1007" android:orientation="horizontal" android:paddingBottom="20dp" android:paddingLeft="20dp" diff --git a/C5/app/src/main/res/layout/fragment_result_election.xml b/C5/app/src/main/res/layout/fragment_result_election.xml index ae84ce8..319f64b 100644 --- a/C5/app/src/main/res/layout/fragment_result_election.xml +++ b/C5/app/src/main/res/layout/fragment_result_election.xml @@ -1,23 +1,23 @@ - + android:orientation="vertical"> + android:layout_marginTop="10dp"> + android:background="@drawable/back_white_selector" + android:visibility="invisible" /> @@ -39,138 +39,153 @@ android:id="@+id/fragment_result_election_title" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_below="@id/title_linear" android:layout_centerHorizontal="true" android:layout_marginLeft="@dimen/content_margin" android:layout_marginRight="@dimen/content_margin" - android:layout_marginTop="@dimen/content_margin" + android:layout_marginTop="10dp" android:gravity="center" + android:lines="1" android:text="@string/vote_result" android:textColor="@color/white" android:textSize="@dimen/big_text_p3" /> + android:layout_below="@id/fragment_result_election_title" + android:layout_marginTop="20dp" + android:orientation="horizontal" + android:paddingRight="80dp"> + android:id="@+id/bottom_linear" + android:layout_width="800dp" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="20dp" + android:orientation="horizontal"> - + + + + + + + - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/C5/app/src/main/res/layout/list_result_election_item.xml b/C5/app/src/main/res/layout/list_result_election_item.xml index a2c596a..56e613e 100644 --- a/C5/app/src/main/res/layout/list_result_election_item.xml +++ b/C5/app/src/main/res/layout/list_result_election_item.xml @@ -2,81 +2,68 @@ - + android:paddingRight="80dp"> diff --git a/C5/app/src/main/res/values/color.xml b/C5/app/src/main/res/values/color.xml index 75646cc..e45cfd7 100644 --- a/C5/app/src/main/res/values/color.xml +++ b/C5/app/src/main/res/values/color.xml @@ -160,6 +160,8 @@ #0000CD #00008B #000080 - #000000 + #000000 + + #450603 \ No newline at end of file -- libgit2 0.21.4