diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
index bfa7fed..a469b42 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
@@ -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;
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/dialog/ToastAlertDialog.java b/C5/app/src/main/java/com/sunvote/xpadapp/dialog/ToastAlertDialog.java
new file mode 100644
index 0000000..54fd8ac
--- /dev/null
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/dialog/ToastAlertDialog.java
@@ -0,0 +1,70 @@
+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);
+ }
+}
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
index 3209df8..4320ec3 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
@@ -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();
+
+ }
}
/*
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java
index 9b5abd2..33a4480 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java
@@ -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);
diff --git a/C5/app/src/main/res/drawable-xxhdpi/btn_modify_disable.xml b/C5/app/src/main/res/drawable-xxhdpi/btn_modify_disable.xml
new file mode 100644
index 0000000..720ed46
--- /dev/null
+++ b/C5/app/src/main/res/drawable-xxhdpi/btn_modify_disable.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/C5/app/src/main/res/drawable-xxhdpi/btn_modify_enable.xml b/C5/app/src/main/res/drawable-xxhdpi/btn_modify_enable.xml
new file mode 100644
index 0000000..3fd8f37
--- /dev/null
+++ b/C5/app/src/main/res/drawable-xxhdpi/btn_modify_enable.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/C5/app/src/main/res/drawable-xxhdpi/modify_selector_new.xml b/C5/app/src/main/res/drawable-xxhdpi/modify_selector_new.xml
new file mode 100644
index 0000000..b996032
--- /dev/null
+++ b/C5/app/src/main/res/drawable-xxhdpi/modify_selector_new.xml
@@ -0,0 +1,12 @@
+
+
+
+
+