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 84fae31..d75587e 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 @@ -267,9 +267,8 @@ public class AjhGzActivity extends BaseActivity2 { //处理NFC的数据 @Override public void handleNfc(String result) { - super.handleNfc(result); // tvNodata.setText(result); - if (list.size() != 0) { + if (!list.isEmpty()) { Intent intent = new Intent(AjhGzActivity.this, AjhAndSbjdActivity.class); //intent.putExtra("lx",true); intent.putExtra(Contans.NFCOREWM, false); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglActivity.java index df421bd..c337df1 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglActivity.java @@ -319,9 +319,9 @@ public class AxwaqgcglActivity extends BaseActivity2 { @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); - if (jhs.size() != 0) { + if (!jhs.isEmpty()) { Intent intent = new Intent(AxwaqgcglActivity.this, AxwaqgcglDetaliActivity.class); intent.putExtra(Contans.KEY_BQBM, result); intent.putExtra(Contans.NFCOREWM, false); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java index 8a4d1e0..4e2c348 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AxwaqgcglHmActivity.java @@ -402,9 +402,9 @@ public class AxwaqgcglHmActivity extends BaseActivity2 { @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); - if (jhs.size() != 0) { + if (!jhs.isEmpty()) { Intent intent = new Intent(AxwaqgcglHmActivity.this, AxwaqgcglDetaliActivity.class); intent.putExtra(Contans.KEY_BQBM, result); intent.putExtra(Contans.NFCOREWM, false); 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 c1e62b1..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 @@ -108,12 +108,6 @@ public class Gzqkgb1Activity extends BaseActivity2 { Button btnNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); btnPos.setTextColor(Color.BLACK); btnNeg.setTextColor(Color.BLACK); - //确定按钮 - 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/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt index 5d1b5b3..bf2aabd 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 @@ -238,6 +238,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding() { // binding.etUsername.setText("310291") // binding.etPassword.setText("sfd02910291Z+") +// binding.etUsername.setText("310465") +// binding.etPassword.setText("Liu524042*") } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/NFCInfoActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/NFCInfoActivity.java index ff66116..885377c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/NFCInfoActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/NFCInfoActivity.java @@ -28,7 +28,7 @@ public class NFCInfoActivity extends BaseActivity2 { @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); tvNfc.setText(result); Log.i("app",result); } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt index 2389b8d..cf4eb0c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/QrCodeActivity.kt @@ -149,7 +149,7 @@ class QrCodeActivity : BaseActivityOaToolbarViewBinding() sb.append(it) //sb.append("\n") } - intentToResult(sb.toString()) + intentToResult(sb.toString().trim()) } private fun intentToResult(result: String) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SbxdjglActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SbxdjglActivity.java index 0c1ed7a..77d0d9f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SbxdjglActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SbxdjglActivity.java @@ -22,8 +22,8 @@ import java.util.List; public class SbxdjglActivity extends BaseActivity2 { GridView gv; - private final String[] str = {"任务", "工作", "缺陷工单录入", "读取NFC标签"}; - private final int[] imageId = {R.drawable.icon3, R.drawable.icon6, R.drawable.icon15, R.drawable.icon11}; + private final String[] str = {"任务", "工作", "缺陷工单录入", "读取NFC标签", "读取二维码"}; + private final int[] imageId = {R.drawable.icon3, R.drawable.icon6, R.drawable.icon15, R.drawable.icon11, R.drawable.icon_xs2}; private GridViewYXAdapter adapter; @Override public int getContentViewID() { @@ -80,6 +80,10 @@ public class SbxdjglActivity extends BaseActivity2 { intent = new Intent(SbxdjglActivity.this, NFCInfoActivity.class); startActivity(intent); break; + case 4: + intent = new Intent(SbxdjglActivity.this, QrCodeInfoActivity.class); + startActivity(intent); + break; } } }); 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 615d7ee..cb3fc4d 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 @@ -107,20 +107,9 @@ public class SdjgzActivity extends BaseActivity2 { btn_sm.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (list.size() != 0) { - //检测摄像头权限 - if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)) { - Toast.makeText(context, "权限拒绝,请手动设置开启APP访问摄像头权限", Toast.LENGTH_LONG).show(); - return; - } - //动态权限申请 - if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { - //权限请求 - ActivityCompat.requestPermissions(SdjgzActivity.this, new String[]{Manifest.permission.CAMERA}, CAMERA_REQUEST_CAMERA_SCAN); - } else { - //已授权，打开摄像头扫描 - intentTOQRCode(); - } + if (!list.isEmpty()) { + //已授权，打开摄像头扫描 + intentTOQRCode(); } else { showToast("你还没有计划"); } @@ -155,6 +144,9 @@ public class SdjgzActivity extends BaseActivity2 { Set set = new HashSet<>(); set.addAll(qyAll); qys.addAll(set); + showLog("-------"); + showLog(GsonUtils.GsonString(qys)); + int i = 0; for (String code : qys) { int djyj = 0; @@ -180,12 +172,17 @@ public class SdjgzActivity extends BaseActivity2 { ajhyj++; } } + showLog("-------"); + showLog(GsonUtils.GsonString(djjhs)); + + info.setXh(++i + ""); info.setDjrw(djyj + "/" + djjhs.size()); info.setAjhrw(ajhyj + "/" + ajhs.size()); list.add(info); } + showLog("-----------"); showLog(GsonUtils.GsonString(list)); // Cursor cursor = DataSupport.findBySQL("select * from djjhrwqy group by meaarea"); @@ -314,8 +311,8 @@ public class SdjgzActivity extends BaseActivity2 { @Override public void handleNfc(String result) { - result="AB4E97E6"; - if (list.size() != 0) { + //result="EB77449D"; + if (!list.isEmpty()) { Intent intent = new Intent(SdjgzActivity.this, SdlbActivity.class); //intent.putExtra("lx",true); intent.putExtra(Contans.NFCOREWM, false); @@ -338,6 +335,9 @@ public class SdjgzActivity extends BaseActivity2 { if (resultCode == RESULT_OK) { if(data!=null){ ewm = data.getStringExtra("code"); + showLog("ewm:"+ewm); + showLog(ewm); + showLog(String.valueOf(ewm.length())); Intent intent = new Intent(SdjgzActivity.this, SdlbActivity.class); //intent.putExtra("lx",true); intent.putExtra(Contans.NFCOREWM, true); @@ -357,17 +357,4 @@ public class SdjgzActivity extends BaseActivity2 { launcherResultQRCode.launch(intent); } - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (CAMERA_REQUEST_CAMERA_SCAN == requestCode) { - if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - //已授权，打开摄像头扫描 - intentTOQRCode(); - } else { - //权限拒绝 - Toast.makeText(SdjgzActivity.this, "权限拒绝,请手动设置开启APP访问摄像头权限", Toast.LENGTH_SHORT).show(); - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdlbActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdlbActivity.java index f4f3099..faf1e7b 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdlbActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/SdlbActivity.java @@ -10,6 +10,7 @@ import com.rehome.zhdcoa.DBModel.DjjhRwQy; import com.rehome.zhdcoa.R; import com.rehome.zhdcoa.adapter.MyFragmentYXAdapter; import com.rehome.zhdcoa.base.BaseActivity2; +import com.rehome.zhdcoa.utils.GsonUtils; import com.rehome.zhdcoa.weiget.AutoRadioGroup; import com.rehome.zhdcoa.weiget.NoscrollViewPager; import org.litepal.crud.DataSupport; @@ -70,6 +71,9 @@ public class SdlbActivity extends BaseActivity2 { num = getIntent().getExtras().getString(Contans.KEY_BQBM); nfrorewm = getIntent().getExtras().getBoolean(Contans.NFCOREWM); + showLog(num); + showLog(String.valueOf(nfrorewm)); + rwqys = new ArrayList<>(); rwwj = new ArrayList<>(); rwyjwsc = new ArrayList<>(); @@ -148,6 +152,8 @@ public class SdlbActivity extends BaseActivity2 { rwwj.clear(); rwyjwsc.clear(); rwysc.clear(); + + //二维码一维码 if (nfrorewm) { ContentValues values = new ContentValues(); @@ -161,6 +167,10 @@ public class SdlbActivity extends BaseActivity2 { rwwj.addAll(DataSupport.where("bqbm = ? and checked = ? ", num, "0").find(DjjhRwQy.class)); rwysc.addAll(DataSupport.where("bqbm = ? and uploaded = ? ", num, "1").find(DjjhRwQy.class)); rwyjwsc.addAll(DataSupport.where("bqbm = ? and uploaded = ? and checked = ? ", num, "0", "1").find(DjjhRwQy.class)); + + showLog("-------------------"); + showLog(GsonUtils.GsonString(rwqys)); + } else { //NFC标签 ContentValues values = new ContentValues(); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Xbaxg2Activity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Xbaxg2Activity.java index 99f8b0f..cc3b674 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/Xbaxg2Activity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/Xbaxg2Activity.java @@ -158,7 +158,7 @@ public class Xbaxg2Activity extends BaseActivity2 { //处理nfc的数据 @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); ContentValues values = new ContentValues(); values.put("checked", "1"); values.put("smfx", "NFC标签"); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XlyxcActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XlyxcActivity.java index db95987..e68a202 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XlyxcActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XlyxcActivity.java @@ -175,7 +175,7 @@ public class XlyxcActivity extends BaseActivity2 { @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); if (!infos.isEmpty()) { Intent intent = new Intent(XlyxcActivity.this, Xlyxc2Activity.class); intent.putExtra(Contans.KEY_BQBM, result); 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 0fa14df..3251a16 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 @@ -293,7 +293,7 @@ public class XscbqyActivity extends BaseActivity2 { @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); for (XsjhQyBean.DataBeanX qy : qys) { if (result.equals(qy.getNfcbm())) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxfxcActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxfxcActivity.java index 457f716..a8ffe38 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxfxcActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/XxfxcActivity.java @@ -226,7 +226,7 @@ public class XxfxcActivity extends BaseActivity2 { //处理nfc @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); if (!list.isEmpty()) { Intent intent = new Intent(XxfxcActivity.this, XxfxcDetaliActivity.class); intent.putExtra(Contans.KEY_BQBM, result); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YhpclrActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YhpclrActivity.java index de7930d..4efcce6 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/YhpclrActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/YhpclrActivity.java @@ -562,7 +562,7 @@ public class YhpclrActivity extends BaseActivity2 { @Override public void handleNfc(String result) { - super.handleNfc(result); + //super.handleNfc(result); if (isUpdate) { } else { List qys = DataSupport.where("bqbm = ?", result).find(Qy.class); diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index 96920ad..c06e59a 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -137,7 +137,7 @@ class HomeFragment : BaseViewBindingFragment() { Handler().postDelayed({ // 在指定时间后要执行的代码 //隐藏掉 本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息 - showLog("隐藏掉 本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息") + //showLog("隐藏掉 本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息") binding.llTip.visibility=View.GONE; }, 5000) diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index d005582..89b20ff 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -189,7 +189,6 @@ android:textColor="#DAA520" android:text="国家秘密、工作秘密、商业秘密、敏感信息" android:textSize="16sp" /> -