wangh
/
JinYu-RFID-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

读取app 准备

Browse Source
master
wangh 6 months ago
parent 0f83bf9a17
commit 38edb74d4c
15 changed files with 165 additions and 40 deletions
Show Stats Download Patch File Download Diff File

25
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -30,11 +30,10 @@
<activity
android:name=".AppLoginActivity"
android:exported="true">
<!-- <intent-filter> -->
<!-- <action android:name="android.intent.action.MAIN" /> -->
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
<!-- </intent-filter> -->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ReadActivity"
@ -43,10 +42,10 @@
android:name=".WriteUserActivity"
android:exported="true">
<!-- <intent-filter> -->
<!-- <action android:name="android.intent.action.MAIN" /> -->
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
<!-- </intent-filter> -->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
</activity>
<activity
android:name=".ConfigurationTableActivity"
@ -54,11 +53,11 @@
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
</activity>
</application>

3
app/src/main/java/com/example/jinyu_rfid/AppLoginActivity.java
Unescape Escape View File

@ -50,10 +50,11 @@ public class AppLoginActivity extends AppCompatActivity {
SharedPreferencesUtils.putstring("language", s);
getLocaleStringXML(s);
resources.updateConfiguration(config, resources.getDisplayMetrics());
//
var intent = new Intent(this, ReadActivity.class);
Log.e("TAG", "appLoginClick:" + value);
intent.putExtra("work",value);
SharedPreferencesUtils.putstring("languageIndex", index + "");
intent.putExtra("appType",true);
startActivity(intent);
finish();
}

32
app/src/main/java/com/example/jinyu_rfid/MainActivity.java
Unescape Escape View File

@ -39,6 +39,7 @@ public class MainActivity extends BaseActivity {
private Resources resources;
private Configuration config;
private int index;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -49,7 +50,7 @@ public class MainActivity extends BaseActivity {
resources.updateConfiguration(config, resources.getDisplayMetrics());
binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
binding.mainLanguage.setSelection(index);
loginVm = new LoginVm();
loginVm = new LoginVm();
boolean isRemember = SharedPreferencesUtils.getboolean("isRemember", false);
if (isRemember) {
loginVm.setUsername(SharedPreferencesUtils.getstring("user", ""));
@ -62,17 +63,16 @@ public class MainActivity extends BaseActivity {
}
private void getLocaleStringXML(String languageString){
if (languageString.equals("中文")){
config.locale = Locale.CHINA;
index=0;
}else if (languageString.equals("English")){
config.locale = Locale.ENGLISH;
index=1;
}else {
config.locale =new Locale("vi","VN");
index=2;
private void getLocaleStringXML(String languageString) {
if (languageString.equals("中文")) {
config.locale = Locale.CHINA;
index = 0;
} else if (languageString.equals("English")) {
config.locale = Locale.ENGLISH;
index = 1;
} else {
config.locale = new Locale("vi", "VN");
index = 2;
}
}
@ -90,7 +90,7 @@ public class MainActivity extends BaseActivity {
map.put("UserID", name);
map.put("UserPass", pass);
map.put("token", "123456");
map.put("Language", index+"");
map.put("Language", index + "");
if (pass == null || name == null || pass.isEmpty() || name.isEmpty()) return;
OkGo.<MyResult>post(url + "/login")
.upRequestBody(RequestBody.create(JSON, gson.toJson(map)))
@ -109,13 +109,13 @@ public class MainActivity extends BaseActivity {
SharedPreferencesUtils.putstring("pass", pass);
}
SharedPreferencesUtils.putstring("language", selectLanguage);
SharedPreferencesUtils.putstring("languageIndex", index+"");
SharedPreferencesUtils.putstring("languageIndex", index + "");
resources.updateConfiguration(config, resources.getDisplayMetrics());
List<ConfigurationTable> list = LitePal.findAll(ConfigurationTable.class);
Intent intent;
if (list==null||list.isEmpty()){
if (list == null || list.isEmpty()) {
intent = new Intent(MainActivity.this, ConfigurationTableActivity.class);
}else {
} else {
intent = new Intent(MainActivity.this, WriteUserActivity.class);
}
startActivity(intent);

21
app/src/main/java/com/example/jinyu_rfid/ReadActivity.java
Unescape Escape View File

@ -50,7 +50,14 @@ public class ReadActivity extends BaseActivity implements DataReturnCall {
binding.setType(workmode == 1);
// 名称
stringArray = getResources().getStringArray(R.array.project_list);
rfidModel = new C5106Device(this);
var appType = getIntent().getBooleanExtra("appType", false);
if (appType) {
// tl-gx4
} else {
rfidModel = new C5106Device(this);
}
}
@ -61,6 +68,7 @@ public class ReadActivity extends BaseActivity implements DataReturnCall {
public void readEPCInfo(View view) {
rfidModel.sanEpc(6);
}
@SuppressLint("NotifyDataSetChanged")
@Override
public void readEpcCodeInfo(String info, boolean state, String stateInfo) {
@ -71,7 +79,7 @@ public class ReadActivity extends BaseActivity implements DataReturnCall {
Map<String, String> map = new HashMap<>();
map.put("EpcCode", info);
map.put("token", "123456");
map.put("Language", SharedPreferencesUtils.getstring("languageIndex","0"));
map.put("Language", SharedPreferencesUtils.getstring("languageIndex", "0"));
OkGo.<MyResult>post(url + "/readEPCCode")
.upRequestBody(RequestBody.create(JSON, gson.toJson(map))).execute(new MyRecultCall(dialog, this) {
@Override
@ -79,7 +87,8 @@ public class ReadActivity extends BaseActivity implements DataReturnCall {
super.onSuccess(response);
var body = response.body();
if (body.getResultFlag().equals("1")) {
list.addAll(gson.fromJson(body.getJson(),new TypeToken<List<ReadTyreNoResult>>(){}.getType()));
list.addAll(gson.fromJson(body.getJson(), new TypeToken<List<ReadTyreNoResult>>() {
}.getType()));
adapter.notifyDataSetChanged();
} else {
Toast.makeText(ReadActivity.this, body.getJson(), Toast.LENGTH_SHORT).show();
@ -89,7 +98,7 @@ public class ReadActivity extends BaseActivity implements DataReturnCall {
}
});
}else {
} else {
binding.readText.setText(null);
}
}
@ -107,10 +116,12 @@ public class ReadActivity extends BaseActivity implements DataReturnCall {
for (int i = 0; i < 12; i++) {
list.add(new ReadTyreNoResult(i, stringArray[i], infos[i]));
}
}else {
} else {
binding.readText.setText(null);
}
adapter.notifyDataSetChanged();
}
//
}

4
app/src/main/java/com/example/jinyu_rfid/WriteUserActivity.java
Unescape Escape View File

@ -125,7 +125,7 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
writeUserState = true;
return;
}
Toast.makeText(WriteUserActivity.this, body.getSaveMessage(), Toast.LENGTH_SHORT).show();
tipDialog.shouDialog(false, body.getSaveMessage());
}
});
@ -133,7 +133,7 @@ public class WriteUserActivity extends BaseActivity implements DataReturnCall, P
if (writeUserState){
Log.e("TAG", "写入");
var writeState = rfidModel.writeUser(validateDataLength(user), epcStr);
Toast.makeText(context, getString(writeState ? R.string.write_success : R.string.write_failed), Toast.LENGTH_SHORT).show();
tipDialog.shouDialog(writeState,getString(writeState ? R.string.write_success : R.string.write_failed));
if (writeState) {
list.clear();
adapter.notifyDataSetChanged();

5
app/src/main/java/com/example/jinyu_rfid/base/BaseActivity.java
Unescape Escape View File

@ -25,6 +25,7 @@ import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import com.example.jinyu_rfid.R;
import com.example.jinyu_rfid.dialog.TipDialog;
import com.google.gson.Gson;
import java.io.ByteArrayOutputStream;
@ -48,6 +49,7 @@ public class BaseActivity extends AppCompatActivity {
private MyReceiver myReceiver;
public MediaPlayer music;
public Context context;
public TipDialog tipDialog;
@SuppressLint("SimpleDateFormat")
public SimpleDateFormat format= new SimpleDateFormat( "yyyyMMdd_HHmmss");
@Override
@ -57,10 +59,8 @@ public class BaseActivity extends AppCompatActivity {
gson = new Gson();
this.context=this;
initDialog();
music = MediaPlayer.create(this, R.raw.msg);
}
public class MyReceiver extends BroadcastReceiver {
@ -78,6 +78,7 @@ public class BaseActivity extends AppCompatActivity {
dialog.setCanceledOnTouchOutside(false);
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
dialog.setMessage("loading...");
tipDialog=new TipDialog(this);
}
private void initSan() {

35
app/src/main/java/com/example/jinyu_rfid/dialog/TipDialog.java
Unescape Escape View File

@ -0,0 +1,35 @@
package com.example.jinyu_rfid.dialog;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import androidx.annotation.NonNull;
import androidx.databinding.DataBindingUtil;
import com.example.jinyu_rfid.R;
import com.example.jinyu_rfid.databinding.DialogLayoutBinding;
/**
* @author wanghao
* @date 2024/6/3 9:17
*/
public class TipDialog extends Dialog {
private DialogLayoutBinding binding;
public TipDialog(@NonNull Context context) {
super(context, R.style.dialog);
binding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.dialog_layout, null, false);
setContentView(binding.getRoot());
binding.dialogButton.setOnClickListener(v -> dismiss());
}
public void shouDialog(boolean state,String text){
binding.setState(state);
binding.setTipText(text);
show();
}
}

6
app/src/main/res/drawable/dialog_bg.xml
Unescape Escape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white"/>
<corners android:radius="10dp"/>
<stroke android:color="#e1e1e1" android:width="1dp"/>
</shape>

55
app/src/main/res/layout/dialog_layout.xml
Unescape Escape View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="state"
type="Boolean" />
<variable
name="tipText"
type="String" />
<import type="android.view.View"/>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/dialog_bg"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="15dp"
android:visibility="@{state?View.VISIBLE:View.GONE}"
android:src="@mipmap/icon_true" />
<ImageView
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="15dp"
android:visibility="@{state?View.GONE:View.VISIBLE}"
android:src="@mipmap/icon_false" />
<TextView
style="@style/text_name"
android:layout_width="match_parent"
android:layout_height="66dp"
android:text="@{tipText}" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#e1e1e1" />
<TextView
android:id="@+id/dialog_button"
style="@style/text_name"
android:layout_width="match_parent"
android:layout_height="55dp"
android:text="@string/dialog_button_text"
android:textStyle="bold" />
</LinearLayout>
</layout>

BIN
app/src/main/res/mipmap-xhdpi/icon_false.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_true.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

1
app/src/main/res/values-en-rUS/strings.xml
Unescape Escape View File

@ -34,4 +34,5 @@
<string name="net_model">network mode</string>
<string name="standalone_mode">"standalone mode "</string>
<string name="scanning_area">scanning area</string>
<string name="dialog_button_text">I see</string>
</resources>

1
app/src/main/res/values-vi-rVN/strings.xml
Unescape Escape View File

@ -35,4 +35,5 @@
<string name="net_model">Chế độ mạng</string>
<string name="standalone_mode">Chế độ đơn</string>
<string name="scanning_area">Khu vực quét</string>
<string name="dialog_button_text">Tôi biết rồi</string>
</resources>

3
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -33,5 +33,6 @@
<string name="work_model_select">工作模式</string>
<string name="net_model">网络模式</string>
<string name="standalone_mode">单机模式</string>
<string name="scanning_area">扫描区域</string>>
<string name="scanning_area">扫描区域</string>
<string name="dialog_button_text">我知道了</string>>
</resources>

14
app/src/main/res/values/themes.xml
Unescape Escape View File

@ -16,4 +16,18 @@
<item name="android:gravity">center</item>
<item name="android:textSize">17sp</item>
</style>
<style name="dialog">
<!--背景颜色及和透明程度-->
<item name="android:windowBackground">@android:color/transparent</item>
<!--是否去除标题 -->
<item name="android:windowNoTitle">true</item>
<!--是否去除边框-->
<item name="android:windowFrame">@null</item>
<!--是否浮现在activity之上-->
<item name="android:windowIsFloating">true</item>
<!--是否模糊-->
<item name="android:backgroundDimEnabled">true</item>
<item name="android:windowMinWidthMinor">95%</item><!--宽度铺满全屏-->
</style>
</resources>
Write Preview
Loading…
Cancel
Save