_chid = new ArrayList<>();
+ for (BPA_GOODPROPERTY k:zsx)
+ {
+ ResGoodProperty m=new ResGoodProperty();
+ m.id=k.id;
+ m.name=k.name;
+ m.isSelect=false;
+ _chid.add(m);
+ }
+ re.child=_chid;
+
+ bpa_goodproperties.add(re);
+ }
+
+
//1.商品类型
goodstypes = QueryDB.GetGoodsTypeALL();
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java
index 22f3a5b5..8cedf1eb 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java
@@ -176,26 +176,17 @@ public class JiaoYan_lsjy_fragment extends BaseFragment {
//endregion
ExecuteTheRecipe.WritePLC("校准完成",false,null);
- ExecuteTheRecipe.WritePLC("手自切换", false, new IWriteCallBack() {
+ ExecuteTheRecipe.WritePLC("手自切换", false, null);
+ ExecuteTheRecipe.WritePLC("通道校准", true, new IWriteCallBack() {
@Override
public void onSuccess() {
- ExecuteTheRecipe.WritePLC("通道校准", true, new IWriteCallBack() {
- @Override
- public void onSuccess() {
- ToastUtils.info("启动通道校准成功！");
- }
- @Override
- public void onFailure(String ErrorMsg) {
- ToastUtils.error("启动通道校准失败！");
- }
- });
+ ToastUtils.info("启动通道校准成功！");
}
@Override
public void onFailure(String ErrorMsg) {
ToastUtils.error("启动通道校准失败！");
}
});
-
break;
case R.id.kscl://开始出料
String zltext = edittext_cl.getText().toString();
@@ -369,18 +360,19 @@ public class JiaoYan_lsjy_fragment extends BaseFragment {
ExecuteTheRecipe.OnChargeMixtureComNotPar = new IRun() {
@Override
public void Run() {
- ToastUtils.warning("通道校准完成！");
if (selectIndexSilos > 0) {
final int kkk = selectIndexSilos;
try {
- new Handler().postDelayed(new Runnable() {
+
+ getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
+ try {
+ new Handler().postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ ToastUtils.warning("通道校准完成！");
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- try {
// 在2秒后执行按钮操作
ExecuteTheRecipe.WritePLC("校准值"+kkk,(short) zhongliangxianshi,null);
@@ -397,13 +389,15 @@ public class JiaoYan_lsjy_fragment extends BaseFragment {
{
lsjyAdapter.refresh();
}
- } catch (Exception e) {
- ToastUtils.error("重量解析显示异常！" + e.getMessage());
}
- }
- });
+ }, 2000);
+
+ } catch (Exception e) {
+ ToastUtils.error("重量解析显示异常！" + e.getMessage());
+ }
}
- }, 1000);
+ });
+
} catch (Exception ex) {
Log.d("dsds", "Run: " + ex.getMessage());
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdbs_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdbs_fragment.java
new file mode 100644
index 00000000..f506f4a9
--- /dev/null
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdbs_fragment.java
@@ -0,0 +1,91 @@
+package com.bonait.bnframework.modules.home.fragment.from.fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+
+import com.bonait.bnframework.R;
+import com.bonait.bnframework.business.ConfigData;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
+import com.bonait.bnframework.common.base.BaseFragment;
+import com.bonait.bnframework.common.constant.ConfigName;
+import com.orhanobut.logger.Logger;
+import com.suke.widget.SwitchButton;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class JiaoYan_zdbs_fragment extends BaseFragment {
+
+ @BindView(R.id.control_switch_zdbs)
+ SwitchButton control_switch_zdbs;//自动补水
+ private Context context;
+
+ @Override
+ protected View onCreateView() {
+ View root = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_jiaoyan_zdbs, null);
+ ButterKnife.bind(this, root);
+ return root;
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ Logger.d("我的fragment创建");
+ context = getContext();
+ InitView();
+ }
+
+ /**
+ * 初始化界面
+ */
+ public void InitView() {
+ Initdata();
+ }
+
+ /**
+ * 初始化数据加载
+ */
+ public void Initdata() {
+ control_switch_zdbs.setChecked(ConfigName.getInstance().AutomaticWaterRefill);
+ control_switch_zdbs.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(SwitchButton view, boolean isChecked) {
+ //设置
+ ConfigName.getInstance().AutomaticWaterRefill=isChecked;
+ ConfigData.getInstance().SavePZ();
+ if(!isChecked) //关闭
+ {
+ ExecuteTheRecipe.WritePLC("水池进水阀",false,null);
+ }
+ }
+ });
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ Logger.d("我的fragment销毁");
+ ExecuteTheRecipe.WritePLC("清洗模式",false,null);
+ }
+
+ /**
+ * 当在activity设置viewPager + BottomNavigation + fragment时，
+ * 为防止viewPager左滑动切换界面，与fragment左滑返回上一界面冲突引起闪退问题，
+ * 必须加上此方法，禁止fragment左滑返回上一界面。
+ *
+ * 切记！切记！切记！否则会闪退！
+ *
+ * 当在fragment设置viewPager + BottomNavigation + fragment时，则不会出现这个问题。
+ */
+ @Override
+ protected boolean canDragBack() {
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java
index 17a4576b..918922ee 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java
@@ -5,6 +5,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import android.content.Context;
@@ -17,15 +18,22 @@ import android.widget.Button;
import android.widget.EditText;
import com.bonait.bnframework.R;
+import com.bonait.bnframework.business.ConfigData;
import com.bonait.bnframework.business.ExecuteTheRecipe;
import com.bonait.bnframework.common.base.BaseFragment;
import com.bonait.bnframework.common.constant.DataBus;
+import com.bonait.bnframework.common.db.QueryDB;
+import com.bonait.bnframework.common.db.mode.BPA_SUGAR;
import com.bonait.bnframework.common.helper.I.IRun;
import com.bonait.bnframework.common.helper.I.IWriteCallBack;
import com.bonait.bnframework.common.helper.WrapContentLinearLayoutManager;
+import com.bonait.bnframework.common.utils.AlertDialogUtils;
import com.bonait.bnframework.common.utils.ToastUtils;
import com.bonait.bnframework.modules.home.adapter.wdsz_adapter;
+import com.bonait.bnframework.modules.home.adapter.zdqxchid_adapter;
import com.orhanobut.logger.Logger;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -33,16 +41,13 @@ import butterknife.OnClick;
public class JiaoYan_zdqx_fragment extends BaseFragment {
- @BindView(R.id.edittext_pssj)
- EditText edittext_pssj;//排水阀排水时间
- @BindView(R.id.edittext_xhsj)
- EditText edittext_xhsj;//循环清洗时间
-
- @BindView(R.id.edittext_qxwd)
- EditText edittext_qxwd;//清洗温度
@BindView(R.id.bt_start)
- Button bt_start;//开始时间
+ Button bt_start;//开始清洗
+
+ @BindView(R.id.Recy_zdqx)
+ RecyclerView Recy_zdqx;//自动清洗流程
+
private Context context;
@Override
protected View onCreateView() {
@@ -66,73 +71,78 @@ public class JiaoYan_zdqx_fragment extends BaseFragment {
}
boolean IsStart = false;
- @OnClick({R.id.save_time,R.id.bt_start})
+ @OnClick({R.id.bt_add_zdqx,R.id.bt_start})
public void onViewClicked(View view) {
switch (view.getId()) {
- case R.id.save_time://保存时间
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- if (!edittext_pssj.getText().toString().equals("")) {
- int k= (int)Math.round((Double.parseDouble(edittext_pssj.getText().toString()) * 10));
- ExecuteTheRecipe.WritePLC("排水阀排水时间",(short)k,null);
- Thread.sleep(200);
- }
-
- if (!edittext_xhsj.getText().toString().equals("")) {
- int k= (int)Math.round((Double.parseDouble(edittext_xhsj.getText().toString()) * 10));
- ExecuteTheRecipe.WritePLC("循环清洗时间",(short)k,null);
- Thread.sleep(200);
- }
-
- if (!edittext_qxwd.getText().toString().equals("")) {
- int k= Integer.parseInt(edittext_qxwd.getText().toString());
- ExecuteTheRecipe.WritePLC("水池温度设置",k,null);
- Thread.sleep(200);
- }
-
- } catch (InterruptedException e) {
-
- } catch (Exception e) {
-
- }
-
- }
- }).start();
- ToastUtils.info("保存成功！");
+ case R.id.bt_add_zdqx://增加流程
+ BPA_SUGAR sugar=new BPA_SUGAR();
+ sugar.plcvar="0.0|0.0|0";
+ QueryDB.AddSugar(sugar);
+ DataBus.getInstance().GetZDQXChid();
+ ToastUtils.info("增加成功！");
break;
case R.id.bt_start://开始清洗
if (IsStart) {
+
+ String title = "温馨提示！";
+ String message = "客官确定要强制停止清洗吗？";
+ AlertDialogUtils.showDialog(context, title, message, new QMUIDialogAction.ActionListener() {
+ @Override
+ public void onClick(QMUIDialog dialog, int index) {
+ IsStart=false;
+ bt_start.setText("开始清洗");
+ bt_start.setBackgroundResource(R.drawable.sz_bj);
+ }
+ });
ToastUtils.warning("正在清洗中,请勿重复点击！");
return;
}
+ ExecuteTheRecipe.WritePLC("清洗模式", true, new IWriteCallBack() {
+ @Override
+ public void onSuccess() {
+ IsStart=true;
+ bt_start.setText("正在清洗");
+ bt_start.setBackgroundResource(R.drawable.cp_bj);
+ }
+ @Override
+ public void onFailure(String ErrorMsg) {
+
+ }
+ });
+
new Thread(new Runnable() {
@Override
public void run() {
try {
- ExecuteTheRecipe.WritePLC("清洗模式",true,null);
- ExecuteTheRecipe.WritePLC("自动清洗开始", true, new IWriteCallBack() {
- @Override
- public void onSuccess() {
- //UI线程操作UI控件
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- IsStart=true;
- bt_start.setText("正在清洗");
- bt_start.setBackgroundResource(R.drawable.cp_bj);
- }
- });
- }
-
- @Override
- public void onFailure(String ErrorMsg) {
+ for (BPA_SUGAR item:
+ DataBus.getInstance().zdqx) {
+
+ item.exp="执行中";
+ DataBus.getInstance().zdqxchidAdapter.refresh();
+
+ final boolean[] IsStop = {false};
+ ExecuteTheRecipe.CleaningComplete=new IRun() {
+ @Override
+ public void Run() {
+ IsStop[0] =true;
+ }
+ };
+
+ long a = System.currentTimeMillis();
+ while (IsStart && !IsStop[0] && IsStart) {
+ if ((System.currentTimeMillis() - a) > 1000 * 500) {
+ break;
+ }
+ Thread.sleep(100);//10 *6
}
- });
+ item.exp="执行完成";
+ DataBus.getInstance().zdqxchidAdapter.refresh();
+ }
+
+ ExecuteTheRecipe.WritePLC("管道自动排水",true,null);
} catch (Exception e) {
@@ -146,23 +156,6 @@ public class JiaoYan_zdqx_fragment extends BaseFragment {
//region 数据加载
- private Handler mHandler = new Handler() {
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case 0:
- bt_start.setText("开始清洗");
- bt_start.setBackgroundResource(R.drawable.sz_bj);
- break;
- case 1:
-
- break;
- case 2:
-
- break;
- }
-
- }
- };
/**
* 初始化数据加载
*/
@@ -172,40 +165,34 @@ public class JiaoYan_zdqx_fragment extends BaseFragment {
@Override
public void run() {
try {
- //填充数据
- Object t1= ExecuteTheRecipe.ReadPLC("排水阀排水时间");
- Object t5= ExecuteTheRecipe.ReadPLC("循环清洗时间");
- Object t7= ExecuteTheRecipe.ReadPLC("水池温度设置");
+ DataBus.getInstance().GetZDQXChid();
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
- edittext_pssj.setText(t1==null?"0.0":(String.format ("%.1f", (Double.parseDouble(t1.toString())/10))));
- edittext_xhsj.setText(t5==null?"0.0":(String.format ("%.1f", (Double.parseDouble(t5.toString())/10))));
- edittext_qxwd.setText((t7==null?0:(int)t7) +"");
+ if(isAdded())
+ {
+ Recy_zdqx.setLayoutManager(new WrapContentLinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL,false));
+ DataBus.getInstance().zdqxchidAdapter = new zdqxchid_adapter(getContext(),getActivity());
+ Recy_zdqx.setAdapter(DataBus.getInstance().zdqxchidAdapter);
+ }
}
});
- ExecuteTheRecipe.WritePLC("手自切换",true,null);
+
} catch (Exception e) {
}
}
}).start();
-
- ExecuteTheRecipe.CleaningComplete=new IRun() {
+ ExecuteTheRecipe.AutoPaiShui=new IRun() {
@Override
public void Run() {
- if (IsStart) {
- IsStart = false;
- mHandler.sendEmptyMessage(0);
- ExecuteTheRecipe.WritePLC("清洗模式",false,null);
- ToastUtils.info("清洗完成");
- }
+ IsStart=false;
+ bt_start.setText("开始清洗");
+ bt_start.setBackgroundResource(R.drawable.sz_bj);
}
};
-
-
} catch (Exception e) {
}
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_makegood_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_makegood_control.java
index f297e2af..8db96a68 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_makegood_control.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_makegood_control.java
@@ -11,9 +11,11 @@ import android.widget.ListView;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bonait.bnframework.R;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
import com.bonait.bnframework.common.constant.ConfigName;
import com.bonait.bnframework.common.constant.DataBus;
import com.bonait.bnframework.common.db.QueryDB;
@@ -50,10 +52,14 @@ public class add_makegood_control extends LinearLayout{
public BPA_GOODS Good = null;
@BindView(R.id.datatab_makesx)
- ListView datatab_makesx;//属性
+ RecyclerView datatab_makesx;//属性
@BindView(R.id.makegoodtitle)
TextView makegoodtitle;//配方名称
+
+ @BindView(R.id.chubeiliang)
+ TextView chubeiliang;
+
/**
* 点击事件
*/
@@ -79,10 +85,15 @@ public class add_makegood_control extends LinearLayout{
private void initData() {
//2.填充规则数据，查询所有属性大类
+ LinearLayoutManager layoutManager=new LinearLayoutManager(getContext());
+ layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+ datatab_makesx.setLayoutManager(layoutManager);
+
if(DataBus.getInstance().sxadapter==null)
{
- DataBus.getInstance().sxadapter = new pfsx_adapter(contextMian, R.layout.pfsx_item, DataBus.getInstance().bpa_goodproperties);
+ DataBus.getInstance().sxadapter = new pfsx_adapter(contextMian,DataBus.getInstance().bpa_goodproperties);
}
+
datatab_makesx.setAdapter(DataBus.getInstance().sxadapter);
}
@@ -95,6 +106,7 @@ public class add_makegood_control extends LinearLayout{
try {
Good = good;
makegoodtitle.setText(Good.name + "");
+ chubeiliang.setText(ExecuteTheRecipe.MakeGoodCount +"杯");
initData();
} catch (Exception ex) {
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
index 8bcbe1fd..7a6a6b36 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
@@ -11,6 +11,7 @@ import android.widget.ListView;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.bonait.bnframework.R;
@@ -27,6 +28,7 @@ import com.bonait.bnframework.common.db.res.ResMaterilas;
import com.bonait.bnframework.common.helper.I.MyClickListener;
import com.bonait.bnframework.common.utils.ToastUtils;
import com.bonait.bnframework.common.view.MyLayoutManager;
+import com.bonait.bnframework.modules.home.adapter.loadinggood_adapter;
import com.bonait.bnframework.modules.home.adapter.newmeatrilselect_adapter;
import com.bonait.bnframework.modules.home.adapter.newneatril_adapter;
import com.bonait.bnframework.modules.home.adapter.pfsx_adapter;
@@ -57,17 +59,14 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
EditText edittext;//配方名称
@BindView(R.id.datatab_sx)
- ListView datatab_sx;
+ RecyclerView datatab_sx;
@BindView(R.id.datatab_pf)
ListView datatab_pf;
@BindView(R.id.title)
TextView title;//配方名称
- /**
- * 属性数据
- */
- ArrayList bpa_goodproperties = new ArrayList<>();
+
/**
* 当前物料数据
@@ -75,7 +74,10 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
public ArrayList resMaterilas=new ArrayList<>();
-
+ /**
+ * 属性数据
+ */
+ ArrayList bpa_goodproperties = new ArrayList<>();
/**
* 点击事件
*/
@@ -128,37 +130,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
recycler_view_wl_click.setAdapter(adapter);
//2.填充规则数据，查询所有属性大类
- bpa_goodproperties.clear();
- ArrayList da = QueryDB.GetGoodsPropertyALL("0");
- for (BPA_GOODPROPERTY item:da)
- {
- ResGoodProperty re=new ResGoodProperty();
- re.id=item.id;
- re.name=item.name;
- ArrayList zsx =QueryDB.GetGoodsPropertyALL(item.id);
- re.child=new ArrayList<>();
-
-
- ArrayList _chid = new ArrayList<>();
- for (BPA_GOODPROPERTY k:zsx)
- {
- ResGoodProperty m=new ResGoodProperty();
- m.id=k.id;
- m.name=k.name;
- if(bpaGoodsrecipename!=null && bpaGoodsrecipename.design!=null && !bpaGoodsrecipename.design.isEmpty() && bpaGoodsrecipename.design.contains(k.id))
- {
- m.isSelect=true;
- }else
- {
- m.isSelect=false;
- }
- _chid.add(m);
- }
- re.child=_chid;
-
- bpa_goodproperties.add(re);
- }
if(bpaGoodsrecipename==null)
{
@@ -174,10 +146,28 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
i++;
}
}
+ }else
+ {
+ for(ResGoodProperty item:bpa_goodproperties)
+ {
+ for(ResGoodProperty c:item.child)
+ {
+ if(bpaGoodsrecipename!=null && bpaGoodsrecipename.design!=null && !bpaGoodsrecipename.design.isEmpty() && bpaGoodsrecipename.design.contains(c.id))
+ {
+ c.isSelect=true;
+ }else
+ {
+ c.isSelect=false;
+ }
+ }
+ }
}
+ LinearLayoutManager layoutManager=new LinearLayoutManager(getContext());
+ layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+ datatab_sx.setLayoutManager(layoutManager);
- pfsx_adapter sxadapter = new pfsx_adapter(getContext(), R.layout.pfsx_item, bpa_goodproperties);
+ pfsx_adapter sxadapter = new pfsx_adapter(getContext(), bpa_goodproperties);
datatab_sx.setAdapter(sxadapter);
InitTab();
@@ -215,9 +205,10 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
* 设置数据
* @param name
*/
- public void SetData(BPA_GOODSRECIPENAME name, BPA_GOODS good)
+ public void SetData(BPA_GOODSRECIPENAME name, BPA_GOODS good,ArrayList properties)
{
try {
+ bpa_goodproperties=properties;
bpaGoodsrecipename=name;
Good=good;
if(name!=null)
@@ -242,8 +233,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
peifang_queren.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
- if (mListener != null) {
- SaveData();
+ if (mListener != null && SaveData()) {
mListener.clickListenerNew(view,1,null);
}
}
@@ -261,7 +251,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
/**
* 保存数据
*/
- public void SaveData()
+ public boolean SaveData()
{
if(DataValidation())
{
@@ -311,7 +301,9 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
QueryDB.AddGoodsSrecipe(good);
}
}
+ return true;
}
+ return false;
}
diff --git a/app/src/main/res/layout/activity_bottom_navigation_main.xml b/app/src/main/res/layout/activity_bottom_navigation_main.xml
index 9c9a1c4d..578e0f91 100644
--- a/app/src/main/res/layout/activity_bottom_navigation_main.xml
+++ b/app/src/main/res/layout/activity_bottom_navigation_main.xml
@@ -45,14 +45,17 @@
android:gravity="center|top"
android:orientation="vertical">
diff --git a/app/src/main/res/layout/activity_systemparameter.xml b/app/src/main/res/layout/activity_systemparameter.xml
index c4594b33..1ddd2cb2 100644
--- a/app/src/main/res/layout/activity_systemparameter.xml
+++ b/app/src/main/res/layout/activity_systemparameter.xml
@@ -154,8 +154,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
-
+
+
@@ -110,8 +119,10 @@