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 9f18fec..4a83714 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
@@ -6,6 +6,9 @@ import android.app.FragmentTransaction;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.AbsoluteSizeSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -113,8 +116,9 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
tvConfirmText = (TextView) view.findViewById(R.id.multivote_confirm_text);
// tvPage = (TextView) view.findViewById(R.id.multivote_page);
- Button btnPageUp = (Button) view.findViewById(R.id.multivote_pageup);
- Button btnPageDown = (Button) view.findViewById(R.id.multivote_pagedown);
+ View btnPageUp = view.findViewById(R.id.multivote_pageup);
+ View btnPageDown = view.findViewById(R.id.multivote_pagedown);
+ View btnPageEnd = view.findViewById(R.id.multivote_pageend);
btnPageUp.setOnClickListener(new OnClickListener() {
@@ -132,6 +136,13 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
}
});
+ btnPageEnd.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ listview.setSelection(mAdapter.getCount() - 1);
+ }
+ });
+
btnConfirm = (Button) view.findViewById(R.id.multivote_btn_submit);
btnConfirm.setOnClickListener(new OnClickListener() {
@Override
@@ -341,10 +352,16 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
if (fDetail != null) {
fDetail.showVote();
}
+ SpannableStringBuilder text1= new SpannableStringBuilder(replaceBlank(bill.title));
+ text1.setSpan(new AbsoluteSizeSpan(70), 0, text1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
if (voteInfo.less == 1) {// 迫选
- tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项), 不可缺选");
+ SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项, 不可缺选)");
+ text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ tvTitle.setText(text1.append(text));
} else {
- tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项)");
+ SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项)");
+ text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ tvTitle.setText(text1.append(text));
}
}
@@ -379,10 +396,16 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
fDetail.showVote();
}
mAdapter.notifyDataSetChanged();
+ SpannableStringBuilder text1= new SpannableStringBuilder(replaceBlank(bill.title));
+ text1.setSpan(new AbsoluteSizeSpan(70), 0, text1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
if (voteInfo.less == 1) {// 迫选
- tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项), 不可缺选");
+ SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项, 不可缺选)");
+ text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ tvTitle.setText(text1.append(text));
} else {
- tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项)");
+ SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项)");
+ text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ tvTitle.setText(text1.append(text));
}
checkVoted();
}
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 f7c786b..f95f4d9 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
@@ -46,6 +46,8 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
private BillInfo bill;
private VoteInfo voteInfo;
private RelativeLayout singlevoteLayout;
+ private RelativeLayout singlevoteTvTipsLayout;
+ private TextView votetype;
private String TAG = "SingleTitleFragment";
@@ -121,6 +123,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
View view = inflater.inflate(R.layout.fragment_singlevote, container, false);
singlevoteLayout=(RelativeLayout)view.findViewById(R.id.singlevote_btn_layout1);
+ votetype = view.findViewById(R.id.votetype);
initOptions();
mact = (MainActivity) getActivity();
view.setOnClickListener(new OnClickListener() {
@@ -131,10 +134,21 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
}
});
tvTitle = (TextView) view.findViewById(R.id.singlevote_content);
+ singlevoteTvTipsLayout = view.findViewById(R.id.singlevote_tv_tips_layout);
if (bill != null && bill.title != null && bill.title.length() > 0) {
tvTitle.setText(bill.title);
}
+ 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);
+ }
+
tvTitle.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
@@ -314,9 +328,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
}
}
- /**
- * 评测按钮点击事件 wutaian 2017.08.23
- */
View.OnClickListener btnClick=new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -429,6 +440,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
private void doVoteWithIndex(int index) {
if (bill != null) {
+ singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
tvTips.setText(getString(R.string.submiting));
bill.voteResult = index;
}
@@ -473,7 +485,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
btnB.setVisibility(View.INVISIBLE);
btnC.setVisibility(View.INVISIBLE);
}
- // tvTips.setVisibility(View.INVISIBLE);
btnModify.setVisibility(View.INVISIBLE);
}
@@ -490,7 +501,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
enableVote();
}
ivReuslt.setVisibility(View.INVISIBLE);
- // tvTips.setVisibility(View.VISIBLE);
btnModify.setVisibility(View.INVISIBLE);
}
@@ -525,9 +535,11 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
if (bill.voteResult > 0) {
if (voteInfo.mode2_modify == 1) {
showModify();
+ singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
tvTips.setText(getString(R.string.submited));
} else {
disableVote();
+ singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
tvTips.setText(getString(R.string.submited_no_modify));
}
}
diff --git a/C5/app/src/main/java/com/sunvote/xpadcomm/XPadApi.java b/C5/app/src/main/java/com/sunvote/xpadcomm/XPadApi.java
index 453d98d..42e96a3 100644
--- a/C5/app/src/main/java/com/sunvote/xpadcomm/XPadApi.java
+++ b/C5/app/src/main/java/com/sunvote/xpadcomm/XPadApi.java
@@ -771,7 +771,7 @@ public class XPadApi implements XPadApiInterface {
VoteResultItem it = new VoteResultItem();
it.status = 0;
it.ansType = AnsType_BatchSingle;
- it.serialNo = (byte)allokSerialNum;
+ it.serialNo = ((byte)allokSerialNum & 0xff);
allOkSerialNumber = (byte)allokSerialNum;
it.ansCount = 1;
it.allOK = 1;
diff --git a/C5/app/src/main/res/drawable/bh_cicle.xml b/C5/app/src/main/res/drawable/bh_cicle.xml
new file mode 100644
index 0000000..d8b43bd
--- /dev/null
+++ b/C5/app/src/main/res/drawable/bh_cicle.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/C5/app/src/main/res/drawable/page_down.xml b/C5/app/src/main/res/drawable/page_down.xml
new file mode 100644
index 0000000..9d7a301
--- /dev/null
+++ b/C5/app/src/main/res/drawable/page_down.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/C5/app/src/main/res/drawable/page_frist.xml b/C5/app/src/main/res/drawable/page_frist.xml
new file mode 100644
index 0000000..1b32533
--- /dev/null
+++ b/C5/app/src/main/res/drawable/page_frist.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/C5/app/src/main/res/drawable/page_up.xml b/C5/app/src/main/res/drawable/page_up.xml
new file mode 100644
index 0000000..ed79d20
--- /dev/null
+++ b/C5/app/src/main/res/drawable/page_up.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/C5/app/src/main/res/drawable/right_control.xml b/C5/app/src/main/res/drawable/right_control.xml
new file mode 100644
index 0000000..a17dd07
--- /dev/null
+++ b/C5/app/src/main/res/drawable/right_control.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/C5/app/src/main/res/drawable/scan_qrcode.xml b/C5/app/src/main/res/drawable/scan_qrcode.xml
index 4969abb..fff09d2 100644
--- a/C5/app/src/main/res/drawable/scan_qrcode.xml
+++ b/C5/app/src/main/res/drawable/scan_qrcode.xml
@@ -1,8 +1,10 @@
-
-
-
-
-
-
+
+
diff --git a/C5/app/src/main/res/drawable/service_server.xml b/C5/app/src/main/res/drawable/service_server.xml
index 1ae2cf1..529d9ff 100644
--- a/C5/app/src/main/res/drawable/service_server.xml
+++ b/C5/app/src/main/res/drawable/service_server.xml
@@ -1,4 +1,9 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/C5/app/src/main/res/layout/activity_main.xml b/C5/app/src/main/res/layout/activity_main.xml
index e31158b..3c2606d 100644
--- a/C5/app/src/main/res/layout/activity_main.xml
+++ b/C5/app/src/main/res/layout/activity_main.xml
@@ -23,8 +23,8 @@
+ android:background="@color/red"
+ android:orientation="horizontal"
+ android:paddingBottom="20dp"
+ android:paddingLeft="20dp"
+ android:paddingRight="80dp"
+ android:paddingTop="20dp">
+ android:background="@drawable/gray_alpha">
-
-
-
-
-
-