diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SigninFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SigninFragment.java
index e6e5312..c176029 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SigninFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SigninFragment.java
@@ -1,5 +1,6 @@
package com.sunvote.xpadapp.fragments;
+import android.graphics.Color;
import android.os.Bundle;
import android.os.Message;
import android.util.Log;
@@ -46,6 +47,7 @@ public class SigninFragment extends BaseFragment {
btnSignin = (Button)view.findViewById(R.id.signin_btnSign);
btnSignin.setEnabled(false);
+ btnSignin.setTextColor(Color.parseColor("#c75d3a"));
btnSignin.setOnClickListener(new OnClickListener() {
@Override
@@ -68,9 +70,11 @@ public class SigninFragment extends BaseFragment {
public void onVoteEvent( VoteInfo info) {
if(info.mode ==XPadApi.VoteType_Signin){
btnSignin.setEnabled(true);
+ btnSignin.setTextColor(Color.RED);
}else if(info.mode == XPadApi.VoteType_Stop){
btnSignin.setEnabled(false);
+ btnSignin.setTextColor(Color.parseColor("#c75d3a"));
}
if(SharedPreferencesUtil.getData(getActivity(),"signin","").equals("" + voteInfo.dataPos)){
LogUtil.i(TAG,"该dataPos已签到。");
@@ -85,6 +89,7 @@ public class SigninFragment extends BaseFragment {
public void onVoteSubmitSuccess() {
tv.setText(getString(R.string.signined));
btnSignin.setEnabled(false);
+ btnSignin.setTextColor(Color.parseColor("#c75d3a"));
// bgView.setBackgroundColor(0xFF009966);
SharedPreferencesUtil.saveData(getActivity(),"signin",""+voteInfo.dataPos);
((MainActivity)getActivity()).myHandler.sendEmptyMessageDelayed(MainActivity.MSG_DELAY_TO_VIEW,2000);
@@ -94,6 +99,7 @@ public class SigninFragment extends BaseFragment {
super.onVoteSubmitError();
tv.setText(getString(R.string.please_signin));
btnSignin.setEnabled(true);
+ btnSignin.setTextColor(Color.RED);
}
}
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java
index d3d0fd7..6f63b0a 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java
@@ -31,7 +31,7 @@ public class SinginResultFragment extends BaseFragment {
shidaoresult.setText("" + resultInfo.num3);
yingdaoresult.setText("" + resultInfo.num2);
weidaoresult.setText("" + resultInfo.num1);
- ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160"));
+ ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
if ((resultInfo.bits & 0xF) == 0xF) {
result.setText("");
} else if ((resultInfo.bits & 0xF) == 0) {
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
index d0f018b..06de4af 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
@@ -141,14 +141,15 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
tvTitle.setText(bill.title);
}
- if(voteInfo.mode1_msgType < 2){
+ if(voteInfo.mode1_msgType <= 2){
votetype.setText(R.string.yianbiaojue);
}
- if(voteInfo.mode1_msgType == 2){
- votetype.setText(R.string.yianxuanju);
- }
if(voteInfo.mode1_msgType > 2){
- votetype.setText(R.string.yianceping);
+ if(voteInfo.mode4 > 2){
+ votetype.setText(R.string.yianceping);
+ }else{
+ votetype.setText(R.string.yianbiaojue);
+ }
}
tvTitle.setOnClickListener(new OnClickListener() {
@@ -538,7 +539,9 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
if (voteInfo.mode2_modify == 1) {
showModify();
singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
- tvTips.setText(getString(R.string.submited));
+// tvTips.setText(getString(R.string.submited));
+ tvTips.setText("");
+ tvTips.setBackgroundResource(R.drawable.submitted);
} else {
disableVote();
singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
diff --git a/C5/app/src/main/java/com/sunvote/xpadcomm/AntZipUtil.java b/C5/app/src/main/java/com/sunvote/xpadcomm/AntZipUtil.java
index a88bc2e..979abc0 100644
--- a/C5/app/src/main/java/com/sunvote/xpadcomm/AntZipUtil.java
+++ b/C5/app/src/main/java/com/sunvote/xpadcomm/AntZipUtil.java
@@ -329,6 +329,7 @@ public class AntZipUtil {
}
File f = new File(outputDirectory + File.separator
+ zipEntry.getName());
+ f.deleteOnExit();
f.createNewFile();
InputStream in = zipFile.getInputStream(zipEntry);
FileOutputStream out = new FileOutputStream(f);
diff --git a/C5/app/src/main/java/com/sunvote/xpadcomm/DownloadFileModule.java b/C5/app/src/main/java/com/sunvote/xpadcomm/DownloadFileModule.java
index f657d36..a3956d9 100644
--- a/C5/app/src/main/java/com/sunvote/xpadcomm/DownloadFileModule.java
+++ b/C5/app/src/main/java/com/sunvote/xpadcomm/DownloadFileModule.java
@@ -160,9 +160,21 @@ public class DownloadFileModule {
private void unzip(){
if (fileName.endsWith(".zip") || fileName.endsWith(".rar") || fileName.endsWith(".7z")) {
- String outDirName = fileName.substring(0, fileName.length() - 4);
+ String outDirName = "";
+ boolean isAdd = false;
+ if(fileName.startsWith("q")){
+ isAdd = true;
+ }
+ if(isAdd){
+ outDirName = fileName.substring(1,fileName.length() - 4);
+ }else{
+ outDirName = fileName.substring(0, fileName.length() - 4);
+ }
String uzipDirPath = FILEPATH + "/" + outDirName;
- createAndCleanFolder(uzipDirPath);
+
+ if(!isAdd){
+ createAndCleanFolder(uzipDirPath);
+ }
try {
boolean ret = AntZipUtil.unZip(FILEPATH + fileName, uzipDirPath);
if (fileReciverInterface != null) {
diff --git a/C5/app/src/main/res/drawable-hdpi/rendavote.xml b/C5/app/src/main/res/drawable-hdpi/rendavote.xml
index 8163b08..8bb16f4 100644
--- a/C5/app/src/main/res/drawable-hdpi/rendavote.xml
+++ b/C5/app/src/main/res/drawable-hdpi/rendavote.xml
@@ -8,5 +8,5 @@
android:left="5dp"
android:right="5dp"
android:top="5dp" />
-
+
\ No newline at end of file
diff --git a/C5/app/src/main/res/drawable/bgpic_1.png b/C5/app/src/main/res/drawable/bgpic_1.png
index a8696f6..cfc735a 100644
--- a/C5/app/src/main/res/drawable/bgpic_1.png
+++ b/C5/app/src/main/res/drawable/bgpic_1.png
diff --git a/C5/app/src/main/res/drawable/btn_signin_disable.xml b/C5/app/src/main/res/drawable/btn_signin_disable.xml
new file mode 100644
index 0000000..d16c5ab
--- /dev/null
+++ b/C5/app/src/main/res/drawable/btn_signin_disable.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/C5/app/src/main/res/drawable/btn_signin_enable.xml b/C5/app/src/main/res/drawable/btn_signin_enable.xml
new file mode 100644
index 0000000..99138b7
--- /dev/null
+++ b/C5/app/src/main/res/drawable/btn_signin_enable.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/C5/app/src/main/res/drawable/signin_selector.xml b/C5/app/src/main/res/drawable/signin_selector.xml
index cd764e3..d085e8e 100644
--- a/C5/app/src/main/res/drawable/signin_selector.xml
+++ b/C5/app/src/main/res/drawable/signin_selector.xml
@@ -3,12 +3,12 @@
-