Commit e129be23017455ddcadb90fb84c40d5110e58500
1 parent
e1e56163
添加一些修改选项
Showing
19 changed files
with
189 additions
and
123 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SigninFragment.java
| 1 | package com.sunvote.xpadapp.fragments; | 1 | package com.sunvote.xpadapp.fragments; |
| 2 | 2 | ||
| 3 | +import android.graphics.Color; | ||
| 3 | import android.os.Bundle; | 4 | import android.os.Bundle; |
| 4 | import android.os.Message; | 5 | import android.os.Message; |
| 5 | import android.util.Log; | 6 | import android.util.Log; |
| @@ -46,6 +47,7 @@ public class SigninFragment extends BaseFragment { | @@ -46,6 +47,7 @@ public class SigninFragment extends BaseFragment { | ||
| 46 | 47 | ||
| 47 | btnSignin = (Button)view.findViewById(R.id.signin_btnSign); | 48 | btnSignin = (Button)view.findViewById(R.id.signin_btnSign); |
| 48 | btnSignin.setEnabled(false); | 49 | btnSignin.setEnabled(false); |
| 50 | + btnSignin.setTextColor(Color.parseColor("#c75d3a")); | ||
| 49 | btnSignin.setOnClickListener(new OnClickListener() { | 51 | btnSignin.setOnClickListener(new OnClickListener() { |
| 50 | 52 | ||
| 51 | @Override | 53 | @Override |
| @@ -68,9 +70,11 @@ public class SigninFragment extends BaseFragment { | @@ -68,9 +70,11 @@ public class SigninFragment extends BaseFragment { | ||
| 68 | public void onVoteEvent( VoteInfo info) { | 70 | public void onVoteEvent( VoteInfo info) { |
| 69 | if(info.mode ==XPadApi.VoteType_Signin){ | 71 | if(info.mode ==XPadApi.VoteType_Signin){ |
| 70 | btnSignin.setEnabled(true); | 72 | btnSignin.setEnabled(true); |
| 73 | + btnSignin.setTextColor(Color.RED); | ||
| 71 | 74 | ||
| 72 | }else if(info.mode == XPadApi.VoteType_Stop){ | 75 | }else if(info.mode == XPadApi.VoteType_Stop){ |
| 73 | btnSignin.setEnabled(false); | 76 | btnSignin.setEnabled(false); |
| 77 | + btnSignin.setTextColor(Color.parseColor("#c75d3a")); | ||
| 74 | } | 78 | } |
| 75 | if(SharedPreferencesUtil.getData(getActivity(),"signin","").equals("" + voteInfo.dataPos)){ | 79 | if(SharedPreferencesUtil.getData(getActivity(),"signin","").equals("" + voteInfo.dataPos)){ |
| 76 | LogUtil.i(TAG,"该dataPos已签到。"); | 80 | LogUtil.i(TAG,"该dataPos已签到。"); |
| @@ -85,6 +89,7 @@ public class SigninFragment extends BaseFragment { | @@ -85,6 +89,7 @@ public class SigninFragment extends BaseFragment { | ||
| 85 | public void onVoteSubmitSuccess() { | 89 | public void onVoteSubmitSuccess() { |
| 86 | tv.setText(getString(R.string.signined)); | 90 | tv.setText(getString(R.string.signined)); |
| 87 | btnSignin.setEnabled(false); | 91 | btnSignin.setEnabled(false); |
| 92 | + btnSignin.setTextColor(Color.parseColor("#c75d3a")); | ||
| 88 | // bgView.setBackgroundColor(0xFF009966); | 93 | // bgView.setBackgroundColor(0xFF009966); |
| 89 | SharedPreferencesUtil.saveData(getActivity(),"signin",""+voteInfo.dataPos); | 94 | SharedPreferencesUtil.saveData(getActivity(),"signin",""+voteInfo.dataPos); |
| 90 | ((MainActivity)getActivity()).myHandler.sendEmptyMessageDelayed(MainActivity.MSG_DELAY_TO_VIEW,2000); | 95 | ((MainActivity)getActivity()).myHandler.sendEmptyMessageDelayed(MainActivity.MSG_DELAY_TO_VIEW,2000); |
| @@ -94,6 +99,7 @@ public class SigninFragment extends BaseFragment { | @@ -94,6 +99,7 @@ public class SigninFragment extends BaseFragment { | ||
| 94 | super.onVoteSubmitError(); | 99 | super.onVoteSubmitError(); |
| 95 | tv.setText(getString(R.string.please_signin)); | 100 | tv.setText(getString(R.string.please_signin)); |
| 96 | btnSignin.setEnabled(true); | 101 | btnSignin.setEnabled(true); |
| 102 | + btnSignin.setTextColor(Color.RED); | ||
| 97 | } | 103 | } |
| 98 | 104 | ||
| 99 | } | 105 | } |
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java
| @@ -31,7 +31,7 @@ public class SinginResultFragment extends BaseFragment { | @@ -31,7 +31,7 @@ public class SinginResultFragment extends BaseFragment { | ||
| 31 | shidaoresult.setText("" + resultInfo.num3); | 31 | shidaoresult.setText("" + resultInfo.num3); |
| 32 | yingdaoresult.setText("" + resultInfo.num2); | 32 | yingdaoresult.setText("" + resultInfo.num2); |
| 33 | weidaoresult.setText("" + resultInfo.num1); | 33 | weidaoresult.setText("" + resultInfo.num1); |
| 34 | - ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160")); | 34 | + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148")); |
| 35 | if ((resultInfo.bits & 0xF) == 0xF) { | 35 | if ((resultInfo.bits & 0xF) == 0xF) { |
| 36 | result.setText(""); | 36 | result.setText(""); |
| 37 | } else if ((resultInfo.bits & 0xF) == 0) { | 37 | } else if ((resultInfo.bits & 0xF) == 0) { |
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
| @@ -141,14 +141,15 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa | @@ -141,14 +141,15 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa | ||
| 141 | tvTitle.setText(bill.title); | 141 | tvTitle.setText(bill.title); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | - if(voteInfo.mode1_msgType < 2){ | 144 | + if(voteInfo.mode1_msgType <= 2){ |
| 145 | votetype.setText(R.string.yianbiaojue); | 145 | votetype.setText(R.string.yianbiaojue); |
| 146 | } | 146 | } |
| 147 | - if(voteInfo.mode1_msgType == 2){ | ||
| 148 | - votetype.setText(R.string.yianxuanju); | ||
| 149 | - } | ||
| 150 | if(voteInfo.mode1_msgType > 2){ | 147 | if(voteInfo.mode1_msgType > 2){ |
| 151 | - votetype.setText(R.string.yianceping); | 148 | + if(voteInfo.mode4 > 2){ |
| 149 | + votetype.setText(R.string.yianceping); | ||
| 150 | + }else{ | ||
| 151 | + votetype.setText(R.string.yianbiaojue); | ||
| 152 | + } | ||
| 152 | } | 153 | } |
| 153 | 154 | ||
| 154 | tvTitle.setOnClickListener(new OnClickListener() { | 155 | tvTitle.setOnClickListener(new OnClickListener() { |
| @@ -538,7 +539,9 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa | @@ -538,7 +539,9 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa | ||
| 538 | if (voteInfo.mode2_modify == 1) { | 539 | if (voteInfo.mode2_modify == 1) { |
| 539 | showModify(); | 540 | showModify(); |
| 540 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); | 541 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); |
| 541 | - tvTips.setText(getString(R.string.submited)); | 542 | +// tvTips.setText(getString(R.string.submited)); |
| 543 | + tvTips.setText(""); | ||
| 544 | + tvTips.setBackgroundResource(R.drawable.submitted); | ||
| 542 | } else { | 545 | } else { |
| 543 | disableVote(); | 546 | disableVote(); |
| 544 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); | 547 | singlevoteTvTipsLayout.setVisibility(View.VISIBLE); |
C5/app/src/main/java/com/sunvote/xpadcomm/AntZipUtil.java
| @@ -329,6 +329,7 @@ public class AntZipUtil { | @@ -329,6 +329,7 @@ public class AntZipUtil { | ||
| 329 | } | 329 | } |
| 330 | File f = new File(outputDirectory + File.separator | 330 | File f = new File(outputDirectory + File.separator |
| 331 | + zipEntry.getName()); | 331 | + zipEntry.getName()); |
| 332 | + f.deleteOnExit(); | ||
| 332 | f.createNewFile(); | 333 | f.createNewFile(); |
| 333 | InputStream in = zipFile.getInputStream(zipEntry); | 334 | InputStream in = zipFile.getInputStream(zipEntry); |
| 334 | FileOutputStream out = new FileOutputStream(f); | 335 | FileOutputStream out = new FileOutputStream(f); |
C5/app/src/main/java/com/sunvote/xpadcomm/DownloadFileModule.java
| @@ -160,9 +160,21 @@ public class DownloadFileModule { | @@ -160,9 +160,21 @@ public class DownloadFileModule { | ||
| 160 | 160 | ||
| 161 | private void unzip(){ | 161 | private void unzip(){ |
| 162 | if (fileName.endsWith(".zip") || fileName.endsWith(".rar") || fileName.endsWith(".7z")) { | 162 | if (fileName.endsWith(".zip") || fileName.endsWith(".rar") || fileName.endsWith(".7z")) { |
| 163 | - String outDirName = fileName.substring(0, fileName.length() - 4); | 163 | + String outDirName = ""; |
| 164 | + boolean isAdd = false; | ||
| 165 | + if(fileName.startsWith("q")){ | ||
| 166 | + isAdd = true; | ||
| 167 | + } | ||
| 168 | + if(isAdd){ | ||
| 169 | + outDirName = fileName.substring(1,fileName.length() - 4); | ||
| 170 | + }else{ | ||
| 171 | + outDirName = fileName.substring(0, fileName.length() - 4); | ||
| 172 | + } | ||
| 164 | String uzipDirPath = FILEPATH + "/" + outDirName; | 173 | String uzipDirPath = FILEPATH + "/" + outDirName; |
| 165 | - createAndCleanFolder(uzipDirPath); | 174 | + |
| 175 | + if(!isAdd){ | ||
| 176 | + createAndCleanFolder(uzipDirPath); | ||
| 177 | + } | ||
| 166 | try { | 178 | try { |
| 167 | boolean ret = AntZipUtil.unZip(FILEPATH + fileName, uzipDirPath); | 179 | boolean ret = AntZipUtil.unZip(FILEPATH + fileName, uzipDirPath); |
| 168 | if (fileReciverInterface != null) { | 180 | if (fileReciverInterface != null) { |
C5/app/src/main/res/drawable-hdpi/rendavote.xml
| @@ -8,5 +8,5 @@ | @@ -8,5 +8,5 @@ | ||
| 8 | android:left="5dp" | 8 | android:left="5dp" |
| 9 | android:right="5dp" | 9 | android:right="5dp" |
| 10 | android:top="5dp" /> | 10 | android:top="5dp" /> |
| 11 | - <solid android:color="@color/yellow" /> | 11 | + <solid android:color="@color/white" /> |
| 12 | </shape> | 12 | </shape> |
| 13 | \ No newline at end of file | 13 | \ No newline at end of file |
C5/app/src/main/res/drawable/bgpic_1.png
C5/app/src/main/res/drawable/btn_signin_disable.xml
0 → 100644
| 1 | +<vector android:height="24dp" android:viewportHeight="120" | ||
| 2 | + android:viewportWidth="500" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | + <path android:fillColor="#DC704C" android:pathData="M490,120H10c-5.5,0 -10,-4.5 -10,-10V10C0,4.5 4.5,0 10,0h480c5.5,0 10,4.5 10,10v100C500,115.5 495.5,120 490,120z"/> | ||
| 4 | +</vector> |
C5/app/src/main/res/drawable/btn_signin_enable.xml
0 → 100644
| 1 | +<vector android:height="24dp" android:viewportHeight="120" | ||
| 2 | + android:viewportWidth="500" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | + <path android:fillColor="#FFF134" android:pathData="M490,120H10c-5.5,0 -10,-4.5 -10,-10V10C0,4.5 4.5,0 10,0h480c5.5,0 10,4.5 10,10v100C500,115.5 495.5,120 490,120z"/> | ||
| 4 | +</vector> |
C5/app/src/main/res/drawable/signin_selector.xml
| @@ -3,12 +3,12 @@ | @@ -3,12 +3,12 @@ | ||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | <!-- 点击后的颜色 --> | 5 | <!-- 点击后的颜色 --> |
| 6 | - <item android:state_pressed="true" android:drawable="@drawable/btn_signin_d"/> | ||
| 7 | - <item android:state_focused="true" android:drawable="@drawable/btn_signin"/> | 6 | + <item android:state_pressed="true" android:drawable="@drawable/btn_signin_disable"/> |
| 7 | + <item android:state_focused="true" android:drawable="@drawable/btn_signin_enable"/> | ||
| 8 | 8 | ||
| 9 | - <item android:state_enabled="false" android:drawable="@drawable/btn_signin_d"/> | 9 | + <item android:state_enabled="false" android:drawable="@drawable/btn_signin_disable"/> |
| 10 | <!-- 默认 --> | 10 | <!-- 默认 --> |
| 11 | - <item android:drawable="@drawable/btn_signin"/> | 11 | + <item android:drawable="@drawable/btn_signin_enable"/> |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | </selector> | 14 | </selector> |
C5/app/src/main/res/drawable/submitted.png
0 → 100644
159 KB
C5/app/src/main/res/layout/fragment_custom_election.xml
| @@ -232,7 +232,7 @@ | @@ -232,7 +232,7 @@ | ||
| 232 | android:layout_height="@dimen/button_heigh" | 232 | android:layout_height="@dimen/button_heigh" |
| 233 | android:layout_alignParentLeft="true" | 233 | android:layout_alignParentLeft="true" |
| 234 | android:layout_below="@id/singlevote_confirm_textview" | 234 | android:layout_below="@id/singlevote_confirm_textview" |
| 235 | - android:layout_marginLeft="@dimen/button_to_left" | 235 | + android:layout_marginLeft="200dp" |
| 236 | android:layout_marginTop="@dimen/button_to_right" | 236 | android:layout_marginTop="@dimen/button_to_right" |
| 237 | android:background="@drawable/btn_signin_d" | 237 | android:background="@drawable/btn_signin_d" |
| 238 | android:text="@string/cancel" | 238 | android:text="@string/cancel" |
| @@ -246,7 +246,7 @@ | @@ -246,7 +246,7 @@ | ||
| 246 | android:layout_height="@dimen/button_heigh" | 246 | android:layout_height="@dimen/button_heigh" |
| 247 | android:layout_alignParentRight="true" | 247 | android:layout_alignParentRight="true" |
| 248 | android:layout_below="@id/singlevote_confirm_textview" | 248 | android:layout_below="@id/singlevote_confirm_textview" |
| 249 | - android:layout_marginRight="@dimen/button_to_right" | 249 | + android:layout_marginRight="200dp" |
| 250 | android:layout_marginTop="@dimen/button_to_right" | 250 | android:layout_marginTop="@dimen/button_to_right" |
| 251 | android:background="@drawable/btn_agree" | 251 | android:background="@drawable/btn_agree" |
| 252 | android:text="@string/ok" | 252 | android:text="@string/ok" |
C5/app/src/main/res/layout/fragment_election.xml
| @@ -380,7 +380,7 @@ | @@ -380,7 +380,7 @@ | ||
| 380 | android:layout_height="@dimen/button_heigh" | 380 | android:layout_height="@dimen/button_heigh" |
| 381 | android:layout_alignParentLeft="true" | 381 | android:layout_alignParentLeft="true" |
| 382 | android:layout_below="@id/singlevote_confirm_textview" | 382 | android:layout_below="@id/singlevote_confirm_textview" |
| 383 | - android:layout_marginLeft="@dimen/button_to_left" | 383 | + android:layout_marginLeft="200dp" |
| 384 | android:layout_marginTop="@dimen/button_to_content" | 384 | android:layout_marginTop="@dimen/button_to_content" |
| 385 | android:background="@drawable/btn_signin_d" | 385 | android:background="@drawable/btn_signin_d" |
| 386 | android:text="@string/cancel" | 386 | android:text="@string/cancel" |
| @@ -394,7 +394,7 @@ | @@ -394,7 +394,7 @@ | ||
| 394 | android:layout_height="@dimen/button_heigh" | 394 | android:layout_height="@dimen/button_heigh" |
| 395 | android:layout_alignParentRight="true" | 395 | android:layout_alignParentRight="true" |
| 396 | android:layout_below="@id/singlevote_confirm_textview" | 396 | android:layout_below="@id/singlevote_confirm_textview" |
| 397 | - android:layout_marginRight="@dimen/button_to_right" | 397 | + android:layout_marginRight="200dp" |
| 398 | android:layout_marginTop="@dimen/button_to_content" | 398 | android:layout_marginTop="@dimen/button_to_content" |
| 399 | android:background="@drawable/btn_agree" | 399 | android:background="@drawable/btn_agree" |
| 400 | android:text="@string/ok" | 400 | android:text="@string/ok" |
C5/app/src/main/res/layout/fragment_offline.xml
| @@ -2,8 +2,7 @@ | @@ -2,8 +2,7 @@ | ||
| 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:background="@drawable/bgpic_1" | 3 | android:background="@drawable/bgpic_1" |
| 4 | android:layout_width="match_parent" | 4 | android:layout_width="match_parent" |
| 5 | - android:layout_height="match_parent" | ||
| 6 | - > | 5 | + android:layout_height="match_parent"> |
| 7 | 6 | ||
| 8 | <LinearLayout | 7 | <LinearLayout |
| 9 | android:id="@+id/title" | 8 | android:id="@+id/title" |
C5/app/src/main/res/layout/fragment_signin.xml
| @@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
| 15 | 15 | ||
| 16 | <TextView | 16 | <TextView |
| 17 | android:id="@+id/signin_title" | 17 | android:id="@+id/signin_title" |
| 18 | - android:textSize="@dimen/big_text_p2" | 18 | + android:textSize="@dimen/big_text_p3" |
| 19 | android:layout_marginTop="@dimen/content_margin" | 19 | android:layout_marginTop="@dimen/content_margin" |
| 20 | android:textColor="@color/white" | 20 | android:textColor="@color/white" |
| 21 | android:layout_width="wrap_content" | 21 | android:layout_width="wrap_content" |
| @@ -35,6 +35,7 @@ | @@ -35,6 +35,7 @@ | ||
| 35 | android:text="@string/signin" | 35 | android:text="@string/signin" |
| 36 | android:enabled="false" | 36 | android:enabled="false" |
| 37 | android:textSize="@dimen/big_text_p4" | 37 | android:textSize="@dimen/big_text_p4" |
| 38 | + android:textColor="@color/red" | ||
| 38 | android:layout_below="@id/signin_title"/> | 39 | android:layout_below="@id/signin_title"/> |
| 39 | 40 | ||
| 40 | </RelativeLayout> | 41 | </RelativeLayout> |
C5/app/src/main/res/layout/fragment_signin_result_vote.xml
| @@ -2,121 +2,160 @@ | @@ -2,121 +2,160 @@ | ||
| 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent" | 4 | android:layout_height="match_parent" |
| 5 | - android:background="#ff0952B5"> | 5 | + android:background="#0952B5"> |
| 6 | 6 | ||
| 7 | <TextView | 7 | <TextView |
| 8 | android:id="@+id/signin_result_title" | 8 | android:id="@+id/signin_result_title" |
| 9 | android:layout_width="wrap_content" | 9 | android:layout_width="wrap_content" |
| 10 | android:layout_height="wrap_content" | 10 | android:layout_height="wrap_content" |
| 11 | android:layout_centerHorizontal="true" | 11 | android:layout_centerHorizontal="true" |
| 12 | - android:layout_marginTop="100dp" | 12 | + android:layout_marginTop="50dp" |
| 13 | android:text="@string/signin_result" | 13 | android:text="@string/signin_result" |
| 14 | - android:textColor="@color/yellow" | ||
| 15 | - android:textSize="@dimen/big_text_p2" | 14 | + android:textColor="@color/white" |
| 15 | + android:textSize="@dimen/big_text_p1" | ||
| 16 | android:textStyle="bold" /> | 16 | android:textStyle="bold" /> |
| 17 | 17 | ||
| 18 | - <RelativeLayout | ||
| 19 | - android:id="@+id/data_title_layout" | 18 | + <View |
| 19 | + android:id="@+id/line0" | ||
| 20 | android:layout_width="match_parent" | 20 | android:layout_width="match_parent" |
| 21 | - android:layout_height="wrap_content" | 21 | + android:layout_height="1dp" |
| 22 | android:layout_below="@id/signin_result_title" | 22 | android:layout_below="@id/signin_result_title" |
| 23 | - android:layout_marginTop="50dp"> | 23 | + android:background="#5386cb" |
| 24 | + android:layout_marginTop="54dp"/> | ||
| 24 | 25 | ||
| 25 | - <TextView | ||
| 26 | - android:id="@+id/shidao" | ||
| 27 | - android:layout_width="200dp" | ||
| 28 | - android:layout_height="wrap_content" | ||
| 29 | - android:layout_centerHorizontal="true" | ||
| 30 | - android:gravity="center" | ||
| 31 | - android:text="@string/shidao" | ||
| 32 | - android:textColor="@color/yellow" | ||
| 33 | - android:textSize="@dimen/big_text_p3" /> | 26 | + <LinearLayout |
| 27 | + android:id="@+id/data_title_layout" | ||
| 28 | + android:layout_width="match_parent" | ||
| 29 | + android:layout_height="66dp" | ||
| 30 | + android:layout_below="@id/line0" | ||
| 31 | + android:background="#084aa3" | ||
| 32 | + android:gravity="center_vertical" | ||
| 33 | + android:layout_centerHorizontal="true"> | ||
| 34 | 34 | ||
| 35 | <TextView | 35 | <TextView |
| 36 | - android:layout_width="200dp" | 36 | + android:id="@+id/yindao" |
| 37 | + android:layout_width="0dp" | ||
| 37 | android:layout_height="wrap_content" | 38 | android:layout_height="wrap_content" |
| 38 | - android:layout_toLeftOf="@id/shidao" | ||
| 39 | - android:gravity="center" | 39 | + android:gravity="right" |
| 40 | + android:paddingRight="60dp" | ||
| 40 | android:text="@string/yindao" | 41 | android:text="@string/yindao" |
| 41 | - android:textColor="@color/yellow" | ||
| 42 | - android:textSize="@dimen/big_text_p3" /> | 42 | + android:layout_weight="1" |
| 43 | + android:textColor="@color/white" | ||
| 44 | + android:textSize="@dimen/big_text_p4" | ||
| 45 | + android:textStyle="bold" /> | ||
| 43 | 46 | ||
| 44 | <TextView | 47 | <TextView |
| 45 | - android:layout_width="200dp" | 48 | + android:id="@+id/yingdaoresult" |
| 49 | + android:layout_width="0dp" | ||
| 46 | android:layout_height="wrap_content" | 50 | android:layout_height="wrap_content" |
| 47 | - android:layout_toRightOf="@id/shidao" | ||
| 48 | - android:gravity="center" | ||
| 49 | - android:text="@string/weidao" | ||
| 50 | - android:textColor="@color/yellow" | ||
| 51 | - android:textSize="@dimen/big_text_p3" /> | 51 | + android:layout_weight="1" |
| 52 | + android:layout_toRightOf="@+id/yindao" | ||
| 53 | + android:paddingLeft="60dp" | ||
| 54 | + android:gravity="left" | ||
| 55 | + android:text="@string/yindao" | ||
| 56 | + android:textColor="@color/white" | ||
| 57 | + android:textSize="@dimen/big_text_p4" | ||
| 58 | + android:textStyle="bold" /> | ||
| 52 | 59 | ||
| 53 | - </RelativeLayout> | 60 | + </LinearLayout> |
| 54 | 61 | ||
| 55 | <View | 62 | <View |
| 56 | android:id="@+id/line" | 63 | android:id="@+id/line" |
| 57 | android:layout_width="match_parent" | 64 | android:layout_width="match_parent" |
| 58 | android:layout_height="1dp" | 65 | android:layout_height="1dp" |
| 59 | android:layout_below="@id/data_title_layout" | 66 | android:layout_below="@id/data_title_layout" |
| 60 | - android:layout_marginTop="10dp" | ||
| 61 | - android:background="#B2FFFFFF" /> | 67 | + android:background="#5386CB" /> |
| 62 | 68 | ||
| 63 | - <RelativeLayout | 69 | + <LinearLayout |
| 64 | android:id="@+id/data_result_layout" | 70 | android:id="@+id/data_result_layout" |
| 65 | android:layout_width="match_parent" | 71 | android:layout_width="match_parent" |
| 66 | - android:layout_height="wrap_content" | 72 | + android:layout_height="66dp" |
| 67 | android:layout_below="@id/line" | 73 | android:layout_below="@id/line" |
| 68 | - android:background="#064AA3"> | 74 | + android:gravity="center_vertical" |
| 75 | + android:layout_centerHorizontal="true" | ||
| 76 | + > | ||
| 77 | + <!-- android:background="#064AA3"--> | ||
| 78 | + <TextView | ||
| 79 | + android:id="@+id/shidao" | ||
| 80 | + android:layout_width="0dp" | ||
| 81 | + android:layout_weight="1" | ||
| 82 | + android:layout_height="wrap_content" | ||
| 83 | + android:gravity="right" | ||
| 84 | + android:text="@string/shidao" | ||
| 85 | + android:paddingRight="60dp" | ||
| 86 | + android:textColor="@color/white" | ||
| 87 | + android:textSize="@dimen/big_text_p4" | ||
| 88 | + android:textStyle="bold" /> | ||
| 69 | 89 | ||
| 70 | <TextView | 90 | <TextView |
| 71 | android:id="@+id/shidaoresult" | 91 | android:id="@+id/shidaoresult" |
| 72 | - android:layout_width="200dp" | 92 | + android:layout_width="0dp" |
| 93 | + android:layout_weight="1" | ||
| 73 | android:layout_height="wrap_content" | 94 | android:layout_height="wrap_content" |
| 74 | - android:layout_centerHorizontal="true" | ||
| 75 | - android:gravity="center" | 95 | + android:gravity="left" |
| 96 | + android:paddingLeft="60dp" | ||
| 76 | android:text="@string/shidao" | 97 | android:text="@string/shidao" |
| 77 | android:textColor="@color/white" | 98 | android:textColor="@color/white" |
| 78 | - android:textSize="@dimen/big_text_p2" | 99 | + android:textSize="@dimen/big_text_p4" |
| 79 | android:textStyle="bold" /> | 100 | android:textStyle="bold" /> |
| 80 | 101 | ||
| 102 | + </LinearLayout> | ||
| 103 | + | ||
| 104 | + <View | ||
| 105 | + android:id="@+id/line2" | ||
| 106 | + android:layout_width="match_parent" | ||
| 107 | + android:layout_height="1dp" | ||
| 108 | + android:layout_below="@id/data_result_layout" | ||
| 109 | + android:background="#5386cb" /> | ||
| 110 | + | ||
| 111 | + <LinearLayout | ||
| 112 | + android:id="@+id/weidaoresult_layout" | ||
| 113 | + android:layout_width="match_parent" | ||
| 114 | + android:layout_height="66dp" | ||
| 115 | + android:layout_below="@id/line2" | ||
| 116 | + android:gravity="center_vertical" | ||
| 117 | + android:background="#084aa3" | ||
| 118 | + android:layout_centerHorizontal="true"> | ||
| 81 | 119 | ||
| 82 | <TextView | 120 | <TextView |
| 83 | - android:id="@+id/yingdaoresult" | ||
| 84 | - android:layout_width="200dp" | 121 | + android:layout_weight="1" |
| 122 | + android:layout_width="0dp" | ||
| 85 | android:layout_height="wrap_content" | 123 | android:layout_height="wrap_content" |
| 86 | - android:layout_toLeftOf="@id/shidaoresult" | ||
| 87 | - android:gravity="center" | ||
| 88 | - android:text="@string/yindao" | 124 | + android:gravity="right" |
| 125 | + android:paddingRight="60dp" | ||
| 126 | + android:text="@string/weidao" | ||
| 89 | android:textColor="@color/white" | 127 | android:textColor="@color/white" |
| 90 | - android:textSize="@dimen/big_text_p2" | ||
| 91 | - android:textStyle="bold" /> | ||
| 92 | - | 128 | + android:textStyle="bold" |
| 129 | + android:textSize="@dimen/big_text_p4" /> | ||
| 93 | 130 | ||
| 94 | <TextView | 131 | <TextView |
| 95 | android:id="@+id/weidaoresult" | 132 | android:id="@+id/weidaoresult" |
| 96 | - android:layout_width="200dp" | 133 | + android:layout_width="0dp" |
| 97 | android:layout_height="wrap_content" | 134 | android:layout_height="wrap_content" |
| 98 | - android:layout_toRightOf="@id/shidaoresult" | ||
| 99 | - android:gravity="center" | 135 | + android:layout_weight="1" |
| 136 | + android:gravity="left" | ||
| 100 | android:text="@string/weidao" | 137 | android:text="@string/weidao" |
| 138 | + android:paddingLeft="60dp" | ||
| 101 | android:textColor="@color/white" | 139 | android:textColor="@color/white" |
| 102 | - android:textSize="@dimen/big_text_p2" | 140 | + android:textSize="@dimen/big_text_p4" |
| 103 | android:textStyle="bold" /> | 141 | android:textStyle="bold" /> |
| 142 | + </LinearLayout> | ||
| 104 | 143 | ||
| 105 | - </RelativeLayout> | 144 | + <View |
| 145 | + android:layout_width="match_parent" | ||
| 146 | + android:layout_height="1dp" | ||
| 147 | + android:layout_below="@id/weidaoresult_layout" | ||
| 148 | + android:background="#5386CB" /> | ||
| 106 | 149 | ||
| 107 | <TextView | 150 | <TextView |
| 108 | android:id="@+id/result" | 151 | android:id="@+id/result" |
| 109 | android:layout_width="wrap_content" | 152 | android:layout_width="wrap_content" |
| 110 | android:layout_height="wrap_content" | 153 | android:layout_height="wrap_content" |
| 111 | - android:layout_centerHorizontal="true" | ||
| 112 | android:layout_alignParentBottom="true" | 154 | android:layout_alignParentBottom="true" |
| 113 | - android:textSize="@dimen/big_text_p4" | ||
| 114 | - android:textColor="@color/yellow" | ||
| 115 | - android:layout_marginBottom="40dp"/> | 155 | + android:layout_centerHorizontal="true" |
| 156 | + android:layout_marginBottom="40dp" | ||
| 157 | + android:textColor="@color/white" | ||
| 158 | + android:textSize="@dimen/big_text_p5" /> | ||
| 159 | + | ||
| 116 | 160 | ||
| 117 | - <View | ||
| 118 | - android:layout_width="match_parent" | ||
| 119 | - android:layout_height="1dp" | ||
| 120 | - android:layout_below="@id/data_result_layout" | ||
| 121 | - android:background="#B2FFFFFF" /> | ||
| 122 | </RelativeLayout> | 161 | </RelativeLayout> |
| 123 | \ No newline at end of file | 162 | \ No newline at end of file |
C5/app/src/main/res/layout/fragment_singlevote.xml
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | <LinearLayout | 7 | <LinearLayout |
| 8 | android:id="@+id/singlevote_title_layout" | 8 | android:id="@+id/singlevote_title_layout" |
| 9 | android:layout_width="match_parent" | 9 | android:layout_width="match_parent" |
| 10 | - android:layout_height="80dp" | 10 | + android:layout_height="63dp" |
| 11 | android:background="#AC1007"> | 11 | android:background="#AC1007"> |
| 12 | 12 | ||
| 13 | <TextView | 13 | <TextView |
| @@ -24,11 +24,11 @@ | @@ -24,11 +24,11 @@ | ||
| 24 | 24 | ||
| 25 | <Button | 25 | <Button |
| 26 | android:id="@+id/singlevote_btnB" | 26 | android:id="@+id/singlevote_btnB" |
| 27 | - android:layout_width="200dp" | 27 | + android:layout_width="160dp" |
| 28 | android:layout_height="60dp" | 28 | android:layout_height="60dp" |
| 29 | android:layout_alignParentBottom="true" | 29 | android:layout_alignParentBottom="true" |
| 30 | android:layout_centerHorizontal="true" | 30 | android:layout_centerHorizontal="true" |
| 31 | - android:layout_marginBottom="20dp" | 31 | + android:layout_marginBottom="26dp" |
| 32 | android:background="@drawable/oppos_selector" | 32 | android:background="@drawable/oppos_selector" |
| 33 | android:text="@string/oppose" | 33 | android:text="@string/oppose" |
| 34 | android:textColor="@color/white" | 34 | android:textColor="@color/white" |
| @@ -37,12 +37,12 @@ | @@ -37,12 +37,12 @@ | ||
| 37 | 37 | ||
| 38 | <Button | 38 | <Button |
| 39 | android:id="@+id/singlevote_btnA" | 39 | android:id="@+id/singlevote_btnA" |
| 40 | - android:layout_width="200dp" | 40 | + android:layout_width="160dp" |
| 41 | android:layout_height="60dp" | 41 | android:layout_height="60dp" |
| 42 | android:layout_alignParentBottom="true" | 42 | android:layout_alignParentBottom="true" |
| 43 | android:layout_centerHorizontal="true" | 43 | android:layout_centerHorizontal="true" |
| 44 | - android:layout_marginBottom="20dp" | ||
| 45 | - android:layout_marginRight="40dp" | 44 | + android:layout_marginBottom="26dp" |
| 45 | + android:layout_marginRight="10dp" | ||
| 46 | android:layout_toLeftOf="@id/singlevote_btnB" | 46 | android:layout_toLeftOf="@id/singlevote_btnB" |
| 47 | android:background="@drawable/agree_selector" | 47 | android:background="@drawable/agree_selector" |
| 48 | android:text="@string/agree" | 48 | android:text="@string/agree" |
| @@ -52,12 +52,12 @@ | @@ -52,12 +52,12 @@ | ||
| 52 | 52 | ||
| 53 | <Button | 53 | <Button |
| 54 | android:id="@+id/singlevote_btnC" | 54 | android:id="@+id/singlevote_btnC" |
| 55 | - android:layout_width="200dp" | 55 | + android:layout_width="160dp" |
| 56 | android:layout_height="60dp" | 56 | android:layout_height="60dp" |
| 57 | android:layout_alignParentBottom="true" | 57 | android:layout_alignParentBottom="true" |
| 58 | android:layout_centerHorizontal="true" | 58 | android:layout_centerHorizontal="true" |
| 59 | - android:layout_marginBottom="20dp" | ||
| 60 | - android:layout_marginLeft="40dp" | 59 | + android:layout_marginBottom="26dp" |
| 60 | + android:layout_marginLeft="10dp" | ||
| 61 | android:layout_toRightOf="@id/singlevote_btnB" | 61 | android:layout_toRightOf="@id/singlevote_btnB" |
| 62 | android:background="@drawable/abstain_selector" | 62 | android:background="@drawable/abstain_selector" |
| 63 | android:text="@string/abstant" | 63 | android:text="@string/abstant" |
| @@ -67,11 +67,11 @@ | @@ -67,11 +67,11 @@ | ||
| 67 | 67 | ||
| 68 | <Button | 68 | <Button |
| 69 | android:id="@+id/singlevote_btn_modify" | 69 | android:id="@+id/singlevote_btn_modify" |
| 70 | - android:layout_width="200dp" | 70 | + android:layout_width="160dp" |
| 71 | android:layout_height="60dp" | 71 | android:layout_height="60dp" |
| 72 | android:layout_alignParentBottom="true" | 72 | android:layout_alignParentBottom="true" |
| 73 | android:layout_centerHorizontal="true" | 73 | android:layout_centerHorizontal="true" |
| 74 | - android:layout_marginBottom="20dp" | 74 | + android:layout_marginBottom="26dp" |
| 75 | android:background="@drawable/modify_selector" | 75 | android:background="@drawable/modify_selector" |
| 76 | android:text="@string/modify" | 76 | android:text="@string/modify" |
| 77 | android:textColor="@color/modifytext" | 77 | android:textColor="@color/modifytext" |
| @@ -85,7 +85,7 @@ | @@ -85,7 +85,7 @@ | ||
| 85 | android:layout_height="wrap_content" | 85 | android:layout_height="wrap_content" |
| 86 | android:layout_alignParentBottom="true" | 86 | android:layout_alignParentBottom="true" |
| 87 | android:layout_centerHorizontal="true" | 87 | android:layout_centerHorizontal="true" |
| 88 | - android:layout_marginBottom="20dp" | 88 | + android:layout_marginBottom="26dp" |
| 89 | android:layout_marginLeft="@dimen/content_margin" | 89 | android:layout_marginLeft="@dimen/content_margin" |
| 90 | android:layout_marginRight="@dimen/content_margin" | 90 | android:layout_marginRight="@dimen/content_margin" |
| 91 | android:gravity="center_horizontal"> | 91 | android:gravity="center_horizontal"> |
| @@ -109,7 +109,6 @@ | @@ -109,7 +109,6 @@ | ||
| 109 | android:layout_centerVertical="true" | 109 | android:layout_centerVertical="true" |
| 110 | android:layout_marginLeft="20dp" | 110 | android:layout_marginLeft="20dp" |
| 111 | android:layout_marginRight="20dp" | 111 | android:layout_marginRight="20dp" |
| 112 | - android:layout_marginTop="20dp" | ||
| 113 | android:fadeScrollbars="false" | 112 | android:fadeScrollbars="false" |
| 114 | android:fillViewport="false" | 113 | android:fillViewport="false" |
| 115 | android:scrollbarAlwaysDrawVerticalTrack="true" | 114 | android:scrollbarAlwaysDrawVerticalTrack="true" |
| @@ -120,6 +119,7 @@ | @@ -120,6 +119,7 @@ | ||
| 120 | android:layout_width="match_parent" | 119 | android:layout_width="match_parent" |
| 121 | android:layout_height="wrap_content" | 120 | android:layout_height="wrap_content" |
| 122 | android:layout_centerInParent="true" | 121 | android:layout_centerInParent="true" |
| 122 | + android:layout_margin="110dp" | ||
| 123 | android:background="@color/white" | 123 | android:background="@color/white" |
| 124 | android:gravity="center" | 124 | android:gravity="center" |
| 125 | android:scrollbars="vertical" | 125 | android:scrollbars="vertical" |
| @@ -141,41 +141,38 @@ | @@ -141,41 +141,38 @@ | ||
| 141 | <RelativeLayout | 141 | <RelativeLayout |
| 142 | android:id="@+id/singlevote_tv_tips_layout" | 142 | android:id="@+id/singlevote_tv_tips_layout" |
| 143 | android:layout_width="match_parent" | 143 | android:layout_width="match_parent" |
| 144 | - android:layout_height="50dp" | 144 | + android:layout_height="wrap_content" |
| 145 | + android:layout_marginBottom="20dp" | ||
| 145 | android:layout_alignParentBottom="true" | 146 | android:layout_alignParentBottom="true" |
| 146 | - android:background="#FFF134" | ||
| 147 | - android:visibility="gone"> | 147 | + > |
| 148 | 148 | ||
| 149 | <TextView | 149 | <TextView |
| 150 | android:id="@+id/singlevote_tv_tips" | 150 | android:id="@+id/singlevote_tv_tips" |
| 151 | + android:layout_width="250dp" | ||
| 152 | + android:layout_height="80dp" | ||
| 153 | + android:layout_centerHorizontal="true" | ||
| 154 | + android:gravity="center" | ||
| 155 | + android:text="@string/submiting" | ||
| 156 | + android:textColor="#AC1007" | ||
| 157 | + android:textSize="@dimen/big_text_p1" | ||
| 158 | + android:textStyle="bold" /> | ||
| 159 | + | ||
| 160 | + <TextView | ||
| 161 | + android:id="@+id/singlevote_tv_result" | ||
| 151 | android:layout_width="wrap_content" | 162 | android:layout_width="wrap_content" |
| 152 | android:layout_height="wrap_content" | 163 | android:layout_height="wrap_content" |
| 153 | android:layout_centerHorizontal="true" | 164 | android:layout_centerHorizontal="true" |
| 154 | android:gravity="center" | 165 | android:gravity="center" |
| 155 | - android:text="@string/please_press_key" | ||
| 156 | - android:textColor="@color/red" | ||
| 157 | - android:textSize="@dimen/big_text_p4" | ||
| 158 | - android:textStyle="bold" /> | 166 | + android:alpha="0.9" |
| 167 | + android:background="@drawable/voted_empty" | ||
| 168 | + android:rotation="-20" | ||
| 169 | + android:textSize="@dimen/big_text_p1" | ||
| 170 | + android:textStyle="bold" | ||
| 171 | + android:visibility="gone" /> | ||
| 159 | </RelativeLayout> | 172 | </RelativeLayout> |
| 160 | </RelativeLayout> | 173 | </RelativeLayout> |
| 161 | 174 | ||
| 162 | - <TextView | ||
| 163 | - android:id="@+id/singlevote_tv_result" | ||
| 164 | - android:layout_width="wrap_content" | ||
| 165 | - android:layout_height="wrap_content" | ||
| 166 | - android:layout_alignRight="@id/singlevote_content_layout" | ||
| 167 | - android:layout_alignTop="@id/singlevote_content_layout" | ||
| 168 | - android:layout_marginRight="@dimen/button_to_content" | ||
| 169 | - android:layout_marginTop="@dimen/content_margin" | ||
| 170 | - android:alpha="0.9" | ||
| 171 | - android:background="@drawable/voted_empty" | ||
| 172 | - android:gravity="center" | ||
| 173 | - android:rotation="-20" | ||
| 174 | - android:text="" | ||
| 175 | - android:textColor="#ddff9933" | ||
| 176 | - android:textSize="@dimen/big_text_p2" | ||
| 177 | - android:textStyle="bold" | ||
| 178 | - android:visibility="visible" /> | 175 | + |
| 179 | 176 | ||
| 180 | <RelativeLayout | 177 | <RelativeLayout |
| 181 | android:id="@+id/singlevote_confirm_panel" | 178 | android:id="@+id/singlevote_confirm_panel" |
| @@ -202,7 +199,7 @@ | @@ -202,7 +199,7 @@ | ||
| 202 | android:layout_height="@dimen/button_heigh" | 199 | android:layout_height="@dimen/button_heigh" |
| 203 | android:layout_alignParentLeft="true" | 200 | android:layout_alignParentLeft="true" |
| 204 | android:layout_below="@id/singlevote_confirm_textview" | 201 | android:layout_below="@id/singlevote_confirm_textview" |
| 205 | - android:layout_marginLeft="120dp" | 202 | + android:layout_marginLeft="200dp" |
| 206 | android:layout_marginTop="@dimen/button_to_content" | 203 | android:layout_marginTop="@dimen/button_to_content" |
| 207 | android:background="@drawable/btn_signin_d" | 204 | android:background="@drawable/btn_signin_d" |
| 208 | android:text="@string/cancel" | 205 | android:text="@string/cancel" |
| @@ -216,7 +213,7 @@ | @@ -216,7 +213,7 @@ | ||
| 216 | android:layout_height="@dimen/button_heigh" | 213 | android:layout_height="@dimen/button_heigh" |
| 217 | android:layout_alignParentRight="true" | 214 | android:layout_alignParentRight="true" |
| 218 | android:layout_below="@id/singlevote_confirm_textview" | 215 | android:layout_below="@id/singlevote_confirm_textview" |
| 219 | - android:layout_marginRight="120dp" | 216 | + android:layout_marginRight="200dp" |
| 220 | android:layout_marginTop="@dimen/button_to_content" | 217 | android:layout_marginTop="@dimen/button_to_content" |
| 221 | android:background="@drawable/btn_agree" | 218 | android:background="@drawable/btn_agree" |
| 222 | android:text="@string/ok" | 219 | android:text="@string/ok" |
C5/app/src/main/res/values/strings.xml
| @@ -4,8 +4,8 @@ | @@ -4,8 +4,8 @@ | ||
| 4 | <string name="app_name">中天会议表决系统</string> | 4 | <string name="app_name">中天会议表决系统</string> |
| 5 | <string name="hello_world">Hello world!</string> | 5 | <string name="hello_world">Hello world!</string> |
| 6 | <string name="action_settings">Settings</string> | 6 | <string name="action_settings">Settings</string> |
| 7 | - <string name="welcome">中天无纸化会议表决系统</string> | ||
| 8 | - <string name="renda_vote">人大版</string> | 7 | + <string name="welcome">人大智能平板会议表决系统</string> |
| 8 | + <string name="renda_vote">普及版</string> | ||
| 9 | <string name="connect_meeting">正在连接会议网络...</string> | 9 | <string name="connect_meeting">正在连接会议网络...</string> |
| 10 | <string name="welcome_use">欢迎使用</string> | 10 | <string name="welcome_use">欢迎使用</string> |
| 11 | <string name="sunvote_system">中天无纸化会议表决系统</string> | 11 | <string name="sunvote_system">中天无纸化会议表决系统</string> |
| @@ -46,7 +46,7 @@ | @@ -46,7 +46,7 @@ | ||
| 46 | <string name="memo">说 明</string> | 46 | <string name="memo">说 明</string> |
| 47 | <string name="result">结果</string> | 47 | <string name="result">结果</string> |
| 48 | <string name="please_signin">请按键签到</string> | 48 | <string name="please_signin">请按键签到</string> |
| 49 | - <string name="signin">签到</string> | 49 | + <string name="signin">签 到</string> |
| 50 | <string name="select_other">另选他人</string> | 50 | <string name="select_other">另选他人</string> |
| 51 | <string name="vote">投票</string> | 51 | <string name="vote">投票</string> |
| 52 | <string name="title">标题</string> | 52 | <string name="title">标题</string> |
C5/xpadprotocal/build/libs/xpadprotocal.jar
No preview for this file type