소스 검색

现场改动奶茶吧1

调味吧台
fyf 1 년 전
부모
커밋
50ec94dd7d
4개의 변경된 파일21개의 추가작업 그리고 2개의 파일을 삭제
  1. +5
    -1
      app/src/main/java/com/example/bpa/view/fragment/HomeFragment.java
  2. +1
    -0
      app/src/main/java/com/example/bpa/view/from/add_pf_activity.java
  3. +14
    -0
      app/src/main/res/layout/from/layout/fragment_home.xml
  4. +1
    -1
      app/src/main/res/layout/spinner_dropdown_item.xml

+ 5
- 1
app/src/main/java/com/example/bpa/view/fragment/HomeFragment.java 파일 보기

@@ -74,7 +74,7 @@ public class HomeFragment extends Fragment implements View.OnClickListener, MyCl
/**
* 当前温度
*/
TextView wendu1, wendu2,pf_ms;
TextView wendu1, wendu2,pf_ms,plc_status;
/**
* 界面实例
*/
@@ -106,6 +106,7 @@ public class HomeFragment extends Fragment implements View.OnClickListener, MyCl
wendu1 = view.findViewById(R.id.wendu1);
wendu2 = view.findViewById(R.id.wendu2);
pf_ms = view.findViewById(R.id.pf_ms);
plc_status = view.findViewById(R.id.plc_status);
if( ConfigName.getInstance().IsUserDownOrder)
{
makesp.setVisibility(View.VISIBLE);
@@ -309,6 +310,9 @@ public class HomeFragment extends Fragment implements View.OnClickListener, MyCl
public void run() {
wendu1.setText(String.valueOf(DeviceData.Get().getBWX_FructoseTemperature()) + "°C");
wendu2.setText(String.valueOf(DeviceData.Get().getJRX_FructoseTemperature()) + "°C");
plc_status.setText(DataBus.getInstance().PlcIsConnect?"正常":"异常");
plc_status.setTextColor(DataBus.getInstance().PlcIsConnect?getResources().getColor(R.color.foreground):getResources().getColor(R.color.warm_red));

}
});
Thread.sleep(100);


+ 1
- 0
app/src/main/java/com/example/bpa/view/from/add_pf_activity.java 파일 보기

@@ -168,6 +168,7 @@ public class add_pf_activity extends AppCompatActivity implements View.OnClickLi
adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
wuliaolist_spinner.setAdapter(adapter);


List<BPA_SUGAR> resSugars = QueryDB.GetSugarALL();
for (BPA_SUGAR sugar:resSugars){
sugar_map.put(sugar.sugarName,sugar.id);


+ 14
- 0
app/src/main/res/layout/from/layout/fragment_home.xml 파일 보기

@@ -174,6 +174,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:text="设备:"
android:layout_margin="5dp"/>
<TextView
android:id="@+id/plc_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/lable_color"
android:textSize="@dimen/TitleSize"
android:text="正常"
android:layout_margin="5dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"


+ 1
- 1
app/src/main/res/layout/spinner_dropdown_item.xml 파일 보기

@@ -2,7 +2,7 @@
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/checkedTextViewCustom_1"
style="?android:attr/spinnerDropDownItemStyle"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="35dp"
android:background="#EF132D54"
android:ellipsize="marquee"


불러오는 중...
취소
저장