Merge branch 'C58寸' of http://120.78.57.84/Elvis/VoteC5 into C58寸

孙向锦
2 parents 49b6752a 691d9f67
Showing 12 changed files with 228 additions and 99 deletions
C5/app/src/main/AndroidManifest.xml
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
C5/app/src/main/res/drawable/agree_selector.xml
C5/app/src/main/res/drawable/darkgrey_round_button.xml
C5/app/src/main/res/drawable/green_round_button.xml
C5/app/src/main/res/drawable/oppos_selector.xml
C5/app/src/main/res/drawable/red_round_button.xml
C5/app/src/main/res/drawable/signin_selector.xml
C5/app/src/main/res/drawable/yellow_round_button.xml
C5/app/src/main/res/layout/fragment_election.xml
C5/app/src/main/res/layout/list_election_item.xml
C5/app/src/main/res/values/color.xml
@@ -4,9 +4,6 @@
     package="com.sunvote.xpadapp"
     android:versionCode="70"
     android:versionName="1.3.0.0"> <!-- android:sharedUserId="android.studentUID.system" -->
-    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"></uses-permission>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Environment;
+import android.text.Html;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -155,6 +156,8 @@ public class ElectionFragment extends BaseFragment {
 				}
 				drawView.clear();
 				addOtherLayout.setVisibility(View.VISIBLE);
+				tvInfo.setVisibility(View.GONE);
+				list_election_item_add_btn.setVisibility(View.GONE);
 			}
 		});
 		addOtherLayout.setOnClickListener(new OnClickListener() {
@@ -347,6 +350,8 @@ public class ElectionFragment extends BaseFragment {
 				aryContent.add(aryContent.size() , it);
 				mAdapter.notifyDataSetChanged();
 				addOtherLayout.setVisibility(View.GONE);
+				tvInfo.setVisibility(View.VISIBLE);
+				list_election_item_add_btn.setVisibility(View.VISIBLE);
 				checkVoted();
 				edtOther.setText("");
 			}
@@ -358,6 +363,8 @@ public class ElectionFragment extends BaseFragment {
 			public void onClick(View v) {
 				edtOther.setText("");
 				addOtherLayout.setVisibility(View.GONE);
+				tvInfo.setVisibility(View.VISIBLE);
+				list_election_item_add_btn.setVisibility(View.VISIBLE);
 				KeyboardUtils.hideSoftInput(getActivity());
 			}
 		});
@@ -657,7 +664,7 @@ public class ElectionFragment extends BaseFragment {
 				holder.btnX = (RadioButton) convertView.findViewById(R.id.list_election_item_xx);// to
 				holder.RG = (RadioGroup) convertView.findViewById(R.id.list_election_item_radio_group);
 				holder.btnDel = (RadioButton) convertView.findViewById(R.id.list_election_item_del);
-				holder.imgBook = (PhotoView) convertView.findViewById(R.id.img_book);
+				//holder.imgBook = (PhotoView) convertView.findViewById(R.id.img_book);
 				convertView.setTag(holder);
 			} else {
 				holder = (ViewHolder) convertView.getTag();
@@ -674,21 +681,21 @@ public class ElectionFragment extends BaseFragment {
 			if (it.No > 0) {
 				holder.btnX.setVisibility(View.VISIBLE);
-				holder.btnDel.setVisibility(View.INVISIBLE);
+				holder.btnDel.setVisibility(View.GONE);
 			}else
 			{
 				holder.btnX.setVisibility(View.GONE);
 				holder.btnDel.setVisibility(View.VISIBLE);
 			}
-			String bookImgPath = (String)SharedPreferencesUtil.getData(getActivity(),it.title,"");
+			/*String bookImgPath = (String)SharedPreferencesUtil.getData(getActivity(),it.title,"");
 			if(!TextUtils.isEmpty(bookImgPath)){
 				holder.imgBook.setVisibility(View.VISIBLE);
 				Bitmap bitmap = BitmapFactory.decodeFile(bookImgPath);
 				holder.imgBook.setImageBitmap(bitmap);
 			}else{
 				holder.imgBook.setVisibility(View.GONE);
-			}
+			}*/
 			if(it.modifyModel){
 				holder.btnO.setEnabled(false);
@@ -817,15 +824,20 @@ public class ElectionFragment extends BaseFragment {
 			}
 		}
 		if(voteInfo!=null){
-			tvInfo.setText(getString(R.string.should_select1) + votedCount + getString(R.string.person));
+			String s=getString(R.string.should_select1);
+			String str= String.format("%s<font color='#FFFF00'><big>%s</big></font>%s",getString(R.string.should_select1),votedCount,getString(R.string.person));
+			tvInfo.setText(Html.fromHtml(str));
+			//tvInfo.setText(getString(R.string.should_select1) + votedCount + getString(R.string.person));
 		}
 		mAdapter.notifyDataSetChanged();
 		listview.invalidate();
 		if((aryContent.size()-  voteInfo.select)<checkOpposeVoted()){
-			list_election_item_add_btn.setVisibility(View.VISIBLE);
+			//list_election_item_add_btn.setVisibility(View.VISIBLE);
+			list_election_item_add_btn.setEnabled(true);
 		}else{
-			list_election_item_add_btn.setVisibility(View.GONE);
+			//list_election_item_add_btn.setVisibility(View.GONE);
+			list_election_item_add_btn.setEnabled(false);
 		}
 	}
@@ -2,10 +2,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
 	<!-- 点击后的颜色 -->
-	<item android:state_pressed="true" android:drawable="@drawable/btn_signin_d"/>
-	<item android:state_focused="true" android:drawable="@drawable/btn_agree"/>
+	<item android:state_pressed="true" android:drawable="@drawable/darkgrey_round_button"/>
+	<item android:state_focused="true" android:drawable="@drawable/green_round_button"/>
-	<item android:state_enabled="false" android:drawable="@drawable/btn_signin_d"/>
+	<item android:state_enabled="false" android:drawable="@drawable/darkgrey_round_button"/>
 	<!-- 默认 -->
-	<item android:drawable="@drawable/btn_agree"/>
+	<item android:drawable="@drawable/green_round_button"/>
 </selector>
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/darkgrey" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px10dp" />
+</shape>
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/green1" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px10dp" />
+</shape>
 <?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_signin_d"/>
-	<item android:state_focused="true" android:drawable="@drawable/btn_oppose"/>
+	<item android:state_pressed="true" android:drawable="@drawable/darkgrey_round_button"/>
+	<item android:state_focused="true" android:drawable="@drawable/red_round_button"/>
-	<item android:state_enabled="false" android:drawable="@drawable/btn_signin_d"/>
+	<item android:state_enabled="false" android:drawable="@drawable/darkgrey_round_button"/>
 	<!-- 默认 -->
-	<item android:drawable="@drawable/btn_oppose"/>
+	<item android:drawable="@drawable/red_round_button"/>
 </selector>
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/red1" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px10dp" />
+</shape>
 <?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_signin_disable"/>
 	<item android:state_focused="true" android:drawable="@drawable/btn_signin_enable"/>
@@ -10,5 +9,4 @@
 	<!-- 默认 -->
 	<item android:drawable="@drawable/btn_signin_enable"/>
-
 </selector>
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/yellow" />
+    <!-- 圆角的半径 -->
+    <corners android:radius="@dimen/px10dp" />
+</shape>
@@ -32,17 +32,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="20dp"
+            android:textColor="@color/white"
             android:text=""
             android:textSize="@dimen/big_text_p5" />
         <Button
             android:id="@+id/list_election_item_add_btn"
-            android:layout_width="120dp"
-            android:layout_height="50dp"
+            android:layout_width="@dimen/px320dp"
+            android:layout_height="@dimen/px100dp"
             android:background="@drawable/agree_selector"
             android:text="@string/select_other"
             android:textColor="@color/white"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="@dimen/px40dp"
             android:textSize="@dimen/big_text_p5" />
     </LinearLayout>
@@ -100,7 +101,7 @@
     <RelativeLayout
         android:id="@+id/election_pannal_bottom"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/linear_heigh"
+        android:layout_height="@dimen/px138dp"
         android:layout_alignParentBottom="true"
         android:alpha="0.9"
         android:background="@drawable/gray_alpha"
@@ -108,26 +109,26 @@
         <Button
             android:id="@+id/election_btn_confirm"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/px420dp"
+            android:layout_height="@dimen/px110dp"
             android:layout_centerInParent="true"
             android:layout_marginRight="@dimen/content_margin"
             android:background="@drawable/oppos_selector"
             android:text="@string/confirm_submit"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px60dp"
             android:textStyle="bold" />
         <Button
             android:id="@+id/election_btn_modify"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/px420dp"
+            android:layout_height="@dimen/px110dp"
             android:layout_centerInParent="true"
             android:layout_marginRight="@dimen/content_margin"
             android:background="@drawable/signin_selector"
             android:text="@string/modify"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px60dp"
             android:textStyle="bold"
             android:visibility="invisible" />
     </RelativeLayout>
@@ -164,33 +165,39 @@
             android:textColor="@color/red"
             android:textSize="@dimen/big_text_p6" />
-        <TextView
+        <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/button_to_content"
-            android:text="@string/agree"
-            android:textColor="@color/red"
-            android:textSize="@dimen/big_text_p6" />
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:gravity="center|center_vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/agree"
+                android:textColor="@color/red"
+                android:textSize="@dimen/big_text_p6" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/button_to_content"
-            android:text="@string/oppose"
-            android:textColor="@color/red"
-            android:textSize="@dimen/big_text_p6" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/button_to_content"
+                android:text="@string/oppose"
+                android:textColor="@color/red"
+                android:textSize="@dimen/big_text_p6" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/button_to_content"
-            android:text="@string/delete"
-            android:textColor="@color/red"
-            android:textSize="@dimen/big_text_p6"
-            android:visibility="gone" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/button_to_content"
+                android:text="@string/delete"
+                android:textColor="@color/red"
+                android:textSize="@dimen/big_text_p6"
+                android:visibility="gone" />
+
+        </LinearLayout>
     </LinearLayout>
@@ -220,7 +227,8 @@
         android:layout_marginRight="20dp"
         android:layout_marginTop="50dp"
         android:background="@drawable/right_control"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone">
         <ImageView
             android:id="@+id/election_pageup"
@@ -258,23 +266,26 @@
         <LinearLayout
             android:id="@+id/name_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="20dp"
-            android:orientation="horizontal">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/px20dp"
+            android:layout_above="@+id/bottom_linear"
+            android:layout_margin="@dimen/px20dp"
+            android:gravity="bottom|center"
+            android:orientation="vertical">
             <TextView
                 android:layout_width="wrap_content"
-                android:layout_height="60dp"
+                android:layout_height="@dimen/px120dp"
                 android:text="@string/input_other"
-                android:textColor="@color/gray"
-                android:textSize="@dimen/big_text_p5" />
+                android:layout_marginRight="@dimen/px90dp"
+                android:textColor="@color/black"
+                android:textSize="@dimen/px60dp" />
             <com.sunvote.xpadapp.base.ZanyEditText
                 android:id="@+id/election_add_edit"
-                android:layout_width="200dp"
-                android:layout_height="60dp"
+                android:layout_width="@dimen/px787dp"
+                android:layout_height="@dimen/px120dp"
                 android:layout_marginLeft="20dp"
                 android:background="@color/white"
                 android:imeOptions="flagNoExtractUi"
@@ -289,27 +300,28 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
-            android:layout_marginBottom="20dp"
+            android:layout_marginBottom="@dimen/px300dp"
+            android:layout_marginTop="@dimen/px30dp"
             android:orientation="horizontal">
             <Button
-                android:id="@+id/election_add_edit_btn_cancel"
-                android:layout_width="@dimen/button_width"
-                android:layout_height="@dimen/button_heigh"
-                android:layout_marginRight="80dp"
-                android:background="@drawable/oppos_selector"
-                android:text="@string/cancel"
+                android:id="@+id/election_add_edit_btn_ok"
+                android:layout_width="@dimen/px360dp"
+                android:layout_height="@dimen/px120dp"
+                android:layout_marginLeft="@dimen/px67dp"
+                android:background="@drawable/btn_agree"
+                android:text="@string/ok"
                 android:textColor="@color/white"
                 android:textSize="@dimen/big_text_p4"
                 android:textStyle="bold" />
             <Button
-                android:id="@+id/election_add_edit_btn_ok"
-                android:layout_width="@dimen/button_width"
-                android:layout_height="@dimen/button_heigh"
-                android:layout_marginLeft="80dp"
-                android:background="@drawable/btn_agree"
-                android:text="@string/ok"
+                android:id="@+id/election_add_edit_btn_cancel"
+                android:layout_width="@dimen/px360dp"
+                android:layout_height="@dimen/px120dp"
+                android:background="@drawable/oppos_selector"
+                android:layout_marginLeft="@dimen/px90dp"
+                android:text="@string/cancel"
                 android:textColor="@color/white"
                 android:textSize="@dimen/big_text_p4"
                 android:textStyle="bold" />
@@ -319,10 +331,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/name_layout"
-            android:layout_above="@id/bottom_linear"
             android:layout_margin="20dp"
             android:background="@color/white"
             android:gravity="center"
+            android:visibility="invisible"
             android:orientation="vertical">
             <TextView
@@ -333,27 +345,26 @@
                 android:textSize="@dimen/big_text_p5"
                 android:textColor="@color/darkgrey"/>
-                <com.sunvote.xpadapp.base.PaletteView
-                    android:id="@+id/draw_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-                <ImageView
-                    android:id="@+id/clear_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginRight="20dp"
-                    android:src="@drawable/ic_clear" />
-
-        </RelativeLayout>
+            <com.sunvote.xpadapp.base.PaletteView
+                android:id="@+id/draw_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+            <ImageView
+                android:id="@+id/clear_img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="20dp"
+                android:src="@drawable/ic_clear" />
+        </RelativeLayout>
     </RelativeLayout>
+
     <RelativeLayout
         android:id="@+id/singlevote_confirm_panel"
         android:layout_width="fill_parent"
@@ -3,11 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/button_heigh" >
-    <LinearLayout
+   <!-- <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:background="@color/white"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingRight="100dp">
         <TextView
             android:id="@+id/seq"
@@ -80,8 +81,79 @@
             android:layout_height="@dimen/button_heigh"
             android:scaleType="fitXY"
             android:layout_margin="2dp"
-            android:layout_toRightOf="@+id/list_election_item_radio_group" />/>
-
+            android:visibility="gone"
+            android:layout_toRightOf="@+id/list_election_item_radio_group" />
     </LinearLayout>
+-->
+
+    <LinearLayout
+        android:id="@+id/title_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="60dp"
+        android:layout_below="@id/election_pannal_OX"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingRight="100dp">
+
+        <TextView
+            android:id="@+id/seq"
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="150dp"
+            android:gravity="center"
+            android:layout_gravity="center_vertical"
+            android:text="1"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/big_text_p5" />
+
+        <TextView
+            android:id="@+id/list_election_item_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:layout_marginLeft="40dp"
+            android:gravity="left|center_vertical"
+            android:text=""
+            android:textColor="@color/black"
+            android:textSize="@dimen/big_text_p5" />
+        <RadioGroup
+            android:id="@+id/list_election_item_radio_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal" >
+
+            <RadioButton
+                android:id="@+id/list_election_item_oo"
+                android:layout_width="@dimen/px60dp"
+                android:layout_height="@dimen/px63dp"
+                android:layout_centerVertical="true"
+                android:layout_marginTop="@dimen/inner_button_margin"
+                android:layout_marginRight="@dimen/px180dp"
+                android:button="@null"
+                android:background="@drawable/oo_selector"
+                android:visibility="visible" />
+
+            <RadioButton
+                android:id="@+id/list_election_item_xx"
+                android:layout_width="@dimen/px60dp"
+                android:layout_height="@dimen/px63dp"
+                android:layout_centerVertical="true"
+                android:layout_marginTop="@dimen/inner_button_margin"
+                android:button="@null"
+                android:background="@drawable/xx_selector"/>
+
+            <RadioButton
+                android:id="@+id/list_election_item_del"
+                android:layout_width="@dimen/px60dp"
+                android:layout_height="@dimen/px63dp"
+                android:layout_centerVertical="true"
+                android:visibility="invisible"
+                android:layout_marginTop="@dimen/inner_button_margin"
+                android:button="@null"
+                android:background="@drawable/delete"/>
+        </RadioGroup>
+    </LinearLayout>
 </RelativeLayout>
 \ No newline at end of file
@@ -164,4 +164,7 @@
     <color name="titile_background_1">#450603</color>
+    <color name="green1">#00964d</color> <!--绿色 -->
+    <color name="red1">#d50c00</color> <!--红色 -->
+
 </resources>
 \ No newline at end of file