diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 96cfa5e..3f29dab 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> @@ -16,34 +16,47 @@ android:supportsRtl="true" android:theme="@style/Theme.WriteEpc" android:usesCleartextTraffic="true" - tools:targetApi="31" > + tools:targetApi="31"> - - + + + android:exported="false" + android:theme="@style/traceActivityStyle" /> + android:exported="true"> - + android:name=".HomeActivity2" + android:exported="true" + android:label="轮胎信息追溯"> + + + + + + + + android:exported="true"> @@ -66,7 +79,7 @@ + android:exported="true"> @@ -75,12 +88,12 @@ - - + android:exported="true"> + + - - + + diff --git a/app/src/main/java/com/example/writeepc/HomeActivity.java b/app/src/main/java/com/example/writeepc/HomeActivity.java index 1fb600f..e3c5dc4 100644 --- a/app/src/main/java/com/example/writeepc/HomeActivity.java +++ b/app/src/main/java/com/example/writeepc/HomeActivity.java @@ -24,7 +24,7 @@ public class HomeActivity extends BaseActivity { RadioButton button2 = this.findViewById(R.id.home_2); RadioButton button1_1 = this.findViewById(R.id.home_1_1); RadioButton button4 = this.findViewById(R.id.home_4); - RadioButton button3 = this.findViewById(R.id.home_3); + Intent intent = new Intent(this, ShuangqianActivity.class); button1.setOnClickListener(v -> { intent.putExtra("type",true); @@ -42,9 +42,7 @@ public class HomeActivity extends BaseActivity { startActivity(new Intent(this, SettingsActivity.class)); }); - button3.setOnClickListener(v -> { - startActivity(new Intent(this, IntentSelectActivity.class)); - }); + } diff --git a/app/src/main/java/com/example/writeepc/HomeActivity2.java b/app/src/main/java/com/example/writeepc/HomeActivity2.java new file mode 100644 index 0000000..43b7238 --- /dev/null +++ b/app/src/main/java/com/example/writeepc/HomeActivity2.java @@ -0,0 +1,59 @@ +package com.example.writeepc; + +import android.content.Intent; +import android.os.Bundle; +import android.view.KeyEvent; +import android.widget.RadioButton; +import android.widget.Toast; + +import com.example.writeepc.base.BaseActivity; +import com.example.writeepc.base.MyApplication; +import com.handheld.uhfr.UHFRManager; + +public class HomeActivity2 extends BaseActivity { + private UHFRManager uhfrManager; + private long exitTime = 0L; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_home2); + uhfrManager = UHFRManager.getInstance(); + MyApplication.getApplication().setUhfrManager(uhfrManager); + + RadioButton button4 = this.findViewById(R.id.home2_4); + RadioButton button3 = this.findViewById(R.id.home2_3); + button4.setOnClickListener(v -> { + startActivity(new Intent(this, SettingsActivity2.class)); + }); + + button3.setOnClickListener(v -> { + startActivity(new Intent(this, IntentSelectActivity.class)); + }); + + + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == 4) { + if ((System.currentTimeMillis() - exitTime) > 2000) { + Toast.makeText(getApplicationContext(), "再按一次退出程序", Toast.LENGTH_SHORT).show(); + exitTime = System.currentTimeMillis(); + return true; + } else { + finish(); + } + } + return false; + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (uhfrManager != null) { + uhfrManager.close(); + uhfrManager = null; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/writeepc/IntentSelectActivity.java b/app/src/main/java/com/example/writeepc/IntentSelectActivity.java index 94fc02c..1899e02 100644 --- a/app/src/main/java/com/example/writeepc/IntentSelectActivity.java +++ b/app/src/main/java/com/example/writeepc/IntentSelectActivity.java @@ -56,7 +56,7 @@ public class IntentSelectActivity extends BaseActivity { binding = DataBindingUtil.setContentView(this, R.layout.activity_intent_select); initUHFRManager1(); // 设置功率 - String powerTrace1 = SharedPreferencesUtils.getstring("powerTrace", "22"); + String powerTrace1 = SharedPreferencesUtils.getstring("powerTrace2", "22"); int powerTrace = Integer.parseInt(powerTrace1); Reader.READER_ERR readerErr = uhfrManager.setPower(powerTrace, powerTrace); Log.e("TAG", "追溯设置功率" + powerTrace1 + ":" + readerErr.name()); diff --git a/app/src/main/java/com/example/writeepc/SettingsActivity.java b/app/src/main/java/com/example/writeepc/SettingsActivity.java index 1c7194d..8b31fed 100644 --- a/app/src/main/java/com/example/writeepc/SettingsActivity.java +++ b/app/src/main/java/com/example/writeepc/SettingsActivity.java @@ -17,7 +17,7 @@ import java.util.List; public class SettingsActivity extends AppCompatActivity { private Spinner powerBinding; private Spinner powerTrace; - private EditText settingIp; + // private EditText settingIp; @Override protected void onCreate(Bundle savedInstanceState) { @@ -26,19 +26,19 @@ public class SettingsActivity extends AppCompatActivity { DataBindingUtil.setContentView(this, R.layout.settings_activity); powerBinding = binding.selectPowerBinding; powerTrace = binding.selectPowerTrace; - settingIp = binding.settingIp; + // settingIp = binding.settingIp; String bindingPower = SharedPreferencesUtils.getstring("powerBinding", "22"); String tracePower = SharedPreferencesUtils.getstring("powerTrace", "22"); List powerList = Arrays.asList(getResources().getStringArray(R.array.power)); powerBinding.setSelection(powerList.indexOf(bindingPower)); powerTrace.setSelection(powerList.indexOf(tracePower)); - settingIp.setText(SharedPreferencesUtils.getstring("ip", "https://rfidpub.haohuatire.com:7443")); + // settingIp.setText(SharedPreferencesUtils.getstring("ip", "https://rfidpub.haohuatire.com:7443")); } public void saveInfo(View view) { SharedPreferencesUtils.putstring("powerBinding", powerBinding.getSelectedItem().toString()); SharedPreferencesUtils.putstring("powerTrace", powerTrace.getSelectedItem().toString()); - SharedPreferencesUtils.putstring("ip", settingIp.getText().toString()); + // SharedPreferencesUtils.putstring("ip", settingIp.getText().toString()); finish(); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/writeepc/SettingsActivity2.java b/app/src/main/java/com/example/writeepc/SettingsActivity2.java new file mode 100644 index 0000000..a30cf42 --- /dev/null +++ b/app/src/main/java/com/example/writeepc/SettingsActivity2.java @@ -0,0 +1,45 @@ +package com.example.writeepc; + +import android.os.Bundle; +import android.view.View; +import android.widget.EditText; +import android.widget.Spinner; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; + +import com.example.writeepc.databinding.SettingsActivity2Binding; +import com.example.writeepc.databinding.SettingsActivityBinding; +import com.example.writeepc.utils.SharedPreferencesUtils; + +import java.util.Arrays; +import java.util.List; + +public class SettingsActivity2 extends AppCompatActivity { + + private Spinner powerTrace; + private EditText settingIp; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + SettingsActivity2Binding binding = + DataBindingUtil.setContentView(this, R.layout.settings_activity2); + + powerTrace = binding.selectPowerTrace; + settingIp = binding.settingIp; + + String tracePower = SharedPreferencesUtils.getstring("powerTrace2", "22"); + List powerList = Arrays.asList(getResources().getStringArray(R.array.power)); + + powerTrace.setSelection(powerList.indexOf(tracePower)); + settingIp.setText(SharedPreferencesUtils.getstring("ip", "https://rfidpub.haohuatire.com:7443")); + } + + public void saveInfo(View view) { + + SharedPreferencesUtils.putstring("powerTrace2", powerTrace.getSelectedItem().toString()); + SharedPreferencesUtils.putstring("ip", settingIp.getText().toString()); + finish(); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 5e60b23..94605f2 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:orientation="horizontal" - android:visibility="gone"> + > - + android:textSize="20sp"/> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index 0edc765..3fcc68a 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -29,7 +29,6 @@ android:layout_width="match_parent" android:layout_height="45dp" android:layout_marginTop="20dp" -android:visibility="gone" android:orientation="horizontal"> + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +