diff --git a/C5/app/build.gradle b/C5/app/build.gradle index 76fdd8a..fd83076 100644 --- a/C5/app/build.gradle +++ b/C5/app/build.gradle @@ -88,7 +88,6 @@ dependencies { }) implementation 'com.android.support:appcompat-v7:26.+' compile files('libs/ant.jar') - compile project(':udpmodule') compile(name: 'ycanfilereadfunc-release', ext: 'aar') compile(name: 'ycanreaderfileshow-release', ext: 'aar') compile(name: 'ycan-release', ext: 'aar') diff --git a/C5/app/src/main/AndroidManifest.xml b/C5/app/src/main/AndroidManifest.xml index bb14d8a..fa46f32 100644 --- a/C5/app/src/main/AndroidManifest.xml +++ b/C5/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="com.sunvote.xpadapp" android:versionCode="70" - android:versionName="1.3.0.3"> + android:versionName="1.3.0.7"> 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 9284242..c072935 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java @@ -1458,6 +1458,7 @@ public class MainActivity extends BaseActivity implements ComListener { private void doVote(VoteInfo voteInfo) { LogUtil.i(TAG,"doVote:" + voteInfo); + hideBottomUIMenu(); mVoteInfo=voteInfo; if (voteInfo.mode == XPadApi.VoteType_KeypadTest) { setKeypadTestFragment(); diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java index 27b676b..90b1ef0 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java @@ -376,11 +376,11 @@ public class ElectionCustomFragment extends BaseFragment { return super.isEnabled(position); } - private ViewHolder holder; @Override public View getView(final int position, View convertView, ViewGroup parent) { MultiTitleItem it = aryContent.get(position); + final ViewHolder holder; if (convertView == null) { convertView = mInflater.inflate(R.layout.list_custom_election_item, null); holder = new ViewHolder(); @@ -417,6 +417,12 @@ public class ElectionCustomFragment extends BaseFragment { holder.btnAbstain.setEnabled(true); } + if(it.result == 1){ + holder.btnO.setChecked(true); + }else { + holder.btnO.setChecked(false); + } + holder.btnO.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -425,6 +431,7 @@ public class ElectionCustomFragment extends BaseFragment { voteWithValue(position,0); }else{ if(agreeVotedCount >= voteInfo.limitFavor){ + holder.btnO.setChecked(false); ToastAlertDialog.makeText(mMainActivity, "已投"+agreeVotedCount+getString(R.string.fix)+",不可多选").show(); checkVoted(); return; diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java index 3441f96..9fc87bc 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java @@ -464,6 +464,7 @@ public class ElectionFragment extends BaseFragment { tvResult.setVisibility(View.GONE); resultLayout.setVisibility(View.VISIBLE); this.listview.setEnabled(false); + hideVote(); new Thread(new Runnable() { public void run() { mMainActivity.presenter.submitVote(XPadApi.AnsType_SelectOther,"0"); @@ -586,6 +587,7 @@ public class ElectionFragment extends BaseFragment { showResult(); showModifyOrDisable(); saveVoteInfo(); + hideVote(); } private void showModifyOrDisable(){ diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiContentDetailFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiContentDetailFragment.java index 2eb48ca..581b37b 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiContentDetailFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiContentDetailFragment.java @@ -161,207 +161,208 @@ public class MultiContentDetailFragment extends BaseFragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - Log.d(TAG, "onCreateView"); View view = inflater.inflate(R.layout.fragment_multi_content_detail, container, false); - contentDetailLayout =view.findViewById(R.id.content_detail_pannal_vote1); - initOptions(); - view.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - ;// - } - }); - mact = (MainActivity) getActivity(); - tvTitle = (TextView) view.findViewById(R.id.content_detail_title); - if(bill!=null){ - if (bill.title != null) { - tvTitle.setText(bill.title); - } - } - final View pdfViews = view.findViewById(R.id.content_detail_scview); - pdfViews.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View view) { - ; - } - }); - pdfView = view.findViewById(R.id.content_detail_pdfview); - filename = DATABASE_PATH + "/sunvote/" + mact.meetingId + "/" + bill.billFile; - panelVotes = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_vote); - panelModify = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_modify); - tvTips = (TextView) view.findViewById(R.id.content_detail_tv_tips); - ivReuslt = (TextView) view.findViewById(R.id.content_detail_tv_result); - ivReuslt.setVisibility(View.INVISIBLE); - new Handler().postDelayed(new Runnable(){ - public void run() { - //execute the task - openPdfFile(); - } - }, pdfDelayLoadTime); - panelVotes.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - ; - } - }); - panelModify.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - ; - } - }); - ivReuslt.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - ; - } - }); - - btnLookPdf= (Button) view.findViewById(R.id.btn_look_pdf); - btnLookPdf.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - isClose= false; - mact.isLoadPDF = false; - pdfPageNum=pdfView.getCurrentPage()+1; - //pdfPageNum=pdfView.getCurrentItem()+1; - FragmentManager fm = getFragmentManager(); - FragmentTransaction tx = fm.beginTransaction(); - PDFContextShowFragment pdfShow = new PDFContextShowFragment(); - mact.pdfFragment = pdfShow; - pdfShow.setInfo(filename, bill.billFile,pdfPageNum + "","0",false); - tx.add(R.id.frame_content, pdfShow, "pdfShow"); - if(uType==1){ - tx.addToBackStack(null); - }else { - mact.multiContentFragment = null; - fm.popBackStack(); + try { + Log.d(TAG, "onCreateView"); + contentDetailLayout = view.findViewById(R.id.content_detail_pannal_vote1); + initOptions(); + view.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ;// + } + }); + mact = (MainActivity) getActivity(); + tvTitle = (TextView) view.findViewById(R.id.content_detail_title); + if (bill != null) { + if (bill.title != null) { + tvTitle.setText(bill.title); } - tx.commitAllowingStateLoss(); } - }); + final View pdfViews = view.findViewById(R.id.content_detail_scview); + pdfViews.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + ; + } + }); + pdfView = view.findViewById(R.id.content_detail_pdfview); + filename = DATABASE_PATH + "/sunvote/" + mact.meetingId + "/" + bill.billFile; + panelVotes = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_vote); + panelModify = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_modify); + tvTips = (TextView) view.findViewById(R.id.content_detail_tv_tips); + ivReuslt = (TextView) view.findViewById(R.id.content_detail_tv_result); + ivReuslt.setVisibility(View.INVISIBLE); + new Handler().postDelayed(new Runnable() { + public void run() { + //execute the task + openPdfFile(); + } + }, pdfDelayLoadTime); + panelVotes.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ; + } + }); + panelModify.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ; + } + }); + ivReuslt.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + ; + } + }); - btnA = (Button) view.findViewById(R.id.content_detail_btnA); - btnA.setOnClickListener(new OnClickListener() { + btnLookPdf = (Button) view.findViewById(R.id.btn_look_pdf); + btnLookPdf.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - if (voteInfo.mode2_modify == 1) { - doVoteWithIndex(1); - } else { - showConfirmWithValue(1); + @Override + public void onClick(View v) { + isClose = false; + mact.isLoadPDF = false; + pdfPageNum = pdfView.getCurrentPage() + 1; + //pdfPageNum=pdfView.getCurrentItem()+1; + FragmentManager fm = getFragmentManager(); + FragmentTransaction tx = fm.beginTransaction(); + PDFContextShowFragment pdfShow = new PDFContextShowFragment(); + mact.pdfFragment = pdfShow; + pdfShow.setInfo(filename, bill.billFile, pdfPageNum + "", "0", false); + tx.add(R.id.frame_content, pdfShow, "pdfShow"); + if (uType == 1) { + tx.addToBackStack(null); + } else { + mact.multiContentFragment = null; + fm.popBackStack(); + } + tx.commitAllowingStateLoss(); } - } - }); + }); - btnB = (Button) view.findViewById(R.id.content_detail_btnB); - btnB.setOnClickListener(new OnClickListener() { + btnA = (Button) view.findViewById(R.id.content_detail_btnA); + btnA.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - if (voteInfo.mode2_modify == 1) { - doVoteWithIndex(2); - } else { - showConfirmWithValue(2); + @Override + public void onClick(View v) { + if (voteInfo.mode2_modify == 1) { + doVoteWithIndex(1); + } else { + showConfirmWithValue(1); + } } - } - }); + }); - btnC = (Button) view.findViewById(R.id.content_detail_btnC); - btnC.setOnClickListener(new OnClickListener() { + btnB = (Button) view.findViewById(R.id.content_detail_btnB); + btnB.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - if (options.length == 2) { + @Override + public void onClick(View v) { if (voteInfo.mode2_modify == 1) { doVoteWithIndex(2); } else { showConfirmWithValue(2); } - } else { - if (voteInfo.mode2_modify == 1) { - doVoteWithIndex(3); + } + }); + + btnC = (Button) view.findViewById(R.id.content_detail_btnC); + btnC.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View v) { + if (options.length == 2) { + if (voteInfo.mode2_modify == 1) { + doVoteWithIndex(2); + } else { + showConfirmWithValue(2); + } } else { - showConfirmWithValue(3); + if (voteInfo.mode2_modify == 1) { + doVoteWithIndex(3); + } else { + showConfirmWithValue(3); + } } } - } - }); - - ImageButton btnBack = (ImageButton) view.findViewById(R.id.content_detail_btnback); - btnBack.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - goBack(); - } - }); + }); - if (!showBackBtn) { - btnBack.setVisibility(View.INVISIBLE); - }else{ - btnBack.setVisibility(View.VISIBLE); - } + ImageButton btnBack = (ImageButton) view.findViewById(R.id.content_detail_btnback); + btnBack.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + goBack(); + } + }); - Button btnModify = (Button) view.findViewById(R.id.content_detail_btn_modify); - btnModify.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - panelModify.setVisibility(View.GONE); - showVote(); - ivReuslt.setVisibility(View.VISIBLE); + if (!showBackBtn) { + btnBack.setVisibility(View.INVISIBLE); + } else { + btnBack.setVisibility(View.VISIBLE); } - }); + Button btnModify = (Button) view.findViewById(R.id.content_detail_btn_modify); + btnModify.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + panelModify.setVisibility(View.GONE); + showVote(); + ivReuslt.setVisibility(View.VISIBLE); + } + }); - tvConfirmText = (TextView) view.findViewById(R.id.content_detail_confirm_textview); - confirmLayout = (RelativeLayout) view.findViewById(R.id.content_detail_confirm_panel); - Button btnConfirmOK = (Button) view.findViewById(R.id.content_detail_btn_confirm_ok); - btnConfirmOK.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - hideConfirm(); - doVoteWithIndex(voteValue); - } - }); - - Button btnConfirmCancel = (Button) view.findViewById(R.id.content_detail_btn_confirm_cancel); - btnConfirmCancel.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - hideConfirm(); - } - }); + tvConfirmText = (TextView) view.findViewById(R.id.content_detail_confirm_textview); + confirmLayout = (RelativeLayout) view.findViewById(R.id.content_detail_confirm_panel); + Button btnConfirmOK = (Button) view.findViewById(R.id.content_detail_btn_confirm_ok); + btnConfirmOK.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + hideConfirm(); + doVoteWithIndex(voteValue); + } + }); - if (voteInfo != null) { - if(voteInfo.mode4==customVote){ - contentDetailLayout.setVisibility(View.VISIBLE); - panelVotes.setVisibility(View.GONE); - if(options!=null){ - setButton(options); + Button btnConfirmCancel = (Button) view.findViewById(R.id.content_detail_btn_confirm_cancel); + btnConfirmCancel.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + hideConfirm(); } - }else{ - contentDetailLayout.setVisibility(View.INVISIBLE); - if (options.length == 2) { - btnA.setText(options[0]); - btnB.setVisibility(View.INVISIBLE); - btnC.setText(options[1]); - } else if (options.length == 3) { - btnA.setText(options[0]); - btnB.setText(options[1]); - btnC.setText(options[2]); + }); + + if (voteInfo != null) { + if (voteInfo.mode4 == customVote) { + contentDetailLayout.setVisibility(View.VISIBLE); + panelVotes.setVisibility(View.GONE); + if (options != null) { + setButton(options); + } + } else { + contentDetailLayout.setVisibility(View.INVISIBLE); + if (options.length == 2) { + btnA.setText(options[0]); + btnB.setVisibility(View.INVISIBLE); + btnC.setText(options[1]); + } else if (options.length == 3) { + btnA.setText(options[0]); + btnB.setText(options[1]); + btnC.setText(options[2]); + } + setBtnModle(1, false); + showVote(); } - setBtnModle(1,false); - showVote(); + showResult(); + checkIsVoted(); + panelVotes.setVisibility(View.VISIBLE); + } else { + panelVotes.setVisibility(View.GONE); + hideVote(); } - showResult(); - checkIsVoted(); - panelVotes.setVisibility(View.VISIBLE); - } else { - panelVotes.setVisibility(View.GONE); - hideVote(); - } + }catch (Exception ex){} return view; } diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/PDFContextShowFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/PDFContextShowFragment.java index 3f4ec3d..e7ab9d2 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/PDFContextShowFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/PDFContextShowFragment.java @@ -136,8 +136,8 @@ public class PDFContextShowFragment extends BaseFragment { public void openFile() { File fpath = new File(filepath); if (!fpath.exists()) { - Toast.makeText(getActivity(), - "文件不存在", Toast.LENGTH_LONG).show(); +// Toast.makeText(getActivity(), +// "文件不存在", Toast.LENGTH_LONG).show(); return; } Intent intent = new Intent(); diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionCustomFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionCustomFragment.java index 9940f01..06cbfe9 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionCustomFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionCustomFragment.java @@ -105,6 +105,12 @@ public class ResultElectionCustomFragment extends BaseFragment { return view; } + @Override + public void onResume() { + super.onResume(); + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148")); + } + private void initData() { int bitNum = data[2] & 0xf; diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java index 105e9be..c70cc3b 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java @@ -269,7 +269,10 @@ public class ResultVoteFragment extends BaseFragment { } if(voteInfo.resultInfo.num3 != 0xffff){ double opt4 = voteInfo.resultInfo.num3 * 1.0 / fenmu * 100; - String strOpt4 = formatDoubleToString(opt4, xiaoShuWei, false); + String strOpt4 = "" ; + if(fenmu > 0 && fenmu != 0xffff){ + strOpt4 = formatDoubleToString(opt4, xiaoShuWei, false); + } dataTitleLayout4.setVisibility(View.VISIBLE); ((TextView)(dataTitleLayout4.findViewById(R.id.data_title_layout4_text1))).setText(getString(R.string.weian)); String text = "" + voteInfo.resultInfo.num3 ; 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 c176029..1cc377b 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 @@ -82,24 +82,30 @@ public class SigninFragment extends BaseFragment { } } - - @Override 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); + try { + 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); + }catch (Exception ex){ + LogUtil.e(TAG,ex); + } } @Override public void onVoteSubmitError() { - super.onVoteSubmitError(); - tv.setText(getString(R.string.please_signin)); - btnSignin.setEnabled(true); - btnSignin.setTextColor(Color.RED); + try { + super.onVoteSubmitError(); + tv.setText(getString(R.string.please_signin)); + btnSignin.setEnabled(true); + btnSignin.setTextColor(Color.RED); + }catch (Exception ex){ + + } } } 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 06d2c66..ced58c5 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 @@ -237,7 +237,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa public void onClick(View v) { btnModify.setVisibility(View.INVISIBLE); showVote(); - ivReuslt.setVisibility(View.VISIBLE); +// ivReuslt.setVisibility(View.VISIBLE); } }); @@ -312,7 +312,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa btn[i].setOnClickListener(btnClick); //TextViewUtils.adjustTvTextSize(btn[i],(width-50)/btnNum,data[i].toString()); - RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams((width-180)/btnNum, 100); + RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams((width-180)/btnNum, 130); //设置按钮的宽度和高度 if (i%btnNum == 0) { j++; @@ -441,33 +441,36 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa } private void doVoteWithIndex(int index) { - + disableVote(); if (bill != null) { singlevoteTvTipsLayout.setVisibility(View.VISIBLE); + tvTips.setBackgroundResource(0); tvTips.setText(getString(R.string.submiting)); bill.voteResult = index; } voteValue = index; mMainActivity.presenter.submitVote(XPadApi.AnsType_Single, String.valueOf(index)); - disableVote(); - showResult(); + +// showResult(); } private void showResult() { + ivReuslt.setVisibility(View.INVISIBLE); + singlevoteTvTipsLayout.setVisibility(View.GONE); if (bill.voteResult > 0) { - ivReuslt.setVisibility(View.INVISIBLE); - singlevoteTvTipsLayout.setVisibility(View.GONE); new Handler(Looper.getMainLooper()).postDelayed(new Runnable() { @Override public void run() { + if (voteInfo.mode3_secret == 0 && options != null) {// if(voteValue -1 >= 0 && voteValue - 1 < options.length) { ivReuslt.setText(options[voteValue - 1]); ivReuslt.setBackgroundResource(R.drawable.voted_empty); tvTitle.setTextColor(Color.parseColor("#B5B5B5")); ivReuslt.setVisibility(View.VISIBLE); + singlevoteTvTipsLayout.setVisibility(View.VISIBLE); } } else { tvTips.setBackgroundResource(R.drawable.voted); @@ -475,6 +478,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa tvTips.setText(""); // ivReuslt.setText(""); // ivReuslt.setBackgroundResource(R.drawable.voted); + singlevoteTvTipsLayout.setVisibility(View.VISIBLE); tvTitle.setTextColor(Color.parseColor("#B5B5B5")); } } @@ -598,6 +602,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa showModifyOrDisable(); if(voteValue > 0){ saveVoteInfo(); + showResult(); } } diff --git a/C5/app/src/main/res/drawable/download_complete.xml b/C5/app/src/main/res/drawable/download_complete.xml index 2ff785c..d320da1 100644 --- a/C5/app/src/main/res/drawable/download_complete.xml +++ b/C5/app/src/main/res/drawable/download_complete.xml @@ -5,8 +5,8 @@ android:height="254.9dp"> + android:fillColor="@color/white" /> + android:fillColor="@color/white" /> \ No newline at end of file diff --git a/C5/app/src/main/res/layout/dialog_service.xml b/C5/app/src/main/res/layout/dialog_service.xml index 7018e27..80fe5f6 100644 --- a/C5/app/src/main/res/layout/dialog_service.xml +++ b/C5/app/src/main/res/layout/dialog_service.xml @@ -11,33 +11,7 @@ android:text="呼叫服务" android:textStyle="bold" android:textSize="18sp"/> - - - -