wangh
/
5106utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加 设置功能

Browse Source
fengshen
wanghao 2 months ago
parent c2b4aa59e7
commit 2bd638e0ab
7 changed files with 173 additions and 71 deletions
Show Stats Download Patch File Download Diff File

BIN
app/release/app-release.apk
View File

Binary file not shown.

35
app/src/main/java/com/example/writeepc/SettingsActivity.java
Unescape Escape View File

@ -1,17 +1,44 @@
package com.example.writeepc; package com.example.writeepc;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.app.ActionBar; import android.view.View;
import android.widget.EditText;
import android.widget.Spinner;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.preference.PreferenceFragmentCompat; import androidx.databinding.DataBindingUtil;
import com.example.writeepc.databinding.SettingsActivityBinding;
import com.example.writeepc.utils.SharedPreferencesUtils;
import java.util.Arrays;
import java.util.List;
public class SettingsActivity extends AppCompatActivity { public class SettingsActivity extends AppCompatActivity {
private Spinner powerBinding;
private Spinner powerTrace;
private EditText settingIp;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
SettingsActivityBinding binding =
DataBindingUtil.setContentView(this, R.layout.settings_activity);
powerBinding = binding.selectPowerBinding;
powerTrace = binding.selectPowerTrace;
settingIp = binding.settingIp;
String bindingPower = SharedPreferencesUtils.getstring("powerBinding", "22");
String tracePower = SharedPreferencesUtils.getstring("powerTrace", "22");
List<String> powerList = Arrays.asList(getResources().getStringArray(R.array.power));
powerBinding.setSelection(powerList.indexOf(bindingPower));
powerTrace.setSelection(powerList.indexOf(tracePower));
settingIp.setText(SharedPreferencesUtils.getstring("ip", null));
} }
public void saveInfo(View view) {
SharedPreferencesUtils.putstring("powerBinding", powerBinding.getSelectedItem().toString());
SharedPreferencesUtils.putstring("powerTrace", powerTrace.getSelectedItem().toString());
SharedPreferencesUtils.putstring("ip", settingIp.getText().toString());
finish();
}
} }

18
app/src/main/java/com/example/writeepc/ShuangqianActivity.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.example.writeepc;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import androidx.databinding.DataBindingUtil; import androidx.databinding.DataBindingUtil;
@ -12,10 +13,12 @@ import com.example.writeepc.base.okgo.MyResult;
import com.example.writeepc.broadcast.MyScannerCall; import com.example.writeepc.broadcast.MyScannerCall;
import com.example.writeepc.broadcast.MyScannerReceiver; import com.example.writeepc.broadcast.MyScannerReceiver;
import com.example.writeepc.databinding.ActivityShuangqianBinding; import com.example.writeepc.databinding.ActivityShuangqianBinding;
import com.example.writeepc.utils.SharedPreferencesUtils;
import com.lzy.okgo.OkGo; import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback; import com.lzy.okgo.callback.StringCallback;
import com.lzy.okgo.model.Response; import com.lzy.okgo.model.Response;
import com.lzy.okgo.request.base.Request; import com.lzy.okgo.request.base.Request;
import com.uhf.api.cls.Reader;
public class ShuangqianActivity extends BaseActivity implements MyScannerCall { public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
@ -30,7 +33,9 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
binding = DataBindingUtil.setContentView(this, R.layout.activity_shuangqian); binding = DataBindingUtil.setContentView(this, R.layout.activity_shuangqian);
initUHFRManager1(); initUHFRManager1();
initDialog(); initDialog();
int powerBinding = Integer.parseInt(SharedPreferencesUtils.getstring("powerBinding", "22"));
Reader.READER_ERR readerErr = uhfrManager.setPower(powerBinding, powerBinding);
Log.e("TAG", "绑定设置功率:" + readerErr.name());
myReceiver = new MyScannerReceiver(this); myReceiver = new MyScannerReceiver(this);
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction("com.rfid.SCAN"); intentFilter.addAction("com.rfid.SCAN");
@ -38,7 +43,7 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
boolean type = getIntent().getBooleanExtra("type", true); boolean type = getIntent().getBooleanExtra("type", true);
binding.setTitle(type ? "MES轮胎绑定" : "解绑"); binding.setTitle(type ? "MES轮胎绑定" : "解绑");
binding.setType(type); binding.setType(type);
uriLastStr = type ? "barcodeAndRFIDBinding" : "unBinding"; // uriLastStr = type ? "barcodeAndRFIDBinding" : "unBinding";
} }
// 读取 // 读取
@ -120,15 +125,18 @@ public class ShuangqianActivity extends BaseActivity implements MyScannerCall {
String str = "<faultstring>"; String str = "<faultstring>";
int faultstringIndex = result.indexOf(str); int faultstringIndex = result.indexOf(str);
if (faultstringIndex > -1) { if (faultstringIndex > -1) {
String faultstring = result.substring(faultstringIndex + str.length(), result.indexOf("</faultstring>")); String faultstring =
result.substring(faultstringIndex + str.length(), result.indexOf("</faultstring>"));
tipsDialog.setTip(false, faultstring); tipsDialog.setTip(false, faultstring);
tipsDialog.show(); tipsDialog.show();
return; return;
} }
int codeIndex = result.indexOf("<Code>"); int codeIndex = result.indexOf("<Code>");
if (codeIndex > -1) { if (codeIndex > -1) {
String resultCode = result.substring(codeIndex + 6, result.indexOf("</Code>")); String resultCode =
String resultMsg = result.substring(result.indexOf("<Msg>") + 5, result.indexOf("</Msg>")); result.substring(codeIndex + 6, result.indexOf("</Code>"));
String resultMsg =
result.substring(result.indexOf("<Msg>") + 5, result.indexOf("</Msg>"));
if (resultCode.equals("200")) { if (resultCode.equals("200")) {
tipsDialog.setTip(true, resultMsg); tipsDialog.setTip(true, resultMsg);
tipsDialog.show(); tipsDialog.show();

6
app/src/main/java/com/example/writeepc/ShuangqianActivity2.java
Unescape Escape View File

@ -15,11 +15,13 @@ import com.example.writeepc.base.okgo.MyRecultCall;
import com.example.writeepc.base.okgo.MyResult; import com.example.writeepc.base.okgo.MyResult;
import com.example.writeepc.been.MESInfo; import com.example.writeepc.been.MESInfo;
import com.example.writeepc.databinding.ActivityShuangqian2Binding; import com.example.writeepc.databinding.ActivityShuangqian2Binding;
import com.example.writeepc.utils.SharedPreferencesUtils;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.lzy.okgo.OkGo; import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback; import com.lzy.okgo.callback.StringCallback;
import com.lzy.okgo.model.Response; import com.lzy.okgo.model.Response;
import com.lzy.okgo.request.base.Request; import com.lzy.okgo.request.base.Request;
import com.uhf.api.cls.Reader;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@ -38,6 +40,10 @@ private MyMesInfoAdapter adapter;
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this, R.layout.activity_shuangqian2); binding = DataBindingUtil.setContentView(this, R.layout.activity_shuangqian2);
initUHFRManager1(); initUHFRManager1();
int powerTrace = Integer.parseInt(SharedPreferencesUtils.getstring("powerTrace", "22"));
Reader.READER_ERR readerErr = uhfrManager.setPower(powerTrace, powerTrace);
Log.e("TAG", "追溯设置功率:" + readerErr.name());
initDialog(); initDialog();
adapter=new MyMesInfoAdapter(this); adapter=new MyMesInfoAdapter(this);
binding.setAdapter(adapter); binding.setAdapter(adapter);

1
app/src/main/res/layout/activity_home.xml
Unescape Escape View File

@ -66,6 +66,7 @@
android:drawableTop="@mipmap/ic_un" android:drawableTop="@mipmap/ic_un"
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:gravity="center" android:gravity="center"
android:visibility="gone"
android:text="解绑" android:text="解绑"
android:textSize="20sp" /> android:textSize="20sp" />

35
app/src/main/res/layout/activity_shuangqian.xml
Unescape Escape View File

@ -9,6 +9,7 @@
type="String" /> type="String" />
<import type="android.view.View" /> <import type="android.view.View" />
<variable <variable
name="type" name="type"
type="Boolean" /> type="Boolean" />
@ -46,7 +47,7 @@
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:text="扫描条码:" /> android:text="胎胚条码:" />
<EditText <EditText
android:id="@+id/socket_barcode" android:id="@+id/socket_barcode"
@ -57,6 +58,28 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_marginTop="20dp"
android:orientation="horizontal">
<TextView
style="@style/info_text"
android:layout_width="110dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:text="胎胚年份:" />
<EditText
android:id="@+id/socket_year"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
/>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
@ -98,18 +121,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="65dp" android:layout_height="65dp"
android:onClick="submit" android:onClick="submit"
android:visibility="@{type?View.VISIBLE:View.GONE}" android:text="数据提交"
android:text="数据提交" /> android:visibility="@{type?View.VISIBLE:View.GONE}" />
<Button <Button
style="@style/button_style" style="@style/button_style"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="65dp" android:layout_height="65dp"
android:onClick="unBindingSubmit"
android:backgroundTint="#DD2C00" android:backgroundTint="#DD2C00"
android:visibility="@{type?View.GONE:View.VISIBLE}" android:onClick="unBindingSubmit"
android:text="解绑提交" /> android:text="解绑提交"
android:visibility="@{type?View.GONE:View.VISIBLE}" />
</LinearLayout> </LinearLayout>

149
app/src/main/res/layout/settings_activity.xml
Unescape Escape View File

@ -1,74 +1,111 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools">
android:layout_height="match_parent"
android:orientation="vertical">
<TextView <data>
style="@style/info_text"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="#6750A4"
android:letterSpacing="1"
android:text="设置"
android:textColor="@color/white"
android:textSize="22sp"
android:textStyle="bold" />
</data>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="match_parent"
android:layout_marginTop="20dp" android:orientation="vertical"
tools:context=".SettingsActivity">
android:orientation="horizontal">
<TextView <TextView
style="@style/info_text"
android:layout_width="110dp"
android:layout_height="45dp"
android:layout_gravity="center"
android:text="绑定功率:" />
<Spinner style="@style/info_text"
android:id="@+id/select_power_binding" android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_gravity="center"
android:background="#6750A4"
android:letterSpacing="1"
android:text="设置"
android:textColor="@color/white"
android:textSize="22sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_gravity="center" android:layout_marginTop="20dp"
android:entries="@array/power"
android:textAlignment="center"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
style="@style/info_text" style="@style/info_text"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_gravity="center" android:layout_gravity="center"
android:text="追溯功率:" /> android:text="绑定功率:" />
<Spinner <Spinner
android:id="@+id/select_power_" android:id="@+id/select_power_binding"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_gravity="center"
android:entries="@array/power"
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_gravity="center" android:layout_marginTop="20dp"
android:entries="@array/power"
android:textAlignment="center"
/>
</LinearLayout>
android:orientation="horizontal">
<Button <TextView
style="@style/button_style" style="@style/info_text"
android:layout_width="110dp"
android:layout_height="45dp"
android:layout_gravity="center"
android:text="追溯功率:" />
<Spinner
android:id="@+id/select_power_trace"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_gravity="center"
android:entries="@array/power"
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="20dp"
android:orientation="horizontal">
<TextView
style="@style/info_text"
android:layout_width="110dp"
android:layout_height="45dp"
android:layout_gravity="center"
android:text="请求地址:" />
<EditText
android:id="@+id/setting_ip"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:entries="@array/power"
android:textAlignment="center"
android:lines="1"
/>
</LinearLayout>
<View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:onClick="setPower" android:layout_weight="1"/>
android:text="设置功率" />
</LinearLayout> <Button
style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:onClick="saveInfo"
android:text="保存并退出" />
</LinearLayout>
</layout>
Write Preview
Loading…
Cancel
Save