Commit 69fa5dd9 by 郑鹏

加上字体文件

parent 31c53555
//apply plugin: 'com.android.application'
apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'com.android.application'
/*apply plugin: 'com.android.library'
apply plugin: 'maven'*/
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
......@@ -15,8 +15,8 @@ android {
compileSdkVersion 30
defaultConfig {
/* multiDexEnabled true
applicationId "com.mhq.smartorder"*/
multiDexEnabled true
applicationId "com.mhq.smartorder"
minSdkVersion 26
targetSdkVersion 30
......@@ -173,7 +173,7 @@ def getAppVersionCode() {
}
return stout.toString().split("\n").size()
}
ext {
/*ext {
GITHUB_REPO_PATH = "../../androidlibrary"
PUBLISH_GROUP_ID = 'com.mhq.smartorder'
PUBLISH_ARTIFACT_ID = 'smartorder'
......@@ -190,7 +190,7 @@ uploadArchives {
pom.version = project.PUBLISH_VERSION // 版本号
}
}
}
}*/
dependencies {
......
......@@ -285,11 +285,11 @@
<activity
android:name="cn.dankal.user.login.LanguageSelectActivity"
android:screenOrientation="portrait">
<!-- <intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>-->
</intent-filter>
</activity>
<activity
android:name="com.mhq.smartorder.wxapi.WXPayEntryActivity"
......
......@@ -3,6 +3,7 @@ package cn.dankal.basiclib;
import android.app.Application;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Typeface;
import android.support.multidex.MultiDex;
import android.support.v7.app.AppCompatDelegate;
......@@ -15,6 +16,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import org.litepal.LitePal;
import java.lang.reflect.Field;
import java.util.Locale;
import cn.dankal.basiclib.image.Utils;
......@@ -42,6 +44,8 @@ public class ModooApplication extends Application {
private static IWXAPI api;
private Typeface mFromAsset;
@Override
public void onCreate() {
super.onCreate();
......@@ -107,6 +111,31 @@ public class ModooApplication extends Application {
} else if ("zh".equals(language)) {
SPUtil.getInstance(ModooApplication.getContext()).saveLanguage(0);
}
mFromAsset = Typeface.createFromAsset(getAssets(), "fonts/test_font.ttf");
//setFonts();
}
public Typeface getFromAsset() {
return mFromAsset;
}
private void setFonts() {
Typeface typeFaceYaHei = Typeface.createFromAsset(getAssets(), "fonts/NotoSansKR-Light.otf");
try
{
Field field = Typeface.class.getDeclaredField("MONOSPACE");
field.setAccessible(true);
field.set(null, typeFaceYaHei);
}
catch (NoSuchFieldException e)
{
e.printStackTrace();
}
catch (IllegalAccessException e)
{
e.printStackTrace();
}
}
/**
......
package cn.dankal.basiclib.widget;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Typeface;
import android.text.Layout;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
import cn.dankal.basiclib.ModooApplication;
import cn.dankal.basiclib.widget.passwordview.Util;
import cn.dankal.client.R;
/**
* Author: roczheng
* Date: 2021/3/18
* Time: 21:43
* Description:
*/
public class NewFontTextView extends android.support.v7.widget.AppCompatTextView {
private Context context;
private Float testSize;
public NewFontTextView(Context context) {
this(context, null);
}
public NewFontTextView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
public NewFontTextView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
this.context = context;
// getPaint().setTypeface(ModooApplication.getInstance().getFromAsset());
}
public void setTypeface(Typeface tf, int style) {
if (style == Typeface.BOLD) {
super.setTypeface(ModooApplication.getInstance().getFromAsset());
} else {
super.setTypeface(ModooApplication.getInstance().getFromAsset());
}
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int wMode = MeasureSpec.getMode(widthMeasureSpec);
int wSize = MeasureSpec.getSize(widthMeasureSpec);
int hMode = MeasureSpec.getMode(heightMeasureSpec);
int hSize = MeasureSpec.getSize(heightMeasureSpec);
/* hSize = this.getMeasuredHeight();
TextPaint newPaint = new TextPaint();
String textStr = getText().toString();
float textSize = getResources().getDisplayMetrics().scaledDensity * Util.px2sp(context, getTextSize());
newPaint.setTextSize(textSize);
float textWidth = getLineLength(textStr, getTextSize());
int targetWidith = 0;
int newWidthMeasureSpec = 0;
int newHeightMeasureSpec = 0;
switch (wMode) {
case MeasureSpec.UNSPECIFIED:
wSize = (int) ( textWidth);
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(wSize, wMode);
break;
case MeasureSpec.EXACTLY:
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(wSize, wMode);
break;
case MeasureSpec.AT_MOST:
targetWidith = (int) (textWidth);
if (wSize > targetWidith) {
wSize = targetWidith;
}
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(wSize, wMode);
break;
}*/
/* String textStr = getText().toString();
//float textSize = getResources().getDisplayMetrics().scaledDensity * Util.px2sp(context, getTextSize());
float textWidth = getLineLength(textStr, getTextSize());
int targetWidith = 0;
targetWidith = (int) (textWidth);
int newWidthMeasureSpec = 0;
int newHeightMeasureSpec = 0;
newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(getHeight(), hMode);
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(getWidth(), wMode);
setMeasuredDimension(newWidthMeasureSpec, newHeightMeasureSpec);*/
}
/* @Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
if (!TextUtils.isEmpty(getText())){
float txtLen = Layout.getDesiredWidth(getText().toString(),0,getText().length(),getPaint());
if(txtLen>getWidth()-10){//当字体长度大于宽度-10的时候,按比例缩放
float scale = getWidth()/txtLen;
setTextSize(TypedValue.COMPLEX_UNIT_PX,getTextSize()*scale);
}else{
setTextSize(TypedValue.COMPLEX_UNIT_PX,getTextSize());
}
}
}*/
public int getLineLength(String str, float textSize) {
Paint pFont = new Paint();
pFont.setTextSize(textSize);
pFont.setTypeface(ModooApplication.getInstance().getFromAsset());
return (int) pFont.measureText(str);
}
public static int dip2px(Context context, float dpValue) {
final float scale = context.getResources().getDisplayMetrics().density;
return (int) (dpValue * scale + 0.5f);
}
}
\ No newline at end of file
......@@ -166,7 +166,7 @@ class CarFragment : BaseFragment(), View.OnClickListener {
if (t.data == null || t.data.size == 0) {
var view = UIUtile.getView(R.layout.adapter_layout_personal_empty_data, rv_coupon_list)
var textTip = view.findViewById<TextView>(R.id.tv_text_tip)
var textTip = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_tip)
textTip.text = getString(R.string.shopping_cart_is_empty)
adapter?.emptyView = view
tv_car_price.text = UIUtile.stringToPrice("0")
......
package cn.dankal.client.ui.home
//import cn.dankal.client.ui.home.map.GoogleMapsActivity
import android.Manifest
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.graphics.Typeface
import android.location.Location
import android.location.LocationManager
import android.os.Build
......@@ -20,28 +22,26 @@ import cn.dankal.basiclib.api.HomeServiceFactory
import cn.dankal.basiclib.api.RestaurantServiceFactory
import cn.dankal.basiclib.base.activity.BaseActivity
import cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter
import cn.dankal.basiclib.protocol.MainProtocol
import cn.dankal.basiclib.rx.AbstractDialogSubscriber
import cn.dankal.basiclib.util.SPUtils
import cn.dankal.basiclib.util.ToastUtils
import cn.dankal.client.R
import cn.dankal.client.constants.ConstantsHomeType
//import cn.dankal.client.ui.home.map.GoogleMapsActivity
import cn.dankal.client.ui.home.details.MerchantDetailsActivity
import cn.dankal.entities.event.LocationChangeEvent
import cn.dankal.entities.home.QRCodeEntity
import cn.dankal.entities.home.TopHomeInfoEntity
import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson
import com.scwang.smartrefresh.layout.header.ClassicsHeader
import com.yanzhenjie.permission.Permission
import com.yzq.zxinglibrary.android.CaptureActivity
import io.reactivex.rxjava3.disposables.Disposable
import kotlinx.android.synthetic.main.fragment_home.*
import kotlinx.android.synthetic.main.activity_home.*
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import cn.dankal.basiclib.protocol.MainProtocol
import cn.dankal.client.ui.home.details.MerchantDetailsActivity
import cn.dankal.client.ui.personal.MyQueueActivity
import cn.dankal.entities.home.QRCodeEntity
import com.alibaba.android.arouter.facade.annotation.Route
import com.google.gson.Gson
@Route(path = MainProtocol.MAIN)
class HomeActivity : BaseActivity(), View.OnClickListener {
......@@ -92,6 +92,7 @@ class HomeActivity : BaseActivity(), View.OnClickListener {
getStateBar()
}
//획득 상태 표시 줄 높이
private fun getStateBar() {
var result = 0
......@@ -106,13 +107,13 @@ class HomeActivity : BaseActivity(), View.OnClickListener {
private fun judgeProvider(locationManager: LocationManager): String {
var podiatrist = locationManager?.getProviders(true)
if (podiatrist.contains(LocationManager.NETWORK_PROVIDER)) {
tv_location_tip.text = ""
//tv_location_tip.text = ""
return LocationManager.NETWORK_PROVIDER//네트워크 위치 확인
} else if (podiatrist.contains(LocationManager.GPS_PROVIDER)) {
tv_location_tip.text = ""
//tv_location_tip.text = ""
return LocationManager.GPS_PROVIDER//GPS 포 지 셔 닝
} else {
tv_location_tip.text = getString(R.string.unopened_positioning)
//tv_location_tip.text = getString(R.string.unopened_positioning)
ToastUtils.showShort(getString(R.string.please_turn_on_positioning))
SPUtils.put(ConstantsHomeType.LATITUDE, "")
SPUtils.put(ConstantsHomeType.LONGITUDE, "")
......
......@@ -86,7 +86,7 @@ class NearbyMerchantActivity : BaseListActivity<BottomAroundEntity.DataBean>() {
} else {
if (rvList != null && adapter != null) {
var view = UIUtile.getView(R.layout.adapter_layout_personal_empty_data, rvList)
var tvTip = view.findViewById<TextView>(R.id.tv_text_tip)
var tvTip = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_tip)
tvTip.text = getString(R.string.there_is_no_business_nearby)
adapter.emptyView = view
}
......
......@@ -270,17 +270,17 @@ class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
private fun showBottomDialog(entity: RestaurantSpecEntity) {
val view = LayoutInflater.from(this).inflate(R.layout.dialog_select_format_tow, null, false)
val flowLayoutOne = view.findViewById<TagFlowLayout>(R.id.fl_tag_one)
val mainName = view.findViewById<TextView>(R.id.tv_format)
val price = view.findViewById<TextView>(R.id.tv_restaurant_price)
val tvSpecShow = view.findViewById<TextView>(R.id.tv_restaurant_spec)
val tvShopName = view.findViewById<TextView>(R.id.tv_title_name)
val mainName = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_format)
val price = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_restaurant_price)
val tvSpecShow = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_restaurant_spec)
val tvShopName = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_title_name)
val tvShopAdd = view.findViewById<Button>(R.id.btn_restaurant_add)
val imageViewClose = view.findViewById<ImageView>(R.id.iv_dialog_close)
val recyclerView = view.findViewById<RecyclerView>(R.id.rv_auxiliary)
val llCount = view.findViewById<LinearLayout>(R.id.ll_count)
val ivReduce = view.findViewById<ImageView>(R.id.tv_item_reduce)
val ivAdd = view.findViewById<ImageView>(R.id.tv_item_add)
val tvItemCount = view.findViewById<TextView>(R.id.tv_item_count)
val tvItemCount = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_item_count)
ivAdd.setOnClickListener { v ->
addAndReduce(tvItemCount, 0)
......@@ -527,9 +527,9 @@ class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
private fun initCar() {
view = LayoutInflater.from(this).inflate(R.layout.dialog_bottom_list, null, false)
view?.let {
tvSettlement = it.findViewById<TextView>(R.id.tv_bottom_shop_button)
val tvCleanCars = it.findViewById<TextView>(R.id.tv_car_clean)
tvShowShopInfo = it.findViewById<TextView>(R.id.tv_bottom_shop_tip_text)
tvSettlement = it.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_bottom_shop_button)
val tvCleanCars = it.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_car_clean)
tvShowShopInfo = it.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_bottom_shop_tip_text)
tvCount = it.findViewById(R.id.tv_bottom_shop_count)
val llBg = it.findViewById<LinearLayoutCompat>(R.id.ll_bg)
......
......@@ -314,17 +314,17 @@ class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesVie
private fun showBottomDialog(entity: RestaurantSpecEntity) {
val view = LayoutInflater.from(this).inflate(R.layout.dialog_select_format_tow, null, false)
val flowLayoutOne = view.findViewById<TagFlowLayout>(R.id.fl_tag_one)
val mainName = view.findViewById<TextView>(R.id.tv_format)
val price = view.findViewById<TextView>(R.id.tv_restaurant_price)
val tvSpecShow = view.findViewById<TextView>(R.id.tv_restaurant_spec)
val tvShopName = view.findViewById<TextView>(R.id.tv_title_name)
val mainName = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_format)
val price = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_restaurant_price)
val tvSpecShow = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_restaurant_spec)
val tvShopName = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_title_name)
val tvShopAdd = view.findViewById<Button>(R.id.btn_restaurant_add)
val imageViewClose = view.findViewById<ImageView>(R.id.iv_dialog_close)
val recyclerView = view.findViewById<RecyclerView>(R.id.rv_auxiliary)
val llCount = view.findViewById<LinearLayout>(R.id.ll_count)
val ivReduce = view.findViewById<ImageView>(R.id.tv_item_reduce)
val ivAdd = view.findViewById<ImageView>(R.id.tv_item_add)
val tvItemCount = view.findViewById<TextView>(R.id.tv_item_count)
val tvItemCount = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_item_count)
ivAdd.setOnClickListener { v ->
addAndReduce(tvItemCount, 0)
......@@ -600,9 +600,9 @@ class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesVie
private fun initCar() {
view = LayoutInflater.from(this).inflate(R.layout.dialog_bottom_list, null, false)
view?.let {
tvSettlement = it.findViewById<TextView>(R.id.tv_bottom_shop_button)
val tvCleanCars = it.findViewById<TextView>(R.id.tv_car_clean)
tvShowShopInfo = it.findViewById<TextView>(R.id.tv_bottom_shop_tip_text)
tvSettlement = it.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_bottom_shop_button)
val tvCleanCars = it.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_car_clean)
tvShowShopInfo = it.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_bottom_shop_tip_text)
tvCount = it.findViewById(R.id.tv_bottom_shop_count)
val llBg = it.findViewById<LinearLayoutCompat>(R.id.ll_bg)
......
......@@ -275,7 +275,7 @@ class OrderResultActivity : BaseActivity(), View.OnClickListener {
val btnClose = view.findViewById<ImageView>(R.id.iv_dialog_close)
val btnOk = view.findViewById<Button>(R.id.btn_pop_ok)
val etRemark = view.findViewById<EditText>(R.id.et_feedback)
val tvTextCount = view.findViewById<TextView>(R.id.tv_text_size)
val tvTextCount = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_size)
etRemark.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {
......
......@@ -90,7 +90,7 @@ class AfterListActivity : BaseActivity(), OnRefreshLoadMoreListener {
} else {
adapter?.let {
var view = UIUtile.getView(R.layout.adapter_layout_personal_empty_data, rv_list)
var tvTip = view.findViewById<TextView>(R.id.tv_text_tip)
var tvTip = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_tip)
tvTip.text = getString(R.string.you_dont_have_an_order_yet)
it.emptyView = view
}
......
......@@ -119,7 +119,7 @@ class MyCollectActivity : BaseActivity(), OnRefreshLoadMoreListener {
ll_bottom.visibility = View.VISIBLE
} else {
var view = UIUtile.getView(R.layout.adapter_layout_personal_empty_data, rv_coupon_list)
var textTip = view.findViewById<TextView>(R.id.tv_text_tip)
var textTip = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_tip)
textTip.text = getString(R.string.you_have_not_added_any_items_yet)
myCollectAdapter?.emptyView = view
ll_bottom.visibility = View.GONE
......
......@@ -63,7 +63,7 @@ class StampActivity : BaseListActivity<StampListEntity.DataBean>() {
} else {
if (rvList != null && adapter != null) {
var view = UIUtile.getView(R.layout.adapter_layout_personal_empty_data, rvList)
var tvTip = view.findViewById<TextView>(R.id.tv_text_tip)
var tvTip = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_tip)
tvTip.text = getString(R.string.you_don_have_a_stamp_at_the_moment)
adapter.emptyView = view
}
......
......@@ -74,10 +74,10 @@ class LeaveMessageActivity : BaseActivity(), OnRefreshLoadMoreListener {
refreshLayout.setRefreshFooter(ClassicsFooter(this))
val footerView = LayoutInflater.from(this).inflate(R.layout.item_footer_leave_message, null, false)
var tvCommit = footerView.findViewById<TextView>(R.id.tv_commit)
var tvCancel = footerView.findViewById<TextView>(R.id.tv_cancel)
var tvCommit = footerView.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_commit)
var tvCancel = footerView.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_cancel)
var etContent = footerView.findViewById<EditText>(R.id.et_feedback)
val tvSize = footerView.findViewById<TextView>(R.id.tv_text_size)
val tvSize = footerView.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_size)
tvCancel.text = getString(R.string.cancel)
......
......@@ -291,10 +291,10 @@ class MallOrderDetailsActivity : BaseActivity(), View.OnClickListener, CallDialo
private fun showBottomDialog() {
val view = LayoutInflater.from(this).inflate(R.layout.item_footer_leave_message, null, false)
val tvCancel = view.findViewById<TextView>(R.id.tv_cancel)
val tvCommit = view.findViewById<TextView>(R.id.tv_commit)
val tvCancel = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_cancel)
val tvCommit = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_commit)
val etContent = view.findViewById<EditText>(R.id.et_feedback)
val tvCount = view.findViewById<TextView>(R.id.tv_text_size)
val tvCount = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_text_size)
tvCancel.setOnClickListener {
popupWindow?.let {
......
......@@ -311,12 +311,12 @@ class ShopDetailActivity : BaseActivity(), View.OnClickListener {
val view = LayoutInflater.from(this).inflate(R.layout.dialog_mall_details, null, false)
val flowLayoutOne = view.findViewById<TagFlowLayout>(R.id.fl_tag_one)
val imageViewClose = view.findViewById<ImageView>(R.id.iv_dialog_close)
val btnPay = view.findViewById<TextView>(R.id.tv_mall_pay)
val btnAddCar = view.findViewById<TextView>(R.id.tv_mall_add_car)
val tvUnitPrice = view.findViewById<TextView>(R.id.tv_popup_price_unit_price)
/* val tvOriginalPrice = view.findViewById<TextView>(R.id.tv_popup_price_original_price)*/
val tvRepertory = view.findViewById<TextView>(R.id.tv_popup_price_unit_repertory)
val tvNumber = view.findViewById<TextView>(R.id.tv_item_shop_number)
val btnPay = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_mall_pay)
val btnAddCar = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_mall_add_car)
val tvUnitPrice = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_popup_price_unit_price)
/* val tvOriginalPrice = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_popup_price_original_price)*/
val tvRepertory = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_popup_price_unit_repertory)
val tvNumber = view.findViewById<cn.dankal.basiclib.widget.NewFontTextView>(R.id.tv_item_shop_number)
val clCarReduce = view.findViewById<ConstraintLayout>(R.id.cl_car_reduce)
val clCarAdd = view.findViewById<ConstraintLayout>(R.id.cl_car_add)
var ivMallPicture = view.findViewById<ImageView>(R.id.iv_mall_picture)
......
......@@ -15,7 +15,7 @@
android:layout_marginTop="@dimen/dp_80"
android:src="@mipmap/ic_complaint_successful"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/successful_order_appeal"
......@@ -24,7 +24,7 @@
android:layout_marginTop="@dimen/dp_21"
android:layout_gravity="center_horizontal"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_a6a6a6"
......@@ -33,7 +33,7 @@
android:layout_gravity="center_horizontal"
android:text="@string/please_wait_patiently_for_background_processing"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_return"
android:background="@drawable/bg_button_return_night"
android:layout_width="@dimen/dp_124"
......
......@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -43,7 +43,7 @@
android:textSize="@dimen/sp_17"
tools:text="蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_sales"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -59,7 +59,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_unit_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -68,7 +68,7 @@
android:textColor="@color/font_FF3B30"
android:textSize="@dimen/sp_22" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_select_spec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -88,7 +88,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
......@@ -96,7 +96,7 @@
android:layout_marginRight="@dimen/dp_15"
android:background="@color/color_3d3d3d" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_12"
......@@ -150,7 +150,7 @@
android:textColor="@color/color_595959"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_button"
android:layout_width="@dimen/dp_134"
android:layout_height="@dimen/dp_55"
......@@ -172,7 +172,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_count"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
......@@ -199,7 +199,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_tip"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
......
......@@ -25,7 +25,7 @@
app:mImageWidth="@dimen/dp_20"
app:mMargin="@dimen/dp_3" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_grade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -35,7 +35,7 @@
android:textSize="@dimen/font_18_sp"
tools:text="4.7" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -44,7 +44,7 @@
tools:text="(230评价)" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/color_232323" />
......@@ -54,7 +54,7 @@
android:layout_height="@dimen/dp_50"
android:gravity="right|center_vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_new_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -63,14 +63,14 @@
android:textColor="@color/color_fbbc39"
android:textSize="@dimen/font_16_sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:background="@color/bg_979797"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_grade_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -41,7 +41,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/iv_hotel_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -89,7 +89,7 @@
android:maxLength="500"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -99,7 +99,7 @@
android:text="0/500" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_img_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -122,7 +122,7 @@
</android.support.v4.widget.NestedScrollView>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_btn_commit"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_46"
......
......@@ -11,7 +11,7 @@
android:orientation="vertical"
tools:context="cn.dankal.client.ui.home.HomeFragment">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_state_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_25"
......@@ -48,13 +48,12 @@
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_16"
android:src="@mipmap/ic_combined_shape"
android:text="SMART ORDER"
android:textColor="@color/white"
android:textSize="@dimen/sp_25" />
......
......@@ -27,7 +27,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_25"
......@@ -46,7 +46,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_merchant_title" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_merchant_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -98,7 +98,7 @@
android:layout_marginTop="@dimen/dp_8"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_restaurant_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -106,7 +106,7 @@
android:textSize="@dimen/sp_19"
tools:text="王妃家(深圳总店)" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_stamp_tag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -124,7 +124,7 @@
android:layout_marginTop="@dimen/dp_7"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/business_bulletin"
......@@ -158,7 +158,7 @@
app:mImageWidth="@dimen/dp_14"
app:mMargin="@dimen/dp_3" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_grade"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -169,7 +169,7 @@
android:textSize="@dimen/font_18_sp"
tools:text="4.7" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_see_evaluation"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_30"
......@@ -180,7 +180,7 @@
android:textColor="@color/color_999999" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_restaurant_stamp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -191,7 +191,7 @@
android:textSize="@dimen/sp_12"
android:visibility="gone" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_restaurant_coupons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -217,7 +217,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_55">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_2_dp"
android:layout_alignParentBottom="true"
......
......@@ -15,7 +15,7 @@
android:gravity="center"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_weight="1"
......
......@@ -29,7 +29,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_18"
......@@ -37,7 +37,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_15" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_table_number"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -48,7 +48,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_15" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_replace_table"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -64,7 +64,7 @@
android:textSize="@dimen/sp_12" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginLeft="@dimen/dp_18"
......@@ -84,7 +84,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_18"
......@@ -93,7 +93,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_total_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -113,7 +113,7 @@
android:paddingRight="@dimen/dp_20"
android:paddingBottom="@dimen/dp_14">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -123,7 +123,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_coupon_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -137,7 +137,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginLeft="@dimen/dp_23"
......@@ -154,7 +154,7 @@
android:paddingRight="@dimen/dp_20"
android:paddingBottom="@dimen/dp_14">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -165,7 +165,7 @@
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_remark"
android:layout_width="0dp"
android:layout_weight="1"
......@@ -179,7 +179,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginLeft="@dimen/dp_23"
......@@ -194,7 +194,7 @@
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_26">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_total_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -202,7 +202,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_11" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_end_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -75,7 +75,7 @@
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/ic_home_tips" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:src="@mipmap/ic_home_queuing" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_you_queue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -58,7 +58,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_15" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -67,7 +67,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="39sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_spec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -75,7 +75,7 @@
tools:text="中桌(2-4人)"
android:textColor="@color/font_gray_four" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_12"
......@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_count"
android:layout_width="21dp"
android:layout_height="wrap_content"
......@@ -107,7 +107,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tag_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -119,7 +119,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_count"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/number_of_waiting_tables_ahead"
......@@ -131,7 +131,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
......@@ -143,7 +143,7 @@
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_count_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -156,7 +156,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -168,7 +168,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_count_time"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/expected_waiting_time"
......@@ -181,7 +181,7 @@
</android.support.constraint.ConstraintLayout>
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_show_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:src="@mipmap/ic_home_line_up_success" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_you_queue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -60,7 +60,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_15" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -69,7 +69,7 @@
android:textColor="@color/white"
android:textSize="39sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_table_shop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -77,7 +77,7 @@
android:text="中桌(2-4人)"
android:textColor="@color/font_gray_four" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="@dimen/dp_12"
......@@ -96,7 +96,7 @@
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -109,7 +109,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tag_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -121,7 +121,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_count"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/number_of_waiting_tables_ahead"
......@@ -133,7 +133,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
......@@ -145,7 +145,7 @@
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_count_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -158,7 +158,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -170,7 +170,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_count_time"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/expected_waiting_time"
......@@ -183,7 +183,7 @@
</android.support.constraint.ConstraintLayout>
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -28,7 +28,7 @@
android:layout_marginTop="@dimen/dp_24"
android:src="@mipmap/ic_successful" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_19"
......@@ -36,7 +36,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_18" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_get_stamp_tip"
android:layout_width="@dimen/dp_235"
android:layout_height="wrap_content"
......@@ -46,7 +46,7 @@
android:textSize="@dimen/sp_15"
android:visibility="gone" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
......@@ -65,7 +65,7 @@
android:background="@color/color_232323"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_18"
......@@ -74,7 +74,7 @@
android:text="@string/currently_ordered"
android:textColor="@color/color_a6a6a6" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_18"
......@@ -96,7 +96,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -104,7 +104,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_total_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
......
......@@ -15,7 +15,7 @@
android:layout_marginTop="@dimen/dp_108"
android:src="@mipmap/ic_home_scan_fail" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
......@@ -24,7 +24,7 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_15"
......@@ -32,7 +32,7 @@
android:textColor="@color/colorC1"
android:text="@string/two_dimensional_accessed"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_button_result"
android:layout_width="@dimen/dp_124"
android:layout_height="@dimen/dp_34"
......
......@@ -29,7 +29,7 @@
android:hint="@string/please_enter_the_name_merchant"
android:paddingLeft="@dimen/dp_10" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -41,7 +41,7 @@
android:textSize="@dimen/sp_14" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:background="@color/color_3d3d3d" />
......@@ -60,7 +60,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_15"
......@@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -91,7 +91,7 @@
android:textColor="@color/font_tow"
android:textSize="@dimen/sp_18" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_clean_history"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -22,7 +22,7 @@
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/ic_home_alipay" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
......@@ -33,7 +33,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginLeft="@dimen/dp_15"
......@@ -55,7 +55,7 @@
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/ic_home_alipay_copy" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
......@@ -71,7 +71,7 @@
android:src="@mipmap/ic_home_wechat" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginLeft="@dimen/dp_15"
......
......@@ -10,7 +10,7 @@
android:layout_height="100dp"
android:src="@mipmap/pic_my_home_no_order" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_13"
......
......@@ -11,7 +11,7 @@
android:layout_marginTop="@dimen/dp_75"
android:src="@mipmap/ic_order_confirmation_light" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
......
......@@ -10,7 +10,7 @@
android:layout_height="@dimen/dp_100"
android:src="@mipmap/ic_order_confirmation" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_13"
......
......@@ -11,7 +11,7 @@
android:layout_marginTop="130dp"
android:src="@mipmap/ic_order_confirmation" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_13"
......
......@@ -11,7 +11,7 @@
android:layout_marginTop="@dimen/dp_126"
android:src="@mipmap/ic_order_confirmation" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_text_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -11,7 +11,7 @@
android:layout_marginTop="@dimen/dp_126"
android:src="@mipmap/pic_my_home_stamp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_text_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -11,7 +11,7 @@
android:layout_marginTop="@dimen/dp_126"
android:src="@mipmap/pic_profiling_monochromatic" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_text_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -23,7 +23,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
......@@ -32,7 +32,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_car_clean"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -84,7 +84,7 @@
android:textColor="@color/font_A4A4A4"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_button"
android:layout_width="@dimen/dp_134"
android:layout_height="@dimen/dp_55"
......@@ -106,7 +106,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_count"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
......
......@@ -21,7 +21,7 @@
android:orientation="vertical"
android:visibility="visible">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -30,7 +30,7 @@
android:visibility="visible"
tools:text="标题" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_des"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -45,7 +45,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -72,7 +72,7 @@
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/bt_negative"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -90,7 +90,7 @@
android:layout_height="match_parent"
android:background="@color/color_3d3d3d" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/bt_positive"
android:layout_width="0dp"
android:layout_height="wrap_content"
......
......@@ -14,7 +14,7 @@
android:background="@color/color_232323"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_state_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_25"
......@@ -79,7 +79,7 @@
</RelativeLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_pack_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -94,7 +94,7 @@
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_title_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -112,7 +112,7 @@
android:layout_marginBottom="@dimen/dp_13"
app:max_select="1" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_title_queue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -136,7 +136,7 @@
android:layout_marginTop="@dimen/dp_40"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_add_car"
android:layout_width="0dp"
android:layout_height="@dimen/dp_50"
......@@ -147,7 +147,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_17" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_pay"
android:layout_width="0dp"
android:layout_height="@dimen/dp_50"
......
......@@ -17,7 +17,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/Input_notes"
......@@ -62,7 +62,7 @@
android:maxLength="100"
android:textSize="14sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -15,7 +15,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_39"
......@@ -23,7 +23,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_18" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_store_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -32,7 +32,7 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_19" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:background="@color/color_3d3d3d" />
......@@ -42,7 +42,7 @@
android:layout_height="@dimen/dp_50"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="match_parent"
......@@ -52,12 +52,12 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_18" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dimen_1_dp"
android:layout_height="match_parent"
android:background="@color/color_3d3d3d" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_call"
android:layout_width="0dp"
android:layout_height="match_parent"
......
......@@ -6,7 +6,7 @@
android:background="@drawable/bg_shop_item_night"
android:paddingBottom="@dimen/dp_22">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_dialog_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf="@id/tv_dialog_title"
app:layout_constraintBottom_toBottomOf="@id/tv_dialog_title"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_title_line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
......
......@@ -6,7 +6,7 @@
android:background="@drawable/bg_shop_item_night"
android:paddingBottom="@dimen/dp_22">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_dialog_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -28,7 +28,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_dialog_title" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_title_line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
......
......@@ -12,7 +12,7 @@
android:layout_marginRight="@dimen/dp_27"
android:background="@drawable/bg_pw_select_night">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_title_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_format"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -124,7 +124,7 @@
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/ic_home_mall_order_reduce" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -28,7 +28,7 @@
android:visibility="gone"
android:src="@mipmap/ic_home_details_location_1" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_merchant_address"
android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content"
......@@ -38,7 +38,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_4"
......@@ -56,7 +56,7 @@
android:src="@mipmap/ic_home_details_tel" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
......
......@@ -69,7 +69,7 @@
android:textColor="@color/color_595959"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_button"
android:layout_width="@dimen/dp_134"
android:layout_height="@dimen/dp_55"
......@@ -92,7 +92,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_count"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
......@@ -118,7 +118,7 @@
android:textSize="@dimen/sp_20"
android:visibility="gone" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_tip"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
......
......@@ -26,7 +26,7 @@
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/ic_home_recommend" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_3"
......@@ -36,7 +36,7 @@
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_home_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -67,7 +67,7 @@
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/ic_home_placeholder" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_3"
......@@ -77,7 +77,7 @@
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_filter"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......
......@@ -25,7 +25,7 @@
app:layout_constraintRight_toRightOf="parent"
android:src="@mipmap/ic_evaluation_increase" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -55,7 +55,7 @@
android:src="@mipmap/ic_mall_order_comment_close" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_duration"
android:layout_width="80dp"
android:layout_height="30dp"
......
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<cn.dankal.basiclib.widget.NewFontTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/space_16_dp"
......@@ -12,4 +12,4 @@
android:text="加载中"
android:textColor="@drawable/label_text_selector_night">
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<cn.dankal.basiclib.widget.NewFontTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_36"
android:layout_marginRight="@dimen/space_12_dp"
......@@ -10,4 +10,4 @@
android:textColor="@drawable/label_text_selector_night"
android:textSize="@dimen/sp_14">
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
......@@ -20,7 +20,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_comment_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -39,7 +39,7 @@
app:mMargin="@dimen/dp_3" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_comment_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -50,7 +50,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_comment_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -64,7 +64,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_margin="@dimen/dp_15"
......
......@@ -34,7 +34,7 @@
android:layout_marginTop="@dimen/dp_17"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_order_food_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -44,7 +44,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_order_food_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -54,7 +54,7 @@
android:textSize="@dimen/sp_14" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_order_food_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -64,7 +64,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginLeft="@dimen/dp_9"
......@@ -79,7 +79,7 @@
android:layout_marginBottom="@dimen/dp_15"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_order_food_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -88,7 +88,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_13"
......@@ -96,7 +96,7 @@
android:textColor="@color/color_a6a6a6"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_order_food_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -19,7 +19,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_home_bottom_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -47,7 +47,7 @@
app:mIsClick="false"
app:mMargin="@dimen/dp_3" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_home_bottom_distance"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:src="@mipmap/ic_home_line_new" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
......@@ -86,7 +86,7 @@
</FrameLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_queue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -95,7 +95,7 @@
android:textColor="@color/font_gray"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_home_bottom_queue"
android:layout_width="0dp"
android:layout_height="wrap_content"
......
......@@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_spicy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -24,7 +24,7 @@
android:src="@mipmap/pic_home_banner_2" />
</android.support.v7.widget.CardView>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_menu_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -36,7 +36,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_menu_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -22,7 +22,7 @@
android:layout_marginRight="@dimen/dp_15"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_recommend_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_recommend_sale"
android:layout_width="0dp"
android:layout_weight="1"
......@@ -47,7 +47,7 @@
android:textColor="@color/color_595959"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_recommend_distance"
android:layout_width="0dp"
android:layout_weight="1"
......@@ -58,7 +58,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_recommend_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -13,7 +13,7 @@
android:background="@color/color_232323"
android:layout_marginRight="@dimen/dp_10">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -25,7 +25,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -37,7 +37,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_number_tow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -48,7 +48,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_queue_number"
app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_table_specs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -60,7 +60,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_queue_number_tow"
app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_waiting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -72,7 +72,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_waiting_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -83,7 +83,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_queue_waiting" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_minute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -95,7 +95,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_minute_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -105,7 +105,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/tv_queue_minute" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_minute_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -14,7 +14,7 @@
android:layout_marginRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_16">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -26,7 +26,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -38,7 +38,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_queue_number_tow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -49,7 +49,7 @@
app:layout_constraintLeft_toRightOf="@id/tv_queue_number"
app:layout_constraintTop_toBottomOf="@id/tv_queue_title" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_table_specs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -31,7 +31,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_shop_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -39,7 +39,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_shop_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -59,7 +59,7 @@
android:gravity="right"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_shop_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -67,7 +67,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_shop_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -79,7 +79,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginLeft="@dimen/dp_18"
......
......@@ -20,12 +20,12 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dp_3"
android:layout_height="@dimen/dp_13"
android:background="@color/color_fbbc39" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tables_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -35,7 +35,7 @@
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_number_min_max"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -44,7 +44,7 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -54,7 +54,7 @@
android:text="约30分钟"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_front"
android:layout_width="0dp"
android:layout_height="wrap_content"
......
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<cn.dankal.basiclib.widget.NewFontTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/space_10_dp"
......@@ -12,4 +12,4 @@
android:textColor="@color/color_d3d3d3"
android:text="加载中">
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<cn.dankal.basiclib.widget.NewFontTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -10,4 +10,4 @@
android:textColor="@color/color_d3d3d3"
android:textSize="@dimen/sp_14">
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
......@@ -13,7 +13,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_shop_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -23,7 +23,7 @@
android:textSize="@dimen/font_18_sp"
android:text="水果蛋糕1个" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_shop_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -48,7 +48,7 @@
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/ic_home_mall_order_reduce_night" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -66,7 +66,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_show_spec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -24,7 +24,7 @@
android:layout_marginRight="@dimen/dp_15"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_content_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -34,7 +34,7 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_15" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_content_sales"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -58,7 +58,7 @@
android:textColor="@color/font_orange"
android:textSize="@dimen/sp_20" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_select_format"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -6,13 +6,13 @@
android:background="@color/color_ff2f2f2f"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_item_title_tag"
android:layout_width="@dimen/dp_4"
android:layout_height="match_parent"
android:background="@color/color_fffbbc39" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_menu_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -17,7 +17,7 @@
android:src="@mipmap/ic_back_black"
tools:ignore="ContentDescription" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="49dp"
......
......@@ -15,7 +15,7 @@
android:layout_marginBottom="@dimen/dp_12"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dp_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
......@@ -38,7 +38,7 @@
android:textSize="@dimen/sp_14" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_20"
......@@ -52,7 +52,7 @@
android:layout_marginBottom="@dimen/dp_12"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dp_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
......@@ -75,7 +75,7 @@
android:textSize="@dimen/sp_14" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_20"
......@@ -91,7 +91,7 @@
android:paddingTop="@dimen/dp_12"
android:paddingBottom="@dimen/dp_12">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dp_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
......@@ -117,14 +117,14 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_2"
android:background="@color/line_one" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
......@@ -155,7 +155,7 @@
android:layout_marginTop="@dimen/dp_25"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
......@@ -172,7 +172,7 @@
android:src="@mipmap/ic_mall_details_coupon_close" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
......
......@@ -12,7 +12,7 @@
android:layout_height="@dimen/dp_0"
android:layout_weight="1" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_address_add"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
......
......@@ -27,7 +27,7 @@
android:orientation="vertical"
android:visibility="gone">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_25"
......@@ -35,7 +35,7 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_remaining_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -45,7 +45,7 @@
android:textSize="@dimen/sp_12" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_after_success"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -59,7 +59,7 @@
android:textSize="@dimen/sp_16"
android:visibility="gone" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_after_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -82,7 +82,7 @@
android:background="@color/white"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -94,7 +94,7 @@
android:textColor="@color/color33"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_text_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -103,7 +103,7 @@
android:textColor="@color/color99"
android:textSize="@dimen/sp_12" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_text_tow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -121,7 +121,7 @@
android:layout_marginBottom="@dimen/dp_13"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -135,7 +135,7 @@
android:textSize="@dimen/sp_12"
android:visibility="gone" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_btn_update"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -151,7 +151,7 @@
android:textSize="@dimen/sp_12"
android:visibility="gone" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_btn_service"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -181,7 +181,7 @@
android:orientation="horizontal"
android:visibility="gone">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
......@@ -190,7 +190,7 @@
android:textColor="@color/color33"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_refund_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -209,7 +209,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
......@@ -236,7 +236,7 @@
android:orientation="horizontal"
android:visibility="gone">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
......@@ -247,7 +247,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_store_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -291,7 +291,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -300,7 +300,7 @@
android:textSize="@dimen/sp_13"
tools:text="新西兰有机新鲜苹果" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_unit_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -311,7 +311,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_original_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -327,7 +327,7 @@
android:gravity="bottom"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_specs"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -337,7 +337,7 @@
android:textSize="@dimen/sp_12"
tools:text="2个/500g" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -359,7 +359,7 @@
android:paddingLeft="@dimen/dp_15"
android:paddingBottom="@dimen/dp_10">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_reason_return"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -368,7 +368,7 @@
android:textSize="12sp"
tools:text="退款原因:重复下单/误下单" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_money_return"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -377,7 +377,7 @@
android:textSize="12sp"
tools:text="退款原因:重复下单/误下单" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_time_return"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -386,7 +386,7 @@
android:textSize="12sp"
tools:text="退款原因:重复下单/误下单" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_id_return"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -14,7 +14,7 @@
android:layout_marginTop="@dimen/dp_80"
android:src="@mipmap/ic_successful"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/successful_order_appeal"
......@@ -23,7 +23,7 @@
android:layout_marginTop="@dimen/dp_21"
android:layout_gravity="center_horizontal"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorC1"
......@@ -32,7 +32,7 @@
android:layout_gravity="center_horizontal"
android:text="@string/please_wait_patiently_for_background_processing"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_return"
android:background="@drawable/bg_button_return"
android:layout_width="@dimen/dp_124"
......
......@@ -8,7 +8,7 @@
android:orientation="vertical"
tools:context="cn.dankal.client.ui.personal.order.mall.ApplyAfterSaleActivity">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_store_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -60,7 +60,7 @@
android:textSize="@dimen/sp_13"
tools:text="新西兰有机新鲜苹果" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_unit_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -71,7 +71,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_original_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -87,7 +87,7 @@
android:gravity="bottom"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_specs"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -97,7 +97,7 @@
android:textSize="@dimen/sp_12"
tools:text="2个/500g" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -125,7 +125,7 @@
android:paddingBottom="@dimen/dp_10"
android:paddingLeft="@dimen/dp_19">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -137,7 +137,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_tow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -168,7 +168,7 @@
android:paddingBottom="@dimen/dp_10"
android:paddingLeft="@dimen/dp_19">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_one"
android:layout_width="wrap_content"
android:layout_height="17dp"
......@@ -180,7 +180,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -7,7 +7,7 @@
android:background="@color/bg_f0f2f5"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_store_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -58,7 +58,7 @@
android:textColor="@color/font_tow"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_unit_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -69,7 +69,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_original_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -85,7 +85,7 @@
android:gravity="bottom"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_specs"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -95,7 +95,7 @@
android:textColor="@color/colorCF"
android:textSize="@dimen/sp_12" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -115,7 +115,7 @@
android:background="@color/white"
android:paddingLeft="@dimen/dp_19">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -128,7 +128,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_select_reason"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -153,7 +153,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_tip_one">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tag_tow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -161,14 +161,14 @@
android:textColor="@color/color33"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="₩"
android:textColor="@color/btn_bg"
android:textSize="@dimen/sp_12" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_refund_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -188,14 +188,14 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/most"
android:textColor="@color/color99"
android:textSize="@dimen/sp_12" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_refund_more_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -212,7 +212,7 @@
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_19">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reimbursement_note"
......@@ -244,7 +244,7 @@
android:orientation="horizontal"
android:paddingTop="@dimen/dp_12">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_19"
......@@ -252,7 +252,7 @@
android:text="@string/upload_vouchers"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_img_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
......
......@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colorFF"
......
......@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......@@ -40,7 +40,7 @@
android:textColor="#ffffff"
android:textSize="14sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......@@ -74,7 +74,7 @@
android:layout_height="36dp"
app:srcCompat="@drawable/ic_close" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/flashLightTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -100,7 +100,7 @@
android:tint="#ffffffff"
app:srcCompat="@drawable/ic_photo" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
......
......@@ -29,7 +29,7 @@
android:background="@color/white"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -40,7 +40,7 @@
android:textSize="@dimen/sp_17"
tools:text="蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_sales"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -56,7 +56,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_unit_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -66,7 +66,7 @@
android:textColor="@color/font_FF3B30"
android:textSize="@dimen/sp_22" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_select_spec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -86,7 +86,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
......@@ -94,7 +94,7 @@
android:layout_marginRight="@dimen/dp_15"
android:background="#E5E5E5" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_12"
......@@ -132,7 +132,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_tip_text"
android:layout_width="0dp"
android:layout_height="match_parent"
......@@ -144,7 +144,7 @@
android:textColor="@color/font_A4A4A4"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_button"
android:layout_width="@dimen/dp_134"
android:layout_height="@dimen/dp_55"
......@@ -166,7 +166,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_count"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
......@@ -193,7 +193,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_tip"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
......
......@@ -31,7 +31,7 @@
android:background="@color/white"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -42,7 +42,7 @@
android:textSize="@dimen/sp_17"
tools:text="蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_sales"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -58,7 +58,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_mall_unit_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
......@@ -67,7 +67,7 @@
android:textColor="@color/font_FF3B30"
android:textSize="@dimen/sp_22" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_select_spec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -87,7 +87,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
......@@ -95,7 +95,7 @@
android:layout_marginRight="@dimen/dp_15"
android:background="#E5E5E5" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_12"
......@@ -148,7 +148,7 @@
android:textColor="@color/font_A4A4A4"
android:textSize="@dimen/sp_16" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_button"
android:layout_width="@dimen/dp_134"
android:layout_height="@dimen/dp_55"
......@@ -170,7 +170,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_bottom_shop_count"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
......@@ -197,7 +197,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_shop_tip"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
......
......@@ -20,7 +20,7 @@
android:textColor="@color/color99"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_15"
......
......@@ -15,7 +15,7 @@
app:layout_constraintRight_toRightOf="@+id/et_old_password"
app:layout_constraintTop_toBottomOf="@+id/et_old_password" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/passwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -56,7 +56,7 @@
app:layout_constraintRight_toLeftOf="@id/btn_code"
app:layout_constraintTop_toBottomOf="@+id/et_passwd" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_password_sure"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -15,7 +15,7 @@
android:layout_height="0dp"
android:layout_weight="1"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_commit"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_46"
......
......@@ -24,7 +24,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
......@@ -32,7 +32,7 @@
android:textColor="@color/color33"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_order_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -42,7 +42,7 @@
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/bg_f0f2f5" />
......@@ -53,7 +53,7 @@
android:layout_weight="1"
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
......@@ -63,7 +63,7 @@
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_function"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -24,7 +24,7 @@
android:maxLength="200"
android:textSize="14sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -33,14 +33,14 @@
android:text="0/200" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:background="@color/colorE5" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_img_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="@color/colorFF">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -31,7 +31,7 @@
android:gravity="center_vertical"
app:layout_constraintTop_toBottomOf="@id/tv_phone_num">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_pop_select"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -64,7 +64,7 @@
app:layout_constraintRight_toRightOf="@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf="@+id/ll_phone_num" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/passwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="@color/colorFF">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -24,7 +24,7 @@
app:mImageWidth="@dimen/dp_20"
app:mMargin="@dimen/dp_3" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_grade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -34,7 +34,7 @@
android:textSize="@dimen/font_18_sp"
tools:text="4.7" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -43,7 +43,7 @@
tools:text="(230评价)" />
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/bg_fff5f5f5" />
......@@ -53,7 +53,7 @@
android:layout_height="@dimen/dp_50"
android:gravity="right|center_vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_new_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -62,14 +62,14 @@
android:textColor="@color/color00"
android:textSize="@dimen/font_16_sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:background="@color/bg_979797"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_grade_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -41,7 +41,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/iv_hotel_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -88,7 +88,7 @@
android:maxLength="500"
android:textSize="@dimen/sp_13" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -97,7 +97,7 @@
android:text="0/500" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_img_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -120,7 +120,7 @@
</android.support.v4.widget.NestedScrollView>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_btn_commit"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_46"
......
......@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="@color/colorFF">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -48,7 +48,7 @@
app:layout_constraintRight_toRightOf="@+id/et_phone_num"
app:layout_constraintTop_toBottomOf="@+id/et_phone_num" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/passwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -20,7 +20,7 @@
android:gravity="center"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -31,7 +31,7 @@
android:textColor="@color/font_orange"
android:textSize="@dimen/font_16_sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_tag"
android:layout_width="40dp"
android:layout_height="2dp"
......@@ -39,7 +39,7 @@
android:background="@color/font_orange" />
</LinearLayout>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="@dimen/dimen_1_dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_16"
......@@ -55,7 +55,7 @@
android:gravity="center"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_email_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -66,7 +66,7 @@
android:textColor="@color/font_one"
android:textSize="@dimen/font_16_sp" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_email_tag"
android:layout_width="40dp"
android:layout_height="2dp"
......@@ -89,7 +89,7 @@
android:layout_height="match_parent"
android:background="@color/colorFF">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -114,7 +114,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_phone_num">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_pop_select"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -147,7 +147,7 @@
app:layout_constraintRight_toRightOf="@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf="@+id/ll_phone_num" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/passwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -227,7 +227,7 @@
android:background="@color/colorFF"
android:visibility="gone">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -268,7 +268,7 @@
app:layout_constraintRight_toRightOf="@+id/et_email_num"
app:layout_constraintTop_toBottomOf="@+id/et_email_num" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_email_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -322,7 +322,7 @@
app:layout_constraintRight_toLeftOf="@id/btn_email_code"
app:layout_constraintTop_toBottomOf="@+id/et_email_password" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -12,7 +12,7 @@
android:orientation="vertical"
tools:context="cn.dankal.client.ui.home.HomeFragment">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_state_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_25"
......@@ -45,7 +45,7 @@
android:orientation="horizontal">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:background="@color/colorFF">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -30,7 +30,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_phone_num">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_pop_select"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......@@ -62,7 +62,7 @@
app:layout_constraintRight_toRightOf="@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf="@+id/ll_phone_num" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/passwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -150,7 +150,7 @@
android:textColor="@color/font_gray"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_user_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -8,7 +8,7 @@
android:visibility="gone"
tools:context=".login.LanguageSelectActivity">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:gravity="center"
......@@ -16,12 +16,12 @@
android:textColor="@color/color14"
android:textSize="@dimen/sp_22" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/bg_E9E9E9" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......@@ -31,7 +31,7 @@
android:textSize="@dimen/font_16_sp"
android:textStyle="bold" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......
......@@ -14,7 +14,7 @@
android:layout_marginTop="@dimen/dp_79"
android:src="@mipmap/img"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#ff313131"
......
......@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:background="@color/colorFF">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_phone_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -47,7 +47,7 @@
app:layout_constraintRight_toRightOf="@+id/et_phone_num"
app:layout_constraintTop_toBottomOf="@+id/et_phone_num" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/passwd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -107,7 +107,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider_passwd" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_forget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -118,7 +118,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bt_login" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_find_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -130,7 +130,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/bt_login" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_register_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -142,7 +142,7 @@
app:layout_constraintTop_toBottomOf="@id/bt_login" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_quick_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -174,7 +174,7 @@
android:layout_marginLeft="@dimen/dp_8"
android:src="@mipmap/ic_wechat" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
......
......@@ -20,7 +20,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
......@@ -30,12 +30,12 @@
android:textColor="@color/color33"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/bg_f0f2f5"/>
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_refund_reason"
android:layout_width="wrap_content"
android:layout_height="0dp"
......
......@@ -18,7 +18,7 @@
android:background="@drawable/bg_logout_layout"
android:orientation="vertical">
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_logout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -56,7 +56,7 @@
android:textColor="@color/font_gray"
android:textSize="@dimen/sp_14" />
<TextView
<cn.dankal.basiclib.widget.NewFontTextView
android:id="@+id/tv_user_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment