Browse Source

444

tags/old_version_1
fyf 1 year ago
parent
commit
236835bbe0
10 changed files with 44 additions and 4 deletions
  1. +8
    -0
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java
  2. +11
    -2
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingActivity.java
  3. +11
    -2
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java
  4. +10
    -0
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DishTestActivity.java
  5. +1
    -0
      app/src/main/res/layout/activity_cooking.xml
  6. +1
    -0
      app/src/main/res/layout/activity_cookingsimulated.xml
  7. +1
    -0
      app/src/main/res/layout/activity_dishtest.xml
  8. +1
    -0
      app/src/main/res/layout/fragment_home_sbkz.xml
  9. BIN
     
  10. BIN
     

+ 8
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java View File

@@ -131,6 +131,8 @@ public class HomeFragmentSBKZ extends BaseFragment {
@BindView(R.id.chaoguo_wendu)
TextView chaoguo_wendu;

@BindView(R.id.device_image)
ImageView device_image;
//endregion

//region 界面
@@ -228,6 +230,12 @@ public class HomeFragmentSBKZ extends BaseFragment {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒版本")) {
touliao_k.setVisibility(View.GONE);
touliao_m.setVisibility(View.GONE);
device_image.setImageResource(R.mipmap.device00);
}else
{
touliao_k.setVisibility(View.VISIBLE);
touliao_m.setVisibility(View.VISIBLE);
device_image.setImageResource(R.mipmap.device1);
}
}



+ 11
- 2
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingActivity.java View File

@@ -17,6 +17,7 @@ import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Chronometer;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

@@ -54,6 +55,9 @@ import butterknife.OnClick;
public class CookingActivity extends LinearLayout {

//region 变量
@BindView(R.id.device_image)
ImageView device_image;

@BindView(R.id.touliao_k)
LinearLayout touliao_k;

@@ -174,10 +178,15 @@ public class CookingActivity extends LinearLayout {
SetMiaoShu("等待开始...");
runtime.setText(formatTime(goods.maketime));

if (ConfigName.getInstance().versionSelectionEnum.equals("大炒版本"))
{
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒版本")) {
touliao_k.setVisibility(View.GONE);
touliao_m.setVisibility(View.GONE);
device_image.setImageResource(R.mipmap.device00);
}else
{
touliao_k.setVisibility(View.VISIBLE);
touliao_m.setVisibility(View.VISIBLE);
device_image.setImageResource(R.mipmap.device1);
}
}



+ 11
- 2
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java View File

@@ -13,6 +13,7 @@ import android.os.Bundle;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -52,6 +53,9 @@ import butterknife.OnClick;

public class CookingSimulatedActivity extends BaseActivity {
//region 变量
@BindView(R.id.device_image)
ImageView device_image;

@BindView(R.id.touliao_k)
LinearLayout touliao_k;

@@ -140,10 +144,15 @@ public class CookingSimulatedActivity extends BaseActivity {
* 初始化数据
*/
public void initData() {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒版本"))
{
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒版本")) {
touliao_k.setVisibility(View.GONE);
touliao_m.setVisibility(View.GONE);
device_image.setImageResource(R.mipmap.device00);
}else
{
touliao_k.setVisibility(View.VISIBLE);
touliao_m.setVisibility(View.VISIBLE);
device_image.setImageResource(R.mipmap.device1);
}

yeliao1.setTag(ConfigName.getInstance().SilosDisplayMaterial.get(1) + "");


+ 10
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DishTestActivity.java View File

@@ -20,6 +20,7 @@ import android.view.View;
import android.widget.AdapterView;
import android.widget.Chronometer;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.RelativeLayout;
@@ -64,6 +65,9 @@ import butterknife.OnClick;
public class DishTestActivity extends BaseActivity {

//region 变量
@BindView(R.id.device_image)
ImageView device_image;

@BindView(R.id.touliao_k)
LinearLayout touliao_k;

@@ -262,6 +266,12 @@ public class DishTestActivity extends BaseActivity {
if (ConfigName.getInstance().versionSelectionEnum.equals("大炒版本")) {
touliao_k.setVisibility(View.GONE);
touliao_m.setVisibility(View.GONE);
device_image.setImageResource(R.mipmap.device00);
}else
{
touliao_k.setVisibility(View.VISIBLE);
touliao_m.setVisibility(View.VISIBLE);
device_image.setImageResource(R.mipmap.device1);
}

DataBus.getInstance().ShowGoodName = "";


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

@@ -125,6 +125,7 @@
android:layout_weight="2">

<ImageView
android:id="@+id/device_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"


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

@@ -107,6 +107,7 @@
android:layout_weight="2">

<ImageView
android:id="@+id/device_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"


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

@@ -59,6 +59,7 @@
android:layout_weight="2">

<ImageView
android:id="@+id/device_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"


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

@@ -48,6 +48,7 @@
android:layout_weight="4">

<ImageView
android:id="@+id/device_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"


BIN
View File


BIN
View File


Loading…
Cancel
Save