孙向锦 / VoteC5

Commit f839a78ef283a96625122c64ba45372f75b18055

Authored by 孙向锦
1 parent dd9a0f58

commit

Inline Side-by-side
Showing 19 changed files with 270 additions and 237 deletions
C5/app/build.gradle
  View file @f839a78
... ... @@ -88,7 +88,6 @@ dependencies {
88 88 })
89 89 implementation 'com.android.support:appcompat-v7:26.+'
90 90 compile files('libs/ant.jar')
91   - compile project(':udpmodule')
92 91 compile(name: 'ycanfilereadfunc-release', ext: 'aar')
93 92 compile(name: 'ycanreaderfileshow-release', ext: 'aar')
94 93 compile(name: 'ycan-release', ext: 'aar')
... ...
C5/app/src/main/AndroidManifest.xml
  View file @f839a78
... ... @@ -3,7 +3,7 @@
3 3 xmlns:tools="http://schemas.android.com/tools"
4 4 package="com.sunvote.xpadapp"
5 5 android:versionCode="70"
6   - android:versionName="1.3.0.3"> <!-- android:sharedUserId="android.studentUID.system" -->
  6 + android:versionName="1.3.0.7"> <!-- android:sharedUserId="android.studentUID.system" -->
7 7  
8 8 <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"></uses-permission>
9 9 <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
... ...
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
  View file @f839a78
... ... @@ -1458,6 +1458,7 @@ public class MainActivity extends BaseActivity implements ComListener {
1458 1458  
1459 1459 private void doVote(VoteInfo voteInfo) {
1460 1460 LogUtil.i(TAG,"doVote:" + voteInfo);
  1461 + hideBottomUIMenu();
1461 1462 mVoteInfo=voteInfo;
1462 1463 if (voteInfo.mode == XPadApi.VoteType_KeypadTest) {
1463 1464 setKeypadTestFragment();
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
  View file @f839a78
... ... @@ -376,11 +376,11 @@ public class ElectionCustomFragment extends BaseFragment {
376 376 return super.isEnabled(position);
377 377 }
378 378  
379   - private ViewHolder holder;
380 379  
381 380 @Override
382 381 public View getView(final int position, View convertView, ViewGroup parent) {
383 382 MultiTitleItem it = aryContent.get(position);
  383 + final ViewHolder holder;
384 384 if (convertView == null) {
385 385 convertView = mInflater.inflate(R.layout.list_custom_election_item, null);
386 386 holder = new ViewHolder();
... ... @@ -417,6 +417,12 @@ public class ElectionCustomFragment extends BaseFragment {
417 417 holder.btnAbstain.setEnabled(true);
418 418 }
419 419  
  420 + if(it.result == 1){
  421 + holder.btnO.setChecked(true);
  422 + }else {
  423 + holder.btnO.setChecked(false);
  424 + }
  425 +
420 426 holder.btnO.setOnClickListener(new OnClickListener() {
421 427 @Override
422 428 public void onClick(View v) {
... ... @@ -425,6 +431,7 @@ public class ElectionCustomFragment extends BaseFragment {
425 431 voteWithValue(position,0);
426 432 }else{
427 433 if(agreeVotedCount >= voteInfo.limitFavor){
  434 + holder.btnO.setChecked(false);
428 435 ToastAlertDialog.makeText(mMainActivity, "已投"+agreeVotedCount+getString(R.string.fix)+",不可多选").show();
429 436 checkVoted();
430 437 return;
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
  View file @f839a78
... ... @@ -464,6 +464,7 @@ public class ElectionFragment extends BaseFragment {
464 464 tvResult.setVisibility(View.GONE);
465 465 resultLayout.setVisibility(View.VISIBLE);
466 466 this.listview.setEnabled(false);
  467 + hideVote();
467 468 new Thread(new Runnable() {
468 469 public void run() {
469 470 mMainActivity.presenter.submitVote(XPadApi.AnsType_SelectOther,"0");
... ... @@ -586,6 +587,7 @@ public class ElectionFragment extends BaseFragment {
586 587 showResult();
587 588 showModifyOrDisable();
588 589 saveVoteInfo();
  590 + hideVote();
589 591 }
590 592  
591 593 private void showModifyOrDisable(){
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiContentDetailFragment.java
  View file @f839a78
... ... @@ -161,207 +161,208 @@ public class MultiContentDetailFragment extends BaseFragment {
161 161  
162 162 @Override
163 163 public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
164   - Log.d(TAG, "onCreateView");
165 164 View view = inflater.inflate(R.layout.fragment_multi_content_detail, container, false);
166   - contentDetailLayout =view.findViewById(R.id.content_detail_pannal_vote1);
167   - initOptions();
168   - view.setOnClickListener(new OnClickListener() {
169   - @Override
170   - public void onClick(View v) {
171   - ;//
172   - }
173   - });
174   - mact = (MainActivity) getActivity();
175   - tvTitle = (TextView) view.findViewById(R.id.content_detail_title);
176   - if(bill!=null){
177   - if (bill.title != null) {
178   - tvTitle.setText(bill.title);
179   - }
180   - }
181   - final View pdfViews = view.findViewById(R.id.content_detail_scview);
182   - pdfViews.setOnClickListener(new OnClickListener() {
183   - @Override
184   - public void onClick(View view) {
185   - ;
186   - }
187   - });
188   - pdfView = view.findViewById(R.id.content_detail_pdfview);
189   - filename = DATABASE_PATH + "/sunvote/" + mact.meetingId + "/" + bill.billFile;
190   - panelVotes = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_vote);
191   - panelModify = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_modify);
192   - tvTips = (TextView) view.findViewById(R.id.content_detail_tv_tips);
193   - ivReuslt = (TextView) view.findViewById(R.id.content_detail_tv_result);
194   - ivReuslt.setVisibility(View.INVISIBLE);
195   - new Handler().postDelayed(new Runnable(){
196   - public void run() {
197   - //execute the task
198   - openPdfFile();
199   - }
200   - }, pdfDelayLoadTime);
201   - panelVotes.setOnClickListener(new OnClickListener() {
202   - @Override
203   - public void onClick(View v) {
204   - ;
205   - }
206   - });
207   - panelModify.setOnClickListener(new OnClickListener() {
208   - @Override
209   - public void onClick(View v) {
210   - ;
211   - }
212   - });
213   - ivReuslt.setOnClickListener(new OnClickListener() {
214   - @Override
215   - public void onClick(View v) {
216   - ;
217   - }
218   - });
219   -
220   - btnLookPdf= (Button) view.findViewById(R.id.btn_look_pdf);
221   - btnLookPdf.setOnClickListener(new OnClickListener() {
222   -
223   - @Override
224   - public void onClick(View v) {
225   - isClose= false;
226   - mact.isLoadPDF = false;
227   - pdfPageNum=pdfView.getCurrentPage()+1;
228   - //pdfPageNum=pdfView.getCurrentItem()+1;
229   - FragmentManager fm = getFragmentManager();
230   - FragmentTransaction tx = fm.beginTransaction();
231   - PDFContextShowFragment pdfShow = new PDFContextShowFragment();
232   - mact.pdfFragment = pdfShow;
233   - pdfShow.setInfo(filename, bill.billFile,pdfPageNum + "","0",false);
234   - tx.add(R.id.frame_content, pdfShow, "pdfShow");
235   - if(uType==1){
236   - tx.addToBackStack(null);
237   - }else {
238   - mact.multiContentFragment = null;
239   - fm.popBackStack();
  165 + try {
  166 + Log.d(TAG, "onCreateView");
  167 + contentDetailLayout = view.findViewById(R.id.content_detail_pannal_vote1);
  168 + initOptions();
  169 + view.setOnClickListener(new OnClickListener() {
  170 + @Override
  171 + public void onClick(View v) {
  172 + ;//
  173 + }
  174 + });
  175 + mact = (MainActivity) getActivity();
  176 + tvTitle = (TextView) view.findViewById(R.id.content_detail_title);
  177 + if (bill != null) {
  178 + if (bill.title != null) {
  179 + tvTitle.setText(bill.title);
240 180 }
241   - tx.commitAllowingStateLoss();
242 181 }
243   - });
  182 + final View pdfViews = view.findViewById(R.id.content_detail_scview);
  183 + pdfViews.setOnClickListener(new OnClickListener() {
  184 + @Override
  185 + public void onClick(View view) {
  186 + ;
  187 + }
  188 + });
  189 + pdfView = view.findViewById(R.id.content_detail_pdfview);
  190 + filename = DATABASE_PATH + "/sunvote/" + mact.meetingId + "/" + bill.billFile;
  191 + panelVotes = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_vote);
  192 + panelModify = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_modify);
  193 + tvTips = (TextView) view.findViewById(R.id.content_detail_tv_tips);
  194 + ivReuslt = (TextView) view.findViewById(R.id.content_detail_tv_result);
  195 + ivReuslt.setVisibility(View.INVISIBLE);
  196 + new Handler().postDelayed(new Runnable() {
  197 + public void run() {
  198 + //execute the task
  199 + openPdfFile();
  200 + }
  201 + }, pdfDelayLoadTime);
  202 + panelVotes.setOnClickListener(new OnClickListener() {
  203 + @Override
  204 + public void onClick(View v) {
  205 + ;
  206 + }
  207 + });
  208 + panelModify.setOnClickListener(new OnClickListener() {
  209 + @Override
  210 + public void onClick(View v) {
  211 + ;
  212 + }
  213 + });
  214 + ivReuslt.setOnClickListener(new OnClickListener() {
  215 + @Override
  216 + public void onClick(View v) {
  217 + ;
  218 + }
  219 + });
244 220  
245   - btnA = (Button) view.findViewById(R.id.content_detail_btnA);
246   - btnA.setOnClickListener(new OnClickListener() {
  221 + btnLookPdf = (Button) view.findViewById(R.id.btn_look_pdf);
  222 + btnLookPdf.setOnClickListener(new OnClickListener() {
247 223  
248   - @Override
249   - public void onClick(View v) {
250   - if (voteInfo.mode2_modify == 1) {
251   - doVoteWithIndex(1);
252   - } else {
253   - showConfirmWithValue(1);
  224 + @Override
  225 + public void onClick(View v) {
  226 + isClose = false;
  227 + mact.isLoadPDF = false;
  228 + pdfPageNum = pdfView.getCurrentPage() + 1;
  229 + //pdfPageNum=pdfView.getCurrentItem()+1;
  230 + FragmentManager fm = getFragmentManager();
  231 + FragmentTransaction tx = fm.beginTransaction();
  232 + PDFContextShowFragment pdfShow = new PDFContextShowFragment();
  233 + mact.pdfFragment = pdfShow;
  234 + pdfShow.setInfo(filename, bill.billFile, pdfPageNum + "", "0", false);
  235 + tx.add(R.id.frame_content, pdfShow, "pdfShow");
  236 + if (uType == 1) {
  237 + tx.addToBackStack(null);
  238 + } else {
  239 + mact.multiContentFragment = null;
  240 + fm.popBackStack();
  241 + }
  242 + tx.commitAllowingStateLoss();
254 243 }
255   - }
256   - });
  244 + });
257 245  
258   - btnB = (Button) view.findViewById(R.id.content_detail_btnB);
259   - btnB.setOnClickListener(new OnClickListener() {
  246 + btnA = (Button) view.findViewById(R.id.content_detail_btnA);
  247 + btnA.setOnClickListener(new OnClickListener() {
260 248  
261   - @Override
262   - public void onClick(View v) {
263   - if (voteInfo.mode2_modify == 1) {
264   - doVoteWithIndex(2);
265   - } else {
266   - showConfirmWithValue(2);
  249 + @Override
  250 + public void onClick(View v) {
  251 + if (voteInfo.mode2_modify == 1) {
  252 + doVoteWithIndex(1);
  253 + } else {
  254 + showConfirmWithValue(1);
  255 + }
267 256 }
268   - }
269   - });
  257 + });
270 258  
271   - btnC = (Button) view.findViewById(R.id.content_detail_btnC);
272   - btnC.setOnClickListener(new OnClickListener() {
  259 + btnB = (Button) view.findViewById(R.id.content_detail_btnB);
  260 + btnB.setOnClickListener(new OnClickListener() {
273 261  
274   - @Override
275   - public void onClick(View v) {
276   - if (options.length == 2) {
  262 + @Override
  263 + public void onClick(View v) {
277 264 if (voteInfo.mode2_modify == 1) {
278 265 doVoteWithIndex(2);
279 266 } else {
280 267 showConfirmWithValue(2);
281 268 }
282   - } else {
283   - if (voteInfo.mode2_modify == 1) {
284   - doVoteWithIndex(3);
  269 + }
  270 + });
  271 +
  272 + btnC = (Button) view.findViewById(R.id.content_detail_btnC);
  273 + btnC.setOnClickListener(new OnClickListener() {
  274 +
  275 + @Override
  276 + public void onClick(View v) {
  277 + if (options.length == 2) {
  278 + if (voteInfo.mode2_modify == 1) {
  279 + doVoteWithIndex(2);
  280 + } else {
  281 + showConfirmWithValue(2);
  282 + }
285 283 } else {
286   - showConfirmWithValue(3);
  284 + if (voteInfo.mode2_modify == 1) {
  285 + doVoteWithIndex(3);
  286 + } else {
  287 + showConfirmWithValue(3);
  288 + }
287 289 }
288 290 }
289   - }
290   - });
291   -
292   - ImageButton btnBack = (ImageButton) view.findViewById(R.id.content_detail_btnback);
293   - btnBack.setOnClickListener(new OnClickListener() {
294   - @Override
295   - public void onClick(View v) {
296   - goBack();
297   - }
298   - });
  291 + });
299 292  
300   - if (!showBackBtn) {
301   - btnBack.setVisibility(View.INVISIBLE);
302   - }else{
303   - btnBack.setVisibility(View.VISIBLE);
304   - }
  293 + ImageButton btnBack = (ImageButton) view.findViewById(R.id.content_detail_btnback);
  294 + btnBack.setOnClickListener(new OnClickListener() {
  295 + @Override
  296 + public void onClick(View v) {
  297 + goBack();
  298 + }
  299 + });
305 300  
306   - Button btnModify = (Button) view.findViewById(R.id.content_detail_btn_modify);
307   - btnModify.setOnClickListener(new OnClickListener() {
308   - @Override
309   - public void onClick(View v) {
310   - panelModify.setVisibility(View.GONE);
311   - showVote();
312   - ivReuslt.setVisibility(View.VISIBLE);
  301 + if (!showBackBtn) {
  302 + btnBack.setVisibility(View.INVISIBLE);
  303 + } else {
  304 + btnBack.setVisibility(View.VISIBLE);
313 305 }
314   - });
315 306  
  307 + Button btnModify = (Button) view.findViewById(R.id.content_detail_btn_modify);
  308 + btnModify.setOnClickListener(new OnClickListener() {
  309 + @Override
  310 + public void onClick(View v) {
  311 + panelModify.setVisibility(View.GONE);
  312 + showVote();
  313 + ivReuslt.setVisibility(View.VISIBLE);
  314 + }
  315 + });
316 316  
317 317  
318   - tvConfirmText = (TextView) view.findViewById(R.id.content_detail_confirm_textview);
319   - confirmLayout = (RelativeLayout) view.findViewById(R.id.content_detail_confirm_panel);
320   - Button btnConfirmOK = (Button) view.findViewById(R.id.content_detail_btn_confirm_ok);
321   - btnConfirmOK.setOnClickListener(new OnClickListener() {
322   - @Override
323   - public void onClick(View v) {
324   - hideConfirm();
325   - doVoteWithIndex(voteValue);
326   - }
327   - });
328   -
329   - Button btnConfirmCancel = (Button) view.findViewById(R.id.content_detail_btn_confirm_cancel);
330   - btnConfirmCancel.setOnClickListener(new OnClickListener() {
331   - @Override
332   - public void onClick(View v) {
333   - hideConfirm();
334   - }
335   - });
  318 + tvConfirmText = (TextView) view.findViewById(R.id.content_detail_confirm_textview);
  319 + confirmLayout = (RelativeLayout) view.findViewById(R.id.content_detail_confirm_panel);
  320 + Button btnConfirmOK = (Button) view.findViewById(R.id.content_detail_btn_confirm_ok);
  321 + btnConfirmOK.setOnClickListener(new OnClickListener() {
  322 + @Override
  323 + public void onClick(View v) {
  324 + hideConfirm();
  325 + doVoteWithIndex(voteValue);
  326 + }
  327 + });
336 328  
337   - if (voteInfo != null) {
338   - if(voteInfo.mode4==customVote){
339   - contentDetailLayout.setVisibility(View.VISIBLE);
340   - panelVotes.setVisibility(View.GONE);
341   - if(options!=null){
342   - setButton(options);
  329 + Button btnConfirmCancel = (Button) view.findViewById(R.id.content_detail_btn_confirm_cancel);
  330 + btnConfirmCancel.setOnClickListener(new OnClickListener() {
  331 + @Override
  332 + public void onClick(View v) {
  333 + hideConfirm();
343 334 }
344   - }else{
345   - contentDetailLayout.setVisibility(View.INVISIBLE);
346   - if (options.length == 2) {
347   - btnA.setText(options[0]);
348   - btnB.setVisibility(View.INVISIBLE);
349   - btnC.setText(options[1]);
350   - } else if (options.length == 3) {
351   - btnA.setText(options[0]);
352   - btnB.setText(options[1]);
353   - btnC.setText(options[2]);
  335 + });
  336 +
  337 + if (voteInfo != null) {
  338 + if (voteInfo.mode4 == customVote) {
  339 + contentDetailLayout.setVisibility(View.VISIBLE);
  340 + panelVotes.setVisibility(View.GONE);
  341 + if (options != null) {
  342 + setButton(options);
  343 + }
  344 + } else {
  345 + contentDetailLayout.setVisibility(View.INVISIBLE);
  346 + if (options.length == 2) {
  347 + btnA.setText(options[0]);
  348 + btnB.setVisibility(View.INVISIBLE);
  349 + btnC.setText(options[1]);
  350 + } else if (options.length == 3) {
  351 + btnA.setText(options[0]);
  352 + btnB.setText(options[1]);
  353 + btnC.setText(options[2]);
  354 + }
  355 + setBtnModle(1, false);
  356 + showVote();
354 357 }
355   - setBtnModle(1,false);
356   - showVote();
  358 + showResult();
  359 + checkIsVoted();
  360 + panelVotes.setVisibility(View.VISIBLE);
  361 + } else {
  362 + panelVotes.setVisibility(View.GONE);
  363 + hideVote();
357 364 }
358   - showResult();
359   - checkIsVoted();
360   - panelVotes.setVisibility(View.VISIBLE);
361   - } else {
362   - panelVotes.setVisibility(View.GONE);
363   - hideVote();
364   - }
  365 + }catch (Exception ex){}
365 366 return view;
366 367 }
367 368  
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/PDFContextShowFragment.java
  View file @f839a78
... ... @@ -136,8 +136,8 @@ public class PDFContextShowFragment extends BaseFragment {
136 136 public void openFile() {
137 137 File fpath = new File(filepath);
138 138 if (!fpath.exists()) {
139   - Toast.makeText(getActivity(),
140   - "文件不存在", Toast.LENGTH_LONG).show();
  139 +// Toast.makeText(getActivity(),
  140 +// "文件不存在", Toast.LENGTH_LONG).show();
141 141 return;
142 142 }
143 143 Intent intent = new Intent();
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionCustomFragment.java
  View file @f839a78
... ... @@ -105,6 +105,12 @@ public class ResultElectionCustomFragment extends BaseFragment {
105 105 return view;
106 106 }
107 107  
  108 + @Override
  109 + public void onResume() {
  110 + super.onResume();
  111 + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
  112 + }
  113 +
108 114 private void initData() {
109 115  
110 116 int bitNum = data[2] & 0xf;
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
  View file @f839a78
... ... @@ -269,7 +269,10 @@ public class ResultVoteFragment extends BaseFragment {
269 269 }
270 270 if(voteInfo.resultInfo.num3 != 0xffff){
271 271 double opt4 = voteInfo.resultInfo.num3 * 1.0 / fenmu * 100;
272   - String strOpt4 = formatDoubleToString(opt4, xiaoShuWei, false);
  272 + String strOpt4 = "" ;
  273 + if(fenmu > 0 && fenmu != 0xffff){
  274 + strOpt4 = formatDoubleToString(opt4, xiaoShuWei, false);
  275 + }
273 276 dataTitleLayout4.setVisibility(View.VISIBLE);
274 277 ((TextView)(dataTitleLayout4.findViewById(R.id.data_title_layout4_text1))).setText(getString(R.string.weian));
275 278 String text = "" + voteInfo.resultInfo.num3 ;
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SigninFragment.java
  View file @f839a78
... ... @@ -82,24 +82,30 @@ public class SigninFragment extends BaseFragment {
82 82 }
83 83  
84 84 }
85   -
86 85  
87   -
88 86 @Override
89 87 public void onVoteSubmitSuccess() {
90   - tv.setText(getString(R.string.signined));
91   - btnSignin.setEnabled(false);
92   - btnSignin.setTextColor(Color.parseColor("#c75d3a"));
93   - // bgView.setBackgroundColor(0xFF009966);
94   - SharedPreferencesUtil.saveData(getActivity(),"signin",""+voteInfo.dataPos);
95   - ((MainActivity)getActivity()).myHandler.sendEmptyMessageDelayed(MainActivity.MSG_DELAY_TO_VIEW,2000);
  88 + try {
  89 + tv.setText(getString(R.string.signined));
  90 + btnSignin.setEnabled(false);
  91 + btnSignin.setTextColor(Color.parseColor("#c75d3a"));
  92 + // bgView.setBackgroundColor(0xFF009966);
  93 + SharedPreferencesUtil.saveData(getActivity(), "signin", "" + voteInfo.dataPos);
  94 + ((MainActivity) getActivity()).myHandler.sendEmptyMessageDelayed(MainActivity.MSG_DELAY_TO_VIEW, 2000);
  95 + }catch (Exception ex){
  96 + LogUtil.e(TAG,ex);
  97 + }
96 98 }
97 99 @Override
98 100 public void onVoteSubmitError() {
99   - super.onVoteSubmitError();
100   - tv.setText(getString(R.string.please_signin));
101   - btnSignin.setEnabled(true);
102   - btnSignin.setTextColor(Color.RED);
  101 + try {
  102 + super.onVoteSubmitError();
  103 + tv.setText(getString(R.string.please_signin));
  104 + btnSignin.setEnabled(true);
  105 + btnSignin.setTextColor(Color.RED);
  106 + }catch (Exception ex){
  107 +
  108 + }
103 109 }
104 110  
105 111 }
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
  View file @f839a78
... ... @@ -237,7 +237,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
237 237 public void onClick(View v) {
238 238 btnModify.setVisibility(View.INVISIBLE);
239 239 showVote();
240   - ivReuslt.setVisibility(View.VISIBLE);
  240 +// ivReuslt.setVisibility(View.VISIBLE);
241 241 }
242 242 });
243 243  
... ... @@ -312,7 +312,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
312 312 btn[i].setOnClickListener(btnClick);
313 313 //TextViewUtils.adjustTvTextSize(btn[i],(width-50)/btnNum,data[i].toString());
314 314  
315   - RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams((width-180)/btnNum, 100);
  315 + RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams((width-180)/btnNum, 130);
316 316 //设置按钮的宽度和高度
317 317 if (i%btnNum == 0) {
318 318 j++;
... ... @@ -441,33 +441,36 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
441 441 }
442 442  
443 443 private void doVoteWithIndex(int index) {
444   -
  444 + disableVote();
445 445 if (bill != null) {
446 446 singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
  447 + tvTips.setBackgroundResource(0);
447 448 tvTips.setText(getString(R.string.submiting));
448 449 bill.voteResult = index;
449 450 }
450 451 voteValue = index;
451 452 mMainActivity.presenter.submitVote(XPadApi.AnsType_Single, String.valueOf(index));
452 453  
453   - disableVote();
454   - showResult();
  454 +
  455 +// showResult();
455 456  
456 457 }
457 458  
458 459 private void showResult() {
  460 + ivReuslt.setVisibility(View.INVISIBLE);
  461 + singlevoteTvTipsLayout.setVisibility(View.GONE);
459 462 if (bill.voteResult > 0) {
460   - ivReuslt.setVisibility(View.INVISIBLE);
461   - singlevoteTvTipsLayout.setVisibility(View.GONE);
462 463 new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
463 464 @Override
464 465 public void run() {
  466 +
465 467 if (voteInfo.mode3_secret == 0 && options != null) {//
466 468 if(voteValue -1 >= 0 && voteValue - 1 < options.length) {
467 469 ivReuslt.setText(options[voteValue - 1]);
468 470 ivReuslt.setBackgroundResource(R.drawable.voted_empty);
469 471 tvTitle.setTextColor(Color.parseColor("#B5B5B5"));
470 472 ivReuslt.setVisibility(View.VISIBLE);
  473 + singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
471 474 }
472 475 } else {
473 476 tvTips.setBackgroundResource(R.drawable.voted);
... ... @@ -475,6 +478,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
475 478 tvTips.setText("");
476 479 // ivReuslt.setText("");
477 480 // ivReuslt.setBackgroundResource(R.drawable.voted);
  481 + singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
478 482 tvTitle.setTextColor(Color.parseColor("#B5B5B5"));
479 483 }
480 484 }
... ... @@ -598,6 +602,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
598 602 showModifyOrDisable();
599 603 if(voteValue > 0){
600 604 saveVoteInfo();
  605 + showResult();
601 606 }
602 607 }
603 608  
... ...
C5/app/src/main/res/drawable/download_complete.xml
  View file @f839a78
... ... @@ -5,8 +5,8 @@
5 5 android:height="254.9dp">
6 6 <path
7 7 android:pathData="M127.4 0C57.3 0 0 57.3 0 127.4s57.3 127.4 127.4 127.4c70.1 0 127.4 -57.3 127.4 -127.4S197.5 0 127.4 0L127.4 0zM127.4 229.4c-56.1 0 -101.9 -45.9 -101.9 -101.9c0 -56.1 45.9 -101.9 101.9 -101.9c56.1 0 101.9 45.9 101.9 101.9S183.5 229.4 127.4 229.4L127.4 229.4zM127.4 229.4"
8   - android:fillColor="#F6FF00" />
  8 + android:fillColor="@color/white" />
9 9 <path
10 10 android:pathData="M126.9 164.8c-2.1 2.1 -4.9 3.2 -7.7 3.2c-2.8 0 -5.6 -1.1 -7.7 -3.2l-36.2 -36.2c-2.2 -2.2 -3.2 -5.2 -3.1 -8.1c0.1 -2.6 1.1 -5.2 3.1 -7.2c2 -2 4.6 -3 7.2 -3.1c2.9 -0.1 5.9 0.9 8.1 3.1l28.5 28.5l50.2 -50.2c2.2 -2.2 5.2 -3.2 8.1 -3.1c2.6 0.1 5.2 1.1 7.2 3.1c2 2 3 4.6 3.1 7.2c0.1 2.9 -0.9 5.9 -3.1 8.1L126.9 164.8zM126.9 164.8"
11   - android:fillColor="#F6FF00" />
  11 + android:fillColor="@color/white" />
12 12 </vector>
13 13 \ No newline at end of file
... ...
C5/app/src/main/res/layout/dialog_service.xml
  View file @f839a78
... ... @@ -11,33 +11,7 @@
11 11 android:text="呼叫服务"
12 12 android:textStyle="bold"
13 13 android:textSize="18sp"/>
14   - <LinearLayout
15   - android:id="@+id/button_line"
16   - android:layout_width="530dp"
17   - android:layout_height="40dp"
18   - android:layout_alignParentBottom="true"
19   - android:orientation="horizontal">
20   -
21   - <View
22   - android:layout_width="0dp"
23   - android:layout_height="wrap_content"
24   - android:layout_weight="1" />
25 14  
26   - <Button
27   - android:id="@+id/cancel"
28   - android:layout_width="100dp"
29   - android:layout_height="match_parent"
30   - android:layout_marginRight="10dp"
31   - android:visibility="invisible"
32   - android:text="@string/cancel" />
33   -
34   - <Button
35   - android:id="@+id/submit"
36   - android:layout_width="100dp"
37   - android:layout_height="match_parent"
38   - android:layout_marginRight="10dp"
39   - android:text="@string/ok" />
40   - </LinearLayout>
41 15 <LinearLayout
42 16 android:layout_width="530dp"
43 17 android:layout_height="250dp"
... ... @@ -240,4 +214,32 @@
240 214 android:layout_weight="1"></LinearLayout>
241 215 </LinearLayout>
242 216 </LinearLayout>
  217 +
  218 + <LinearLayout
  219 + android:id="@+id/button_line"
  220 + android:layout_width="530dp"
  221 + android:layout_height="40dp"
  222 + android:layout_alignParentBottom="true"
  223 + android:orientation="horizontal">
  224 +
  225 + <View
  226 + android:layout_width="0dp"
  227 + android:layout_height="wrap_content"
  228 + android:layout_weight="1" />
  229 +
  230 + <Button
  231 + android:id="@+id/cancel"
  232 + android:layout_width="100dp"
  233 + android:layout_height="match_parent"
  234 + android:layout_marginRight="10dp"
  235 + android:visibility="invisible"
  236 + android:text="@string/cancel" />
  237 +
  238 + <Button
  239 + android:id="@+id/submit"
  240 + android:layout_width="100dp"
  241 + android:layout_height="match_parent"
  242 + android:layout_marginRight="10dp"
  243 + android:text="@string/ok" />
  244 + </LinearLayout>
243 245 </LinearLayout>
... ...
C5/app/src/main/res/layout/fragment_multi_content_detail.xml
  View file @f839a78
... ... @@ -18,10 +18,10 @@
18 18  
19 19 <ImageButton
20 20 android:id="@+id/content_detail_btnback"
21   - android:layout_width="wrap_content"
22   - android:layout_height="wrap_content"
  21 + android:layout_width="@dimen/px120dp"
  22 + android:layout_height="@dimen/px120dp"
23 23 android:layout_gravity="center_vertical"
24   - android:background="@drawable/back_selector" />
  24 + android:background="@drawable/back" />
25 25  
26 26 <TextView
27 27 android:id="@+id/content_detail_title"
... ... @@ -44,10 +44,11 @@
44 44 android:layout_height="@dimen/button_heigh"
45 45 android:layout_gravity="center_vertical"
46 46 android:layout_marginRight="20dp"
47   - android:background="@drawable/signin_selector"
  47 + android:background="@drawable/oppos_selector"
48 48 android:text="查看批注"
49   - android:textColor="@color/yellow"
  49 + android:textColor="@color/white"
50 50 android:textSize="@dimen/big_text_p4"
  51 + android:visibility="gone"
51 52 android:textStyle="bold" />
52 53  
53 54 </LinearLayout>
... ...
C5/app/src/main/res/layout/fragment_multi_title.xml
  View file @f839a78
... ... @@ -10,7 +10,7 @@
10 10 android:layout_height="@dimen/px152dp"
11 11 android:background="#AC1007"
12 12 android:orientation="horizontal"
13   - android:paddingRight="@dimen/px120dp">
  13 + android:paddingRight="@dimen/px180dp">
14 14  
15 15 <TextView
16 16 android:id="@+id/multivote_title"
... ...
C5/app/src/main/res/layout/fragment_singlevote.xml
  View file @f839a78
... ... @@ -72,9 +72,9 @@
72 72 android:layout_alignParentBottom="true"
73 73 android:layout_centerHorizontal="true"
74 74 android:layout_marginBottom="26dp"
75   - android:background="@drawable/modify_selector"
  75 + android:background="@drawable/agree_selector"
76 76 android:text="@string/modify"
77   - android:textColor="@color/modifytext"
  77 + android:textColor="@color/white"
78 78 android:textSize="@dimen/big_text_p4"
79 79 android:textStyle="bold"
80 80 android:visibility="invisible" />
... ...
C5/app/src/main/res/layout/list_multi_title_item.xml
  View file @f839a78
... ... @@ -4,7 +4,7 @@
4 4 android:layout_height="@dimen/px279dp"
5 5 android:layout_marginBottom="1dp"
6 6 android:layout_marginTop="1dp"
7   - android:paddingRight="@dimen/px120dp"
  7 + android:paddingRight="@dimen/px180dp"
8 8 android:background="@color/white">
9 9  
10 10 <LinearLayout
... ...
C5/app/src/main/res/layout/list_result_election_custom_item.xml
  View file @f839a78
... ... @@ -26,7 +26,7 @@
26 26 android:layout_weight="1"
27 27 android:text="@string/name_xpad"
28 28 android:textColor="@color/white"
29   - android:gravity="center"
  29 + android:gravity="left|center_vertical"
30 30 android:textSize="@dimen/px48dp"
31 31 android:textStyle="bold" />
32 32  
... ...
C5/app/src/main/res/values/strings.xml
  View file @f839a78
... ... @@ -146,8 +146,8 @@
146 146 <string name="oppose_num">反对票数</string>
147 147 <string name="abstant_num">弃权票数</string>
148 148 <string name="my_number">序号</string>
149   - <string name="fix">张</string>
150   - <string name="agree_vote_ok">可投赞成票</string>
  149 + <string name="fix">票</string>
  150 + <string name="agree_vote_ok">可投</string>
151 151  
152 152 <!-- TODO: Remove or change this placeholder text -->
153 153 <string name="hello_blank_fragment">Hello blank fragment</string>
... ...