fyf
/
Scalage
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

标签绑定接口修改

master
pry 7 months ago
parent
3556f74b19
commit
d5e8180cb3
6 changed files with 155 additions and 83 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      app/src/main/java/com/bpa/scalage/HBL/Communication/WeightHelper.java
  2. +1
    -0
      app/src/main/java/com/bpa/scalage/MainActivity.java
  3. +6
    -5
      app/src/main/java/com/bpa/scalage/control/FruitAdapter.java
  4. +10
    -0
      app/src/main/res/drawable/rectange.xml
  5. +8
    -8
      app/src/main/res/layout/activity_main.xml
  6. +129
    -69
      app/src/main/res/layout/controlview/layout/menu_item.xml

+ 1
- 1
app/src/main/java/com/bpa/scalage/HBL/Communication/WeightHelper.java View File

@@ -46,7 +46,7 @@ public class WeightHelper {
cache.add(data.Content[i]);
});
getCardData();
Thread.sleep(50);
Thread.sleep(1);
}
@Override
public void RunComplete() throws InterruptedException {


+ 1
- 0
app/src/main/java/com/bpa/scalage/MainActivity.java View File

@@ -173,6 +173,7 @@ public class MainActivity extends AppCompatActivity {
this.runOnUiThread(()->{
if (s<50){
welcome.setVisibility(View.VISIBLE);
RefreshConsumption();
}else{
welcome.setVisibility(View.GONE);
RefreshConsumption();


+ 6
- 5
app/src/main/java/com/bpa/scalage/control/FruitAdapter.java View File

@@ -32,10 +32,10 @@ public class FruitAdapter extends ArrayAdapter<FoodModel> {
//为每一个子项加载设定的布局
View view=LayoutInflater.from(getContext()).inflate(R.layout.menu_item,parent,false);
//分别获取 image view 和 textview 的实例
MyImageView fruitimage =view.findViewById(R.id.iv_food_pic);
// MyImageView fruitimage =view.findViewById(R.id.iv_food_pic);
TextView fruitname =view.findViewById(R.id.tv_food_name);
TextView fruitprice =view.findViewById(R.id.tv_price);
TextView fruitvipprice =view.findViewById(R.id.tv_vipprice);
// TextView fruitvipprice =view.findViewById(R.id.tv_vipprice);
Button add_car= view.findViewById(R.id.btn_add_car);
add_car.setTag(position);
if(add_car!=null)//点击事件打开，称重界面
@@ -62,10 +62,11 @@ public class FruitAdapter extends ArrayAdapter<FoodModel> {
});
}
// 设置要显示的图片和文字
fruitimage.glideAppLoadUrlImage(fruit.cover);
// fruitimage.glideAppLoadUrlImage(fruit.cover);
fruitname.setText(fruit.name);
fruitprice.setText("非会员 ¥"+new java.text.DecimalFormat("#.00").format(fruit.price)+"/50g");
fruitvipprice.setText("会员 ¥"+new java.text.DecimalFormat("#.00").format(fruit.vipPrice)+"/50g");
// fruitprice.setText("单价 ¥"+new java.text.DecimalFormat("#.00").format(fruit.price)+"/50g");
fruitprice.setText("单价 ¥"+fruit.price+"/50g");
// fruitvipprice.setText("会员 ¥"+new java.text.DecimalFormat("#.00").format(fruit.vipPrice)+"/50g");
view.setTag(fruit);
return view;
}


+ 10
- 0
app/src/main/res/drawable/rectange.xml View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">

<!--背景色-->
<solid android:color="#BBBBD5"/>

<!--设置圆角-->
<corners android:radius="10dp"/>

</shape>

+ 8
- 8
app/src/main/res/layout/activity_main.xml View File

@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/dc_wz"
android:text="环球中心测试店铺"
android:text="- - - - - - - - - - - - - -"
android:textSize="40dp"
/>

@@ -50,7 +50,7 @@
android:id="@+id/tv_food_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="回锅肉炒面"
android:text="- - - - - - - -"
android:textColor="@color/dc_wz"
android:textSize="65dp">
</TextView>
@@ -69,7 +69,7 @@
android:textColor="@color/dc_ts"
android:textSize="50dp"
android:layout_marginLeft="10dp"
android:text="15.00"/>
android:text="- - - -"/>
<TextView
android:id="@+id/ma_pic"
android:layout_width="wrap_content"
@@ -77,7 +77,7 @@
android:textColor="@color/dc_wz"
android:textSize="30dp"
android:layout_marginLeft="10dp"
android:text="/50g"/>
android:text="- - - -"/>
</LinearLayout>

<View
@@ -111,7 +111,7 @@
android:textColor="@color/dc_wz"
android:textSize="30dp"
android:layout_marginLeft="10dp"
android:text="非会员"/>
android:text="- - -"/>
</RelativeLayout>

<RelativeLayout
@@ -134,7 +134,7 @@
android:textColor="@color/dc_wz"
android:textSize="30dp"
android:layout_marginLeft="10dp"
android:text="李四"/>
android:text="- - -"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
@@ -178,7 +178,7 @@
android:textColor="@color/dc_wz"
android:textSize="30dp"
android:layout_marginLeft="10dp"
android:text="9666g"/>
android:text="- - -"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
@@ -200,7 +200,7 @@
android:textColor="@color/dc_wz"
android:textSize="30dp"
android:layout_marginLeft="10dp"
android:text="9656g"/>
android:text="- - -"/>
</RelativeLayout>
<View
android:layout_width="fill_parent"


+ 129
- 69
app/src/main/res/layout/controlview/layout/menu_item.xml View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
@@ -11,79 +13,137 @@
android:background="@color/gray_bg"
android:padding="10dp">

<RelativeLayout
<com.bpa.scalage.HBL.CustomView.ShadowContainer
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
app:containerCornerRadius="10dp"
app:containerDeltaLength="20px"
app:containerShadowColor="#AAAAAC"
app:containerShadowRadius="20px"
tools:ignore="Pxusage,RtlHardcoded">

<TextView
android:id="@+id/tv_food_name"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:text="回锅肉炒饭"
android:textSize="50dp"
android:textStyle="bold" />
android:background="@drawable/rectange">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:orientation="vertical"
android:layout_marginTop="-10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:text="非会员12.00/g"
android:textColor="@color/colorPrimaryDark"
android:textSize="30dp" />
<TextView
android:id="@+id/tv_vipprice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:text="会员11.00/g"
android:textColor="@color/colorPrimaryDark"
android:textSize="30dp"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
<View
android:layout_marginTop="55dp"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#cdcdcd" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.bpa.scalage.control.MyImageView
android:id="@+id/iv_food_pic"
android:layout_width="match_parent"
android:layout_height="400dp"
android:layout_marginTop="60dp"
android:layout_alignParentLeft="true"
android:scaleType="fitXY" />
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
<Button
android:id="@+id/btn_add_car"
android:layout_width="240dp"
android:layout_height="90dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="40dp"
android:background="@drawable/selector_weixin_green_button"
android:gravity="center"
android:text="售卖商品"
android:textColor="@android:color/white"
android:textSize="40sp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_food_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:text="回锅肉炒饭"
android:textSize="50dp"
android:textStyle="bold" />

<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:text="非会员12.00/g"
android:textColor="@color/colorPrimaryDark"
android:textSize="30dp" />

</LinearLayout>

<Button
android:id="@+id/btn_add_car"
android:layout_width="240dp"
android:layout_height="90dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:background="@drawable/selector_weixin_green_button"
android:gravity="center"
android:text="售卖商品"
android:textColor="@android:color/white"
android:textSize="40sp" />

</RelativeLayout>

</com.bpa.scalage.HBL.CustomView.ShadowContainer>

<!-- <RelativeLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content">-->

<!-- <TextView-->
<!-- android:id="@+id/tv_food_name"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentLeft="true"-->
<!-- android:layout_marginLeft="10dp"-->
<!-- android:text="回锅肉炒饭"-->
<!-- android:textSize="50dp"-->
<!-- android:textStyle="bold" />-->

<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:orientation="vertical"-->
<!-- android:layout_marginTop="-10dp">-->

<!-- <TextView-->
<!-- android:id="@+id/tv_price"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="10dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:text="非会员12.00/g"-->
<!-- android:textColor="@color/colorPrimaryDark"-->
<!-- android:textSize="30dp" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_vipprice"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="10dp"-->
<!-- android:layout_marginTop="10dp"-->
<!-- android:text="会员11.00/g"-->
<!-- android:textColor="@color/colorPrimaryDark"-->
<!-- android:textSize="30dp"-->
<!-- android:textStyle="bold" />-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <View-->
<!-- android:layout_marginTop="55dp"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:background="#cdcdcd" />-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content">-->
<!-- <com.bpa.scalage.control.MyImageView-->
<!-- android:id="@+id/iv_food_pic"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="400dp"-->
<!-- android:layout_marginTop="60dp"-->
<!-- android:layout_alignParentLeft="true"-->
<!-- android:scaleType="fitXY" />-->
<!-- </LinearLayout>-->
<!-- <RelativeLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- >-->
<!-- <Button-->
<!-- android:id="@+id/btn_add_car"-->
<!-- android:layout_width="240dp"-->
<!-- android:layout_height="90dp"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_marginBottom="40dp"-->
<!-- android:background="@drawable/selector_weixin_green_button"-->
<!-- android:gravity="center"-->
<!-- android:text="售卖商品"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textSize="40sp" />-->
<!-- </RelativeLayout>-->
</LinearLayout>

Write Preview
Loading…
Cancel
Save