Skip to content

android / dayu

Go to a project
Commit 177b2e53 by 罗翻
Options

android 1.1.0

parent 96ae58af
Expand all
Inline Side-by-side
Showing with 151 additions and 129 deletions
app/build.gradle
......@@ -105,7 +105,6 @@ dependencies {
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
//jsbridge
compile 'com.github.lzyzsd:jsbridge:1.0.4'
......
app/proguard-rules.pro
......@@ -106,6 +106,9 @@
-keepclassmembers class * extends android.webkit.WebViewClient {
public void *(android.webkit.WebView, jav.lang.String);
}
-keepclassmembers class * extends android.webkit.WebChromeClient{
public void openFileChooser(...);
}
#-------------------------------------------定制化区域----------------------------------------------
......
app/src/main/java/com/dayu/bigfish/Constants.java
......@@ -53,13 +53,13 @@ public class Constants {
//个人中心,今日收益
public static final String PERSONAL_ACOUNT_BALANCE = "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/{accountId}";
//账户余额
public static final String PERSONAL_ACCOUT_LIST = "/api-settlement/" + "/payStream/queryPayStream/";
public static final String PERSONAL_ACCOUT_LIST = "/api-settlement/" + "payStream/queryPayStream/";
//绑定支付宝账号
public static final String PERSONAL_ALIPAY_BOUND = "/api-settlement/" + "/alipay/save";
public static final String PERSONAL_ALIPAY_BOUND = "/api-settlement/" + "alipay/save";
//查询支付宝账号
public static final String PERSONAL_ALIPAY_QUERY = "/api-settlement/" + "/alipay/queryAlipayByAccountId/accountId/{accountId}";
public static final String PERSONAL_ALIPAY_QUERY = "/api-settlement/" + "alipay/queryAlipayByAccountId/accountId/{accountId}";
//修改支付宝账号
public static final String PERSONAL_ALIPAY_MODIFY = "/api-settlement/" + "/alipay/modifyAlipay";
public static final String PERSONAL_ALIPAY_MODIFY = "/api-settlement/" + "alipay/modifyAlipay";
//单表查询工单记录
public final static String SELECT_ORDER_LITTLE = "/api-order/" + "orders/{accountId}";
//根据工程师id和工程师id获取今日业绩(今日收益)
......@@ -79,6 +79,10 @@ public class Constants {
public final static String TAB_NUM = "/api-order/" + "orders/{userId}/count/siteId/{siteId}";
//环信
public final static String MESSAGE_HX = "/api-message/" + "hXMessage";
public final static String MESSAGE_HX_LIST = "/api-message/hXMessage/hxAccount/{hxAccount}/category/{category}";
//获取消息数量
public final static String MESSAGE_NUM = " /api-message/" + "hXMessage/count/hxAccount/{hxAccount}";
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
......@@ -277,21 +277,21 @@ public interface APIService {
* @return
*/
@GET(Constants.TAB_NUM)
Observable<BaseResponse<Tab>> getTabNum(@Path("userId") int userId,@Path("siteId") int siteId);
Observable<BaseResponse<Tab>> getTabNum(@Path("userId") int userId, @Path("siteId") int siteId);
/**
* 获取环信信息.
*
* @param hxAccount
* @param category
* @param category 1:系统消息,2:大鱼通知.
* @param page
* @param pageSize
* @return
*/
@GET(Constants.MESSAGE_HX)
Observable<BaseResponse<BasePageBean<NewMessage>>> getHxMessage(@Query("hxAccount") String hxAccount,
@Query("category") int category,
@GET(Constants.MESSAGE_HX_LIST)
Observable<BaseResponse<BasePageBean<NewMessage>>> getHxMessage(@Path("hxAccount") String hxAccount,
@Path("category") int category,
@Query("page") int page,
@Query("pageSize") int pageSize);
......
app/src/main/java/com/dayu/bigfish/api/Api.java
......@@ -7,6 +7,7 @@ import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseResponse;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.LogUtils;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
......@@ -24,7 +25,6 @@ import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.logging.HttpLoggingInterceptor;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
......@@ -48,7 +48,7 @@ public class Api {
Gson gson = new GsonBuilder()
.setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
.create();
HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(m -> Log.i("request", m));
HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(m -> LogUtils.i("request", m));
httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
TokenInterceptord tokenInterceptord = new TokenInterceptord();
OkHttpClient okHttpClient = new OkHttpClient.Builder()
......
app/src/main/java/com/dayu/bigfish/api/ServerException.java
......@@ -52,6 +52,13 @@ public class ServerException extends Exception {
case "USER0005":
message = MyApplication.getContext().getString(R.string.account_frozen);
break;
/** 账户相关*/
case "SETTLEMENT0015":
message = MyApplication.getContext().getString(R.string.not_show);
break;
case "SETTLEMENT0001":
message = MyApplication.getContext().getString(R.string.perameter_is_null);
break;
default:
message = MyApplication.getContext().getString(R.string.get_info_failed);
break;
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
......@@ -138,9 +138,9 @@ public abstract class BasePresenter<V> {
}
return exception;
}
if (mView instanceof BaseActivity) {
if (!"not_show".equals(message) && mView instanceof BaseActivity) {
((BaseActivity) mView).showToast(message);
} else if (mView instanceof BaseFragment) {
} else if (!"not_show".equals(message) && mView instanceof BaseFragment) {
((BaseFragment) mView).showToast(message);
}
return exception;
......
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourContract.java
......@@ -3,7 +3,6 @@ package com.dayu.bigfish.presenter.homefourtab;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.base.BaseView;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement;
......@@ -23,7 +22,10 @@ public interface HomeFourContract {
void getAccountBalanceSuccess(TodayBalance todayBalance);
void getAlipayAccountSuccess(AlipayInfo info);
/**
* 是否显示绑定alipay的对话框.
*/
void showAlipayDialog();
/**
* 跳转账户余额.
......
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomeFourPresenter.java → app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomePersonPresenter.java
......@@ -15,7 +15,7 @@ import io.reactivex.functions.Consumer;
* Created by luofan on 2017/11/8.
*/
@InstanceFactory
public class HomeFourPresenter extends HomeFourContract.Presenter {
public class HomePersonPresenter extends HomeFourContract.Presenter {
@Override
public void onAttached() {
......@@ -27,7 +27,10 @@ public class HomeFourPresenter extends HomeFourContract.Presenter {
ApiFactory.queryAlipay(accountId).subscribe(baseObserver(new Consumer<AlipayInfo>() {
@Override
public void accept(AlipayInfo info) throws Exception {
mView.getAlipayAccountSuccess(info);
}
}, responeThrowable -> {
if ("SETTLEMENT0015".equals(responeThrowable.subCode)) {
mView.showAlipayDialog();
}
}));
}
......
app/src/main/java/com/dayu/bigfish/presenter/orderdetail/OrderDetailPresenter.java
......@@ -50,7 +50,7 @@ public class OrderDetailPresenter extends OrderDetailContract.Presenter {
} else if (staus == 7) {
return mActivity.getString(R.string.order_close);
} else {
return null;
return mActivity.getString(R.string.no_data);
}
}
}
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -199,8 +199,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
} else {
intent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mActivity.startActivity(intent);
}
......
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
......@@ -9,7 +9,7 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.databinding.ActivityOrderDetailsBinding;
import com.dayu.bigfish.ui.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.ui.fragment.OrderDatailsFragment;
import com.dayu.bigfish.ui.fragment.OrderDateilsFragment;
import com.dayu.bigfish.ui.fragment.OrderDatailsServeFragment;
import com.dayu.bigfish.utils.TabLayoutUtils;
......@@ -25,7 +25,7 @@ public class OrderDetailsActivity extends DataBindingActivity<ActivityOrderDetai
private List<Fragment> list;
private FragmentOrderAdapter fragmentAdapter;
private int orderId;
private OrderDatailsFragment orderDatailsFragment;
private OrderDateilsFragment orderDatailsFragment;
private OrderDatailsServeFragment orderDatailsServeFragment;
......@@ -48,7 +48,7 @@ public class OrderDetailsActivity extends DataBindingActivity<ActivityOrderDetai
Intent intent = getIntent();
orderId = intent.getIntExtra("orderId", 0);
list = new ArrayList<>();
orderDatailsFragment = new OrderDatailsFragment();
orderDatailsFragment = new OrderDateilsFragment();
list.add(orderDatailsFragment);
orderDatailsServeFragment = new OrderDatailsServeFragment();
list.add(orderDatailsServeFragment);
......
app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java
......@@ -101,6 +101,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
mWebView.setDefaultHandler(new MyHandler());
mWebView.setWebChromeClient(new WebChromeClient() {
public void openFileChooser(ValueCallback<Uri> uploadMsg, String AcceptType, String capture) {
this.openFileChooser(uploadMsg);
}
......@@ -162,7 +163,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
mWebView.callHandler("getToken", json, new CallBackFunction() {
@Override
public void onCallBack(String data) {
ToastUtils.showShortToast("获取token成功"+mOrderId);
ToastUtils.showShortToast("获取token成功" + mOrderId);
}
});
}
......
app/src/main/java/com/dayu/bigfish/ui/SubcribeTimeActivity.java
......@@ -42,9 +42,9 @@ import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
public class SubcribeTimeActivity extends BaseActivity<SubcribeTimePresenter, ActivitySubscribeTimeBinding>
implements SubcribeContract.View {
private int orderId;
private int mOrderId;
private String mInfo;
private int finshPosition;
private int mPosition;
private boolean mIsToday;
private int mState;
private String mTime;
......@@ -60,8 +60,8 @@ public class SubcribeTimeActivity extends BaseActivity<SubcribeTimePresenter, Ac
public void initView() {
mBind.setPresenter(mPresenter);
Intent intent = getIntent();
orderId = intent.getIntExtra(Constants.ORDER_ID, 0);
finshPosition = intent.getIntExtra(Constants.ORDER_POSTION, 0);
mOrderId = intent.getIntExtra(Constants.ORDER_ID, 0);
mPosition = intent.getIntExtra(Constants.ORDER_POSTION, 0);
mState = intent.getIntExtra(Constants.ORDER_STATE, 0);
if (mState == SUBCRIBE_TIME) {
mBind.tvTile.setText(getString(R.string.tv_home_tab_one_subscribe_time));
......@@ -83,7 +83,7 @@ public class SubcribeTimeActivity extends BaseActivity<SubcribeTimePresenter, Ac
EventBus.getDefault().post(new RefreshApoiment(1));
EventBus.getDefault().post(new RefreshServe(1));
} else if (mState == ORDER_YUYUE || mState == ORDER_DOING) {
EventBus.getDefault().post(new OrderState(ORDER_YUYUE, finshPosition, mTime));
EventBus.getDefault().post(new OrderState(ORDER_YUYUE, mPosition, mTime));
}
}
......@@ -105,7 +105,7 @@ public class SubcribeTimeActivity extends BaseActivity<SubcribeTimePresenter, Ac
try {
String d = UtilsDate.changeFormat(day, LONG_DATE, LONG_DATE_FORMAT);
mTime = d + " " + time + ":00";
mPresenter.subcribeTime(orderId, mTime, mInfo);
mPresenter.subcribeTime(mOrderId, mTime, mInfo);
} catch (ParseException e) {
e.printStackTrace();
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
package com.dayu.bigfish.ui.fragment;
import android.content.Intent;
import android.content.res.AssetManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
......@@ -12,21 +10,17 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.databinding.FragmentPersonalCenterBinding;
import com.dayu.bigfish.presenter.homefourtab.HomeFourContract;
import com.dayu.bigfish.presenter.homefourtab.HomeFourPresenter;
import com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter;
import com.dayu.bigfish.ui.AccountBalanceActivity;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.SettingActivity;
......@@ -40,11 +34,10 @@ import com.dayu.bigfish.utils.SPUtils;
* Created by luofan on 2017/11/20.
*/
public class HomePersonFragment extends BaseFragment<HomeFourPresenter, FragmentPersonalCenterBinding>
public class HomePersonFragment extends BaseFragment<HomePersonPresenter, FragmentPersonalCenterBinding>
implements HomeFourContract.View {
private int userId;
private int siteId;
private static String mHeaderUrl;
private String mUserName;
private String mUserPhone;
private String mScore;
......@@ -58,45 +51,30 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter, Fragment
}
@Override
public int getLayoutId() {
return R.layout.fragment_personal_center;
}
@Override
public View initView(View view) {
mBind.setPresenter(mPresenter);
userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
siteId = GetUserInfo.getSITE_ID(MyApplication.getContext());
AssetManager mgr = mActivity.getAssets();
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");
mBind.tvAchivement.setTypeface(tf);
mBind.tvAccountBalance.setTypeface(tf);
mBind.tvAllAchivement.setTypeface(tf);
mBind.tvOrderRecord.setTypeface(tf);
mHeaderUrl = GetUserInfo.getUserHead(mActivity);
if (!TextUtils.isEmpty(mHeaderUrl)) {
RequestOptions options = new RequestOptions()
.diskCacheStrategy(DiskCacheStrategy.ALL);
Glide.with(view.getContext())
.load(mHeaderUrl)
.apply(options)
.into(mBind.ivHeader);
}
mBind.setImgurl(GetUserInfo.getUserHead(mActivity));
return view;
}
@Override
public int getLayoutId() {
return R.layout.fragment_personal_center;
}
@Override
protected void lazyLoad() {
ProgressUtil.startLoad(mActivity);
mPresenter.getAllData(userId, siteId);
mPresenter.getAlipayAccount(userId);
}
public void fillData(EngineerInfo info) {
@Override
public void getPersonalInfoSuccess(EngineerInfo info) {
mUserName = info.getRealName();
mBind.tvName.setText(mUserName);
SPUtils.put(mActivity, "USER_NAME", mUserName);
if (info.getGender() == 1) {
mBind.tvSex.setText(mActivity.getString(R.string.man));
} else if (info.getGender() == 0) {
......@@ -108,28 +86,7 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter, Fragment
mUserPhone = info.getMobile();
mBind.tvPhone.setText(mUserPhone);
SPUtils.put(mActivity, "USER_PHONE", mUserPhone);
}
private void showAlertDialog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, mActivity.getString(R.string.not_set_account)
, (dialog1, confirm) -> {
if (confirm) {
Intent intent = new Intent(mActivity, WithdrawalsActivity.class);
startActivity(intent);
dialog1.dismiss();
} else {
}
dialog1.dismiss();
});
dialog.setTitle(mActivity.getString(R.string.notice))
.setNegativeButton(mActivity.getString(R.string.not_set_up))
.setPositiveButton(mActivity.getString(R.string.go_set_up));
dialog.show();
}
@Override
public void getPersonalInfoSuccess(EngineerInfo info) {
fillData(info);
SPUtils.put(mActivity, "USER_NAME", mUserName);
}
@Override
......@@ -164,9 +121,9 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter, Fragment
}
@Override
public void getAlipayAccountSuccess(AlipayInfo info) {
public void showAlipayDialog() {
boolean isShow = (boolean) SPUtils.get(mActivity, Constants.IS_SHOW_ALIPAY_DILAOG, true);
if (isShow && TextUtils.isEmpty(info.getAlipayAccount())) {
if (isShow) {
showAlertDialog();
SPUtils.put(mActivity, Constants.IS_SHOW_ALIPAY_DILAOG, false);
}
......@@ -191,6 +148,23 @@ public class HomePersonFragment extends BaseFragment<HomeFourPresenter, Fragment
startActivity(intent);
}
private void showAlertDialog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, mActivity.getString(R.string.not_set_account)
, (dialog1, confirm) -> {
if (confirm) {
Intent intent = new Intent(mActivity, WithdrawalsActivity.class);
startActivity(intent);
dialog1.dismiss();
} else {
}
dialog1.dismiss();
});
dialog.setTitle(mActivity.getString(R.string.notice))
.setNegativeButton(mActivity.getString(R.string.not_set_up))
.setPositiveButton(mActivity.getString(R.string.go_set_up));
dialog.show();
}
/**
* drawStars.
*
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsFragment.java → app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDateilsFragment.java
......@@ -4,6 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
import com.dayu.bigfish.BR;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.CoreAdapter;
......@@ -20,7 +21,7 @@ import com.dayu.bigfish.utils.UIUtils;
* on 2017/9/13.
*/
public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter, FragmentOrderDatailsBinding>
public class OrderDateilsFragment extends BaseFragment<OrderDetailPresenter, FragmentOrderDatailsBinding>
implements OrderDetailContract.View {
private int orderId;
......@@ -33,6 +34,7 @@ public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter, Fra
ProgressUtil.startLoad(mActivity);
mPresenter.getOrderDetailInfo(orderId);
mBind.setPresenter(mPresenter);
mBind.setVariable(BR.item, new OrderDetail());
return view;
}
......
app/src/main/java/com/dayu/bigfish/utils/BindingAdapter.java 0 → 100644
package com.dayu.bigfish.utils;
import android.databinding.BindingConversion;
import android.graphics.Typeface;
import android.text.TextUtils;
import android.widget.ImageView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.dayu.bigfish.MyApplication;
/**
* Created by luofan on 2017/12/12.
*/
public class BindingAdapter {
/**
* databing加载图片.
*
* @param view
* @param url
*/
@android.databinding.BindingAdapter({"imageUrl"})
public static void loadImage(ImageView view, String url) {
if (TextUtils.isEmpty(url)) {
return;
}
RequestOptions options = new RequestOptions()
.diskCacheStrategy(DiskCacheStrategy.ALL);
Glide.with(view.getContext())
.load(url)
.apply(options)
.into(view);
}
/**
* 设置字体转换器.
*
* @param s
* @return
*/
@BindingConversion
public static Typeface convertStringToFace(String s) {
try {
return Typeface.createFromAsset(MyApplication.getContext().getAssets(), s);
} catch (Exception e) {
throw e;
}
}
}
app/src/main/java/com/dayu/bigfish/utils/GlideImageLoader.java
package com.dayu.bigfish.utils;
import android.content.Context;
import android.databinding.BindingAdapter;
import android.support.annotation.DrawableRes;
import android.widget.ImageView;
......@@ -36,21 +35,6 @@ public class GlideImageLoader {
.into(view);
}
/**
* databing加载图片.
* @param view
* @param url
*/
@BindingAdapter({"imageUrl"})
public static void loadImage(ImageView view, String url) {
RequestOptions options = new RequestOptions()
.diskCacheStrategy(DiskCacheStrategy.ALL);
Glide.with(view.getContext())
.load(url)
.apply(options)
.into(view);
}
/* *//**
* 下载图片转换圆角
......
app/src/main/java/com/dayu/bigfish/utils/UIUtils.java
......@@ -2,9 +2,7 @@ package com.dayu.bigfish.utils;
import android.content.Context;
import android.content.res.Resources;
import android.databinding.BindingConversion;
import android.graphics.Paint;
import android.graphics.Typeface;
import android.widget.TextView;
import com.dayu.bigfish.MyApplication;
......@@ -91,15 +89,6 @@ public class UIUtils {
return false;
}
}
@BindingConversion
public static Typeface convertStringToFace(String s) {
try {
return Typeface.createFromAsset(MyApplication.getContext().getAssets(), s);
} catch (Exception e) {
throw e;
}
}
}
app/src/main/res/layout/fragment_order_datails.xml
......@@ -60,7 +60,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_one"
android:text='@{!TextUtils.isEmpty(item.orderNum)?item.orderNum:@string/no_data}'
android:text='@{!TextUtils.isEmpty(item.orderNum)?item.orderNum:@string/no_data,default = @string/no_data}'
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3"/>
......@@ -235,8 +235,10 @@
>
<TextView
android:id="@+id/tv_fujian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="附 件"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3"/>
......@@ -246,7 +248,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_13"
android:layout_toRightOf="@id/text_foure">
android:layout_toRightOf="@id/tv_fujian">
</android.support.v7.widget.RecyclerView>
</LinearLayout>
......@@ -516,7 +518,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/line_three"
android:visibility="@{item.isPay ==1?View.VISIBLE:View.GONE}"
android:visibility="@{item.isPay ==1?View.GONE:View.VISIBLE}"
>
<TextView
......@@ -676,7 +678,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/line_three"
android:visibility="@{item.isPay ==1?View.GONE:View.VISIBLE}"
android:visibility="@{item.isPay ==1?View.VISIBLE:View.GONE}"
>
<TextView
......
app/src/main/res/layout/fragment_personal_center.xml
......@@ -3,11 +3,11 @@
<data>
<import type="com.dayu.bigfish.presenter.homefourtab.HomeFourPresenter"/>
<import type="com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter"/>
<variable
name="presenter"
type="HomeFourPresenter"/>
type="com.dayu.bigfish.presenter.homefourtab.HomePersonPresenter"/>
<variable
name="imgurl"
......@@ -60,6 +60,7 @@
<com.dayu.bigfish.ui.views.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/iv_header"
imageUrl="@{imgurl}"
android:layout_width="@dimen/size_login_mlcircleimageview_width"
android:layout_height="@dimen/size_login_mlcircleimageview_height"
android:layout_centerHorizontal="true"
......@@ -196,6 +197,7 @@
android:text="0"
android:textColor="@color/cl_tab_yellow"
android:textSize="30sp"
android:typeface="@{@string/tv_fonts}"
/>
</RelativeLayout>
......@@ -230,6 +232,7 @@
android:text="0"
android:textColor="@color/cl_tab_yellow"
android:textSize="30sp"
android:typeface="@{@string/tv_fonts}"
/>
<LinearLayout
......@@ -298,6 +301,7 @@
android:text="0"
android:textColor="@color/cl_tab_yellow"
android:textSize="@dimen/sp_30"
android:typeface="@{@string/tv_fonts}"
/>
</RelativeLayout>
......@@ -330,17 +334,10 @@
android:text="0"
android:textColor="@color/cl_tab_yellow"
android:textSize="@dimen/sp_30"
android:typeface="@{@string/tv_fonts}"
/>
</RelativeLayout>
</LinearLayout>
<!--<ImageView-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_alignParentLeft="true"-->
<!--android:layout_alignParentStart="true"-->
<!--android:src="@mipmap/person_bottom_view"/>-->
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
......@@ -259,6 +259,7 @@
<!--error-->
<string name="not_show">not_show</string>
<string name="error_token">token失效</string>
<string name="error_time_out">连接服务器超时</string>
<string name="error_connect">连接服务器失败</string>
......@@ -275,6 +276,7 @@
<string name="order_cancle_not_begin">工单已取消,不能上门了</string>
<string name="order_cancle_not_process">工单已取消,不能处理了</string>
<string name="order_receive_already">已被接单，请选择其他工单</string>
<string name="perameter_is_null">参数为空</string>
<string name="agreement">
......
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 sign in to comment