@@ -0,0 +1,13 @@ | |||
node_modules/ | |||
dist/ | |||
vendor/ | |||
cache/ | |||
.*/ | |||
*.min.* | |||
*.test.* | |||
*.spec.* | |||
*.bundle.* | |||
*.bundle-min.* | |||
*.*.js | |||
*.*.ts | |||
*.log |
@@ -0,0 +1,6 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<project version="4"> | |||
<component name="GitToolBoxBlameSettings"> | |||
<option name="version" value="2" /> | |||
</component> | |||
</project> |
@@ -11,9 +11,9 @@ | |||
"type": "SINGLE", | |||
"filters": [], | |||
"attributes": [], | |||
"versionCode": 105, | |||
"versionName": "1.0.5", | |||
"outputFile": "shmz-xiaochao-v105-202410090954-unsigned-release.apk" | |||
"versionCode": 106, | |||
"versionName": "1.0.6", | |||
"outputFile": "shmz-xiaochao-v106-202410121437-unsigned-release.apk" | |||
} | |||
], | |||
"elementType": "File" |
@@ -52,6 +52,7 @@ import com.bonait.bnframework.common.model.mode.UpdateBomInfo; | |||
import com.bonait.bnframework.common.model.mode.UpdateCloudGood; | |||
import com.bonait.bnframework.common.oss.OssHelper; | |||
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.common.view.GoodEditDialog; | |||
import com.bonait.bnframework.newui.http.UpdateDataService; | |||
@@ -121,10 +122,12 @@ public class ConfigData { | |||
if(systemset.type==-203){ | |||
ConfigName.getInstance().Key = systemset.value; | |||
UpdateDataService.key = systemset.value; | |||
PreferenceUtils.setString(ConfigName.serviceKey,systemset.value); | |||
}else if(systemset.type==-100){ | |||
ConfigName.getInstance().versionSelectionEnum = systemset.value; | |||
}else if(systemset.type==-101){ | |||
ConfigName.getInstance().DeviceAutoKey = systemset.value; | |||
PreferenceUtils.setString(ConfigName.deviceNumber,systemset.value); | |||
} | |||
} | |||
// for(BPA_SYSTEMSET item:bpa_systemsets) | |||
@@ -62,7 +62,8 @@ public class MainInit { | |||
*/ | |||
public static void Init(Application app) | |||
{ | |||
// 配置sharedPreferences | |||
PreferenceUtils.initPreference(app, AppUtils.getAppName(app), Activity.MODE_PRIVATE); | |||
//1.设置程序active,初始化Main函数进程,初始化消息日志 | |||
InitMsgLog(); | |||
@@ -80,8 +81,7 @@ public class MainInit { | |||
// 全局配置OkGo | |||
initOkGo(app); | |||
// 配置sharedPreferences | |||
PreferenceUtils.initPreference(app, AppUtils.getAppName(app), Activity.MODE_PRIVATE); | |||
// 初始化通知栏消息渠道 | |||
MainNotification.initNotificationChannel(app); | |||
@@ -330,6 +330,12 @@ public class ConfigName { | |||
add(new Res_PLCADDRESS("烤箱关门成功", "M100.0", 1, 0,3)); | |||
add(new Res_PLCADDRESS("烤箱关门故障", "M100.1", 1, 0,3)); | |||
add(new Res_PLCADDRESS("自动关门快速", "VW500", 0, 1,3)); | |||
add(new Res_PLCADDRESS("自动关门慢速", "VW502", 0, 1,3)); | |||
add(new Res_PLCADDRESS("自动开门速度", "VW504", 0, 1,3)); | |||
add(new Res_PLCADDRESS("手动强制开门", "M5.0", 0, 1,3)); | |||
add(new Res_PLCADDRESS("手动强制关门", "M5.1", 0, 1,3)); | |||
add(new Res_PLCADDRESS("手动烤箱门速度", "VW510", 0, 1,3)); | |||
}}; | |||
/** | |||
@@ -29,6 +29,7 @@ import com.bonait.bnframework.common.utils.AlertDialogUtils; | |||
import com.bonait.bnframework.common.utils.DisplayManager; | |||
import com.bonait.bnframework.common.utils.PreferenceUtils; | |||
import com.bonait.bnframework.databinding.DialogOvenControlBinding; | |||
import com.bonait.bnframework.databinding.DialogOvenDoorTipBinding; | |||
import com.bonait.bnframework.databinding.DialogTipBinding; | |||
import com.bonait.bnframework.modbus.ModbusCenter; | |||
import com.bonait.bnframework.modbus.OvenModbusTcpServer; | |||
@@ -108,7 +108,7 @@ public class HomeMainsFragment extends BaseFragment { | |||
}); | |||
binding.llSetting.setOnClickListener(v->{ | |||
if(!ConfigName.getInstance().user.name.equals("管理员")){ | |||
if(!ConfigName.getInstance().user.name.contains("管理员")){ | |||
NewToastUtil.getInstance().showToast("管理员才能进行操作"); | |||
return; | |||
} | |||
@@ -2,17 +2,21 @@ package com.bonait.bnframework.newui.fragment.setting; | |||
import static com.lzy.okgo.utils.HttpUtils.runOnUiThread; | |||
import android.annotation.SuppressLint; | |||
import android.os.Bundle; | |||
import android.view.LayoutInflater; | |||
import android.view.MotionEvent; | |||
import android.view.View; | |||
import android.widget.ArrayAdapter; | |||
import androidx.annotation.NonNull; | |||
import androidx.annotation.Nullable; | |||
import com.apkfuns.logutils.LogUtils; | |||
import com.bonait.bnframework.HBL.Thread.ThreadManager; | |||
import com.bonait.bnframework.MainApplication; | |||
import com.bonait.bnframework.R; | |||
import com.bonait.bnframework.business.ExecuteTheRecipe; | |||
import com.bonait.bnframework.common.base.BaseFragment; | |||
import com.bonait.bnframework.common.constant.ConfigName; | |||
import com.bonait.bnframework.common.db.QueryDB; | |||
@@ -23,14 +27,18 @@ import com.bonait.bnframework.common.db.mode.BPA_ORDER_LIST; | |||
import com.bonait.bnframework.common.db.mode.BPA_ORDER_RECORD; | |||
import com.bonait.bnframework.common.db.mode.BPA_SUBORDER_RECORD; | |||
import com.bonait.bnframework.common.db.mode.BPA_SYSTEMSET; | |||
import com.bonait.bnframework.common.helper.I.IWriteCallBack; | |||
import com.bonait.bnframework.common.utils.AlertDialogUtils; | |||
import com.bonait.bnframework.common.utils.DisplayManager; | |||
import com.bonait.bnframework.common.utils.NetworkUtils; | |||
import com.bonait.bnframework.common.utils.PreferenceUtils; | |||
import com.bonait.bnframework.databinding.DialogTipBinding; | |||
import com.bonait.bnframework.databinding.FragmentSceneSetBinding; | |||
import com.bonait.bnframework.modbus.ModbusCenter; | |||
import com.bonait.bnframework.newui.http.UpdateDataService; | |||
import com.bonait.bnframework.newui.viewmodel.HomeGoodsViewModel; | |||
import com.bonait.bnframework.newui.widget.NewToastUtil; | |||
import com.bonait.bnframework.newui.widget.WaitProcessUtil; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
@@ -60,6 +68,7 @@ public class SceneSetFragment extends BaseFragment { | |||
initView(); | |||
} | |||
@SuppressLint("ClickableViewAccessibility") | |||
private void initView(){ | |||
ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getContext(), R.layout.spinner_text_item, environmentList); | |||
spinnerAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item); | |||
@@ -105,6 +114,7 @@ public class SceneSetFragment extends BaseFragment { | |||
PreferenceUtils.setString(ConfigName.serviceKey,viewBinding.editKey.getText().toString()); | |||
PreferenceUtils.setString(ConfigName.deviceNumber,viewBinding.editDeviceNumber.getText().toString()); | |||
PreferenceUtils.setBoolean(ConfigName.rootTip,viewBinding.zijianSwitch.isChecked()); | |||
NewToastUtil.getInstance().showToast("保存成功"); | |||
ConfigName.getInstance().DeviceAutoKey = viewBinding.editDeviceNumber.getText().toString(); | |||
@@ -126,11 +136,61 @@ public class SceneSetFragment extends BaseFragment { | |||
ConfigName.getInstance().versionSelectionEnum = viewBinding.spinnerVersion.getSelectedItem().toString(); | |||
BPA_SYSTEMSET set_main1 = new BPA_SYSTEMSET(); | |||
set_main4.type = -100; | |||
set_main4.value = ConfigName.getInstance().versionSelectionEnum; | |||
set_main4.deviceID = ConfigName.getInstance().DeviceId; | |||
set_main4.userID = ConfigName.getInstance().user.userID; | |||
set_main1.type = -100; | |||
set_main1.value = ConfigName.getInstance().versionSelectionEnum; | |||
set_main1.deviceID = ConfigName.getInstance().DeviceId; | |||
set_main1.userID = ConfigName.getInstance().user.userID; | |||
QueryDB.AddSystemset(set_main1); | |||
short speed1 = Short.parseShort(viewBinding.editAutoCloseFast.getText().toString()); | |||
short speed2 = Short.parseShort(viewBinding.editAutoCloseSlow.getText().toString()); | |||
short speed3 = Short.parseShort(viewBinding.editAutoOpen.getText().toString()); | |||
short speed4 = Short.parseShort(viewBinding.editShoudongSpeed.getText().toString()); | |||
ModbusCenter.ovenWritePlc("自动关门快速",speed1, new IWriteCallBack() { | |||
@Override | |||
public void onSuccess() { | |||
NewToastUtil.getInstance().showToast("速度写入成功"); | |||
} | |||
@Override | |||
public void onFailure(String ErrorMsg) { | |||
NewToastUtil.getInstance().showToast("自动关门快速速度写入失败"); | |||
} | |||
}); | |||
ModbusCenter.ovenWritePlc("自动关门慢速",speed2, new IWriteCallBack() { | |||
@Override | |||
public void onSuccess() { | |||
NewToastUtil.getInstance().showToast("速度写入成功"); | |||
} | |||
@Override | |||
public void onFailure(String ErrorMsg) { | |||
NewToastUtil.getInstance().showToast("自动关门慢速速度写入失败"); | |||
} | |||
}); | |||
ModbusCenter.ovenWritePlc("自动开门速度", speed3, new IWriteCallBack() { | |||
@Override | |||
public void onSuccess() { | |||
NewToastUtil.getInstance().showToast("速度写入成功"); | |||
} | |||
@Override | |||
public void onFailure(String ErrorMsg) { | |||
NewToastUtil.getInstance().showToast("自动开门速度速度写入失败"); | |||
} | |||
}); | |||
ModbusCenter.ovenWritePlc("手动烤箱门速度", speed4, new IWriteCallBack() { | |||
@Override | |||
public void onSuccess() { | |||
NewToastUtil.getInstance().showToast("速度写入成功"); | |||
} | |||
@Override | |||
public void onFailure(String ErrorMsg) { | |||
NewToastUtil.getInstance().showToast("手动烤箱门速度速度写入失败"); | |||
} | |||
}); | |||
}); | |||
viewBinding.btnClearLog.setOnClickListener(v->{ | |||
@@ -171,6 +231,46 @@ public class SceneSetFragment extends BaseFragment { | |||
}); | |||
}); | |||
}); | |||
viewBinding.btnShoudongOpenOven.setOnTouchListener((view, motionEvent) -> { | |||
if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) { | |||
ModbusCenter.ovenWritePlc("手动强制开门", true, new IWriteCallBack() { | |||
@Override | |||
public void onSuccess() { | |||
NewToastUtil.getInstance().showToast("手动强制开门中"); | |||
} | |||
@Override | |||
public void onFailure(String ErrorMsg) { | |||
} | |||
}); | |||
} else if (motionEvent.getAction() == MotionEvent.ACTION_UP) { | |||
ModbusCenter.ovenWritePlc("手动强制开门",false,null); | |||
} | |||
return false; | |||
}); | |||
viewBinding.btnShoudongCloseOven.setOnTouchListener(new View.OnTouchListener() { | |||
@Override | |||
public boolean onTouch(View view, MotionEvent motionEvent) { | |||
if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) { | |||
ModbusCenter.ovenWritePlc("手动强制关门",true, new IWriteCallBack() { | |||
@Override | |||
public void onSuccess() { | |||
NewToastUtil.getInstance().showToast("手动强制关门"); | |||
} | |||
@Override | |||
public void onFailure(String ErrorMsg) { | |||
} | |||
}); | |||
} else if (motionEvent.getAction() == MotionEvent.ACTION_UP) { | |||
ModbusCenter.ovenWritePlc("手动强制关门",false,null); | |||
} | |||
return false; | |||
} | |||
}); | |||
} | |||
private void initData(){ | |||
@@ -182,5 +282,22 @@ public class SceneSetFragment extends BaseFragment { | |||
versionList.clear(); | |||
versionList.add("一拖二"); | |||
versionList.add("一拖二不带输送线"); | |||
try { | |||
short speed1 = (short) ModbusCenter.ovenReadPlc("自动关门快速"); | |||
short speed2 = (short) ModbusCenter.ovenReadPlc("自动关门慢速"); | |||
short speed3 = (short) ModbusCenter.ovenReadPlc("自动开门速度"); | |||
short speed4 = (short) ModbusCenter.ovenReadPlc("手动烤箱门速度"); | |||
viewBinding.editAutoCloseFast.setText(speed1+""); | |||
viewBinding.editAutoCloseSlow.setText(speed2+""); | |||
viewBinding.editAutoOpen.setText(speed3+""); | |||
viewBinding.editShoudongSpeed.setText(speed4+""); | |||
}catch (Exception e){ | |||
e.printStackTrace(); | |||
NewToastUtil.getInstance().showToastError("获取速度参数失败"); | |||
} | |||
} | |||
} |
@@ -109,6 +109,7 @@ | |||
<LinearLayout | |||
android:layout_width="match_parent" | |||
android:orientation="horizontal" | |||
android:visibility="gone" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
@@ -158,26 +159,195 @@ | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="250dp" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="清除日志记录:" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
<LinearLayout | |||
android:layout_width="0dp" | |||
android:layout_weight="1" | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="250dp" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="清除日志记录:" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
<Button | |||
android:id="@+id/btn_clear_log" | |||
android:layout_width="300dp" | |||
android:layout_height="70dp" | |||
android:background="@drawable/bg_btn_login_selected" | |||
android:text="清除日志记录" | |||
android:textColor="@color/white" | |||
android:layout_marginLeft="50dp" | |||
android:textSize="32sp"/> | |||
<Button | |||
android:id="@+id/btn_clear_log" | |||
android:layout_width="300dp" | |||
android:layout_height="70dp" | |||
android:background="@drawable/bg_btn_login_selected" | |||
android:text="清除日志记录" | |||
android:textColor="@color/white" | |||
android:layout_marginLeft="50dp" | |||
android:textSize="32sp"/> | |||
</LinearLayout> | |||
<LinearLayout | |||
android:layout_width="0dp" | |||
android:layout_weight="1" | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="250dp" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="清除订单记录:" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
<Button | |||
android:id="@+id/btn_clear_order" | |||
android:layout_width="300dp" | |||
android:layout_height="70dp" | |||
android:background="@drawable/bg_btn_login_selected" | |||
android:text="清除订单记录" | |||
android:textColor="@color/white" | |||
android:layout_marginLeft="50dp" | |||
android:textSize="32sp"/> | |||
</LinearLayout> | |||
</LinearLayout> | |||
<LinearLayout | |||
android:layout_width="match_parent" | |||
android:orientation="horizontal" | |||
android:layout_height="wrap_content"> | |||
<LinearLayout | |||
android:layout_width="0dp" | |||
android:layout_weight="1" | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="wrap_content" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="VW500自动关门快速:" | |||
android:layout_marginEnd="20dp" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
<EditText | |||
android:id="@+id/edit_auto_close_fast" | |||
android:layout_width="300dp" | |||
android:layout_height="70dp" | |||
android:layout_marginLeft="5dp" | |||
android:background="@drawable/input_bj" | |||
android:hint="速度范围0-5000" | |||
android:inputType="number" | |||
android:maxLines="1" | |||
android:padding="3dp" | |||
android:textSize="32sp" /> | |||
</LinearLayout> | |||
<LinearLayout | |||
android:layout_width="0dp" | |||
android:layout_weight="1" | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="wrap_content" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="VW502自动关门慢速:" | |||
android:layout_marginEnd="20dp" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
<EditText | |||
android:id="@+id/edit_auto_close_slow" | |||
android:layout_width="300dp" | |||
android:layout_height="70dp" | |||
android:layout_marginLeft="5dp" | |||
android:background="@drawable/input_bj" | |||
android:hint="速度范围0-5000" | |||
android:inputType="number" | |||
android:maxLines="1" | |||
android:padding="3dp" | |||
android:textSize="32sp" /> | |||
</LinearLayout> | |||
</LinearLayout> | |||
<LinearLayout | |||
android:layout_width="match_parent" | |||
android:orientation="horizontal" | |||
android:layout_height="wrap_content"> | |||
<LinearLayout | |||
android:layout_width="0dp" | |||
android:layout_weight="1" | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="wrap_content" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="VW504自动开门速度:" | |||
android:layout_marginEnd="20dp" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
<EditText | |||
android:id="@+id/edit_auto_open" | |||
android:layout_width="300dp" | |||
android:layout_height="70dp" | |||
android:layout_marginLeft="5dp" | |||
android:background="@drawable/input_bj" | |||
android:hint="速度范围0-5000" | |||
android:inputType="number" | |||
android:maxLines="1" | |||
android:padding="3dp" | |||
android:textSize="32sp" /> | |||
</LinearLayout> | |||
<LinearLayout | |||
android:layout_width="0dp" | |||
android:layout_weight="1" | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="wrap_content" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="VW510手动烤箱门速度:" | |||
android:layout_marginEnd="20dp" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
<EditText | |||
android:id="@+id/edit_shoudong_speed" | |||
android:layout_width="300dp" | |||
android:layout_height="70dp" | |||
android:layout_marginLeft="5dp" | |||
android:background="@drawable/input_bj" | |||
android:hint="速度范围0-5000" | |||
android:inputType="number" | |||
android:maxLines="1" | |||
android:padding="3dp" | |||
android:textSize="32sp" /> | |||
</LinearLayout> | |||
</LinearLayout> | |||
<LinearLayout | |||
@@ -185,33 +355,31 @@ | |||
android:orientation="horizontal" | |||
android:layout_marginBottom="20dp" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="250dp" | |||
<Button | |||
android:id="@+id/btn_shoudong_open_oven" | |||
android:layout_width="400dp" | |||
android:layout_height="70dp" | |||
android:textColor="@color/black" | |||
android:textSize="32sp" | |||
android:text="清除订单记录:" | |||
android:layout_gravity="center_vertical" | |||
android:gravity="center_vertical" | |||
/> | |||
android:background="@drawable/bg_round15_yellow_btn" | |||
android:text="烤箱:手动强制开门" | |||
android:textColor="@color/white" | |||
android:textSize="32sp"/> | |||
<Button | |||
android:id="@+id/btn_clear_order" | |||
android:layout_width="300dp" | |||
android:id="@+id/btn_shoudong_close_oven" | |||
android:layout_width="400dp" | |||
android:layout_height="70dp" | |||
android:background="@drawable/bg_btn_login_selected" | |||
android:text="清除订单记录" | |||
android:background="@drawable/bg_round15_yellow_btn" | |||
android:text="烤箱:手动强制关门" | |||
android:textColor="@color/white" | |||
android:layout_marginLeft="50dp" | |||
android:textSize="32sp"/> | |||
</LinearLayout> | |||
<Button | |||
android:id="@+id/btn_save" | |||
android:layout_width="match_parent" | |||
android:layout_height="70dp" | |||
android:layout_marginTop="20dp" | |||
android:layout_marginTop="30dp" | |||
android:background="@drawable/bg_btn_login_selected" | |||
android:text="保存参数" | |||
android:textColor="@color/white" | |||
@@ -0,0 +1,90 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
android:layout_width="wrap_content" | |||
android:layout_height="wrap_content" | |||
xmlns:tools="http://schemas.android.com/tools"> | |||
<LinearLayout | |||
android:layout_width="@dimen/dp_800" | |||
android:layout_height="wrap_content" | |||
android:background="@color/white" | |||
android:layout_gravity="center" | |||
android:orientation="vertical" | |||
> | |||
<TextView | |||
android:id="@+id/title" | |||
android:layout_width="wrap_content" | |||
android:layout_height="wrap_content" | |||
android:layout_marginStart="@dimen/dp_20" | |||
tools:text="提示" | |||
android:textColor="@color/black" | |||
android:textSize="@dimen/sp_42" | |||
android:layout_marginTop="@dimen/dp_20" | |||
android:textStyle="bold" | |||
/> | |||
<TextView | |||
android:id="@+id/message" | |||
android:layout_width="wrap_content" | |||
android:layout_height="wrap_content" | |||
android:layout_marginStart="@dimen/dp_20" | |||
android:layout_marginEnd="@dimen/dp_20" | |||
tools:text="正在停止制作,请耐心稍等..." | |||
android:textColor="@color/black" | |||
android:textSize="@dimen/sp_36" | |||
android:layout_marginTop="@dimen/dp_30" | |||
android:layout_gravity="center" | |||
android:gravity="center" | |||
android:layout_marginBottom="@dimen/dp_130" | |||
/> | |||
<LinearLayout | |||
android:layout_width="match_parent" | |||
android:layout_marginBottom="@dimen/dp_200" | |||
android:layout_marginStart="80dp" | |||
android:layout_marginEnd="80dp" | |||
android:visibility="gone" | |||
tools:visibility="visible" | |||
android:id="@+id/ll_speed" | |||
android:layout_height="wrap_content"> | |||
<TextView | |||
android:layout_width="wrap_content" | |||
android:layout_height="wrap_content" | |||
android:text="烤箱门速度:" | |||
android:layout_marginEnd="20dp" | |||
android:textSize="@dimen/sp_36"/> | |||
<EditText | |||
android:id="@+id/edit_open_oven_speed" | |||
android:layout_width="match_parent" | |||
android:layout_height="70dp" | |||
android:layout_marginLeft="5dp" | |||
android:background="@drawable/input_bj" | |||
android:hint="请输入开门速度0-5000" | |||
android:inputType="number" | |||
android:maxLines="1" | |||
android:text="100" | |||
android:padding="3dp" | |||
android:textSize="32sp" /> | |||
</LinearLayout> | |||
</LinearLayout> | |||
<TextView | |||
android:id="@+id/submit" | |||
android:layout_width="220dp" | |||
android:layout_height="100dp" | |||
android:textSize="@dimen/sp_36" | |||
android:text="确认" | |||
android:layout_gravity="end|bottom" | |||
android:gravity="center" | |||
android:textColor="@color/blue_primary" | |||
/> | |||
<TextView | |||
android:id="@+id/close" | |||
android:layout_width="220dp" | |||
android:layout_height="100dp" | |||
android:textSize="@dimen/sp_36" | |||
android:text="取消" | |||
android:layout_gravity="bottom" | |||
android:gravity="center" | |||
android:textColor="@color/blue_primary" | |||
/> | |||
</FrameLayout> |
@@ -35,8 +35,8 @@ task clean(type: Delete) { | |||
ext { // 统一版本入口 | |||
//App版本号 | |||
versionCode = 105 | |||
versionName = "1.0.5" | |||
versionCode = 106 | |||
versionName = "1.0.6" | |||
// 支持Android版本 | |||
buildToolsVersion = "33.0.0" | |||