批次表決UI修改

孙向锦
1 parent 36cce4cb
Showing 13 changed files with 235 additions and 105 deletions
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/ResultMultiVoteFragment.java
C5/app/src/main/res/drawable-xxhdpi/btn_modify_disable.xml
C5/app/src/main/res/drawable-xxhdpi/btn_modify_enable.xml
C5/app/src/main/res/drawable-xxhdpi/modify_selector_new.xml
C5/app/src/main/res/drawable/modify_selector.xml
C5/app/src/main/res/layout/fragment_multi_title.xml
C5/app/src/main/res/layout/fragment_result_multi_vote.xml
C5/app/src/main/res/layout/list_multi_vote_result_item.xml
C5/app/src/main/res/layout/toast_dialog.xml
C5/app/src/main/res/values/strings.xml
@@ -1733,7 +1733,6 @@ public class MainActivity extends BaseActivity implements ComListener {
             return;
         }
         if ((data[0] & 0xff) == 0xF2 && data[1] == 20) {
-
             if (tmpMulResultBuffer != null && Arrays.equals(buf, tmpMulResultBuffer)) {
                 Log.e(TAG, "onMultiPackageData same data,abort");
                 return;
+package com.sunvote.xpadapp.dialog;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import com.sunvote.xpadapp.R;
+
+public class ToastAlertDialog {
+
+    private AlertDialog dialog;
+    private AlertDialog.Builder builder;
+    private TextView messageView ;
+    private TextView confirm;
+    private Handler handler;
+
+    public ToastAlertDialog setMessage(CharSequence message) {
+        messageView.setText(message);
+        return this;
+    }
+
+    public ToastAlertDialog(Context context){
+        builder = new AlertDialog.Builder(context);
+        handler = new Handler(Looper.getMainLooper());
+        builder.setCancelable(true);
+        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) {
+                if(dialog != null){
+                    dialog.dismiss();
+                }
+            }
+        });
+        builder.setView(rootView);
+    }
+
+    Runnable close = new Runnable() {
+        @Override
+        public void run() {
+            if(dialog != null){
+                dialog.dismiss();
+            }
+        }
+    };
+
+    public void show(){
+        if(dialog == null){
+            dialog = builder.create();
+        }
+        WindowManager.LayoutParams  lp= dialog.getWindow().getAttributes();
+        lp.width=750;
+        lp.height=380;
+        lp.alpha = 0.6f;
+        dialog.getWindow().setAttributes(lp);
+        dialog.show();
+        handler.postDelayed(close,2000);
+    }
+
+    public static ToastAlertDialog makeText(Context context, CharSequence text){
+        return new ToastAlertDialog(context).setMessage(text);
+    }
+}
@@ -20,7 +20,6 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 import com.sunvote.util.LogUtil;
 import com.sunvote.xpadapp.MainActivity;
@@ -28,6 +27,7 @@ import com.sunvote.xpadapp.R;
 import com.sunvote.xpadapp.base.BaseFragment;
 import com.sunvote.xpadapp.db.modal.BillInfo;
 import com.sunvote.xpadapp.db.modal.MultiTitleItem;
+import com.sunvote.xpadapp.dialog.ToastAlertDialog;
 import com.sunvote.xpadapp.fragments.MutilTitleDetailFragment.TitleVoteOnBack;
 import com.sunvote.xpadapp.utils.SharedPreferencesUtil;
 import com.sunvote.xpadcomm.XPadApi;
@@ -136,7 +136,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
                 int remain = aryContent.size() - votedCount;
                 if (voteInfo.less == 1) {// 不可缺选
                     if (remain > 0) {
-                        Toast.makeText(mMainActivity, "您还有" + remain + "项未表决", Toast.LENGTH_SHORT).show();
+                        ToastAlertDialog.makeText(mMainActivity, "您还有" + remain + "项未表决").show();
                         return;
                     }
                     if (voteInfo.mode2_modify == 1) {
@@ -172,6 +172,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
             public void onClick(View v) {
                 // mMainActivity.presenter.cancelSubmitVoteAllOK();
                 showVote(true);
+                tvInfoLayout.setVisibility(View.GONE);
             }
         });
@@ -410,6 +411,17 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack 
             tvInfoLayout.setVisibility(View.VISIBLE);
 //            tvInfo.setText(getString(R.string.submited_no_modify));
         }
+        if(voteInfo.mode3_secret != 0){
+            for (int i = 0; i < aryContent.size(); i++) {
+                try {
+                    MultiTitleItem it = aryContent.get(i);
+                    it.result = 0;
+                } catch (Exception ex) {
+                }
+            }
+            mAdapter.notifyDataSetChanged();
+
+        }
     }
     /*
@@ -11,6 +11,7 @@ import com.sunvote.xpadcomm.XPadApiInterface.VoteInfo;
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -109,6 +110,12 @@ public class ResultMultiVoteFragment extends SuperBaseFragment {
 		return view;
 	}
+	@Override
+	public void onResume() {
+		super.onResume();
+		((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
+	}
+
 	private void initData() {
 		int bitNum = data[2] & 0xf;
@@ -325,7 +332,11 @@ public class ResultMultiVoteFragment extends SuperBaseFragment {
 			} else {
 				holder = (ViewHolder) convertView.getTag();
 			}
-
+            if(position % 2 == 0){
+			    convertView.setBackgroundColor(Color.parseColor("#084AA3"));
+            }else{
+                convertView.setBackgroundResource(0);
+            }
 			ListItem it = aryContent.get(position);
+<vector android:height="24dp" android:viewportHeight="120"
+    android:viewportWidth="500" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/darkgrey" 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"/>
+</vector>
+<vector android:height="24dp" android:viewportHeight="120"
+    android:viewportWidth="500" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00964D" 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"/>
+</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+	<!-- 点击后的颜色 -->
+	<item android:state_pressed="true" android:drawable="@drawable/btn_modify_disable"/>
+	<item android:state_focused="true" android:drawable="@drawable/btn_modify_enable"/>
+
+	<item android:state_enabled="false" android:drawable="@drawable/btn_modify_disable"/>
+	<!-- 默认 -->
+	<item android:drawable="@drawable/btn_modify_enable"/>
+
+</selector>
@@ -4,8 +4,6 @@
     <!-- 点击后的颜色 -->
 	<item android:state_pressed="true" android:drawable="@drawable/btn_modify_s"/>
 	<item android:state_focused="true" android:drawable="@drawable/btn_modify_s"/>
-
-	 
 	<!-- 默认 -->
 	<item android:drawable="@drawable/btn_modify"/>
@@ -87,7 +87,7 @@
             android:layout_width="@dimen/px420dp"
             android:layout_height="@dimen/px110dp"
             android:layout_centerInParent="true"
-            android:background="@drawable/signin_selector"
+            android:background="@drawable/modify_selector_new"
             android:text="@string/modify"
             android:textColor="@color/white"
             android:textSize="@dimen/px60dp"
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ff004586">
+    android:background="#0952b5">
     <LinearLayout
         android:id="@+id/multi_vote_result_top_panal"
@@ -27,19 +27,66 @@
             android:layout_weight="1"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p3"
+            android:textSize="@dimen/px80dp"
             android:maxLines="2"
             android:ellipsize="end"
             android:textStyle="bold" />
     </LinearLayout>
+    <LinearLayout
+            android:id="@+id/yingdao_layout"
+            android:layout_below="@id/multi_vote_result_top_panal"
+            android:layout_width="@dimen/px675dp"
+            android:layout_height="wrap_content"
+            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/multi_vote_result_yindao"
+                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/multi_vote_result_shidao"
+                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>
     <LinearLayout
         android:id="@+id/multi_vote_result_title_panel"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/multi_vote_result_top_panal"
+        android:layout_below="@id/yingdao_layout"
         android:paddingRight="80dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="@dimen/px60dp"
         android:orientation="horizontal">
         <TextView
@@ -49,10 +96,10 @@
             android:layout_marginLeft="5dp"
             android:gravity="center"
             android:layout_centerVertical="true"
-            android:textColor="@color/yellow"
-            android:textSize="@dimen/big_text_p4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px48dp"
             android:textStyle="bold"
-            android:text="序号"/>
+            android:text=""/>
         <TextView
             android:id="@+id/multi_vote_result_title_name"
@@ -61,9 +108,10 @@
             android:layout_centerVertical="true"
             android:layout_weight="1"
             android:gravity="center"
-            android:textColor="@color/yellow"
-            android:text="表决项"
-            android:textSize="@dimen/big_text_p4"
+            android:textColor="@color/white"
+            android:layout_marginLeft="10dp"
+            android:text=""
+            android:textSize="@dimen/px48dp"
             android:textStyle="bold" />
         <TextView
@@ -74,8 +122,8 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/agree"
-            android:textColor="@color/yellow"
-            android:textSize="@dimen/big_text_p4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px48dp"
             android:textStyle="bold" />
         <TextView
@@ -85,8 +133,8 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/oppose"
-            android:textColor="@color/yellow"
-            android:textSize="@dimen/big_text_p4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px48dp"
             android:textStyle="bold" />
         <TextView
@@ -96,8 +144,8 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/abstant"
-            android:textColor="@color/yellow"
-            android:textSize="@dimen/big_text_p4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px48dp"
             android:textStyle="bold" />
         <TextView
@@ -107,83 +155,24 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/unvote"
-            android:textColor="@color/yellow"
-            android:textSize="@dimen/big_text_p4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px48dp"
             android:textStyle="bold" />
         <TextView
             android:id="@+id/multi_vote_result_title_result"
-            android:layout_width="80dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/result"
-            android:textColor="@color/yellow"
-            android:textSize="@dimen/big_text_p4"
+            android:textColor="@color/white"
+            android:textSize="@dimen/px48dp"
             android:textStyle="bold" />
     </LinearLayout>
-    <RelativeLayout
-        android:id="@+id/bottom_linear"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp">
-        <LinearLayout
-            android:layout_width="800dp"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:text="@string/yindao1"
-                android:textColor="@color/yellow"
-                android:textSize="@dimen/big_text_p3"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/multi_vote_result_yindao"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="60dp"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="150"
-                android:textColor="@color/white"
-                android:textSize="@dimen/big_text_p3" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="60dp"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:text="@string/shidao1"
-                android:textColor="@color/yellow"
-                android:textSize="@dimen/big_text_p3"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/multi_vote_result_shidao"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="150"
-                android:textColor="@color/white"
-                android:textSize="@dimen/big_text_p3" />
-
-        </LinearLayout>
-    </RelativeLayout>
@@ -192,9 +181,8 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_below="@id/multi_vote_result_title_panel"
-        android:layout_above="@id/bottom_linear"
         android:layout_marginBottom="10dp"
-        android:divider="@color/material_grey_600"
-        android:dividerHeight="2dp"></ListView>
+        android:divider="#5381BF"
+        android:dividerHeight="@dimen/px4dp"></ListView>
 </RelativeLayout>
 \ No newline at end of file
@@ -7,7 +7,6 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:paddingBottom="15dp"
         android:orientation="horizontal">
@@ -20,8 +19,8 @@
             android:gravity="center"
             android:layout_gravity="center_vertical"
             android:text="1234"
-            android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5" />
+            android:textColor="#F1F1F1"
+            android:textSize="@dimen/px40dp" />
         <TextView
             android:id="@+id/list_multi_result_item_name"
@@ -30,22 +29,21 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:layout_weight="1"
-            android:lines="1"
-            android:ellipsize="end"
             android:gravity="center"
+            android:text="表决标题表决标题表决标题表决标题表决标题表决标题表决标题表决标题"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5" />
+            android:textSize="@dimen/px40dp" />
         <TextView
             android:id="@+id/list_multi_result_item_agree"
             android:layout_width="80dp"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/agree"
+            android:layout_marginLeft="15dp"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5" />
+            android:textSize="@dimen/px48dp" />
         <TextView
             android:id="@+id/list_multi_result_item_oppose"
@@ -56,7 +54,7 @@
             android:gravity="center"
             android:text="@string/oppose"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5" />
+            android:textSize="@dimen/px48dp" />
         <TextView
             android:id="@+id/list_multi_result_item_abstan"
@@ -67,7 +65,7 @@
             android:gravity="center"
             android:text="@string/abstant"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5" />
+            android:textSize="@dimen/px48dp" />
         <TextView
             android:id="@+id/list_multi_result_item_unvote"
@@ -78,7 +76,7 @@
             android:gravity="center"
             android:text="@string/abstant"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5" />
+            android:textSize="@dimen/px48dp" />
         <TextView
             android:id="@+id/list_multi_result_item_result"
@@ -89,7 +87,7 @@
             android:gravity="center"
             android:text="@string/pass"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5" />
+            android:textSize="@dimen/px48dp" />
     </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#000000">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/px380dp">
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/px80dp"
+            android:textColor="#fefefe"
+            android:textSize="@dimen/px60dp" />
+
+        <TextView
+            android:id="@+id/confirm"
+            android:layout_width="@dimen/px240dp"
+            android:layout_height="@dimen/px80dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/px80dp"
+            android:background="@drawable/modify_selector_new"
+            android:gravity="center"
+            android:text="确认"
+            android:textColor="#fefefe"
+            android:textSize="@dimen/px48dp" />
+    </RelativeLayout>
+</LinearLayout>
 \ No newline at end of file
@@ -28,9 +28,9 @@
     <string name="open_wifi">正在开启 WiFi</string>
     <string name="keypad_id">终端编号：</string>
     <string name="version">版本</string>
-    <string name="agree">赞&#160;&#160;成</string>
-    <string name="oppose">反&#160;&#160;对</string>
-    <string name="abstant">弃&#160;&#160;权</string>
+    <string name="agree">赞成</string>
+    <string name="oppose">反对</string>
+    <string name="abstant">弃权</string>
     <string name="cant_modify_confirm">投票后不可以修改，是否确定提交?</string>
     <string name="should_vote">当前应投</string>
     <string name="demo_metting">演示会议</string>