fyf
/
AndroidSmartClient
1
0
Rozštěpit 0
Zdrojový kód Úkoly 0 Požadavky na natažení 0 Vydání 1 Wiki Aktivita
Procházet zdrojové kódy

其他

味魔方Android
fyf před 10 měsíci
rodič
9ec199bd60
revize
fae66d8be7
25 změnil soubory, kde provedl 536 přidání a 133 odebrání
Rozdělené zobrazení
Diff Options
Zobrazit statistiky Stáhněte soubor opravy Stáhněte rozdílový soubor
  1. +11
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/GongnengFragment.java
  2. +4
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/SheZhifragment.java
  3. +27
    -0
      app/src/main/res/drawable/goodpf_bj.xml
  4. +27
    -0
      app/src/main/res/drawable/jcsjgl_bj.xml
  5. +27
    -0
      app/src/main/res/drawable/log_bj.xml
  6. +27
    -0
      app/src/main/res/drawable/silos_bj.xml
  7. +9
    -2
      app/src/main/res/drawable/spinner_border.xml
  8. +27
    -0
      app/src/main/res/drawable/ssjk_bj.xml
  9. +21
    -20
      app/src/main/res/layout/activity_log.xml
  10. +30
    -22
      app/src/main/res/layout/activity_orderlist.xml
  11. +1
    -0
      app/src/main/res/layout/activity_realtime.xml
  12. +24
    -18
      app/src/main/res/layout/activity_salesstatistics.xml
  13. +31
    -13
      app/src/main/res/layout/datatab/layout/ddgl_item.xml
  14. +24
    -13
      app/src/main/res/layout/datatab/layout/ddtj_item.xml
  15. +17
    -11
      app/src/main/res/layout/datatab/layout/yjrz_item.xml
  16. +218
    -27
      app/src/main/res/layout/fragment_gongneng.xml
  17. +1
    -2
      app/src/main/res/layout/fragment_jcsjgl_sxgl.xml
  18. +2
    -2
      app/src/main/res/layout/fragment_jcsjgl_wl.xml
  19. +6
    -0
      app/src/main/res/layout/fragment_she_zhi.xml
  20. +2
    -1
      app/src/main/res/layout/item/layout/devstatus.xml
  21. binární
     
  22. binární
     
  23. binární
     
  24. binární
     
  25. binární
     

+ 11
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/GongnengFragment.java Zobrazit soubor

@@ -19,6 +19,8 @@ import com.bonait.bnframework.common.message.MessageManager;
import com.bonait.bnframework.common.utils.ToastUtils;
import com.bonait.bnframework.modules.home.fragment.from.GoodPeiFangActivity;
import com.bonait.bnframework.modules.home.fragment.from.JcsjglActivity;
import com.bonait.bnframework.modules.home.fragment.from.LogActivity;
import com.bonait.bnframework.modules.home.fragment.from.RealTimeActivity;
import com.bonait.bnframework.modules.home.fragment.from.SilosActivity;
import com.bonait.bnframework.modules.home.fragment.mode.caidan_control;
import com.orhanobut.logger.Logger;
@@ -58,7 +60,7 @@ public class GongnengFragment extends BaseFragment {
private void initTopBar() {
mTopBar.setTitle("功能菜单");
}
@OnClick({R.id.jcsjgl,R.id.lcgl,R.id.yfpf})
@OnClick({R.id.jcsjgl,R.id.lcgl,R.id.yfpf,R.id.log,R.id.ssjk})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.jcsjgl://
@@ -73,6 +75,14 @@ public class GongnengFragment extends BaseFragment {
skipToActivity(GoodPeiFangActivity.class);
//ConfigName.getInstance().fragmentAdapter.replaceFragment(0,new GoodPeiFangActivity());
break;
case R.id.log://
skipToActivity(LogActivity.class);
//ConfigName.getInstance().fragmentAdapter.replaceFragment(0,new GoodPeiFangActivity());
break;
case R.id.ssjk://
skipToActivity(RealTimeActivity.class);
//ConfigName.getInstance().fragmentAdapter.replaceFragment(0,new GoodPeiFangActivity());
break;
}
}



+ 4
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/SheZhifragment.java Zobrazit soubor

@@ -56,9 +56,12 @@ public class SheZhifragment extends BaseFragment {
mTopBar.setTitle("订单管理");
}

@OnClick({R.id.xtcs,R.id.imagegl,R.id.shebeixinxi})
@OnClick({R.id.plckz,R.id.xtcs,R.id.imagegl,R.id.shebeixinxi})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.plckz://
skipToActivity(PlcControlActivity.class);
break;
case R.id.xtcs://
skipToActivity(SystemParameterActivity.class);
break;


+ 27
- 0
app/src/main/res/drawable/goodpf_bj.xml Zobrazit soubor

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7FEF5362"
android:radius="-1dp">

<item android:state_pressed="true">
<shape>
<solid android:color="#B3922B" />
<corners android:radius="20dp" />
</shape>
</item>

<item android:state_enabled="false">
<shape>
<solid android:color="#cccccc" />
<corners android:radius="20dp" />
</shape>
</item>


<item>
<shape>
<solid android:color="#BEAA6A" />
<corners android:radius="20dp" />
</shape>
</item>
</ripple>

+ 27
- 0
app/src/main/res/drawable/jcsjgl_bj.xml Zobrazit soubor

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7FEF5362"
android:radius="-1dp">

<item android:state_pressed="true">
<shape>
<solid android:color="#1B7B95" />
<corners android:radius="20dp" />
</shape>
</item>

<item android:state_enabled="false">
<shape>
<solid android:color="#cccccc" />
<corners android:radius="20dp" />
</shape>
</item>


<item>
<shape>
<solid android:color="#7DCCE1" />
<corners android:radius="20dp" />
</shape>
</item>
</ripple>

+ 27
- 0
app/src/main/res/drawable/log_bj.xml Zobrazit soubor

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7FEF5362"
android:radius="-1dp">

<item android:state_pressed="true">
<shape>
<solid android:color="#E499F3" />
<corners android:radius="20dp" />
</shape>
</item>

<item android:state_enabled="false">
<shape>
<solid android:color="#cccccc" />
<corners android:radius="20dp" />
</shape>
</item>


<item>
<shape>
<solid android:color="#EACAF0" />
<corners android:radius="20dp" />
</shape>
</item>
</ripple>

+ 27
- 0
app/src/main/res/drawable/silos_bj.xml Zobrazit soubor

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7FEF5362"
android:radius="-1dp">

<item android:state_pressed="true">
<shape>
<solid android:color="#6AA0E8" />
<corners android:radius="20dp" />
</shape>
</item>

<item android:state_enabled="false">
<shape>
<solid android:color="#cccccc" />
<corners android:radius="20dp" />
</shape>
</item>


<item>
<shape>
<solid android:color="#C6D7ED" />
<corners android:radius="20dp" />
</shape>
</item>
</ripple>

+ 9
- 2
app/src/main/res/drawable/spinner_border.xml Zobrazit soubor

@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 第一组item：设置Spinner背景边框 -->
<item>
<shape>
<item
android:left="-10dp"
android:right="-10dp"
android:top="-10dp"
>
<shape >
<stroke

android:width="1dp"
android:color="@color/color3">
</stroke>
@@ -18,6 +23,8 @@
</shape>
<!-- 第二组item：设置spinner箭头图片 -->
</item>


<item>
<bitmap
android:gravity="end"


+ 27
- 0
app/src/main/res/drawable/ssjk_bj.xml Zobrazit soubor

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7FEF5362"
android:radius="-1dp">

<item android:state_pressed="true">
<shape>
<solid android:color="#ABE849" />
<corners android:radius="20dp" />
</shape>
</item>

<item android:state_enabled="false">
<shape>
<solid android:color="#cccccc" />
<corners android:radius="20dp" />
</shape>
</item>


<item>
<shape>
<solid android:color="#CDEA9E" />
<corners android:radius="20dp" />
</shape>
</item>
</ripple>

+ 21
- 20
app/src/main/res/layout/activity_log.xml Zobrazit soubor

@@ -15,6 +15,7 @@
android:layout_height="match_parent"
>
<RelativeLayout

android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp">
@@ -24,7 +25,7 @@
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp">
android:layout_height="30dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -72,7 +73,7 @@
<Spinner
android:id="@+id/rzlx"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="26dp"
style="@style/commonSpinnerStyle"/>
<EditText
android:id="@+id/edittext"
@@ -89,13 +90,13 @@
<Button
android:id="@+id/button"
android:text="查询"
android:background="@drawable/button3"
android:background="@drawable/bg_btn_login_selected"
android:textSize="@dimen/textSize"
android:textColor="@color/foreground"
android:layout_marginLeft="5dp"
android:layout_gravity="center"
android:layout_width="60dp"
android:layout_width="120dp"
android:layout_height="26dp"
android:textColor="@color/white"
/>
</LinearLayout>

@@ -111,8 +112,8 @@
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:background="@color/main_background"
android:layout_height="26dp">
android:background="@color/datatab_tab"
android:layout_height="36dp">

<TableLayout
android:layout_centerVertical="true"
@@ -130,39 +131,42 @@
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:text="日志类型"
android:textColor="@color/dataGridColumnHeaderColor"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2">
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:text="日志时间"
android:textColor="@color/dataGridColumnHeaderColor"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:text="日志描述"
android:textColor="@color/dataGridColumnHeaderColor"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white"/>
</RelativeLayout>

</TableRow>
@@ -175,9 +179,6 @@
android:id="@+id/datatab"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="#00000000"
android:dividerHeight="3dp"
android:layout_marginTop="3dp"
/>
</RelativeLayout>
</LinearLayout>


+ 30
- 22
app/src/main/res/layout/activity_orderlist.xml Zobrazit soubor

@@ -16,7 +16,8 @@
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_margin="10dp">

<LinearLayout
android:layout_width="match_parent"
@@ -25,7 +26,7 @@

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp">
android:layout_height="30dp">

<LinearLayout
android:layout_width="match_parent"
@@ -74,7 +75,7 @@
android:id="@+id/rzlx"
style="@style/commonSpinnerStyle"
android:layout_width="wrap_content"
android:layout_height="24dp" />
android:layout_height="26dp" />

<EditText
android:id="@+id/edittext"
@@ -91,18 +92,18 @@

<Button
android:id="@+id/button"
android:layout_width="60dp"
android:layout_width="120dp"
android:layout_height="26dp"
android:layout_gravity="center"
android:layout_marginLeft="5dp"
android:background="@drawable/button3"
android:background="@drawable/bg_btn_login_selected"
android:text="查询"
android:textColor="@color/white"
android:textSize="@dimen/textSize" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="0dp"
android:layout_marginLeft="10dp"
android:text="数量："></TextView>
<TextView
android:id="@+id/count"
@@ -127,8 +128,8 @@

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="26dp"
android:background="@color/activity_background">
android:layout_height="36dp"
android:background="@color/datatab_tab">


<TableLayout
@@ -150,12 +151,14 @@
android:layout_weight="2.5">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="订单编号"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>

<RelativeLayout
@@ -164,12 +167,14 @@
android:layout_weight="2">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="创建时间"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white"/>
</RelativeLayout>

<RelativeLayout
@@ -178,12 +183,14 @@
android:layout_weight="1">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="商品名称"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>

<RelativeLayout
@@ -192,12 +199,14 @@
android:layout_weight="1">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="订单状态"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>

<RelativeLayout
@@ -205,12 +214,14 @@
android:layout_height="wrap_content"
android:layout_weight="2">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="备注"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>

</TableRow>
@@ -224,10 +235,7 @@
<ListView
android:id="@+id/datatab"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="3dp"
android:divider="#00000000"
android:dividerHeight="3dp" />
android:layout_height="match_parent"/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>


+ 1
- 0
app/src/main/res/layout/activity_realtime.xml Zobrazit soubor

@@ -21,6 +21,7 @@
tools:ignore="Suspicious0dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_margin="@dimen/dp_10"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</ScrollView>


+ 24
- 18
app/src/main/res/layout/activity_salesstatistics.xml Zobrazit soubor

@@ -16,7 +16,8 @@
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_margin="10dp">

<LinearLayout
android:layout_width="match_parent"
@@ -25,7 +26,7 @@

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp">
android:layout_height="30dp">

<LinearLayout
android:layout_width="match_parent"
@@ -66,11 +67,11 @@

<Button
android:id="@+id/button"
android:layout_width="100dp"
android:layout_width="120dp"
android:layout_height="26dp"
android:layout_gravity="center"
android:layout_marginLeft="15dp"
android:background="@drawable/button3"
android:background="@drawable/bg_btn_login_selected"
android:text="查询"
android:textColor="@color/white"
android:textSize="@dimen/textSize" />
@@ -88,8 +89,8 @@

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="26dp"
android:background="@color/activity_background">
android:layout_height="36dp"
android:background="@color/datatab_tab">

<TableLayout
android:layout_width="match_parent"
@@ -110,12 +111,14 @@
android:layout_weight="2.5">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="商品名称"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white"/>
</RelativeLayout>

<RelativeLayout
@@ -124,12 +127,14 @@
android:layout_weight="2">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="订单总量(单)"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>

<RelativeLayout
@@ -138,12 +143,14 @@
android:layout_weight="2">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="已制作(单)"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>

<RelativeLayout
@@ -152,12 +159,14 @@
android:layout_weight="2">

<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="异常订单(单)"
android:textSize="@dimen/textSize" />
android:textAlignment="center"
android:textStyle="bold"
android:textColor="@color/white" />
</RelativeLayout>
</TableRow>
</TableLayout>
@@ -170,10 +179,7 @@
<ListView
android:id="@+id/datatab"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="3dp"
android:divider="#00000000"
android:dividerHeight="3dp" />
android:layout_height="match_parent" />
</RelativeLayout>
</LinearLayout>
</RelativeLayout>


+ 31
- 13
app/src/main/res/layout/datatab/layout/ddgl_item.xml Zobrazit soubor

@@ -5,7 +5,6 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<TableLayout
android:background="@color/activity_background1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@@ -18,69 +17,88 @@

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2.5">

<TextView
android:id="@+id/bh"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"

android:layout_marginLeft="20dp"
android:text="订单编号"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2">
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"

android:text="创建时间"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:text="商品名称"
android:textSize="12dp" />
android:layout_centerInParent="true"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"

android:layout_centerInParent="true"

android:layout_alignParentLeft="true"
android:text="订单状态"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="30dp"
android:layout_weight="2">
<TextView
android:layout_centerInParent="true"
android:id="@+id/bz"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:text="备注"
android:textSize="12dp" />
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>

</TableRow>


+ 24
- 13
app/src/main/res/layout/datatab/layout/ddtj_item.xml Zobrazit soubor

@@ -5,7 +5,6 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<TableLayout
android:background="@color/activity_background1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@@ -18,62 +17,74 @@

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2.5">

<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:text="商品名称"
android:textSize="12dp"/>
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2">

<TextView
android:id="@+id/ddzl"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:text="订单总量(单)"
android:textSize="12dp"/>
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2">

<TextView
android:id="@+id/ddzl_yzz"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:text="已制作(单)"
android:textSize="12dp"/>
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="30dp"
android:layout_weight="2">

<TextView
android:layout_centerInParent="true"
android:id="@+id/ddzl_yc"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:text="异常订单(单)"
android:textSize="12dp"/>
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>
</TableRow>
</TableLayout>

+ 17
- 11
app/src/main/res/layout/datatab/layout/yjrz_item.xml Zobrazit soubor

@@ -5,7 +5,6 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<TableLayout
android:background="@color/activity_background1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@@ -31,44 +30,51 @@
<!-- </RelativeLayout>-->
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1">

<TextView
android:id="@+id/type"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:text="日志类型"
android:textColor="@color/foreground"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="2">

<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp"
android:text="日志时间"
android:textColor="@color/foreground"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="30dp"
android:layout_weight="4">
<TextView
android:layout_centerInParent="true"
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:text="日志描述日志描述"
android:textColor="@color/foreground"
android:textColor="@color/black"
android:textSize="12dp" />
</RelativeLayout>



+ 218
- 27
app/src/main/res/layout/fragment_gongneng.xml Zobrazit soubor

@@ -5,51 +5,242 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/app_color_blue">
<ScrollView

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/qmui_topbar_height"
android:background="?attr/app_content_bg_color">
<RelativeLayout

<LinearLayout
android:layout_margin="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent"
android:layout_marginBottom="30dp">

<LinearLayout
android:layout_centerHorizontal="true"
android:layout_marginLeft="160dp"
android:layout_marginRight="160dp"
android:layout_width="match_parent"
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_weight="1">

<com.bonait.bnframework.modules.home.fragment.mode.caidan_control
android:id="@+id/jcsjgl"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:imagesrc="@mipmap/wlgl"
android:tag="基础数据管理"/>
android:orientation="vertical">

<com.bonait.bnframework.modules.home.fragment.mode.caidan_control
android:id="@+id/lcgl"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:imagesrc="@mipmap/lcsz"
android:tag="料仓管理(绑定物料)"/>
<RelativeLayout
android:id="@+id/lcgl"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="1"
android:background="@drawable/silos_bj">

<LinearLayout
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="false">
<ImageView
android:layout_width="match_parent"
android:layout_height="120dp"
android:src="@mipmap/new1"
android:focusable="false"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-condensed-medium"
android:text="料仓管理(绑定物料)"
android:textColor="@color/white"
android:textSize="26dp"
android:focusable="false"/>
</LinearLayout>
</RelativeLayout>

<com.bonait.bnframework.modules.home.fragment.mode.caidan_control
android:id="@+id/yfpf"
<RelativeLayout
android:id="@+id/jcsjgl"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="1.4"
android:background="@drawable/jcsjgl_bj">
<LinearLayout
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="false">
<ImageView
android:layout_width="match_parent"
android:layout_height="120dp"
android:src="@mipmap/new4"
android:focusable="false"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-condensed-medium"
android:text="基础数据管理"
android:textColor="@color/white"
android:textSize="26dp"
android:focusable="false"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>

<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:imagesrc="@mipmap/yfpf"
android:tag="商品配方管理"/>
</LinearLayout>
android:orientation="vertical">

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="1.3">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<RelativeLayout
android:id="@+id/yfpf"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
android:background="@drawable/goodpf_bj">
<LinearLayout
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="false">
<ImageView
android:layout_width="match_parent"
android:layout_height="120dp"
android:src="@mipmap/new2"
android:focusable="false"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-condensed-medium"
android:text="饮料配方管理"
android:textColor="@color/white"
android:textSize="26dp"
android:focusable="false"/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/log"
android:layout_marginLeft="5dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/log_bj">
<LinearLayout
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="false">
<ImageView
android:layout_width="match_parent"
android:layout_height="120dp"
android:src="@mipmap/new3"
android:focusable="false"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-condensed-medium"
android:text="日志管理"
android:textColor="@color/white"
android:textSize="26dp"
android:focusable="false"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>

<RelativeLayout
android:id="@+id/ssjk"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="1"
android:background="@drawable/ssjk_bj">
<LinearLayout
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:focusable="false">
<ImageView
android:layout_width="match_parent"
android:layout_height="120dp"
android:src="@mipmap/new5"
android:focusable="false"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:fontFamily="sans-serif-condensed-medium"
android:text="实时监控管理"
android:textColor="@color/white"
android:textSize="26dp"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>


<!-- <LinearLayout-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_marginLeft="160dp"-->
<!-- android:layout_marginRight="160dp"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:orientation="vertical">-->

<!-- <com.bonait.bnframework.modules.home.fragment.mode.caidan_control-->
<!-- android:id="@+id/jcsjgl"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- app:imagesrc="@mipmap/wlgl"-->
<!-- android:tag="基础数据管理"/>-->

<!-- <com.bonait.bnframework.modules.home.fragment.mode.caidan_control-->
<!-- android:id="@+id/lcgl"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- app:imagesrc="@mipmap/lcsz"-->
<!-- android:tag="料仓管理(绑定物料)"/>-->

<!-- <com.bonait.bnframework.modules.home.fragment.mode.caidan_control-->
<!-- android:id="@+id/yfpf"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- app:imagesrc="@mipmap/yfpf"-->
<!-- android:tag="商品配方管理"/>-->
<!-- </LinearLayout>-->

</RelativeLayout>
</ScrollView>
</LinearLayout>
</RelativeLayout>

<com.qmuiteam.qmui.widget.QMUITopBarLayout
android:id="@+id/topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/app_color_blue"/>
android:background="@color/app_color_blue" />
</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

+ 1
- 2
app/src/main/res/layout/fragment_jcsjgl_sxgl.xml Zobrazit soubor

@@ -48,9 +48,8 @@
android:layout_marginLeft="@dimen/dp_10"
android:background="@drawable/bg_btn_login_selected"
android:text="+增加属性"
android:textSize="14dp"
android:textColor="@color/white"
/>
android:textSize="14dp" />
</RelativeLayout>

<RelativeLayout


+ 2
- 2
app/src/main/res/layout/fragment_jcsjgl_wl.xml Zobrazit soubor

@@ -47,6 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">

<Button
android:id="@+id/add_wl"
android:layout_width="100dp"
@@ -56,9 +57,8 @@
android:layout_marginLeft="@dimen/dp_10"
android:background="@drawable/bg_btn_login_selected"
android:text="+增加物料"
android:textSize="14dp"
android:textColor="@color/white"
/>
android:textSize="14dp" />
<Button
android:id="@+id/synchronous"
android:layout_width="100dp"


+ 6
- 0
app/src/main/res/layout/fragment_she_zhi.xml Zobrazit soubor

@@ -20,6 +20,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.bonait.bnframework.modules.home.fragment.mode.caidan_control
android:id="@+id/plckz"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:imagesrc="@mipmap/plcjiankong"
android:tag="PLC地址配置或控制"/>
<com.bonait.bnframework.modules.home.fragment.mode.caidan_control
android:id="@+id/xtcs"
android:layout_width="match_parent"


+ 2
- 1
app/src/main/res/layout/item/layout/devstatus.xml Zobrazit soubor

@@ -18,7 +18,8 @@
android:layout_centerHorizontal="true"
android:rotationX="18"
android:text="杯子检测"
android:textSize="16dp" />
android:textSize="16dp"
android:textColor="@color/black"/>
<ImageView
android:id="@+id/image"
android:layout_width="60dp"


binární
Zobrazit soubor


binární
Zobrazit soubor


binární
Zobrazit soubor


binární
Zobrazit soubor


binární
Zobrazit soubor


Zapsat Náhled
Načítá se…
Zrušit
Uložit