diff --git a/app/build.gradle b/app/build.gradle index 013a818..c677c38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.rehome.zhdcoa" minSdk 24 targetSdk 35 - versionCode 19 - versionName "2.3.5" + versionCode 20 + versionName "2.3.6" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8e0926d..eba58f0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -439,10 +439,9 @@ android:screenOrientation="portrait" /> - - - + android:screenOrientation="portrait" /> + + @@ -497,6 +496,9 @@ + diff --git a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java index b534a62..cc056b1 100755 --- a/app/src/main/java/com/rehome/zhdcoa/service/PushService.java +++ b/app/src/main/java/com/rehome/zhdcoa/service/PushService.java @@ -430,7 +430,7 @@ public class PushService extends IntentService { AlertDialog dialog = builder.create(); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_TOAST); dialog.show(); - //builder.show(); + } @Override diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java index 21d718a..84fae31 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AjhGzActivity.java @@ -227,7 +227,6 @@ public class AjhGzActivity extends BaseActivity2 { // dialogInterface.dismiss(); // } // }); -// builder.show(); // } else { // showToast("暂无该区域点检任务"); // } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java index caa33df..22d3f68 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AscFragment.java @@ -1,6 +1,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.DialogInterface; +import android.graphics.Color; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; import android.view.View; @@ -288,7 +289,14 @@ public class AscFragment extends BaseFragment { //toJson(rwqys); } }); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } else { //已经全部检查 diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java index 9ea6644..dd0d0d4 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxzFragment.java @@ -75,16 +75,17 @@ public class AxzFragment extends BaseFragment { btnDel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - List ajhjhs = new ArrayList<>(); - - for (int i = 0; i < ajhjh.size(); i++) { - if (ajhjh.get(i).isChecked()) { - DataSupport.deleteAll(Ajhjh.class, "jhid = ?", ajhjh.get(i).getJHID()); - ajhjhs.add(ajhjh.get(i)); + if(adapter!=null){ + List ajhjhs = new ArrayList<>(); + for (int i = 0; i < ajhjh.size(); i++) { + if (ajhjh.get(i).isChecked()) { + DataSupport.deleteAll(Ajhjh.class, "jhid = ?", ajhjh.get(i).getJHID()); + ajhjhs.add(ajhjh.get(i)); + } } + ajhjh.removeAll(ajhjhs); + adapter.notifyDataSetChanged(); } - ajhjh.removeAll(ajhjhs); - adapter.notifyDataSetChanged(); } }); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java index b855a23..ab2f4ae 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/DjdscFragment.java @@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.ContentValues; import android.content.DialogInterface; +import android.graphics.Color; import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -325,7 +326,14 @@ public class DjdscFragment extends BaseFragment { showLog(toJson()); } }); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } } else { showToast("没有可上传计划"); @@ -370,7 +378,14 @@ public class DjdscFragment extends BaseFragment { } } }); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } else { showToast("你还没有选择项目"); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Gzqkgb1Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Gzqkgb1Activity.java index 8195994..7aba2c6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Gzqkgb1Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Gzqkgb1Activity.java @@ -1,8 +1,9 @@ package com.rehome.zhdcoa.ui.activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -72,8 +73,14 @@ public class Gzqkgb1Activity extends BaseActivity2 { } }); - builder.create(); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } else if (issave.equals("未保存")) { @@ -93,8 +100,14 @@ public class Gzqkgb1Activity extends BaseActivity2 { } }); - builder.create(); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } } }); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkgbActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkgbActivity.java index 00a67a8..c63fbb8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkgbActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqkgbActivity.java @@ -3,6 +3,7 @@ package com.rehome.zhdcoa.ui.activity; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.Color; import android.view.View; import android.widget.Button; import android.widget.TextView; @@ -78,9 +79,14 @@ public class GzqkgbActivity extends BaseActivity2 { } }); - builder.create(); - builder.show(); - + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } else if (issave.equals("未保存")) { showToast("该工作状态还未保存"); } @@ -183,10 +189,14 @@ public class GzqkgbActivity extends BaseActivity2 { } }); - builder.create(); - builder.show(); - - + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } } }); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqksblrActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqksblrActivity.java index a29c087..e548789 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqksblrActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/GzqksblrActivity.java @@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity; import android.app.AlertDialog; import android.content.DialogInterface; +import android.graphics.Color; import android.text.TextUtils; import android.view.View; import android.widget.Button; @@ -85,8 +86,14 @@ public class GzqksblrActivity extends BaseActivity2 implements DateTimePickDialo } }); - builder.create(); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } }); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java index 8ffb495..2416ddc 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/KccxActivity.java @@ -5,6 +5,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.Bitmap; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; @@ -398,7 +399,14 @@ public class KccxActivity extends BaseActivity2 { dialog.dismiss(); } }); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } else { showToast("该物资没有图片"); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 0048bb8..5d1b5b3 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt @@ -209,6 +209,9 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // 生产岗位 卢高波 可以进入巡视抄表 // binding.etUsername.setText("310492") // binding.etPassword.setText("Dudu520520@") + //李昕逸 可以进入巡视抄表 +// binding.etUsername.setText("310677") +// binding.etPassword.setText("LXY1997.qaz") //陈坚标 // binding.etUsername.setText("310063") diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeInfoActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeInfoActivity.kt new file mode 100644 index 0000000..fa2feac --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeInfoActivity.kt @@ -0,0 +1,58 @@ +package com.rehome.zhdcoa.ui.activity + +import android.content.Intent +import android.util.Log +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import com.rehome.zhdcoa.Contans +import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.zhdcoa.databinding.ActivityQrCodeInfoBinding + +class QrCodeInfoActivity : BaseActivityOaToolbarViewBinding() { + + private lateinit var launcherResult: ActivityResultLauncher + + + override fun getViewBinding() = ActivityQrCodeInfoBinding.inflate(layoutInflater) + + override fun getToolbar() = binding.toolbarView.toolbar + + override fun initView() { + initToolbar("读取二维码") + setLeftOnClickListener { + finish() + } + + launcherResult = createActivityResultLauncher() + + + binding.tvScan.setOnClickListener { + val intent = Intent(context, QrCodeActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + launcherResult.launch(intent) + } + + } + + override fun initData() { + + } + + //创建一个ActivityResultLauncher + private fun createActivityResultLauncher(): ActivityResultLauncher { + //kotlin写法 + return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + val resultIntent = it.data + val resultCode = it.resultCode + if (resultCode == RESULT_OK) { + if(resultIntent!=null){ + val code = resultIntent.getStringExtra("code") + binding.tvNfc.text = code + showLog("---------二维码----------") + showLog(code) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java index a45afe7..615d7ee 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdjgzActivity.java @@ -5,6 +5,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.database.Cursor; +import android.graphics.Color; import android.nfc.NfcAdapter; import android.os.Bundle; @@ -263,7 +264,14 @@ public class SdjgzActivity extends BaseActivity2 { dialogInterface.dismiss(); } }); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } else { showToast("暂无该区域点检任务"); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XaqksblrActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XaqksblrActivity.java index 9086f39..bd2bb88 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XaqksblrActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XaqksblrActivity.java @@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity; import android.app.AlertDialog; import android.content.DialogInterface; +import android.graphics.Color; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -86,8 +87,14 @@ public class XaqksblrActivity extends BaseActivity2 implements DateTimePickDialo } }); - builder.create(); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } }); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsBackLogActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsBackLogActivity.java index 319fec5..4dc4829 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsBackLogActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsBackLogActivity.java @@ -101,9 +101,10 @@ public class XsBackLogActivity extends BaseActivity2 { lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - + XsJhListBean.DataBean item = datas.get(position); + String itemJson = GsonUtils.GsonString(item); Intent intent = new Intent(XsBackLogActivity.this, XscbqyActivity.class); - intent.putExtra(Contans.KEY_XSCBJH, datas.get(position)); + intent.putExtra(Contans.KEY_XSCBJH,itemJson); startActivity(intent); } }); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsHistoryActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsHistoryActivity.java index cd619f6..8d7a773 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsHistoryActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XsHistoryActivity.java @@ -111,8 +111,9 @@ public class XsHistoryActivity extends BaseActivity2 { xsjh.setScsj(jh.getScsj()); + String itemJson = GsonUtils.GsonString(xsjh); Intent intent = new Intent(XsHistoryActivity.this, XscbqyActivity.class); - intent.putExtra(Contans.KEY_XSCBJH, xsjh); + intent.putExtra(Contans.KEY_XSCBJH, itemJson); intent.putExtra("QX", datas.get(groupPosition).getXgqx()); intent.putExtra(Contans.KEY_XS_HISTORY, true); startActivity(intent); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java index 95a91ec..1ddf8f8 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscFragment.java @@ -1,6 +1,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.DialogInterface; +import android.graphics.Color; import android.os.Bundle; import androidx.appcompat.app.AlertDialog; @@ -581,7 +582,14 @@ public class XscFragment extends BaseFragment { } } }); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } } else { showToast("没有可上传计划"); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java index e42194f..6d37ddd 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbglActivity.java @@ -23,8 +23,8 @@ public class XscbglActivity extends BaseActivity2 { GridView gv; - private final String[] str = {"待办任务", "历史抄表", "读取NFC标签"}; - private final int[] imageId = {R.drawable.icon_xs1, R.drawable.icon_xs5, R.drawable.icon11}; + private final String[] str = {"待办任务", "历史抄表", "读取NFC标签", "读取二维码"}; + private final int[] imageId = {R.drawable.icon_xs1, R.drawable.icon_xs5, R.drawable.icon11,R.drawable.icon_xs2}; // private int[] colors = {R.drawable.radius_b1, R.drawable.radius_a4, R.drawable.radius_b2}; private GridViewYXAdapter adapter; @@ -62,6 +62,9 @@ public class XscbglActivity extends BaseActivity2 { case 2: intent = new Intent(XscbglActivity.this, NFCInfoActivity.class); break; + case 3: + intent = new Intent(XscbglActivity.this, QrCodeInfoActivity.class); + break; } if (intent != null) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyActivity.java index 929905b..0fa14df 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyActivity.java @@ -61,7 +61,10 @@ public class XscbqyActivity extends BaseActivity2 { protected void initView() { lv = findViewById(R.id.lv); Intent mIntent = getIntent(); - xscbjh = mIntent.getParcelableExtra(Contans.KEY_XSCBJH); + + String itemJson = mIntent.getStringExtra(Contans.KEY_XSCBJH); + + xscbjh = GsonUtils.GsonToBean(itemJson,XsJhListBean.DataBean.class); isHistory = mIntent.getBooleanExtra(Contans.KEY_XS_HISTORY, false); launcherResultQRCode = createQRCodeActivityResultLauncher(); @@ -161,7 +164,6 @@ public class XscbqyActivity extends BaseActivity2 { intent.putExtra(Contans.KEY_IS_HIS, isSHOW); startActivity(intent); } - } else { /** @@ -213,9 +215,12 @@ public class XscbqyActivity extends BaseActivity2 { if (resultCode == RESULT_OK) { if(data!=null){ String ewm = data.getStringExtra("code"); + showLog("code:-------"); + showLog(ewm); for (XsjhQyBean.DataBeanX qy : qys) { if (ewm!=null&&ewm.equals(qy.getTxm())) { if (xscbjh.getJhlx().equals(XscbqyWorkActivity.JHLX_XS)) { + showLog("XscbqyWorkXsActivity"); Intent intent = new Intent(XscbqyActivity.this, XscbqyWorkXsActivity.class); intent.putExtra(Contans.KEY_QY, qy); intent.putExtra(Contans.KEY_EWM_OR_NFC, "扫描条码"); @@ -223,6 +228,7 @@ public class XscbqyActivity extends BaseActivity2 { intent.putExtra(Contans.KEY_IS_HIS, false); startActivity(intent); } else { + showLog("XscbqyWorkActivity"); Intent intent = new Intent(XscbqyActivity.this, XscbqyWorkActivity.class); intent.putExtra(Contans.KEY_QY, qy); intent.putExtra(Contans.KEY_EWM_OR_NFC, "扫描条码"); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkActivity.java index c09d100..dd38449 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkActivity.java @@ -1,7 +1,8 @@ package com.rehome.zhdcoa.ui.activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.content.DialogInterface; +import android.graphics.Color; import android.text.TextUtils; import android.view.View; import android.widget.Button; @@ -63,8 +64,14 @@ public class XscbqyWorkActivity extends BaseActivity2 { } }); - builder.create(); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } }); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkXsActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkXsActivity.java index acde56a..05369a9 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkXsActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XscbqyWorkXsActivity.java @@ -1,7 +1,9 @@ package com.rehome.zhdcoa.ui.activity; -import android.app.AlertDialog; +//import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.content.DialogInterface; +import android.graphics.Color; import android.text.TextUtils; import android.view.View; import android.widget.Button; @@ -63,8 +65,14 @@ public class XscbqyWorkXsActivity extends BaseActivity2 { } }); - builder.create(); - builder.show(); + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } }); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzaxlFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzaxlFragment.java index c712675..6523f3e 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzaxlFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzaxlFragment.java @@ -109,7 +109,6 @@ public class XzaxlFragment extends BaseFragment { // // } // }); -// builder.show(); // } // }); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java index d3713d6..cfb38ca 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XzjhFragment.java @@ -2,6 +2,7 @@ package com.rehome.zhdcoa.ui.activity; import android.content.ContentValues; import android.content.DialogInterface; +import android.graphics.Color; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -110,8 +111,14 @@ public class XzjhFragment extends BaseFragment { adapter.notifyDataSetChanged(); } }); - builder.show(); - + AlertDialog dialog = builder.create(); + dialog.show(); + //确定按钮 + Button btnPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE); + //取消按钮 + Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); + btnPos.setTextColor(Color.BLACK); + btnNeg.setTextColor(Color.BLACK); } else { showToast("没有可删除计划"); } diff --git a/app/src/main/res/layout/activity_qr_code_info.xml b/app/src/main/res/layout/activity_qr_code_info.xml new file mode 100644 index 0000000..653f4c1 --- /dev/null +++ b/app/src/main/res/layout/activity_qr_code_info.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + \ No newline at end of file