From 40e1c536e6da1b2012811df20b605c06ad7e5db6 Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 28 Apr 2026 14:12:57 +0800 Subject: [PATCH] close: wx-2 --- .../com/example/tyre/HomePageActivity.java | 17 +- .../example/tyre/OutStoreHouseActivity.java | 30 +- .../tyre/maintenance/base/BaseActivity.java | 39 +- .../java/com/example/tyre/util/MyUrl.java | 2 +- .../main/res/layout/activity_home_page.xml | 8 + .../res/layout/activity_out_store_house.xml | 493 ++++++++++-------- 6 files changed, 328 insertions(+), 261 deletions(-) diff --git a/app/src/main/java/com/example/tyre/HomePageActivity.java b/app/src/main/java/com/example/tyre/HomePageActivity.java index c8c9ce8..68e4a19 100644 --- a/app/src/main/java/com/example/tyre/HomePageActivity.java +++ b/app/src/main/java/com/example/tyre/HomePageActivity.java @@ -2,14 +2,13 @@ package com.example.tyre; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.KeyEvent; -import android.view.View; import android.widget.Button; import android.widget.RadioButton; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; + import com.example.tyre.databinding.ActivityHomePageBinding; import com.example.tyre.maintenance.NewHomePageActivity; @@ -19,8 +18,6 @@ import com.example.tyre.maintenance.NewHomePageActivity; public class HomePageActivity extends AppCompatActivity { - private ActivityHomePageBinding binding; - RadioButton chaxun; RadioButton ruku; RadioButton chuku; @@ -28,7 +25,7 @@ public class HomePageActivity extends AppCompatActivity { RadioButton huanwei; RadioButton zhijian; Button logout; - + private ActivityHomePageBinding binding; private long exitTime = 0; @Override @@ -60,10 +57,14 @@ public class HomePageActivity extends AppCompatActivity { Intent intent = new Intent(this, InStoreHouseActivity.class); startActivity(intent); }); - + Intent outStoreIntent = new Intent(this, OutStoreHouseActivity.class); binding.chuku.setOnClickListener(v -> { - Intent intent = new Intent(this, OutStoreHouseActivity.class); - startActivity(intent); + outStoreIntent.putExtra("title","轮胎出库"); + startActivity(outStoreIntent); + }); + binding.chuku1.setOnClickListener(v -> { + outStoreIntent.putExtra("title","调拨出库"); + startActivity(outStoreIntent); }); binding.zhuangxie.setOnClickListener(v -> { diff --git a/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java b/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java index b523707..6be9ce8 100644 --- a/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java +++ b/app/src/main/java/com/example/tyre/OutStoreHouseActivity.java @@ -10,9 +10,9 @@ import android.os.Bundle; import android.os.SystemClock; import android.util.Log; import android.widget.TextView; -import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; +import androidx.databinding.ObservableBoolean; import com.android.hdhe.uhf.reader.UhfReader; import com.android.hdhe.uhf.readerInterface.TagModel; @@ -47,16 +47,15 @@ public class OutStoreHouseActivity extends AppCompatActivity { long lastTime; long nextTime; private ActivityOutStoreHouseBinding binding; - private boolean isStart = true; + private ProgressDialog progressDialog; private boolean runFlag = true; private boolean startFlag = false; private UhfReader manager; // UHF manager,UHF Operating handle private ArrayList listEPC; private ArrayList listepc = new ArrayList(); - private Toast mToast; - private Toast toast; private KeyReceiver keyReceiver; + private ObservableBoolean aType; @Override protected void onCreate(Bundle savedInstanceState) { @@ -70,6 +69,12 @@ public class OutStoreHouseActivity extends AppCompatActivity { Thread thread = new InventoryThread(); thread.start(); Util.initSoundPool(this); + Intent intent = getIntent(); + String title = intent.getStringExtra("title"); + binding.outTitle.setText(title); + aType = new ObservableBoolean(); + aType.set(title.equals("轮胎出库")); + binding.setAType(aType); } private void bindViews() { @@ -232,13 +237,14 @@ public class OutStoreHouseActivity extends AppCompatActivity { private String safeGetString(String value) { return value == null || "null".equals(value) ? "" : value; } - + // 出库提交 private void out_inventory(String epc, String createBy) { - String outReason = binding.outReason.getSelectedItem().toString();//出库原因 + OkGo.post(MyUrl.url + "/tyre/inventory/pdaOutInventory").tag(this) .params("tyreRfid", epc) - // .params("outReason", outReason) .params("createBy", createBy) + .params("outType", (aType.get() ? "0" : "1")) + .params("deptId", getDeptId(binding.outStoreSite.getSelectedItem().toString())) .execute(new StringCallback() { @Override public void onSuccess(Response response) { @@ -263,6 +269,15 @@ public class OutStoreHouseActivity extends AppCompatActivity { unregisterReceiver(keyReceiver); } + public int getDeptId(String name) { + if (name.equals("光明修理厂")) { + return 200; + } else if (name.equals("石岩修理厂")) { + return 201; + } + return 209; + } + /** * Inventory EPC Thread */ @@ -316,5 +331,4 @@ public class OutStoreHouseActivity extends AppCompatActivity { } } } - } diff --git a/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java b/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java index 90e8981..d745d32 100644 --- a/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java +++ b/app/src/main/java/com/example/tyre/maintenance/base/BaseActivity.java @@ -45,16 +45,23 @@ import cn.pda.serialport.Tools; import okhttp3.MediaType; public class BaseActivity extends AppCompatActivity { + public static final int CAMERA_PHOTO = 1; public SimpleDateFormat dateFormat; public ProgressDialog dialog; public Context context; public Gson gson; public String url; public MediaType JSON = MediaType.parse("application/json; charset=utf-8"); + public byte[] accessBytes = Tools.HexString2Bytes("00000000"); + @SuppressLint("SimpleDateFormat") + public SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd_HHmmss"); + public UhfReader uhfReader; + public MediaPlayer music; + public MyKeyReceiver keyReceiver; // 拍照 private Uri img_uri; private File outputImage; - public byte[] accessBytes = Tools.HexString2Bytes("00000000"); + @SuppressLint("SimpleDateFormat") @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -79,9 +86,12 @@ public class BaseActivity extends AppCompatActivity { } public int getDeptId(String name) { - if (name.equals("光明修理厂")) + if (name.equals("光明修理厂")) { return 200; - return 201; + } else if (name.equals("石岩修理厂")) { + return 201; + } + return 209; } public String getTypeCode(String typeName) { @@ -102,9 +112,7 @@ public class BaseActivity extends AppCompatActivity { } - public static final int CAMERA_PHOTO = 1; - @SuppressLint("SimpleDateFormat") - public SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd_HHmmss"); + public void teke_photo() throws IOException { outputImage = new File(getExternalCacheDir(), "output_imgage" + format.format(new Date()) + ".jpg"); outputImage.createNewFile(); @@ -149,9 +157,9 @@ public class BaseActivity extends AppCompatActivity { fos.write(compressedImageData); fos.flush(); fos.close();*/ - if (requestCode == CAMERA_PHOTO ){ - tekePhotoResult(img_uri.toString(), outputImage); - } + if (requestCode == CAMERA_PHOTO) { + tekePhotoResult(img_uri.toString(), outputImage); + } /* } catch (FileNotFoundException e) { throw new RuntimeException(e); @@ -170,11 +178,12 @@ public class BaseActivity extends AppCompatActivity { public boolean dispatchTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { View v = getCurrentFocus(); - boolean isKeyboardShown = v != null && (v instanceof EditText) && isKeyboardShowing(getCurrentFocus(), this); + boolean isKeyboardShown = + v != null && (v instanceof EditText) && isKeyboardShowing(getCurrentFocus(), this); if (isKeyboardShown) { Rect outRect = new Rect(); v.getGlobalVisibleRect(outRect); - if (!outRect.contains((int)ev.getRawX(), (int)ev.getRawY())) { + if (!outRect.contains((int) ev.getRawX(), (int) ev.getRawY())) { hideSoftKeyboard(this); } } @@ -183,7 +192,8 @@ public class BaseActivity extends AppCompatActivity { } private void hideSoftKeyboard(Activity activity) { - InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE); + InputMethodManager inputMethodManager = + (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE); inputMethodManager.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), 0); } @@ -191,9 +201,7 @@ public class BaseActivity extends AppCompatActivity { InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); return imm.isAcceptingText(); } - public UhfReader uhfReader; - public MediaPlayer music; - public MyKeyReceiver keyReceiver; + public void initRFID() { uhfReader = MyApplication.getManager(); music = MediaPlayer.create(this, R.raw.msg); @@ -203,6 +211,7 @@ public class BaseActivity extends AppCompatActivity { initRFID(); initKeyRecriver(this::readEPC); } + @SuppressLint("UnspecifiedRegisterReceiverFlag") public void initKeyRecriver(MyKeyInfoCall call) { keyReceiver = new MyKeyReceiver(call); diff --git a/app/src/main/java/com/example/tyre/util/MyUrl.java b/app/src/main/java/com/example/tyre/util/MyUrl.java index cc1524f..bb565ff 100644 --- a/app/src/main/java/com/example/tyre/util/MyUrl.java +++ b/app/src/main/java/com/example/tyre/util/MyUrl.java @@ -6,7 +6,7 @@ package com.example.tyre.util; * @date: 2019-10-24 13:59 */ public class MyUrl { - public static String url="http://192.168.0.18:8020"; + public static String url="http://192.168.137.1:8020"; // public static String url="http://www.qdhys.xyz:8020"; // public static String url="http://10.11.187.77:8020"; } diff --git a/app/src/main/res/layout/activity_home_page.xml b/app/src/main/res/layout/activity_home_page.xml index e308721..745617b 100644 --- a/app/src/main/res/layout/activity_home_page.xml +++ b/app/src/main/res/layout/activity_home_page.xml @@ -47,6 +47,14 @@ /> + + diff --git a/app/src/main/res/layout/activity_out_store_house.xml b/app/src/main/res/layout/activity_out_store_house.xml index dda902e..6ee8057 100644 --- a/app/src/main/res/layout/activity_out_store_house.xml +++ b/app/src/main/res/layout/activity_out_store_house.xml @@ -1,241 +1,276 @@ - + - + + + + + + + android:layout_height="match_parent" + android:background="@color/allbg" + android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -