C5 vote

孙向锦
1 parent 9eecf3b7
Showing 23 changed files with 342 additions and 52 deletions
C5/app/src/main/AndroidManifest.xml
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
C5/app/src/main/java/com/sunvote/xpadapp/dialog/ToastAlertDialog.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java
C5/app/src/main/res/drawable-xhdpi/btn_election_abstain.png
C5/app/src/main/res/drawable-xhdpi/btn_election_abstain_s.png
C5/app/src/main/res/drawable-xxhdpi/btn_modify_disable.xml → C5/app/src/main/res/drawable/btn_modify_disable.xml
C5/app/src/main/res/drawable-xxhdpi/btn_modify_enable.xml → C5/app/src/main/res/drawable/btn_modify_enable.xml
C5/app/src/main/res/drawable/connect_server.xml
C5/app/src/main/res/drawable/download_fail.xml
C5/app/src/main/res/drawable/downloading.xml
C5/app/src/main/res/drawable/file_not_exsit.xml
C5/app/src/main/res/drawable-xxhdpi/modify_selector_new.xml → C5/app/src/main/res/drawable/modify_selector_new.xml
C5/app/src/main/res/layout/fragment_download.xml
C5/app/src/main/res/layout/fragment_multi_title.xml
C5/app/src/main/res/layout/fragment_result_user.xml
C5/app/src/main/res/layout/item_user_vote_result.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.sunvote.xpadapp"
     android:versionCode="70"
-    android:versionName="1.3.0.0"> <!-- android:sharedUserId="android.studentUID.system" -->
+    android:versionName="1.3.0.2"> <!-- android:sharedUserId="android.studentUID.system" -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"></uses-permission>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
@@ -1272,7 +1272,7 @@ public class MainActivity extends BaseActivity implements ComListener {
         LogUtil.i(TAG, "baseEvent:" + info);
         meetingId = info.confId;
         //attrib bit 6 1 表示服务可以申请，0，表示服务关闭
-        if((mBaseInfo.attrib & 0x20) != 0){
+        if((mBaseInfo.attrib & 0x40) != 0){
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
@@ -2,6 +2,8 @@ package com.sunvote.xpadapp.dialog;
 import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.LayoutInflater;
@@ -9,6 +11,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
+import com.sunvote.xpadapp.MainActivity;
 import com.sunvote.xpadapp.R;
 public class ToastAlertDialog {
@@ -16,8 +19,8 @@ public class ToastAlertDialog {
     private AlertDialog dialog;
     private AlertDialog.Builder builder;
     private TextView messageView ;
-    private TextView confirm;
     private Handler handler;
+    private Context context;
     public ToastAlertDialog setMessage(CharSequence message) {
         messageView.setText(message);
@@ -25,12 +28,18 @@ public class ToastAlertDialog {
     }
     public ToastAlertDialog(Context context){
+        this.context = context;
         builder = new AlertDialog.Builder(context);
         handler = new Handler(Looper.getMainLooper());
         builder.setCancelable(true);
+        builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface d) {
+                handler.postDelayed(hideMenu,10);
+            }
+        });
         View rootView = LayoutInflater.from(context).inflate(R.layout.toast_dialog,null);
         messageView = rootView.findViewById(R.id.message);
-        confirm = rootView.findViewById(R.id.confirm);
         rootView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -61,10 +70,33 @@ public class ToastAlertDialog {
         lp.alpha = 0.6f;
         dialog.getWindow().setAttributes(lp);
         dialog.show();
+        hideBottomUIMenu();
         handler.postDelayed(close,2000);
     }
     public static ToastAlertDialog makeText(Context context, CharSequence text){
         return new ToastAlertDialog(context).setMessage(text);
     }
+
+    private Runnable hideMenu = new Runnable() {
+        @Override
+        public void run() {
+            hideBottomUIMenu();
+        }
+    };
+
+    public void hideBottomUIMenu(){
+        if (Build.VERSION.SDK_INT > 11 && Build.VERSION.SDK_INT < 19) { // lower
+            View v = dialog.getWindow().getDecorView();
+            v.setSystemUiVisibility(View.GONE);
+        } else if (Build.VERSION.SDK_INT >= 19) {
+            View decorView = dialog.getWindow().getDecorView();
+            if(context instanceof MainActivity){
+                MainActivity mainActivity = (MainActivity)context;
+                decorView = mainActivity.getWindow().getDecorView();
+            }
+            int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | 0x00002000;
+            decorView.setSystemUiVisibility(uiOptions);
+        }
+    }
 }
@@ -126,6 +126,12 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
         tvConfirmText = (TextView) view.findViewById(R.id.multivote_confirm_text);
         // tvPage = (TextView) view.findViewById(R.id.multivote_page);
+        confirmLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
         btnConfirm = (Button) view.findViewById(R.id.multivote_btn_submit);
@@ -142,7 +148,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
                     if (voteInfo.mode2_modify == 1) {
                         doSubmitAllOk();
                     } else {
-                        tvConfirmText.setText("投票后不可修改，确定提交吗？");
+                        tvConfirmText.setText("应投" + aryContent.size()+"项，已投" +votedCount+"项，确定提交吗？");
                         confirmLayout.setVisibility(View.VISIBLE);
                     }
@@ -154,7 +160,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
                         if (voteInfo.mode2_modify == 1) {
                             doSubmitAllOk();
                         } else {
-                            tvConfirmText.setText("投票后不可修改，确定提交吗？");
+                            tvConfirmText.setText("应投" + aryContent.size()+"项，已投" +votedCount+"项，确定提交吗？");
                             confirmLayout.setVisibility(View.VISIBLE);
                         }
                     }
@@ -402,11 +408,13 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
         if (voteInfo.mode2_modify == 1) {
             btnModify.setVisibility(View.VISIBLE);
 //            tvInfo.setText(getString(R.string.submited));
+            tvInfo.setText("");
             tvInfo.setBackgroundResource(R.drawable.voted);
             tvInfoLayout.setVisibility(View.VISIBLE);
         } else {
             disableVote();
 //            tvInfo.setText(getString(R.string.submited));
+            tvInfo.setText("");
             tvInfo.setBackgroundResource(R.drawable.voted);
             tvInfoLayout.setVisibility(View.VISIBLE);
 //            tvInfo.setText(getString(R.string.submited_no_modify));
@@ -615,8 +623,9 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
                     holder.ivResult.setBackgroundResource(R.drawable.voted_empty);
                 } else {
-                    holder.ivResult.setText("");
-                    holder.ivResult.setBackgroundResource(R.drawable.voted);
+                    holder.ivResult.setText("已投票");
+                    holder.ivResult.setBackgroundResource(R.drawable.voted_empty);
+//                    holder.ivResult.setBackgroundResource(R.drawable.voted);
                 }
             } else {
                 holder.ivResult.setVisibility(View.INVISIBLE);
@@ -219,6 +219,11 @@ public class ResultVoteFragment extends BaseFragment {
                     dataTitleLayout3.setVisibility(View.VISIBLE);
                     ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.abstant));
                 }
+                if (pass == 0) {
+                    fragmentResultMemo.setText(getString(R.string.no_pass));
+                } else {
+                    fragmentResultMemo.setText(getString(R.string.pass));
+                }
             } else if (voteInfo.resultInfo.resultType == 4) {
                 fragmentMemo.setText(getString(R.string.ceping_result));
                 if (voteInfo.resultInfo.num4 != 0xffff) {
@@ -233,6 +238,13 @@ public class ResultVoteFragment extends BaseFragment {
                     dataTitleLayout3.setVisibility(View.VISIBLE);
                     ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.bumanyi));
                 }
+                if (pass == 0) {
+                    fragmentResultMemo.setText(getString(R.string.manyi));
+                } else if (pass == 1) {
+                    fragmentResultMemo.setText(getString(R.string.jbmanyi));
+                } else {
+                    fragmentResultMemo.setText(getString(R.string.bumanyi));
+                }
             } else if (voteInfo.resultInfo.resultType == 12) {
                 fragmentMemo.setText(getString(R.string.ceping_result));
                 if (voteInfo.resultInfo.num4 != 0xffff) {
@@ -247,6 +259,13 @@ public class ResultVoteFragment extends BaseFragment {
                     dataTitleLayout3.setVisibility(View.VISIBLE);
                     ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.fcbumanyi));
                 }
+                if (pass == 0) {
+                    fragmentResultMemo.setText(getString(R.string.manyi));
+                } else if (pass == 1) {
+                    fragmentResultMemo.setText(getString(R.string.bumanyi));
+                } else {
+                    fragmentResultMemo.setText(getString(R.string.fcbumanyi));
+                }
             }
             if(voteInfo.resultInfo.num3 != 0xffff){
                 double opt4 = voteInfo.resultInfo.num3 * 1.0 / fenmu * 100;
@@ -260,5 +279,8 @@ public class ResultVoteFragment extends BaseFragment {
                 ((TextView)(dataTitleLayout4.findViewById(R.id.data_title_layout4_text2))).setText(text);
             }
         }
+        if (pass == 0xf) {
+            fragmentResultMemo.setText("");
+        }
      }
 }
@@ -527,13 +527,14 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 	}
 	private void disableVote() {
-		if(voteInfo.mode4==customVote){
-			setBtnModle(2,false);
-		}else{
-			btnA.setEnabled(false);
-			btnB.setEnabled(false);
-			btnC.setEnabled(false);
-		}
+//		if(voteInfo.mode4==customVote){
+//			setBtnModle(2,false);
+//		}else{
+//			btnA.setEnabled(false);
+//			btnB.setEnabled(false);
+//			btnC.setEnabled(false);
+//		}
+		hideVote();
 	}
 	private  void showModifyOrDisable() {
@@ -6,7 +6,10 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.BaseAdapter;
 import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.sunvote.xpadapp.MainActivity;
@@ -17,6 +20,7 @@ import com.sunvote.xpadapp.db.modal.MultiTitleItem;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.List;
 public class UserResultVoteFragment extends BaseFragment {
@@ -27,6 +31,9 @@ public class UserResultVoteFragment extends BaseFragment {
         this.data = data;
     }
+    private UserAdapter userAdapter;
+    private List<UserData> dataList;
+
     public void setOptions(String[] options) {
         this.options = options;
     }
@@ -36,26 +43,29 @@ public class UserResultVoteFragment extends BaseFragment {
     // 表決结果
     private TextView fragmentResultMemo;
     private TextView fragmentMemo;
-    //
-//    private LinearLayout tResult;
-//    private LinearLayout dResult;
-//    private LinearLayout pResult;
+    private ListView listView;
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.fragment_result_vote, container, false);
+        View root = inflater.inflate(R.layout.fragment_result_user, container, false);
         yingdaoresult = root.findViewById(R.id.yingdaoresult);
         shidaoresult = root.findViewById(R.id.shidaoresult);
         fragmentResultMemo = root.findViewById(R.id.fragment_result_memo);
         fragmentMemo = root.findViewById(R.id.fragment_memo);
-
-//        tResult = root.findViewById(R.id.t_result);
-//        dResult = root.findViewById(R.id.d_result);
-//        pResult = root.findViewById(R.id.p_result);
+        listView = root.findViewById(R.id.multi_vote_result_listview);
+        dataList = new ArrayList<>();
+        userAdapter = new UserAdapter(dataList);
+        listView.setAdapter(userAdapter);
         showResult();
         return root;
     }
-    private View createView(String txt,int color) {
+    @Override
+    public void onResume() {
+        super.onResume();
+        ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
+    }
+
+    private View createView(String txt, int color) {
         TextView tv1 = new TextView(getActivity());
         ViewGroup.LayoutParams vlp = new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -130,9 +140,7 @@ public class UserResultVoteFragment extends BaseFragment {
     }
     private void setView(int pos, int digiters, int bitNum, int type) {
-//        tResult.removeAllViews();
-//        dResult.removeAllViews();
-//        pResult.removeAllViews();
+        dataList.clear();
         LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.WRAP_CONTENT,1.0f);
         for(int i = 1; i <= options.length ; i++) {
             if (options.length >= i) {
@@ -142,34 +150,48 @@ public class UserResultVoteFragment extends BaseFragment {
                 } else {
                     value1 = (data[pos++] << 8 | data[pos++]) & 0xffff;
                 }
-//                tResult.addView(createView(options[i - 1], Color.YELLOW), lp);
-//                dResult.addView(createView("" + value1, Color.WHITE), lp);
+                String szc = "" ;
                 if (type == 1) {
                     //分母
                     if ((fenmu > 0 && fenmu != 0xff)) {
                         double pzc = value1 * 1.0 / fenmu * 100;
-                        String szc = formatDoubleToString(pzc, digiters, false);
-//                        pResult.addView(createView(szc + "%", Color.WHITE), lp);
+                        szc = formatDoubleToString(pzc, digiters, false);
                     }
                 } else {
                     //分母
                     if ((fenmu > 0 && fenmu != 0xffff)) {
                         double pzc = value1 * 1.0 / fenmu * 100;
-                        String szc = formatDoubleToString(pzc, digiters, false);
-//                        pResult.addView(createView(szc + "%", Color.WHITE), lp);
+                        szc = formatDoubleToString(pzc, digiters, false);
                     }
                 }
+
+
+                String text = "" + value1 ;
+                if(szc != null && !"".equals(szc)){
+                    text += "(" + szc + "%)" ;
+                }
+                UserData userData = new UserData();
+                userData.name = options[i -1];
+                userData.desc = text;
+                dataList.add(userData);
             }
         }
         if (notVote != 0xff) {
-//            tResult.addView(createView(getString(R.string.weian), Color.YELLOW), lp);
-//            dResult.addView(createView("" + notVote, Color.WHITE), lp);
+            String strOpt4 = "" ;
             if ((fenmu > 0 && fenmu != 0xff)) {
-//                pResult.addView(createView("0%", Color.WHITE), lp);
+                strOpt4 = "0%" ;
             }else{
-//                pResult.setVisibility(View.GONE);
             }
+            String text = "" + notVote ;
+            if(strOpt4 != null && !"".equals(strOpt4)){
+                text += "(" + strOpt4 + "%)" ;
+            }
+            UserData userData = new UserData();
+            userData.name = getString(R.string.weian);
+            userData.desc = text;
+            dataList.add(userData);
         }
+        userAdapter.notifyDataSetChanged();
     }
     public static String formatDoubleToString(double value, Integer digits, boolean remove) {
@@ -197,4 +219,58 @@ public class UserResultVoteFragment extends BaseFragment {
         }
     }
+    class UserData{
+        String name;
+        String desc;
+    }
+
+    class UserAdapter extends BaseAdapter{
+
+        private List<UserData> dataList;
+
+        public UserAdapter(List<UserData> dataList){
+            this.dataList = dataList;
+        }
+
+
+        @Override
+        public int getCount() {
+            if(dataList != null){
+                return dataList.size();
+            }
+            return 0;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return position;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder = null;
+            if(convertView == null){
+                viewHolder = new ViewHolder();
+                convertView = LayoutInflater.from(getActivity()).inflate(R.layout.item_user_vote_result,null);
+                viewHolder.nameTextView = convertView.findViewById(R.id.name);
+                viewHolder.descTextView = convertView.findViewById(R.id.desc);
+                convertView.setTag(viewHolder);
+            }else{
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+            viewHolder.nameTextView.setText(dataList.get(position).name);
+            viewHolder.descTextView.setText(dataList.get(position).desc);
+            return convertView;
+        }
+    }
+
+    class ViewHolder{
+        TextView nameTextView;
+        TextView descTextView;
+    }
 }
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="360dp"
+    android:height="120dp"
+    android:viewportWidth="360"
+    android:viewportHeight="120">
+  <path
+      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"
+      android:fillColor="@color/red"/>
+  <path
+      android:pathData="M-125.5,159.8h604.4v92.5h-604.4z"
+      android:fillColor="@color/red"/>
+  <path
+      android:pathData="M223,218.4V316h-92.5v-97.6H223zM304.5,316v154.2H48.9V316H304.5z"
+      android:fillColor="@color/red"/>
+</vector>
@@ -5,5 +5,5 @@
     android:height="292.9dp">
     <path
         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"
-        android:fillColor="#F6FF00" />
+        android:fillColor="@color/white" />
 </vector>
 \ No newline at end of file
@@ -5,5 +5,5 @@
     android:height="260.1dp">
     <path
         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"
-        android:fillColor="#E7E739" />
+        android:fillColor="@color/white" />
 </vector>
 \ No newline at end of file
@@ -5,5 +5,5 @@
     android:height="255.1dp">
     <path
         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"
-        android:fillColor="#E7E739" />
+        android:fillColor="@color/white" />
 </vector>
 \ No newline at end of file
@@ -12,11 +12,11 @@
      <ImageView
          android:id="@+id/download_img"
-         android:layout_width="200dp"
-         android:layout_height="200dp"
+         android:layout_width="@dimen/px294dp"
+         android:layout_height="@dimen/px234dp"
          android:layout_centerHorizontal="true"
          android:layout_above="@id/middle"
-         android:src="@drawable/downloading"/>
+         android:src="@drawable/connect_server"/>
      <TextView 
          android:id="@+id/download_title"
@@ -61,9 +61,6 @@
             android:textSize="@dimen/px50dp"
             android:textStyle="bold" />
     </LinearLayout>
-
-
-
     <RelativeLayout
         android:id="@+id/multivote_pannal_bottom"
         android:layout_width="match_parent"
@@ -94,7 +91,6 @@
             android:textStyle="bold"
             android:visibility="invisible" />
     </RelativeLayout>
-
     <ListView
         android:id="@+id/multivote_listview"
         android:layout_width="fill_parent"
@@ -128,7 +124,7 @@
         android:id="@+id/multivote_confirm_panel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#33000000"
+        android:background="#BB000000"
         android:visibility="gone">
         <TextView
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#0952B5"
+    android:orientation="vertical">
+    <LinearLayout
+        android:id="@+id/result_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/px60dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/fragment_memo"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="表决结果"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px72dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/fragment_result_memo"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/px40dp"
+            android:gravity="center"
+            android:text="通过"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px140dp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/yingdao_layout"
+        android:layout_width="@dimen/px675dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/result_layout"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/px40dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/yindao1"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px60dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/yingdaoresult"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="150"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px60dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/shidao1"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px60dp"
+            android:gravity="center_vertical|right"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/shidaoresult"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="150"
+            android:gravity="center_vertical|right"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px60dp" />
+
+    </LinearLayout>
+
+
+    <View
+        android:id="@+id/line"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/px3dp"
+        android:layout_below="@id/yingdao_layout"
+        android:layout_marginTop="@dimen/px60dp"
+        android:background="#5386CB" />
+
+    <ListView
+        android:id="@+id/multi_vote_result_listview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/line"
+        android:layout_marginBottom="10dp"
+        android:divider="#5386CB"
+        android:dividerHeight="@dimen/px4dp">
+
+
+    </ListView>
+
+
+
+</RelativeLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="@dimen/px628dp"
+        android:layout_height="@dimen/px120dp"
+        android:layout_centerHorizontal="true"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical|left"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px60dp" />
+
+        <TextView
+            android:id="@+id/desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical|right"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px60dp" />
+
+    </LinearLayout>
+</RelativeLayout>
-include ':app', ':udpmodule', ':xpadprotocal', ':util', ':sunvoteadapter', 'txpad', 'sunvotesdk','testproject'
+include ':app', ':udpmodule', ':xpadprotocal', ':util', ':sunvoteadapter', 'txpad', 'sunvotesdk','testproject','statusBar'
 \ No newline at end of file
-Manifest-Version: 1.0
-