孙向锦 / VoteC5

Commit 81252b8428ef1a5098ae2a65e2d46c860bb44830

Authored by 孙向锦
1 parent 9eecf3b7

C5 vote

Inline Side-by-side
Showing 23 changed files with 342 additions and 52 deletions
C5/app/src/main/AndroidManifest.xml
  View file @81252b8
... ... @@ -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.0"> <!-- android:sharedUserId="android.studentUID.system" -->
  6 + android:versionName="1.3.0.2"> <!-- 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 @81252b8
... ... @@ -1272,7 +1272,7 @@ public class MainActivity extends BaseActivity implements ComListener {
1272 1272 LogUtil.i(TAG, "baseEvent:" + info);
1273 1273 meetingId = info.confId;
1274 1274 //attrib bit 6 1 表示服务可以申请，0，表示服务关闭
1275   - if((mBaseInfo.attrib & 0x20) != 0){
  1275 + if((mBaseInfo.attrib & 0x40) != 0){
1276 1276 runOnUiThread(new Runnable() {
1277 1277 @Override
1278 1278 public void run() {
... ...
C5/app/src/main/java/com/sunvote/xpadapp/dialog/ToastAlertDialog.java
  View file @81252b8
... ... @@ -2,6 +2,8 @@ package com.sunvote.xpadapp.dialog;
2 2  
3 3 import android.app.AlertDialog;
4 4 import android.content.Context;
  5 +import android.content.DialogInterface;
  6 +import android.os.Build;
5 7 import android.os.Handler;
6 8 import android.os.Looper;
7 9 import android.view.LayoutInflater;
... ... @@ -9,6 +11,7 @@ import android.view.View;
9 11 import android.view.WindowManager;
10 12 import android.widget.TextView;
11 13  
  14 +import com.sunvote.xpadapp.MainActivity;
12 15 import com.sunvote.xpadapp.R;
13 16  
14 17 public class ToastAlertDialog {
... ... @@ -16,8 +19,8 @@ public class ToastAlertDialog {
16 19 private AlertDialog dialog;
17 20 private AlertDialog.Builder builder;
18 21 private TextView messageView ;
19   - private TextView confirm;
20 22 private Handler handler;
  23 + private Context context;
21 24  
22 25 public ToastAlertDialog setMessage(CharSequence message) {
23 26 messageView.setText(message);
... ... @@ -25,12 +28,18 @@ public class ToastAlertDialog {
25 28 }
26 29  
27 30 public ToastAlertDialog(Context context){
  31 + this.context = context;
28 32 builder = new AlertDialog.Builder(context);
29 33 handler = new Handler(Looper.getMainLooper());
30 34 builder.setCancelable(true);
  35 + builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
  36 + @Override
  37 + public void onDismiss(DialogInterface d) {
  38 + handler.postDelayed(hideMenu,10);
  39 + }
  40 + });
31 41 View rootView = LayoutInflater.from(context).inflate(R.layout.toast_dialog,null);
32 42 messageView = rootView.findViewById(R.id.message);
33   - confirm = rootView.findViewById(R.id.confirm);
34 43 rootView.setOnClickListener(new View.OnClickListener() {
35 44 @Override
36 45 public void onClick(View v) {
... ... @@ -61,10 +70,33 @@ public class ToastAlertDialog {
61 70 lp.alpha = 0.6f;
62 71 dialog.getWindow().setAttributes(lp);
63 72 dialog.show();
  73 + hideBottomUIMenu();
64 74 handler.postDelayed(close,2000);
65 75 }
66 76  
67 77 public static ToastAlertDialog makeText(Context context, CharSequence text){
68 78 return new ToastAlertDialog(context).setMessage(text);
69 79 }
  80 +
  81 + private Runnable hideMenu = new Runnable() {
  82 + @Override
  83 + public void run() {
  84 + hideBottomUIMenu();
  85 + }
  86 + };
  87 +
  88 + public void hideBottomUIMenu(){
  89 + if (Build.VERSION.SDK_INT > 11 && Build.VERSION.SDK_INT < 19) { // lower
  90 + View v = dialog.getWindow().getDecorView();
  91 + v.setSystemUiVisibility(View.GONE);
  92 + } else if (Build.VERSION.SDK_INT >= 19) {
  93 + View decorView = dialog.getWindow().getDecorView();
  94 + if(context instanceof MainActivity){
  95 + MainActivity mainActivity = (MainActivity)context;
  96 + decorView = mainActivity.getWindow().getDecorView();
  97 + }
  98 + int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | 0x00002000;
  99 + decorView.setSystemUiVisibility(uiOptions);
  100 + }
  101 + }
70 102 }
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
  View file @81252b8
... ... @@ -126,6 +126,12 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
126 126 tvConfirmText = (TextView) view.findViewById(R.id.multivote_confirm_text);
127 127  
128 128 // tvPage = (TextView) view.findViewById(R.id.multivote_page);
  129 + confirmLayout.setOnClickListener(new OnClickListener() {
  130 + @Override
  131 + public void onClick(View v) {
  132 +
  133 + }
  134 + });
129 135  
130 136  
131 137 btnConfirm = (Button) view.findViewById(R.id.multivote_btn_submit);
... ... @@ -142,7 +148,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
142 148 if (voteInfo.mode2_modify == 1) {
143 149 doSubmitAllOk();
144 150 } else {
145   - tvConfirmText.setText("投票后不可修改，确定提交吗？");
  151 + tvConfirmText.setText("应投" + aryContent.size()+"项，已投" +votedCount+"项，确定提交吗？");
146 152 confirmLayout.setVisibility(View.VISIBLE);
147 153 }
148 154  
... ... @@ -154,7 +160,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
154 160 if (voteInfo.mode2_modify == 1) {
155 161 doSubmitAllOk();
156 162 } else {
157   - tvConfirmText.setText("投票后不可修改，确定提交吗？");
  163 + tvConfirmText.setText("应投" + aryContent.size()+"项，已投" +votedCount+"项，确定提交吗？");
158 164 confirmLayout.setVisibility(View.VISIBLE);
159 165 }
160 166 }
... ... @@ -402,11 +408,13 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
402 408 if (voteInfo.mode2_modify == 1) {
403 409 btnModify.setVisibility(View.VISIBLE);
404 410 // tvInfo.setText(getString(R.string.submited));
  411 + tvInfo.setText("");
405 412 tvInfo.setBackgroundResource(R.drawable.voted);
406 413 tvInfoLayout.setVisibility(View.VISIBLE);
407 414 } else {
408 415 disableVote();
409 416 // tvInfo.setText(getString(R.string.submited));
  417 + tvInfo.setText("");
410 418 tvInfo.setBackgroundResource(R.drawable.voted);
411 419 tvInfoLayout.setVisibility(View.VISIBLE);
412 420 // tvInfo.setText(getString(R.string.submited_no_modify));
... ... @@ -615,8 +623,9 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
615 623 holder.ivResult.setBackgroundResource(R.drawable.voted_empty);
616 624  
617 625 } else {
618   - holder.ivResult.setText("");
619   - holder.ivResult.setBackgroundResource(R.drawable.voted);
  626 + holder.ivResult.setText("已投票");
  627 + holder.ivResult.setBackgroundResource(R.drawable.voted_empty);
  628 +// holder.ivResult.setBackgroundResource(R.drawable.voted);
620 629 }
621 630 } else {
622 631 holder.ivResult.setVisibility(View.INVISIBLE);
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
  View file @81252b8
... ... @@ -219,6 +219,11 @@ public class ResultVoteFragment extends BaseFragment {
219 219 dataTitleLayout3.setVisibility(View.VISIBLE);
220 220 ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.abstant));
221 221 }
  222 + if (pass == 0) {
  223 + fragmentResultMemo.setText(getString(R.string.no_pass));
  224 + } else {
  225 + fragmentResultMemo.setText(getString(R.string.pass));
  226 + }
222 227 } else if (voteInfo.resultInfo.resultType == 4) {
223 228 fragmentMemo.setText(getString(R.string.ceping_result));
224 229 if (voteInfo.resultInfo.num4 != 0xffff) {
... ... @@ -233,6 +238,13 @@ public class ResultVoteFragment extends BaseFragment {
233 238 dataTitleLayout3.setVisibility(View.VISIBLE);
234 239 ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.bumanyi));
235 240 }
  241 + if (pass == 0) {
  242 + fragmentResultMemo.setText(getString(R.string.manyi));
  243 + } else if (pass == 1) {
  244 + fragmentResultMemo.setText(getString(R.string.jbmanyi));
  245 + } else {
  246 + fragmentResultMemo.setText(getString(R.string.bumanyi));
  247 + }
236 248 } else if (voteInfo.resultInfo.resultType == 12) {
237 249 fragmentMemo.setText(getString(R.string.ceping_result));
238 250 if (voteInfo.resultInfo.num4 != 0xffff) {
... ... @@ -247,6 +259,13 @@ public class ResultVoteFragment extends BaseFragment {
247 259 dataTitleLayout3.setVisibility(View.VISIBLE);
248 260 ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.fcbumanyi));
249 261 }
  262 + if (pass == 0) {
  263 + fragmentResultMemo.setText(getString(R.string.manyi));
  264 + } else if (pass == 1) {
  265 + fragmentResultMemo.setText(getString(R.string.bumanyi));
  266 + } else {
  267 + fragmentResultMemo.setText(getString(R.string.fcbumanyi));
  268 + }
250 269 }
251 270 if(voteInfo.resultInfo.num3 != 0xffff){
252 271 double opt4 = voteInfo.resultInfo.num3 * 1.0 / fenmu * 100;
... ... @@ -260,5 +279,8 @@ public class ResultVoteFragment extends BaseFragment {
260 279 ((TextView)(dataTitleLayout4.findViewById(R.id.data_title_layout4_text2))).setText(text);
261 280 }
262 281 }
  282 + if (pass == 0xf) {
  283 + fragmentResultMemo.setText("");
  284 + }
263 285 }
264 286 }
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
  View file @81252b8
... ... @@ -527,13 +527,14 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
527 527 }
528 528  
529 529 private void disableVote() {
530   - if(voteInfo.mode4==customVote){
531   - setBtnModle(2,false);
532   - }else{
533   - btnA.setEnabled(false);
534   - btnB.setEnabled(false);
535   - btnC.setEnabled(false);
536   - }
  530 +// if(voteInfo.mode4==customVote){
  531 +// setBtnModle(2,false);
  532 +// }else{
  533 +// btnA.setEnabled(false);
  534 +// btnB.setEnabled(false);
  535 +// btnC.setEnabled(false);
  536 +// }
  537 + hideVote();
537 538 }
538 539  
539 540 private void showModifyOrDisable() {
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java
  View file @81252b8
... ... @@ -6,7 +6,10 @@ import android.view.Gravity;
6 6 import android.view.LayoutInflater;
7 7 import android.view.View;
8 8 import android.view.ViewGroup;
  9 +import android.widget.BaseAdapter;
9 10 import android.widget.LinearLayout;
  11 +import android.widget.ListView;
  12 +import android.widget.RelativeLayout;
10 13 import android.widget.TextView;
11 14  
12 15 import com.sunvote.xpadapp.MainActivity;
... ... @@ -17,6 +20,7 @@ import com.sunvote.xpadapp.db.modal.MultiTitleItem;
17 20  
18 21 import java.text.DecimalFormat;
19 22 import java.util.ArrayList;
  23 +import java.util.List;
20 24  
21 25 public class UserResultVoteFragment extends BaseFragment {
22 26  
... ... @@ -27,6 +31,9 @@ public class UserResultVoteFragment extends BaseFragment {
27 31 this.data = data;
28 32 }
29 33  
  34 + private UserAdapter userAdapter;
  35 + private List<UserData> dataList;
  36 +
30 37 public void setOptions(String[] options) {
31 38 this.options = options;
32 39 }
... ... @@ -36,26 +43,29 @@ public class UserResultVoteFragment extends BaseFragment {
36 43 // 表決结果
37 44 private TextView fragmentResultMemo;
38 45 private TextView fragmentMemo;
39   - //
40   -// private LinearLayout tResult;
41   -// private LinearLayout dResult;
42   -// private LinearLayout pResult;
  46 + private ListView listView;
43 47  
44 48 public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
45   - View root = inflater.inflate(R.layout.fragment_result_vote, container, false);
  49 + View root = inflater.inflate(R.layout.fragment_result_user, container, false);
46 50 yingdaoresult = root.findViewById(R.id.yingdaoresult);
47 51 shidaoresult = root.findViewById(R.id.shidaoresult);
48 52 fragmentResultMemo = root.findViewById(R.id.fragment_result_memo);
49 53 fragmentMemo = root.findViewById(R.id.fragment_memo);
50   -
51   -// tResult = root.findViewById(R.id.t_result);
52   -// dResult = root.findViewById(R.id.d_result);
53   -// pResult = root.findViewById(R.id.p_result);
  54 + listView = root.findViewById(R.id.multi_vote_result_listview);
  55 + dataList = new ArrayList<>();
  56 + userAdapter = new UserAdapter(dataList);
  57 + listView.setAdapter(userAdapter);
54 58 showResult();
55 59 return root;
56 60 }
57 61  
58   - private View createView(String txt,int color) {
  62 + @Override
  63 + public void onResume() {
  64 + super.onResume();
  65 + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
  66 + }
  67 +
  68 + private View createView(String txt, int color) {
59 69 TextView tv1 = new TextView(getActivity());
60 70 ViewGroup.LayoutParams vlp = new ViewGroup.LayoutParams(
61 71 ViewGroup.LayoutParams.WRAP_CONTENT,
... ... @@ -130,9 +140,7 @@ public class UserResultVoteFragment extends BaseFragment {
130 140 }
131 141  
132 142 private void setView(int pos, int digiters, int bitNum, int type) {
133   -// tResult.removeAllViews();
134   -// dResult.removeAllViews();
135   -// pResult.removeAllViews();
  143 + dataList.clear();
136 144 LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.WRAP_CONTENT,1.0f);
137 145 for(int i = 1; i <= options.length ; i++) {
138 146 if (options.length >= i) {
... ... @@ -142,34 +150,48 @@ public class UserResultVoteFragment extends BaseFragment {
142 150 } else {
143 151 value1 = (data[pos++] << 8 | data[pos++]) & 0xffff;
144 152 }
145   -// tResult.addView(createView(options[i - 1], Color.YELLOW), lp);
146   -// dResult.addView(createView("" + value1, Color.WHITE), lp);
  153 + String szc = "" ;
147 154 if (type == 1) {
148 155 //分母
149 156 if ((fenmu > 0 && fenmu != 0xff)) {
150 157 double pzc = value1 * 1.0 / fenmu * 100;
151   - String szc = formatDoubleToString(pzc, digiters, false);
152   -// pResult.addView(createView(szc + "%", Color.WHITE), lp);
  158 + szc = formatDoubleToString(pzc, digiters, false);
153 159 }
154 160 } else {
155 161 //分母
156 162 if ((fenmu > 0 && fenmu != 0xffff)) {
157 163 double pzc = value1 * 1.0 / fenmu * 100;
158   - String szc = formatDoubleToString(pzc, digiters, false);
159   -// pResult.addView(createView(szc + "%", Color.WHITE), lp);
  164 + szc = formatDoubleToString(pzc, digiters, false);
160 165 }
161 166 }
  167 +
  168 +
  169 + String text = "" + value1 ;
  170 + if(szc != null && !"".equals(szc)){
  171 + text += "(" + szc + "%)" ;
  172 + }
  173 + UserData userData = new UserData();
  174 + userData.name = options[i -1];
  175 + userData.desc = text;
  176 + dataList.add(userData);
162 177 }
163 178 }
164 179 if (notVote != 0xff) {
165   -// tResult.addView(createView(getString(R.string.weian), Color.YELLOW), lp);
166   -// dResult.addView(createView("" + notVote, Color.WHITE), lp);
  180 + String strOpt4 = "" ;
167 181 if ((fenmu > 0 && fenmu != 0xff)) {
168   -// pResult.addView(createView("0%", Color.WHITE), lp);
  182 + strOpt4 = "0%" ;
169 183 }else{
170   -// pResult.setVisibility(View.GONE);
171 184 }
  185 + String text = "" + notVote ;
  186 + if(strOpt4 != null && !"".equals(strOpt4)){
  187 + text += "(" + strOpt4 + "%)" ;
  188 + }
  189 + UserData userData = new UserData();
  190 + userData.name = getString(R.string.weian);
  191 + userData.desc = text;
  192 + dataList.add(userData);
172 193 }
  194 + userAdapter.notifyDataSetChanged();
173 195 }
174 196 public static String formatDoubleToString(double value, Integer digits, boolean remove) {
175 197  
... ... @@ -197,4 +219,58 @@ public class UserResultVoteFragment extends BaseFragment {
197 219 }
198 220 }
199 221  
  222 + class UserData{
  223 + String name;
  224 + String desc;
  225 + }
  226 +
  227 + class UserAdapter extends BaseAdapter{
  228 +
  229 + private List<UserData> dataList;
  230 +
  231 + public UserAdapter(List<UserData> dataList){
  232 + this.dataList = dataList;
  233 + }
  234 +
  235 +
  236 + @Override
  237 + public int getCount() {
  238 + if(dataList != null){
  239 + return dataList.size();
  240 + }
  241 + return 0;
  242 + }
  243 +
  244 + @Override
  245 + public Object getItem(int position) {
  246 + return position;
  247 + }
  248 +
  249 + @Override
  250 + public long getItemId(int position) {
  251 + return position;
  252 + }
  253 +
  254 + @Override
  255 + public View getView(int position, View convertView, ViewGroup parent) {
  256 + ViewHolder viewHolder = null;
  257 + if(convertView == null){
  258 + viewHolder = new ViewHolder();
  259 + convertView = LayoutInflater.from(getActivity()).inflate(R.layout.item_user_vote_result,null);
  260 + viewHolder.nameTextView = convertView.findViewById(R.id.name);
  261 + viewHolder.descTextView = convertView.findViewById(R.id.desc);
  262 + convertView.setTag(viewHolder);
  263 + }else{
  264 + viewHolder = (ViewHolder) convertView.getTag();
  265 + }
  266 + viewHolder.nameTextView.setText(dataList.get(position).name);
  267 + viewHolder.descTextView.setText(dataList.get(position).desc);
  268 + return convertView;
  269 + }
  270 + }
  271 +
  272 + class ViewHolder{
  273 + TextView nameTextView;
  274 + TextView descTextView;
  275 + }
200 276 }
... ...
C5/app/src/main/res/drawable-xhdpi/btn_election_abstain.png deleted
View file @9eecf3b

2.82 KB
C5/app/src/main/res/drawable-xhdpi/btn_election_abstain_s.png deleted
View file @9eecf3b

2.82 KB
C5/app/src/main/res/drawable-xxhdpi/btn_modify_disable.xml renamed to C5/app/src/main/res/drawable/btn_modify_disable.xml
  View file @81252b8
C5/app/src/main/res/drawable-xxhdpi/btn_modify_enable.xml renamed to C5/app/src/main/res/drawable/btn_modify_enable.xml
  View file @81252b8
C5/app/src/main/res/drawable/connect_server.xml 0 → 100644
  View file @81252b8
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
  2 + android:width="360dp"
  3 + android:height="120dp"
  4 + android:viewportWidth="360"
  5 + android:viewportHeight="120">
  6 + <path
  7 + android:pathData="M553.4,252.4h-92.5c-16.5,0 -31.8,-8.8 -40.1,-23.1c-8.3,-14.3 -8.3,-31.9 0,-46.3c8.3,-14.3 23.5,-23.1 40.1,-23.1h46.3v-416.3h-647.6v416.3h46.3c25.5,0 46.3,20.7 46.3,46.3c0,25.5 -20.7,46.3 -46.3,46.3h-92.5c-25.6,0 -46.3,-20.7 -46.3,-46.3v-508.9c0,-25.5 20.7,-46.3 46.3,-46.3h740.1c25.6,0 46.3,20.7 46.3,46.3v508.9C599.7,231.7 579,252.4 553.4,252.4L553.4,252.4zM648.5,439.4H370.9v-92.5h277.6c0,0 46.3,0 46.3,46.3C694.7,439.4 648.5,439.4 648.5,439.4L648.5,439.4zM-288.7,439.4h277.6v-92.5h-277.6c0,0 -46.3,0 -46.3,46.3C-335,439.4 -288.7,439.4 -288.7,439.4L-288.7,439.4z"
  8 + android:fillColor="@color/red"/>
  9 + <path
  10 + android:pathData="M-125.5,159.8h604.4v92.5h-604.4z"
  11 + android:fillColor="@color/red"/>
  12 + <path
  13 + android:pathData="M223,218.4V316h-92.5v-97.6H223zM304.5,316v154.2H48.9V316H304.5z"
  14 + android:fillColor="@color/red"/>
  15 +</vector>
... ...
C5/app/src/main/res/drawable/download_fail.xml
  View file @81252b8
... ... @@ -5,5 +5,5 @@
5 5 android:height="292.9dp">
6 6 <path
7 7 android:pathData="M150 168.8l-57.1 58.1c-2.8 2.9 -6.7 4.5 -10.7 4.5c-4 0 -7.9 -1.6 -10.7 -4.5c-5.9 -6 -5.9 -15.7 0 -21.8l57.1 -58.1L71.5 88.9c-5.9 -6 -5.9 -15.8 0 -21.8c5.9 -6 15.5 -6 21.4 0l57.1 58.1l57.1 -58.1c5.9 -6 15.5 -6 21.4 0c5.9 6 5.9 15.8 0 21.8L171.4 147l57.1 58.1c5.9 6 5.9 15.8 0 21.8c-5.9 6 -15.5 6 -21.4 0L150 168.8L150 168.8zM279.3 132.6c7.7 0 13.9 6.2 13.9 13.9c0 80.7 -65.8 146.4 -146.6 146.4C65.8 292.9 0 227.2 0 146.4C0 65.7 65.8 0 146.6 0c32.1 0 62.5 10.1 88 29.3c3 2.2 4.9 5.5 5.4 9.1c0.5 3.6 -0.4 7.4 -2.7 10.3c-2.6 3.5 -6.8 5.5 -11.1 5.5c-3 0 -5.9 -1 -8.4 -2.8c-20.7 -15.5 -45.3 -23.7 -71.3 -23.7C81.1 27.8 27.8 81 27.8 146.4c0 65.4 53.3 118.7 118.8 118.7c65.5 0 118.8 -53.2 118.8 -118.7C265.4 138.8 271.7 132.6 279.3 132.6L279.3 132.6zM279.3 132.6"
8   - android:fillColor="#F6FF00" />
  8 + android:fillColor="@color/white" />
9 9 </vector>
10 10 \ No newline at end of file
... ...
C5/app/src/main/res/drawable/downloading.xml
  View file @81252b8
... ... @@ -5,5 +5,5 @@
5 5 android:height="260.1dp">
6 6 <path
7 7 android:pathData="M77.3 227.1c4.2 0.6 7.5 4.2 7.5 9c0 5.2 -4.4 9.4 -9.4 9.4H23.2c-12.3 0 -23.2 -10.7 -23.2 -23V23.2C0 10.9 10.8 0 23.2 0h185.4c12.3 0 23.2 10.8 23.2 23.2v41.6c-0.2 5 -4.6 9 -9.4 9c-4.8 0 -8.5 -3.4 -9.2 -7.7V29.5c0 -6.5 -5 -11.3 -11.5 -11.3H29C23 18.2 18 23 18 29.5v186.6c0 6.1 5 11.1 11.1 11.1L77.3 227.1L77.3 227.1zM172 94.9c45.8 0 83.2 36.8 83.2 82.5c0 45.8 -37.4 82.7 -83.2 82.7c-46.2 0 -83.2 -37 -83.2 -82.7C88.8 131.6 125.8 94.9 172 94.9L172 94.9zM172 245.5c37.6 0 68.5 -30.5 68.5 -68.1c0 -37.4 -30.9 -67.9 -68.5 -67.9c-37.8 0 -68.8 30.5 -68.8 67.9C103.2 215 134.1 245.5 172 245.5L172 245.5zM90.5 90.3c3.1 0 5.7 2.3 5.7 5.4s-2.5 5.7 -5.7 5.7H41.1c-3.1 0 -5.7 -2.5 -5.7 -5.7s2.5 -5.4 5.7 -5.4H90.5zM157.9 72.9c0 3.1 -2.5 5.7 -5.7 5.7H41.1c-3.1 0 -5.7 -2.5 -5.7 -5.7s2.5 -5.8 5.7 -5.8h111.2C155.4 67.1 157.9 69.8 157.9 72.9L157.9 72.9zM196.2 50.3c0 3.1 -2.5 5.4 -5.7 5.4H41.1c-3.1 0 -5.7 -2.3 -5.7 -5.4c0 -3.1 2.5 -5.7 5.7 -5.7h149.4C193.6 44.7 196.2 47.2 196.2 50.3L196.2 50.3zM177.7 222.7c-2.5 3.1 -6.9 3.1 -9.4 0l-24 -27.6c-1.5 -1.7 -2.1 -4 -1.9 -6.7c0.2 -2.5 2.3 -4.4 4.8 -4.4h15.5v-25.7c0 -3.1 2.1 -5.2 5.2 -5.2h10c3.1 0 5.2 2.1 5.2 5.2V184h15.7c2.3 0 4.4 1.9 5 4.4c0.2 2.5 -0.6 4.8 -2.3 6.7L177.7 222.7zM168 142.9c-3.1 0 -5.2 -2.1 -5.2 -5.2c0 -2.7 2.1 -5.2 5.2 -5.2h10c3.1 0 5.2 2.5 5.2 5.2c0 3.1 -2.1 5.2 -5.2 5.2H168zM168 142.9"
8   - android:fillColor="#E7E739" />
  8 + android:fillColor="@color/white" />
9 9 </vector>
10 10 \ No newline at end of file
... ...
C5/app/src/main/res/drawable/file_not_exsit.xml
  View file @81252b8
... ... @@ -5,5 +5,5 @@
5 5 android:height="255.1dp">
6 6 <path
7 7 android:pathData="M139.8 149.8c-0.8 9.1 -6.6 13.3 -12.3 13.3c-4.2 0 0 0 0 0c-5.4 -1 -9.6 -3.3 -11.5 -12.5l-7.4 -85.8c0 -8.6 10.5 -16.3 19.4 -16.3c8.9 0 18.5 8 18.5 16.6L139.8 149.8zM127.6 174.3c-8.9 0 -16.1 7.2 -16.1 16.1c0 8.9 7.2 16.1 16.1 16.1c8.9 0 16.1 -7.2 16.1 -16.1C143.7 181.6 136.5 174.3 127.6 174.3L127.6 174.3zM255.1 127.6c0 70.5 -57.1 127.6 -127.6 127.6C57.1 255.1 0 198 0 127.6C0 57.1 57.1 0 127.5 0C198 0 255.1 57.1 255.1 127.6L255.1 127.6zM231.5 127.6c0 -57.4 -46.5 -103.9 -103.9 -103.9S23.6 70.2 23.6 127.6c0 57.4 46.5 103.9 103.9 103.9S231.5 185 231.5 127.6L231.5 127.6zM231.5 127.6"
8   - android:fillColor="#E7E739" />
  8 + android:fillColor="@color/white" />
9 9 </vector>
10 10 \ No newline at end of file
... ...
C5/app/src/main/res/drawable-xxhdpi/modify_selector_new.xml renamed to C5/app/src/main/res/drawable/modify_selector_new.xml
  View file @81252b8
C5/app/src/main/res/layout/fragment_download.xml
  View file @81252b8
... ... @@ -12,11 +12,11 @@
12 12  
13 13 <ImageView
14 14 android:id="@+id/download_img"
15   - android:layout_width="200dp"
16   - android:layout_height="200dp"
  15 + android:layout_width="@dimen/px294dp"
  16 + android:layout_height="@dimen/px234dp"
17 17 android:layout_centerHorizontal="true"
18 18 android:layout_above="@id/middle"
19   - android:src="@drawable/downloading"/>
  19 + android:src="@drawable/connect_server"/>
20 20  
21 21 <TextView
22 22 android:id="@+id/download_title"
... ...
C5/app/src/main/res/layout/fragment_multi_title.xml
  View file @81252b8
... ... @@ -61,9 +61,6 @@
61 61 android:textSize="@dimen/px50dp"
62 62 android:textStyle="bold" />
63 63 </LinearLayout>
64   -
65   -
66   -
67 64 <RelativeLayout
68 65 android:id="@+id/multivote_pannal_bottom"
69 66 android:layout_width="match_parent"
... ... @@ -94,7 +91,6 @@
94 91 android:textStyle="bold"
95 92 android:visibility="invisible" />
96 93 </RelativeLayout>
97   -
98 94 <ListView
99 95 android:id="@+id/multivote_listview"
100 96 android:layout_width="fill_parent"
... ... @@ -128,7 +124,7 @@
128 124 android:id="@+id/multivote_confirm_panel"
129 125 android:layout_width="match_parent"
130 126 android:layout_height="match_parent"
131   - android:background="#33000000"
  127 + android:background="#BB000000"
132 128 android:visibility="gone">
133 129  
134 130 <TextView
... ...
C5/app/src/main/res/layout/fragment_result_user.xml 0 → 100644
  View file @81252b8
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="#0952B5"
  6 + android:orientation="vertical">
  7 + <LinearLayout
  8 + android:id="@+id/result_layout"
  9 + android:layout_width="wrap_content"
  10 + android:layout_height="wrap_content"
  11 + android:layout_alignParentTop="true"
  12 + android:layout_centerHorizontal="true"
  13 + android:layout_marginTop="@dimen/px60dp"
  14 + android:orientation="vertical">
  15 +
  16 + <TextView
  17 + android:id="@+id/fragment_memo"
  18 + android:layout_width="fill_parent"
  19 + android:layout_height="wrap_content"
  20 + android:gravity="center"
  21 + android:text="表决结果"
  22 + android:textColor="@color/white"
  23 + android:textSize="@dimen/px72dp"
  24 + android:textStyle="bold" />
  25 +
  26 + <TextView
  27 + android:id="@+id/fragment_result_memo"
  28 + android:layout_width="fill_parent"
  29 + android:layout_height="wrap_content"
  30 + android:layout_marginTop="@dimen/px40dp"
  31 + android:gravity="center"
  32 + android:text="通过"
  33 + android:textColor="@color/white"
  34 + android:textSize="@dimen/px140dp"
  35 + android:textStyle="bold" />
  36 + </LinearLayout>
  37 +
  38 + <LinearLayout
  39 + android:id="@+id/yingdao_layout"
  40 + android:layout_width="@dimen/px675dp"
  41 + android:layout_height="wrap_content"
  42 + android:layout_below="@id/result_layout"
  43 + android:layout_centerHorizontal="true"
  44 + android:layout_marginTop="@dimen/px40dp"
  45 + android:orientation="horizontal">
  46 +
  47 + <TextView
  48 + android:layout_width="wrap_content"
  49 + android:layout_height="wrap_content"
  50 + android:layout_weight="1"
  51 + android:text="@string/yindao1"
  52 + android:textColor="@color/white"
  53 + android:textSize="@dimen/px60dp"
  54 + android:textStyle="bold" />
  55 +
  56 + <TextView
  57 + android:id="@+id/yingdaoresult"
  58 + android:layout_width="wrap_content"
  59 + android:layout_height="wrap_content"
  60 + android:layout_weight="1"
  61 + android:text="150"
  62 + android:textColor="@color/white"
  63 + android:textSize="@dimen/px60dp" />
  64 +
  65 + <TextView
  66 + android:layout_width="wrap_content"
  67 + android:layout_height="wrap_content"
  68 + android:layout_weight="1"
  69 + android:text="@string/shidao1"
  70 + android:textColor="@color/white"
  71 + android:textSize="@dimen/px60dp"
  72 + android:gravity="center_vertical|right"
  73 + android:textStyle="bold" />
  74 +
  75 + <TextView
  76 + android:id="@+id/shidaoresult"
  77 + android:layout_width="wrap_content"
  78 + android:layout_height="wrap_content"
  79 + android:layout_weight="1"
  80 + android:text="150"
  81 + android:gravity="center_vertical|right"
  82 + android:textColor="@color/white"
  83 + android:textSize="@dimen/px60dp" />
  84 +
  85 + </LinearLayout>
  86 +
  87 +
  88 + <View
  89 + android:id="@+id/line"
  90 + android:layout_width="match_parent"
  91 + android:layout_height="@dimen/px3dp"
  92 + android:layout_below="@id/yingdao_layout"
  93 + android:layout_marginTop="@dimen/px60dp"
  94 + android:background="#5386CB" />
  95 +
  96 + <ListView
  97 + android:id="@+id/multi_vote_result_listview"
  98 + android:layout_width="fill_parent"
  99 + android:layout_height="fill_parent"
  100 + android:layout_below="@id/line"
  101 + android:layout_marginBottom="10dp"
  102 + android:divider="#5386CB"
  103 + android:dividerHeight="@dimen/px4dp">
  104 +
  105 +
  106 + </ListView>
  107 +
  108 +
  109 +
  110 +</RelativeLayout>
0 111 \ No newline at end of file
... ...
C5/app/src/main/res/layout/item_user_vote_result.xml 0 → 100644
  View file @81252b8
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent">
  5 +
  6 + <LinearLayout
  7 + android:layout_width="@dimen/px628dp"
  8 + android:layout_height="@dimen/px120dp"
  9 + android:layout_centerHorizontal="true"
  10 + android:orientation="horizontal">
  11 +
  12 + <TextView
  13 + android:id="@+id/name"
  14 + android:layout_width="wrap_content"
  15 + android:layout_height="wrap_content"
  16 + android:layout_weight="1"
  17 + android:gravity="center_vertical|left"
  18 + android:textColor="@color/white"
  19 + android:textSize="@dimen/px60dp" />
  20 +
  21 + <TextView
  22 + android:id="@+id/desc"
  23 + android:layout_width="wrap_content"
  24 + android:layout_height="wrap_content"
  25 + android:layout_weight="1"
  26 + android:gravity="center_vertical|right"
  27 + android:textColor="@color/white"
  28 + android:textSize="@dimen/px60dp" />
  29 +
  30 + </LinearLayout>
  31 +</RelativeLayout>
... ...
C5/settings.gradle
  View file @81252b8
1   -include ':app', ':udpmodule', ':xpadprotocal', ':util', ':sunvoteadapter', 'txpad', 'sunvotesdk','testproject'
  1 +include ':app', ':udpmodule', ':xpadprotocal', ':util', ':sunvoteadapter', 'txpad', 'sunvotesdk','testproject','statusBar'
2 2  
3 3 \ No newline at end of file
... ...
C5/xpadprotocal/build/libs/xpadprotocal.jar deleted
View file @9eecf3b
No preview for this file type
C5/xpadprotocal/build/tmp/jar/MANIFEST.MF deleted
View file @9eecf3b
1   -Manifest-Version: 1.0
2   -