Browse Source

Merge branch '调味吧台' of http://10.2.1.24:10244/fyf/AndroidSmartClient into 调味吧台

调味吧台
liup 7 months ago
parent
commit
0499b43aed
3 changed files with 11 additions and 6 deletions
  1. +5
    -0
      .gitignore
  2. +1
    -1
      .idea/gradle.xml
  3. +5
    -5
      app/src/main/res/layout/datatab/layout/xxpf_item.xml

+ 5
- 0
.gitignore View File

@@ -11,3 +11,8 @@
/build
/captures
.externalNativeBuild
/app/release/app-release.apk
/.idea/deploymentTargetDropDown.xml
/.idea/migrations.xml
/app/release/output-metadata.json
/app/src/main/res/mipmap-xxxhdpi/yxz.png

+ 1
- 1
.idea/gradle.xml View File

@@ -5,7 +5,7 @@
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="gradleJvm" value="corretto-11" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />


+ 5
- 5
app/src/main/res/layout/datatab/layout/xxpf_item.xml View File

@@ -34,7 +34,7 @@
android:digits="0123456789"
android:maxLines="1"
android:padding="3dp"
android:textSize="12dp" />
android:textSize="18sp" />
</RelativeLayout>

<RelativeLayout
@@ -50,7 +50,7 @@
android:layout_marginLeft="20dp"
android:layout_alignParentLeft="true"
android:text="回锅肉"
android:textSize="12dp"/>
android:textSize="18sp"/>
</RelativeLayout>

<RelativeLayout
@@ -67,7 +67,7 @@
android:digits="0123456789."
android:maxLines="1"
android:padding="3dp"
android:textSize="12dp" />
android:textSize="18sp" />
</RelativeLayout>

<RelativeLayout
@@ -78,12 +78,12 @@
android:id="@+id/button_delete"
android:layout_width="60dp"
android:layout_centerVertical="true"
android:layout_height="20dp"
android:layout_height="30dp"
android:layout_marginLeft="20dp"
android:background="@drawable/button"
android:focusable="false"
android:text="删除"
android:textSize="12dp"/>
android:textSize="18sp"/>
</RelativeLayout>

</TableRow>


Loading…
Cancel
Save