界面添加图标

zuoxiao

2024-08-16 7cfa7455b345faa55f2d11ff21b1e6b9e678a5a2

界面添加图标

 baselibrary/src/main/java/com/dayu/baselibrary/utils/BaseCommon.java

@@ -32,5 +32,7 @@
    public final static int REPLACE_HAS_CARD = 3;
    //已关泵补卡
    public final static int REPLACE_NO_CARD = 4;
    //泵未关写卡
    public final static int REPLACE_WRITE = 5;

}

 baselibrary/src/main/res/color/text_selecter_color.xml

@@ -4,5 +4,5 @@
    <item android:state_pressed="true" android:color="@color/button_select_text_color"/>
    <item android:state_checked="true" android:color="@color/button_select_text_color"/>
    <item android:state_focused="true" android:color="@color/button_select_text_color"/>
    <item android:color="@color/button_text_color"/>
    <item android:color="@color/dialog_btn"/>
</selector> 

 baselibrary/src/main/res/drawable/home_add.xml

New file
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="40dp"
    android:height="40dp"
    android:viewportWidth="20"
    android:viewportHeight="20">
  <path
      android:pathData="M2,13.86V16h12v-2.14c0,-1.9 -4,-2.86 -6,-2.86C6,11 2,11.96 2,13.86zM3,13.86C3,13.04 5.8,12 8,12c2.2,0 5,1.04 5,1.86V15H3V13.86z"
      android:fillColor="#009ad6"/>
  <path
      android:pathData="M11,7c0,-1.66 -1.34,-3 -3,-3C6.34,4 5,5.34 5,7c0,1.66 1.34,3 3,3C9.66,10 11,8.66 11,7zM10,7c0,1.1 -0.9,2 -2,2S6,8.1 6,7s0.9,-2 2,-2S10,5.9 10,7z"
      android:fillColor="#009ad6"/>
  <path
      android:pathData="M13,9l2,0l0,-2l1,0l0,2l2,0l0,1l-2,0l0,2l-1,0l0,-2l-2,0z"
      android:fillColor="#009ad6"/>
</vector>

 baselibrary/src/main/res/drawable/home_my.xml

New file
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="40dp"
    android:height="40dp"
    android:viewportWidth="20"
    android:viewportHeight="20">
  <path
      android:pathData="M10,5.5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3zM10,10c-0.83,0 -1.5,-0.67 -1.5,-1.5S9.17,7 10,7s1.5,0.67 1.5,1.5S10.83,10 10,10z"
      android:fillColor="#009ad6"/>
  <path
      android:pathData="M10,2c-4.42,0 -8,3.58 -8,8s3.58,8 8,8 8,-3.58 8,-8 -3.58,-8 -8,-8zM10,16.5c-1.49,0 -2.86,-0.51 -3.96,-1.36C7.19,14.42 8.55,14 10,14s2.81,0.42 3.96,1.14c-1.1,0.85 -2.47,1.36 -3.96,1.36zM15.07,14.06c-1.44,-0.99 -3.19,-1.56 -5.07,-1.56s-3.62,0.58 -5.07,1.56C4.04,12.95 3.5,11.54 3.5,10c0,-3.58 2.92,-6.5 6.5,-6.5s6.5,2.92 6.5,6.5c0,1.54 -0.54,2.95 -1.43,4.06z"
      android:fillColor="#009ad6"/>
</vector>

 baselibrary/src/main/res/drawable/home_read.xml

New file
@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="48"
    android:viewportHeight="48">
  <path
      android:pathData="M6,15L19.371,25.538C20.5,26.5 22.828,28 25,26C27.289,23.892 25.5,21.5 25,21L17,15"
      android:strokeLineJoin="round"
      android:strokeWidth="4"
      android:fillColor="#00000000"
      android:strokeColor="#009ad6"
      android:strokeLineCap="round"/>
  <path
      android:pathData="M4,8H27L38,18"
      android:strokeLineJoin="round"
      android:strokeWidth="4"
      android:fillColor="#00000000"
      android:strokeColor="#009ad6"
      android:strokeLineCap="round"/>
  <path
      android:pathData="M9,33L44,33.019"
      android:strokeLineJoin="round"
      android:strokeWidth="4"
      android:fillColor="#00000000"
      android:strokeColor="#009ad6"
      android:strokeLineCap="round"/>
  <path
      android:pathData="M9,18V40H44V18H22"
      android:strokeLineJoin="round"
      android:strokeWidth="4"
      android:fillColor="#00000000"
      android:strokeColor="#009ad6"
      android:strokeLineCap="round"/>
</vector>

 baselibrary/src/main/res/drawable/home_recharge.xml

New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="40dp"
    android:height="40dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20zM12.89,11.1c-1.78,-0.59 -2.64,-0.96 -2.64,-1.9c0,-1.02 1.11,-1.39 1.81,-1.39c1.31,0 1.79,0.99 1.9,1.34l1.58,-0.67c-0.15,-0.44 -0.82,-1.91 -2.66,-2.23V5h-1.75v1.26c-2.6,0.56 -2.62,2.85 -2.62,2.96c0,2.27 2.25,2.91 3.35,3.31c1.58,0.56 2.28,1.07 2.28,2.03c0,1.13 -1.05,1.61 -1.98,1.61c-1.82,0 -2.34,-1.87 -2.4,-2.09L8.1,14.75c0.63,2.19 2.28,2.78 3.02,2.96V19h1.75v-1.24c0.52,-0.09 3.02,-0.59 3.02,-3.22C15.9,13.15 15.29,11.93 12.89,11.1z"
      android:fillColor="#009ad6"/>
</vector>

 baselibrary/src/main/res/drawable/home_replacement.xml

New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="40dp"
    android:height="40dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z"
      android:fillColor="#009ad6"/>
</vector>

 baselibrary/src/main/res/drawable/home_report.xml

New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="40dp"
    android:height="40dp"
    android:viewportWidth="20"
    android:viewportHeight="20">
  <path
      android:pathData="M17.78,17.78L2.22,2.22L1.16,3.28L2.38,4.5C2.15,4.77 2,5.12 2,5.5v9C2,15.33 2.67,16 3.5,16h10.38l2.84,2.84L17.78,17.78zM4.88,7H3.5V5.62L4.88,7zM3.5,14.5V10h4.38l4.5,4.5H3.5zM6.12,4H16.5C17.33,4 18,4.67 18,5.5v9c0,0.38 -0.15,0.73 -0.38,1l-1.12,-1.12V10h-4.38l-3,-3h7.38V5.5H7.62L6.12,4z"
      android:fillColor="#009ad6"/>
</vector>

 baselibrary/src/main/res/drawable/home_system.xml

New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="40dp"
    android:height="40dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"
      android:fillColor="#009ad6"/>
</vector>

 baselibrary/src/main/res/layout/custom_titlebar.xml

@@ -71,7 +71,7 @@
                android:ellipsize="end"
                android:maxLines="1"
                android:text="标题"
                android:textColor="#333333"
                android:textColor="#ffffff"
                android:textSize="20sp"
                android:visibility="visible" />
        </LinearLayout>
@@ -94,7 +94,7 @@
                android:layout_height="wrap_content"
                android:background="@null"
                android:text="完成"
                android:textColor="#333333"
                android:textColor="#ffffff"
                android:textSize="20sp"
                android:visibility="gone" />


 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/HomeActivity.java

@@ -82,18 +82,19 @@
        //补卡写卡
        homeBinding.homeReplacement.setOnClickListener(v -> {
            replacementDialog = new ChooseReplacementDialog(this, type -> {
                Intent intent = new Intent(HomeActivity.this, UserSearchActivity.class);
                intent.putExtra("type", type);
                startActivity(intent);
                if (type == BaseCommon.REPLACE_WRITE) {
                    //补卡写卡
                    Intent intent = new Intent(HomeActivity.this, ManagerReadActivity.class);
                    intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
                    startActivity(intent);
                } else {
                    Intent intent = new Intent(HomeActivity.this, UserSearchActivity.class);
                    intent.putExtra("type", type);
                    startActivity(intent);
                }
                replacementDialog.dismiss();
            });
            replacementDialog.show();
        });
        //补卡写卡
        homeBinding.homeReplacementWrite.setOnClickListener(v -> {
            Intent intent = new Intent(HomeActivity.this, ManagerReadActivity.class);
            intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
            startActivity(intent);
        });
    }


 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java

@@ -63,7 +63,7 @@
                    startActivity(intent);
                    ManagerWriteActivity.this.finish();
                } else {
                    TipUtil.show(this, "请在控制器端刷卡后在首页点击泵未关写卡后继续补卡！", () -> {
                    TipUtil.show(this, "请在控制器端刷卡后在首页点击补卡再点击泵未关写卡后继续补卡！", () -> {
                        ManagerWriteActivity.this.finish();
                        if (UserSearchActivity.userSearchActivity != null) {
                            UserSearchActivity.userSearchActivity.finish();

 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java

@@ -2,11 +2,14 @@

import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.InputFilter;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;

import androidx.annotation.NonNull;

@@ -74,6 +77,7 @@
    }

    private void initView() {
        setPricePoint(newCardBinding.newCardMorny);
//        newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
        newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
        //身份证识别
@@ -391,5 +395,55 @@
        });
    }

    //校验金额
    public void setPricePoint(final EditText editText) {
        editText.addTextChangedListener(new TextWatcher() {
            @Override
            public void onTextChanged(CharSequence s, int start, int before,
                                      int count) {
                if (s.toString().contains(".")) {
                    if (s.length() - 1 - s.toString().indexOf(".") > 2) {
                        s = s.toString().subSequence(0,
                                s.toString().indexOf(".") + 3);
                        editText.setText(s);
                        editText.setSelection(s.length());
                    }
                }
                if (s.toString().trim().substring(0).equals(".")) {
                    s = "0" + s;
                    editText.setText(s);
                    editText.setSelection(2);
                }

                if (s.toString().startsWith("0")
                        && s.toString().trim().length() > 1) {
                    if (!s.toString().substring(1, 2).equals(".")) {
                        editText.setText(s.subSequence(0, 1));
                        editText.setSelection(1);
                    }
                }
                String morny = editText.getText().toString();
                if (!TextUtils.isEmpty(morny)) {
//                    rechageWater = MornyUtil.intDiv(MornyUtil.changeY2F(editText.getText().toString()), waterPrice);
//                    binding.redRechargeWater.setText("充值水量：" + rechageWater + " 立方米(吨)");
                }


            }

            @Override
            public void beforeTextChanged(CharSequence s, int start, int count,
                                          int after) {

            }

            @Override
            public void afterTextChanged(Editable s) {
                // TODO Auto-generated method stub

            }

        });

    }
}

 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/view/ChooseReplacementDialog.java

@@ -3,6 +3,7 @@
import static android.view.Gravity.CENTER;
import static com.dayu.baselibrary.utils.BaseCommon.REPLACE_HAS_CARD;
import static com.dayu.baselibrary.utils.BaseCommon.REPLACE_NO_CARD;
import static com.dayu.baselibrary.utils.BaseCommon.REPLACE_WRITE;

import android.app.Activity;
import android.app.Dialog;
@@ -53,6 +54,8 @@

            } else if (checkedId == R.id.noCard) {
                type = REPLACE_NO_CARD;
            } else if (checkedId == R.id.manager_write) {
                type = REPLACE_WRITE;
            }
        });
        TextView okBtn = findViewById(com.dayu.baselibrary.R.id.ok);

 qiheonlinelibrary/src/main/res/layout/activity_home_qhl.xml

@@ -14,58 +14,111 @@

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="50dp"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="30dp"
        android:orientation="horizontal">

        <TextView
        <LinearLayout
            android:id="@+id/home_newCard"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:gravity="center"
            android:text="新卡开户"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            android:orientation="vertical">

        <TextView
            <ImageView
                android:layout_width="70dp"
                android:layout_height="70dp"
                android:src="@drawable/home_add" />

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:gravity="center"
                android:text="新卡开户"
                android:textColor="@color/text_selecter_color"
                android:textSize="@dimen/home_text_size" />

        </LinearLayout>

        <LinearLayout
            android:id="@+id/home_recharge"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:gravity="center"
            android:text="充值"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            android:orientation="vertical">

        <TextView
            <ImageView
                android:layout_width="70dp"
                android:layout_height="70dp"
                android:src="@drawable/home_recharge" />

            <TextView

                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:text="充值"
                android:textColor="@color/text_selecter_color"
                android:textSize="@dimen/home_text_size" />
        </LinearLayout>

        <LinearLayout
            android:id="@+id/home_redCard"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:gravity="center"
            android:text="读取卡片"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            android:orientation="vertical">

            <ImageView
                android:layout_width="70dp"
                android:layout_height="70dp"
                android:src="@drawable/home_read" />

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:gravity="center"
                android:text="读取卡片"
                android:textColor="@color/text_selecter_color"
                android:textSize="@dimen/home_text_size" />
        </LinearLayout>
    </LinearLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="50dp"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="30dp"

        android:layout_marginTop="40dp"
        android:orientation="horizontal">

        <TextView
        <LinearLayout
            android:id="@+id/home_loss"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:gravity="center"
            android:text="挂失"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            android:orientation="vertical">

            <ImageView
                android:layout_width="70dp"
                android:layout_height="70dp"
                android:src="@drawable/home_report" />

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:text="挂失"
                android:textColor="@color/text_selecter_color"
                android:textSize="@dimen/home_text_size" />
        </LinearLayout>

        <TextView
            android:id="@+id/home_reportLoss"
@@ -78,43 +131,62 @@
            android:textSize="@dimen/home_text_size"
            android:visibility="gone" />

        <TextView
        <LinearLayout
            android:id="@+id/home_replacement"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:gravity="center"
            android:text="补卡"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            android:orientation="vertical">

        <TextView
            android:id="@+id/home_replacementWrite"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_weight="1"
            android:gravity="center"
            android:text="泵未关写卡"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            <ImageView
                android:layout_width="70dp"
                android:layout_height="70dp"
                android:src="@drawable/home_replacement" />

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:text="补卡"
                android:textColor="@color/text_selecter_color"
                android:textSize="@dimen/home_text_size" />
        </LinearLayout>


    </LinearLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="50dp"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginTop="30dp"
        android:layout_marginTop="40dp"
        android:orientation="horizontal">

        <TextView
        <LinearLayout
            android:id="@+id/home_admin"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:gravity="center"
            android:text="管理系统"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            android:orientation="vertical">

            <ImageView
                android:layout_width="70dp"
                android:layout_height="70dp"
                android:src="@drawable/home_system" />

            <TextView

                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:text="管理系统"
                android:textColor="@color/text_selecter_color"
                android:textSize="@dimen/home_text_size" />
        </LinearLayout>

        <TextView
            android:id="@+id/home_parameter"
@@ -127,15 +199,28 @@
            android:textSize="@dimen/home_text_size"
            android:visibility="gone" />

        <TextView
        <LinearLayout
            android:id="@+id/home_my"
            android:layout_width="0dp"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:gravity="center"
            android:text="个人中心"
            android:textColor="@color/text_selecter_color"
            android:textSize="@dimen/home_text_size" />
            android:orientation="vertical">

            <ImageView
                android:layout_width="70dp"
                android:layout_height="70dp"
                android:src="@drawable/home_my" />

            <TextView
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:text="个人中心"
                android:textColor="@color/text_selecter_color"
                android:textSize="@dimen/home_text_size" />
        </LinearLayout>
    </LinearLayout>



 qiheonlinelibrary/src/main/res/layout/activity_new_card_qhl.xml

@@ -61,7 +61,7 @@
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="测试"
                    android:text=""
                    android:textSize="@dimen/new_card_size" />

                <ImageView
@@ -91,7 +91,7 @@
                    android:digits="0123456789Xx"
                    android:inputType="text"
                    android:maxLength="18"
                    android:text="130107199210160024"
                    android:text=""
                    android:textSize="@dimen/new_card_size" />


@@ -148,7 +148,7 @@
                    android:layout_height="wrap_content"
                    android:inputType="number"
                    android:maxLength="11"
                    android:text="15802220723"
                    android:text=""
                    android:textSize="@dimen/new_card_size" />
            </LinearLayout>

@@ -167,8 +167,8 @@
                    android:id="@+id/newCard_morny"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:inputType="number"
                    android:text="5"
                    android:inputType="numberDecimal"
                    android:text=""

                    android:textSize="@dimen/new_card_size" />
            </LinearLayout>

 qiheonlinelibrary/src/main/res/layout/dialog_chose_type.xml

@@ -50,6 +50,7 @@
                android:text="泵未关补卡"
                android:textColor="@drawable/radio_text_select"
                android:textSize="20sp" />

            <RadioButton
                android:id="@+id/noCard"
                android:layout_width="match_parent"
@@ -65,6 +66,20 @@
                android:textColor="@drawable/radio_text_select"
                android:textSize="20sp" />

            <RadioButton
                android:id="@+id/manager_write"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginLeft="50dp"
                android:layout_marginTop="25dp"
                android:layout_marginRight="50dp"
                android:background="@drawable/radio_select"
                android:button="@null"
                android:gravity="center"
                android:padding="6dp"
                android:text="泵未关写卡"
                android:textColor="@drawable/radio_text_select"
                android:textSize="20sp" />

        </RadioGroup>

@@ -78,8 +93,8 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:gravity="center_horizontal"
            android:padding="5dp"
            android:orientation="horizontal">
            android:orientation="horizontal"
            android:padding="5dp">

            <TextView
                android:id="@+id/ok"