fyf
/
AndroidSmartClient
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

优化

master-new-炒锅
liup 1 month ago
parent
0ab9f1eeee
commit
a811e98566
47 changed files with 267 additions and 364 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      .idea/deploymentTargetSelector.xml
  2. +0
    -329
      .idea/other.xml
  3. +0
    -6
      app/build.gradle
  4. +3
    -3
      app/release/output-metadata.json
  5. +10
    -3
      app/src/main/java/com/bonait/bnframework/api/ServerManager.java
  6. +12
    -11
      app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
  7. +1
    -1
      app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
  8. +7
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home2Fragment.java
  9. +40
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java
  10. +4
    -1
      app/src/main/java/com/bonait/bnframework/modules/welcome/activity/LoginActivity.java
  11. +52
    -0
      app/src/main/java/com/bonait/bnframework/ui/util/FileUtil.java
  12. +1
    -0
      app/src/main/res/layout/activity_auto_test.xml
  13. +1
    -0
      app/src/main/res/layout/activity_bleclient.xml
  14. +3
    -1
      app/src/main/res/layout/activity_dishtest.xml
  15. +1
    -0
      app/src/main/res/layout/activity_diy_memory.xml
  16. +2
    -0
      app/src/main/res/layout/activity_log_record.xml
  17. +2
    -1
      app/src/main/res/layout/activity_login.xml
  18. +6
    -0
      app/src/main/res/layout/activity_serial_test.xml
  19. +1
    -0
      app/src/main/res/layout/activity_sz.xml
  20. +1
    -0
      app/src/main/res/layout/activity_wh.xml
  21. +1
    -0
      app/src/main/res/layout/activity_wok_set.xml
  22. +2
    -0
      app/src/main/res/layout/fragment_auto_test_more.xml
  23. +17
    -1
      app/src/main/res/layout/fragment_auto_test_one.xml
  24. +1
    -0
      app/src/main/res/layout/fragment_cloud_goods.xml
  25. +1
    -0
      app/src/main/res/layout/fragment_good_edit_classify.xml
  26. +14
    -1
      app/src/main/res/layout/fragment_home2.xml
  27. +1
    -0
      app/src/main/res/layout/fragment_local_goods.xml
  28. +7
    -0
      app/src/main/res/layout/fragment_system_devicein.xml
  29. +1
    -0
      app/src/main/res/layout/fragment_system_seasoningset.xml
  30. +17
    -0
      app/src/main/res/layout/fragment_system_systemset.xml
  31. +18
    -0
      app/src/main/res/layout/fragment_wok_set_gkcx.xml
  32. +6
    -0
      app/src/main/res/layout/fragment_wok_set_tlzz.xml
  33. +6
    -0
      app/src/main/res/layout/fragment_wok_set_tlzz1.xml
  34. +1
    -0
      app/src/main/res/layout/item/layout/dialog_add_classify.xml
  35. +1
    -0
      app/src/main/res/layout/item/layout/dialog_diy_food_name.xml
  36. +3
    -0
      app/src/main/res/layout/item/layout/dialog_silos_message.xml
  37. +5
    -0
      app/src/main/res/layout/item/layout/dialog_user.xml
  38. +1
    -0
      app/src/main/res/layout/item/layout/fragment_item_gx.xml
  39. +1
    -0
      app/src/main/res/layout/item/layout/fragment_item_plc.xml
  40. +1
    -0
      app/src/main/res/layout/item/layout/fragment_item_plc_control.xml
  41. +1
    -0
      app/src/main/res/layout/item/layout/fragment_item_silos_cl.xml
  42. +6
    -0
      app/src/main/res/layout/item/layout/layout_add_goods_mainfood.xml
  43. +1
    -0
      app/src/main/res/layout/item/layout/layout_add_goods_name.xml
  44. +1
    -0
      app/src/main/res/layout/item/layout/layout_authority.xml
  45. +1
    -0
      app/src/main/res/layout/item/layout/layout_edit_goods_name.xml
  46. +1
    -0
      app/src/main/res/layout/item/layout/view_process_value.xml
  47. +2
    -2
      build.gradle

+ 2
- 2
.idea/deploymentTargetSelector.xml View File

@@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-11-13T06:44:01.611004100Z">
<DropdownSelection timestamp="2024-11-28T01:30:11.322100800Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="Default" identifier="serial=127.0.0.1:7555;connection=ca7fdfd1" />
<DeviceId pluginId="Default" identifier="serial=192.168.1.3:5555;connection=b0986a6c" />
</handle>
</Target>
</DropdownSelection>


+ 0
- 329
.idea/other.xml View File

@@ -1,329 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="direct_access_persist.xml">
<option name="deviceSelectionList">
<list>
<PersistentDeviceSelectionData>
<option name="api" value="27" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="F01L" />
<option name="id" value="F01L" />
<option name="manufacturer" value="FUJITSU" />
<option name="name" value="F-01L" />
<option name="screenDensity" value="360" />
<option name="screenX" value="720" />
<option name="screenY" value="1280" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="28" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="SH-01L" />
<option name="id" value="SH-01L" />
<option name="manufacturer" value="SHARP" />
<option name="name" value="AQUOS sense2 SH-01L" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="Lenovo" />
<option name="codename" value="TB370FU" />
<option name="id" value="TB370FU" />
<option name="manufacturer" value="Lenovo" />
<option name="name" value="Tab P12" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1840" />
<option name="screenY" value="2944" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="samsung" />
<option name="codename" value="a51" />
<option name="id" value="a51" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A51" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="akita" />
<option name="id" value="akita" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="b0q" />
<option name="id" value="b0q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S22 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="32" />
<option name="brand" value="google" />
<option name="codename" value="bluejay" />
<option name="id" value="bluejay" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="caiman" />
<option name="id" value="caiman" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro" />
<option name="screenDensity" value="360" />
<option name="screenX" value="960" />
<option name="screenY" value="2142" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="comet" />
<option name="id" value="comet" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro Fold" />
<option name="screenDensity" value="390" />
<option name="screenX" value="2076" />
<option name="screenY" value="2152" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="29" />
<option name="brand" value="samsung" />
<option name="codename" value="crownqlteue" />
<option name="id" value="crownqlteue" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Note9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2220" />
<option name="screenY" value="1080" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="dm3q" />
<option name="id" value="dm3q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S23 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="e1q" />
<option name="id" value="e1q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix_camera" />
<option name="id" value="felix_camera" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold (Camera-enabled)" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="gts8uwifi" />
<option name="id" value="gts8uwifi" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S8 Ultra" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1848" />
<option name="screenY" value="2960" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="husky" />
<option name="id" value="husky" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8 Pro" />
<option name="screenDensity" value="390" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="motorola" />
<option name="codename" value="java" />
<option name="id" value="java" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="G20" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="komodo" />
<option name="id" value="komodo" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro XL" />
<option name="screenDensity" value="360" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="lynx" />
<option name="id" value="lynx" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="google" />
<option name="codename" value="oriole" />
<option name="id" value="oriole" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="panther" />
<option name="id" value="panther" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="q5q" />
<option name="id" value="q5q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold5" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1812" />
<option name="screenY" value="2176" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="q6q" />
<option name="id" value="q6q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1856" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="r11" />
<option name="id" value="r11" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Watch" />
<option name="screenDensity" value="320" />
<option name="screenX" value="384" />
<option name="screenY" value="384" />
<option name="type" value="WEAR_OS" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="redfin" />
<option name="id" value="redfin" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 5" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="shiba" />
<option name="id" value="shiba" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="tangorpro" />
<option name="id" value="tangorpro" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Tablet" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="tokay" />
<option name="id" value="tokay" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2424" />
</PersistentDeviceSelectionData>
</list>
</option>
</component>
</project>

+ 0
- 6
app/build.gradle View File

@@ -213,12 +213,6 @@ dependencies {
implementation 'com.contrarywind:Android-PickerView:3.2.6'


//retrofit2网络请求
api 'com.squareup.retrofit2:converter-gson:2.5.0'
api "com.squareup.retrofit2:retrofit:2.5.0"
api "com.squareup.retrofit2:adapter-rxjava2:2.5.0"
api "com.squareup.retrofit2:converter-scalars:2.5.0"

//调试okhttp请求（建议debug使用）
api 'com.localebro:okhttpprofiler:1.0.8'
}

+ 3
- 3
app/release/output-metadata.json View File

@@ -11,9 +11,9 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 112,
"versionName": "1.1.2",
"outputFile": "boluo-xiaochao-v112-202411231117-release.apk"
"versionCode": 114,
"versionName": "1.1.4",
"outputFile": "boluo-xiaochao-v114-202411280945-release.apk"
}
],
"elementType": "File"

+ 10
- 3
app/src/main/java/com/bonait/bnframework/api/ServerManager.java View File

@@ -2,6 +2,7 @@ package com.bonait.bnframework.api;

import android.content.Context;

import com.apkfuns.logutils.LogUtils;
import com.bonait.bnframework.MainApplication;
import com.bonait.bnframework.api.net.HttpUtil;
import com.bonait.bnframework.business.RecordManager;
@@ -56,28 +57,34 @@ public class ServerManager {
PreferenceUtils.setInt(ConfigName.SHARE_KEY_loginNum,1);
DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_LOG_RECORD.class,null);
DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_ALERTLOG.class,null);
NewToastUtil.getInstance().showToast("上传文件成功");
// NewToastUtil.getInstance().showToast("上传文件成功");
RecordManager.getInstance().addLogRecord("上传日志","上传文件成功");
LogUtils.d("上传文件成功");
if(showTip){
WaitProcessUtil.getInstance().dismiss();
NewToastUtil.getInstance().showToast("上传成功");
}
}

@Override
public void onError(int failCode,String msg) {
NewToastUtil.getInstance().showToast("上传文件失败 "+msg);
// NewToastUtil.getInstance().showToast("上传文件失败 "+msg);
LogUtils.d("上传文件失败"+msg);
RecordManager.getInstance().addLogRecord("上传日志","上传文件失败 "+failCode+" "+msg);
if(showTip){
WaitProcessUtil.getInstance().dismiss();
NewToastUtil.getInstance().showToast("上传失败");
}
}

@Override
public void onFailed(int failCode, Throwable throwable, String message) {
NewToastUtil.getInstance().showToast("上传文件失败");
// NewToastUtil.getInstance().showToast("上传文件失败");
LogUtils.d("上传文件失败"+message);
RecordManager.getInstance().addLogRecord("上传日志","上传文件失败 "+failCode+" "+message);
if(showTip){
WaitProcessUtil.getInstance().dismiss();
NewToastUtil.getInstance().showToast("上传失败");
}
}
});


+ 12
- 11
app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java View File

@@ -1736,21 +1736,22 @@ public class ExecuteTheRecipe {
@Override
public void Run() throws InterruptedException {
try {
for (String item : ConfigName.getInstance().PLC_Address.keySet()) {
String key = item;
BPA_PLCADDRESS plcaddress = ConfigName.getInstance().PLC_Address.get(item);
if (plcaddress.isread == 1) {
Object val = ReadPLC(key);
ListeningValue.put(key, val);
if(ConfigName.getInstance().PlcIsConnect){
for (String item : ConfigName.getInstance().PLC_Address.keySet()) {
String key = item;
BPA_PLCADDRESS plcaddress = ConfigName.getInstance().PLC_Address.get(item);
if (plcaddress.isread == 1) {
Object val = ReadPLC(key);
ListeningValue.put(key, val);
}
}
}

if ( (ConfigName.getInstance().PlcIsConnect||ConfigName.isTEST)) {
TempControl();
ReadPLCStatus();
if ( (ConfigName.getInstance().PlcIsConnect||ConfigName.isTEST)) {
TempControl();
ReadPLCStatus();

}
}

} catch (Exception ex) {
ToastUtils.error("异常信息:" + ex.getMessage());
}


+ 1
- 1
app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java View File

@@ -138,7 +138,7 @@ public class ConfigName {
/**
* 店铺设备号
*/
public String DeviceAutoKey = "266";
public String DeviceAutoKey = "271";

/**
* 平台授权码


+ 7
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home2Fragment.java View File

@@ -23,6 +23,7 @@ import com.bonait.bnframework.common.constant.MessageName;
import com.bonait.bnframework.common.helper.AuthorizeHelper;
import com.bonait.bnframework.common.message.MessageManager;
import com.bonait.bnframework.modules.home.fragment.from.BunkerSetupActivity;
import com.bonait.bnframework.modules.home.fragment.from.LogRecordActivity;
import com.bonait.bnframework.modules.home.fragment.from.SzActivity;
import com.bonait.bnframework.modules.home.fragment.from.WhActivity;
import com.bonait.bnframework.ui.activity.EditGoodsActivity;
@@ -84,7 +85,7 @@ public class Home2Fragment extends BaseFragment {
mCollapsingTopBarLayout.setTitle("功能菜单");
}

@OnClick({R.id.kshr, R.id.cp, R.id.wh, R.id.sz, R.id.ll_silos_set})
@OnClick({R.id.kshr, R.id.cp, R.id.wh, R.id.sz, R.id.ll_silos_set,R.id.btn_log})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.kshr://开始制作商品
@@ -102,6 +103,11 @@ public class Home2Fragment extends BaseFragment {
case R.id.ll_silos_set://料仓设置界面
skipToActivity(BunkerSetupActivity.class);
break;
case R.id.btn_log:
Intent intent = new Intent(context, LogRecordActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
break;
}
}



+ 40
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java View File

@@ -14,16 +14,22 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.Spinner;

import com.apkfuns.logutils.LogUtils;
import com.bonait.bnframework.MainApplication;
import com.bonait.bnframework.R;
import com.bonait.bnframework.business.ConfigData;
import com.bonait.bnframework.business.RecordManager;
import com.bonait.bnframework.common.base.BaseFragment;
import com.bonait.bnframework.common.constant.ConfigName;
import com.bonait.bnframework.common.db.QueryDB;
import com.bonait.bnframework.common.db.file.DBHelper;
import com.bonait.bnframework.common.db.mode.BPA_ALERTLOG;
import com.bonait.bnframework.common.db.mode.BPA_LOG_RECORD;
import com.bonait.bnframework.common.db.mode.BPA_MATERIAL;
import com.bonait.bnframework.common.db.mode.BPA_SILOS;
import com.bonait.bnframework.common.db.mode.BPA_SILOSANDMATERIAL;
@@ -34,6 +40,8 @@ import com.bonait.bnframework.common.thread.ThreadManager;
import com.bonait.bnframework.common.utils.AlertDialogUtils;
import com.bonait.bnframework.common.utils.PreferenceUtils;
import com.bonait.bnframework.common.utils.ToastUtils;
import com.bonait.bnframework.ui.util.DisplayManager;
import com.bonait.bnframework.ui.util.FileUtil;
import com.bonait.bnframework.ui.viewmodel.HomeGoodsViewModel;
import com.bonait.bnframework.ui.viewmodel.UpdateDataService;
import com.bonait.bnframework.ui.widget.NewToastUtil;
@@ -44,6 +52,7 @@ import com.suke.widget.SwitchButton;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import java.io.File;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -100,6 +109,8 @@ public class SystemSystemsetFragment extends BaseFragment {

@BindView(R.id.edittext_wd)
EditText edittext_wd;
@BindView(R.id.btn_clear_log)
Button btn_clear_log;

ArrayList<EditText> editTextLists = new ArrayList<>();

@@ -163,6 +174,7 @@ public class SystemSystemsetFragment extends BaseFragment {
}

private void initData() {
btn_clear_log.setText("清除日志 已缓存:"+ FileUtil.getCacheSize());
editTextLists.add(edittext1);
editTextLists.add(edittext2);
// editTextLists.add(edittext3);
@@ -310,7 +322,7 @@ public class SystemSystemsetFragment extends BaseFragment {

}

@OnClick({R.id.StartButton,R.id.btn_update_key,R.id.button_init})
@OnClick({R.id.StartButton,R.id.btn_update_key,R.id.button_init,R.id.btn_clear_log})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.btn_update_key:
@@ -484,6 +496,13 @@ public class SystemSystemsetFragment extends BaseFragment {
set_main8.userID = ConfigName.getInstance().user.userID;
QueryDB.AddSystemset(set_main8);

BPA_SYSTEMSET set_mainkey = new BPA_SYSTEMSET();
set_mainkey.type = 4;
set_mainkey.value = ConfigName.getInstance().DeviceAutoKey;
set_mainkey.deviceID = ConfigName.getInstance().DeviceId;
set_mainkey.userID = ConfigName.getInstance().user.userID;
QueryDB.AddSystemset(set_mainkey);

if (isgb) {
ConfigData.getInstance().RevertPLCProcess();
}
@@ -524,6 +543,26 @@ public class SystemSystemsetFragment extends BaseFragment {

break;

case R.id.btn_clear_log:
AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "警告",
"日志可方便排查操作问题，若非内存不足请勿清除！是否清除日志记录？\n日志缓存大小："+ FileUtil.getCacheSize(),
new AlertDialogUtils.DialogClickListener() {
@Override
public void onConfirm() {
DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_LOG_RECORD.class,null);
DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_ALERTLOG.class,null);
RecordManager.getInstance().addLogRecord("角色操作日志","清除日志");
NewToastUtil.getInstance().showToast("清除成功");
}

@Override
public void onCancel() {

}
});

break;

}
}
}

+ 4
- 1
app/src/main/java/com/bonait/bnframework/modules/welcome/activity/LoginActivity.java View File

@@ -53,6 +53,7 @@ import com.bonait.bnframework.common.utils.AnimationToolUtils;
import com.bonait.bnframework.common.utils.AppUtils;
import com.bonait.bnframework.common.utils.Des3Utils;
import com.bonait.bnframework.common.utils.KeyboardToolUtils;
import com.bonait.bnframework.common.utils.NetworkUtils;
import com.bonait.bnframework.common.utils.PreferenceUtils;
import com.bonait.bnframework.common.utils.ToastUtils;
import com.bonait.bnframework.manager.ActivityLifecycleManager;
@@ -235,7 +236,9 @@ public class LoginActivity extends BaseActivity implements Validator.ValidationL
int loginNum = PreferenceUtils.getInt(ConfigName.SHARE_KEY_loginNum,0);
LogUtils.d(" loginNum="+loginNum);
if(loginNum>30){
ServerManager.uploadDeviceLog(this,new File(ConfigName.getInstance().dbPath),false);
if(NetworkUtils.checkNetworkAvailable(this)){
ServerManager.uploadDeviceLog(this,new File(ConfigName.getInstance().dbPath),false);
}
}else {
PreferenceUtils.setInt("loginNum",loginNum+1);
}


+ 52
- 0
app/src/main/java/com/bonait/bnframework/ui/util/FileUtil.java View File

@@ -0,0 +1,52 @@
package com.bonait.bnframework.ui.util;

import android.os.Environment;

import com.bonait.bnframework.common.constant.ConfigName;

import java.io.File;
import java.text.DecimalFormat;

/**
* @author: liup
* @description:
* @date: 2024/10/25 13:26.
*/
public class FileUtil {

/**
* 获取数据库文件夹内存大小
* @return
*/
public static String getCacheSize(){
String sizeString = "";
try {
File folder = new File(ConfigName.getInstance().appResRoot); // 替换为你的文件夹路径
long folderSize = getFolderSize(folder);
sizeString = formatSize(folderSize); // 将大小转换为可读的格式（可选）
}catch (Exception e){
e.printStackTrace();
}
return sizeString;
}
public static long getFolderSize(File dir) {
long size = 0;
if (dir != null && dir.isDirectory()) {
File[] files = dir.listFiles();
for (File file : files) {
if (file.isFile()) {
size += file.length();
} else if (file.isDirectory()) {
size += getFolderSize(file); // 递归调用以获取子文件夹的大小
}
}
}
return size;
}
public static String formatSize(long size) {
if (size <= 0) return "0 Bytes";
final String[] units = {"Bytes", "KB", "MB", "GB", "TB"};
int digitGroups = (int) (Math.log10(size) / Math.log10(1024));
return new DecimalFormat("#,##0.#").format(size / Math.pow(1024, digitGroups)) + " " + units[digitGroups];
}
}

+ 1
- 0
app/src/main/res/layout/activity_auto_test.xml View File

@@ -42,6 +42,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_quanxian"
android:layout_width="200dp"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/activity_bleclient.xml View File

@@ -60,6 +60,7 @@
app:layout_constraintTop_toBottomOf="@+id/rv_ble" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/et_write"
android:layout_width="0dp"
android:layout_height="wrap_content"


+ 3
- 1
app/src/main/res/layout/activity_dishtest.xml View File

@@ -660,6 +660,7 @@
android:textSize="40dp" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/caipinmingchen_text"
android:layout_width="match_parent"
android:layout_height="100dp"
@@ -738,6 +739,7 @@
android:textSize="24dp" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/liaohedata_text"
android:layout_width="match_parent"
android:layout_height="100dp"
@@ -750,7 +752,7 @@
android:lines="3"
android:padding="3dp"
android:textSize="19dp"
android:imeOptions="actionDone"/>
/>

<RelativeLayout
android:layout_width="match_parent"


+ 1
- 0
app/src/main/res/layout/activity_diy_memory.xml View File

@@ -253,6 +253,7 @@
android:paddingEnd="13dp"
android:layout_height="70dp" />
<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_weight"
android:layout_width="160dp"
android:layout_height="70dp"


+ 2
- 0
app/src/main/res/layout/activity_log_record.xml View File

@@ -57,6 +57,7 @@
android:textSize="@dimen/sp_26"
android:text="—"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/stoptime"
android:layout_width="@dimen/dp_200"
android:layout_height="match_parent"
@@ -92,6 +93,7 @@
android:layout_height="match_parent"
style="@style/commonSpinnerStyle"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext"
android:layout_width="@dimen/dp_400"
android:layout_height="match_parent"


+ 2
- 1
app/src/main/res/layout/activity_login.xml View File

@@ -77,6 +77,7 @@
android:src="@mipmap/login_u" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/et_account"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -85,7 +86,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:hint="@string/text_User"
android:imeOptions="actionNext"
android:inputType="text"
android:maxLength="20"
android:maxLines="1"
@@ -122,6 +122,7 @@
android:src="@mipmap/login_p" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/et_password"
android:layout_width="0dp"
android:layout_height="match_parent"


+ 6
- 0
app/src/main/res/layout/activity_serial_test.xml View File

@@ -12,6 +12,7 @@
android:layout_weight="1" >

<EditText
android:imeOptions="actionDone"
android:id="@+id/editTextRecDisp"
android:layout_width="fill_parent"
android:layout_height="match_parent"
@@ -57,6 +58,7 @@


<EditText

android:id="@+id/editTextLines"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -154,6 +156,7 @@
android:gravity="center_vertical" >

<EditText
android:imeOptions="actionDone"
android:id="@+id/editTextTimeCOMA"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -246,6 +249,7 @@
android:gravity="center_vertical" >

<EditText
android:imeOptions="actionDone"
android:id="@+id/editTextTimeCOMB"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -338,6 +342,7 @@
android:gravity="center_vertical" >

<EditText
android:imeOptions="actionDone"
android:id="@+id/editTextTimeCOMC"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -419,6 +424,7 @@
android:gravity="center_vertical" >

<EditText
android:imeOptions="actionDone"
android:id="@+id/editTextTimeCOMD"
android:layout_width="fill_parent"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/activity_sz.xml View File

@@ -44,6 +44,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_quanxian"
android:layout_width="200dp"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/activity_wh.xml View File

@@ -43,6 +43,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_quanxian"
android:layout_width="200dp"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/activity_wok_set.xml View File

@@ -44,6 +44,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_quanxian"
android:layout_width="200dp"
android:layout_height="wrap_content"


+ 2
- 0
app/src/main/res/layout/fragment_auto_test_more.xml View File

@@ -82,6 +82,7 @@
android:text="循环次数"
android:textSize="25dp"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/caipu11"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -151,6 +152,7 @@
</RelativeLayout>

<EditText
android:imeOptions="actionDone"
android:id="@+id/miaoshu"
android:layout_width="match_parent"
android:layout_height="180dp"


+ 17
- 1
app/src/main/res/layout/fragment_auto_test_one.xml View File

@@ -92,6 +92,7 @@
android:text="锅体正转反转" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/gkcx1"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -121,6 +122,7 @@
android:text="设置运行循环" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/gkcx2"

android:layout_width="80dp"
@@ -151,6 +153,7 @@
android:text="搅拌组件运行" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/gkcx3"

android:layout_width="80dp"
@@ -295,6 +298,7 @@
android:text="锅体清洗一次为一循环，共运行" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/qingxi1"
android:layout_width="50dp"
android:layout_height="wrap_content"
@@ -439,6 +443,7 @@
android:text="翻转投料一次为一循环，共运行" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/touliao1"
android:layout_width="50dp"
android:layout_height="wrap_content"
@@ -582,6 +587,7 @@
android:text="通料加料一次为一循环，共运行" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/yetiliao1"
android:layout_width="50dp"
android:layout_height="wrap_content"
@@ -704,6 +710,7 @@
android:text="加热持续" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/yanchi1"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -733,6 +740,7 @@
android:text="冷却锅体" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/yanchi2"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -764,6 +772,7 @@
android:text="执行循环" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/yanchi3"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -885,6 +894,7 @@
android:text="加热持续" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/jiare1"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -914,6 +924,7 @@
android:text="停止冷却" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/jiare2"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -943,6 +954,7 @@
android:text="执行循环" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/jiare3"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -1064,6 +1076,7 @@
android:text="预先加热" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/jiarewending1"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -1094,6 +1107,7 @@
android:text="重新加热" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/jiarewending2"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -1124,6 +1138,7 @@
android:text="执行循环" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/jiarewending3"
android:layout_width="80dp"
android:layout_height="wrap_content"
@@ -1260,7 +1275,8 @@
<!-- android:textSize="12dp"-->
<!-- android:scrollHorizontally="true">-->
<!-- </TextView>-->
<!-- <EditText-->
<!-- <EditText
android:imeOptions="actionDone"-->
<!-- android:id="@+id/miaoshu"-->
<!-- android:visibility="gone"-->
<!-- android:layout_width="match_parent"-->


+ 1
- 0
app/src/main/res/layout/fragment_cloud_goods.xml View File

@@ -68,6 +68,7 @@
android:background="@color/color3"
/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext"
android:layout_width="@dimen/dp_300"
android:layout_height="60dp"


+ 1
- 0
app/src/main/res/layout/fragment_good_edit_classify.xml View File

@@ -95,6 +95,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext"
android:layout_width="@dimen/dp_400"
android:layout_height="60dp"


+ 14
- 1
app/src/main/res/layout/fragment_home2.xml View File

@@ -86,7 +86,7 @@
<LinearLayout
android:id="@+id/ll_silos_set"
android:layout_width="0dp"
android:layout_weight="2"
android:layout_weight="1"
android:layout_marginStart="10dp"
android:layout_height="120dp"
android:gravity="center_vertical"
@@ -194,6 +194,19 @@
android:textSize="@dimen/card_view_in_height" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/btn_log"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_30"
android:text="日志记录"
android:textStyle="bold"
android:textSize="30dp"
android:gravity="right|center"
android:paddingRight="10dp"
android:textColor="@color/blue"
android:elevation="40dp"/>
</LinearLayout>

<RelativeLayout


+ 1
- 0
app/src/main/res/layout/fragment_local_goods.xml View File

@@ -88,6 +88,7 @@
android:layout_height="@dimen/dp_3"
android:background="@color/color3"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext"
android:layout_width="@dimen/dp_300"
android:layout_height="60dp"


+ 7
- 0
app/src/main/res/layout/fragment_system_devicein.xml View File

@@ -37,6 +37,7 @@
android:text="设备编号:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -65,6 +66,7 @@
android:text="设备名称:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -92,6 +94,7 @@
android:text="设备位置:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext3"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -120,6 +123,7 @@
android:text="联系电话:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext4"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -146,6 +150,7 @@
android:text="设备详细地址:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext5"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -173,6 +178,7 @@
android:text="门店编号:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext6"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -200,6 +206,7 @@
android:text="门店名称:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext7"
android:layout_width="120dp"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/fragment_system_seasoningset.xml View File

@@ -52,6 +52,7 @@
android:text="名称:" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext"
android:layout_width="120dp"
android:layout_height="wrap_content"


+ 17
- 0
app/src/main/res/layout/fragment_system_systemset.xml View File

@@ -31,6 +31,7 @@
android:gravity="right"
android:text="PLC连接地址:" />
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext1"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -50,6 +51,7 @@
android:gravity="right"
android:text="PLC连接端口:" />
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext2"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -76,6 +78,7 @@
android:gravity="right"
android:text="商家设备号:" />
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext4"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -126,6 +129,7 @@
android:gravity="right"
android:text="锅低最大温度:" />
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_wd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -238,6 +242,7 @@
android:layout_centerVertical="true" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_silos"
android:layout_width="120dp"
android:layout_gravity="center_vertical"
@@ -268,6 +273,7 @@
android:gravity="right"
android:text="平台授权码:" />
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_key"
android:layout_width="250dp"
android:layout_height="wrap_content"
@@ -298,6 +304,17 @@
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_clear_log"
android:layout_width="wrap_content"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:layout_height="60dp"
android:background="@drawable/bg_btn_login_selected"
android:text="清除日志"
android:textColor="@color/white"
android:layout_marginBottom="20dp"
android:textSize="18sp"/>
<Button
android:id="@+id/StartButton"
android:layout_width="match_parent"


+ 18
- 0
app/src/main/res/layout/fragment_wok_set_gkcx.xml View File

@@ -75,6 +75,7 @@
android:text="原点位置" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_ydw1"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -89,6 +90,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_ydw2"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -152,6 +154,7 @@
android:text="维护位置" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_whw1"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -166,6 +169,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_whw2"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -229,6 +233,7 @@
android:text="洗锅位置" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_xgw1"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -243,6 +248,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_xgw2"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -306,6 +312,7 @@
android:text="出餐位置" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_ccw1"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -320,6 +327,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_ccw2"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -383,6 +391,7 @@
android:text="抽料位置" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_ctl1"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -397,6 +406,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_ctl2"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -460,6 +470,7 @@
android:text="1#炒制位" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_czw11"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -474,6 +485,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_czw12"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -537,6 +549,7 @@
android:text="2#炒制位" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_czw21"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -551,6 +564,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_czw22"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -614,6 +628,7 @@
android:text="3#炒制位" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_czw31"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -628,6 +643,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_czw32"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -691,6 +707,7 @@
android:text="工作范围" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_gzfw1"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -705,6 +722,7 @@
android:text="0"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_gzfw2"
android:layout_width="120dp"
android:layout_height="wrap_content"


+ 6
- 0
app/src/main/res/layout/fragment_wok_set_tlzz.xml View File

@@ -164,6 +164,7 @@
android:text="回零速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_pyz_hlsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -204,6 +205,7 @@
android:text="回零速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_fzz_hlsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -243,6 +245,7 @@
android:text="点动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_pyz_ddsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -277,6 +280,7 @@
android:text="点动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_fzz_ddsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -322,6 +326,7 @@
android:text="自动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_pyz_zdsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -362,6 +367,7 @@
android:text="自动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_fzz_zdsd"
android:layout_width="120dp"
android:layout_height="wrap_content"


+ 6
- 0
app/src/main/res/layout/fragment_wok_set_tlzz1.xml View File

@@ -163,6 +163,7 @@
android:text="回零速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_pyz_hlsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -203,6 +204,7 @@
android:text="回零速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_fzz_hlsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -242,6 +244,7 @@
android:text="点动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_pyz_ddsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -276,6 +279,7 @@
android:text="点动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_fzz_ddsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -321,6 +325,7 @@
android:text="自动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_pyz_zdsd"
android:layout_width="120dp"
android:layout_height="wrap_content"
@@ -361,6 +366,7 @@
android:text="自动速度" />

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_fzz_zdsd"
android:layout_width="120dp"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/item/layout/dialog_add_classify.xml View File

@@ -25,6 +25,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit"
android:layout_width="@dimen/dp_500"
android:layout_height="@dimen/dp_100"


+ 1
- 0
app/src/main/res/layout/item/layout/dialog_diy_food_name.xml View File

@@ -54,6 +54,7 @@
android:gravity="center"
android:layout_height="wrap_content">
<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name"
android:layout_width="420dp"
android:layout_height="70dp"


+ 3
- 0
app/src/main/res/layout/item/layout/dialog_silos_message.xml View File

@@ -143,6 +143,7 @@
android:textSize="15dp"
android:textColor="@color/topbj1"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/zongliang"
android:layout_width="match_parent"
android:layout_height="30dp"
@@ -172,6 +173,7 @@
android:textSize="15dp"
android:textColor="@color/topbj1"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/gaojingrongliang"
android:layout_width="match_parent"
android:layout_height="30dp"
@@ -274,6 +276,7 @@
android:textSize="15dp"
android:textColor="@color/topbj1"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/tiaoliaobiaoding"
android:layout_width="match_parent"
android:layout_height="30dp"


+ 5
- 0
app/src/main/res/layout/item/layout/dialog_user.xml View File

@@ -33,6 +33,7 @@
android:textColor="@color/black"
android:layout_marginRight="@dimen/dp_10"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext"
android:layout_width="140dp"
android:layout_height="wrap_content"
@@ -58,6 +59,7 @@
android:textColor="@color/black"
android:layout_marginRight="@dimen/dp_10"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext1"
android:layout_width="140dp"
android:layout_height="wrap_content"
@@ -83,6 +85,7 @@
android:textColor="@color/black"
android:layout_marginRight="@dimen/dp_10"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext2"
android:layout_width="140dp"
android:layout_height="wrap_content"
@@ -108,6 +111,7 @@
android:textColor="@color/black"
android:layout_marginRight="@dimen/dp_10"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext3"
android:layout_width="140dp"
android:layout_height="wrap_content"
@@ -133,6 +137,7 @@
android:textColor="@color/black"
android:layout_marginRight="@dimen/dp_10"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext4"
android:layout_width="140dp"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/item/layout/fragment_item_gx.xml View File

@@ -39,6 +39,7 @@
android:layout_centerVertical="true"
android:visibility="gone"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittextPF"
android:layout_width="match_parent"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/item/layout/fragment_item_plc.xml View File

@@ -30,6 +30,7 @@
</RelativeLayout>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_plc"
android:layout_width="120dp"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/item/layout/fragment_item_plc_control.xml View File

@@ -39,6 +39,7 @@
android:layout_weight="1"
android:layout_height="match_parent">
<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_plc"
android:layout_width="match_parent"
android:layout_height="wrap_content"


+ 1
- 0
app/src/main/res/layout/item/layout/fragment_item_silos_cl.xml View File

@@ -21,6 +21,7 @@
</RelativeLayout>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edittext_lc"
android:layout_width="120dp"
android:layout_height="wrap_content"


+ 6
- 0
app/src/main/res/layout/item/layout/layout_add_goods_mainfood.xml View File

@@ -42,6 +42,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name1"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"
@@ -66,6 +67,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name2"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"
@@ -103,6 +105,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name3"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"
@@ -127,6 +130,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name4"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"
@@ -164,6 +168,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name5"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"
@@ -189,6 +194,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name6"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"


+ 1
- 0
app/src/main/res/layout/item/layout/layout_add_goods_name.xml View File

@@ -55,6 +55,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name"
android:layout_width="@dimen/dp_400"
android:layout_height="@dimen/dp_90"


+ 1
- 0
app/src/main/res/layout/item/layout/layout_authority.xml View File

@@ -74,6 +74,7 @@
style="@style/TextView_desc"/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"


+ 1
- 0
app/src/main/res/layout/item/layout/layout_edit_goods_name.xml View File

@@ -56,6 +56,7 @@
/>

<EditText
android:imeOptions="actionDone"
android:id="@+id/edit_name"
android:layout_width="@dimen/dp_400"
android:layout_height="@dimen/dp_90"


+ 1
- 0
app/src/main/res/layout/item/layout/view_process_value.xml View File

@@ -57,6 +57,7 @@
tools:visibility="visible"
android:visibility="gone"/>
<EditText
android:imeOptions="actionDone"
android:id="@+id/edit"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_70"


+ 2
- 2
build.gradle View File

@@ -35,8 +35,8 @@ task clean(type: Delete) {

ext { // 统一版本入口
//App版本号
versionCode = 112
versionName = "1.1.2"
versionCode = 114
versionName = "1.1.4"

// 支持Android版本
buildToolsVersion = "33.0.0"


Write Preview
Loading…
Cancel
Save