Skip to content

android / dayu

Go to a project
Commit 0f0b21cb by 罗翻
Options

订单流程修改

parent 046685c7
Expand all
Inline Side-by-side
Showing with 495 additions and 311 deletions
app/src/main/AndroidManifest.xml
......@@ -115,7 +115,9 @@
</receiver>
<activity android:name=".ui.LoginActivity"/>
<activity android:name=".ui.ReceivingActivity"/>
<activity android:name=".ui.ReceivingActivity"
android:theme="@style/Transparent"
/>
<activity android:name=".ui.SettingActivity"/>
<activity android:name=".ui.SubcribeTimeActivity"/>
<activity android:name=".ui.OrderDetailsActivity"/>
......
app/src/main/java/com/dayu/bigfish/SplashActivity.java
......@@ -27,7 +27,6 @@ import com.dayu.bigfish.rxbus.RefreshTabNum;
import com.dayu.bigfish.rxbus.RxBus;
import com.dayu.bigfish.ui.LoginActivity;
import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.utils.LogUtils;
import com.dayu.bigfish.views.CustomDialog;
import com.google.gson.Gson;
import com.hyphenate.EMConnectionListener;
......@@ -141,11 +140,7 @@ public class SplashActivity extends AppCompatActivity {
public void onCmdMessageReceived(List<EMMessage> messages) {
//收到透传消息
for (EMMessage list : messages) {
// ToastUtils.showShortToast("收到CMD消息");
//异步请求刷新待接单列表数据显示待接单小红点
// EventBus.getDefault().post(new RefreReceiveData(0));
RxBus.getDefault().post(new RefreReceiveData(0));
LogUtils.d("收到CMD消息", list.getBody().toString());
}
}
......
app/src/main/java/com/dayu/bigfish/api/APIService.java
......@@ -172,8 +172,8 @@ public interface APIService {
* @param orderInfo
* @return
*/
@POST("/api-order/" + "orders/waitCustomerCheck")
Observable<BaseResponse<Boolean>> commitOrder(@Body RequestBody orderInfo);
@POST("/api-order/" + "orders/waitCustomerCheckUpgrade")
Observable<BaseResponse<Integer>> commitOrder(@Body RequestBody orderInfo);
/**
* 获取工程师信息.
......
app/src/main/java/com/dayu/bigfish/api/ApiWrapper.java
......@@ -116,7 +116,7 @@ public class ApiWrapper extends Api {
}
//提交工单
public Observable<Boolean> commitOrder(RequestBody orderInfo) {
public Observable<Integer> commitOrder(RequestBody orderInfo) {
return getService().commitOrder(orderInfo)
.compose(applySchedulers());
}
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
......@@ -50,7 +50,7 @@ public abstract class BasePresenter<M, T> {
* @return
*/
protected <V> Observer baseObserver(final Consumer<? super V> consumer) {
public <V> Observer baseObserver(final Consumer<? super V> consumer) {
return new Observer<V>() {
@Override
public void onSubscribe(Disposable d) {
......@@ -87,7 +87,7 @@ public abstract class BasePresenter<M, T> {
* @return
*/
protected <V> Observer baseObserver(final Consumer<? super V> consumer, final Consumer<Throwable> tconsumer) {
public <V> Observer baseObserver(final Consumer<? super V> consumer, final Consumer<Throwable> tconsumer) {
return new Observer<V>() {
@Override
public void onSubscribe(Disposable d) {
......@@ -122,43 +122,6 @@ public abstract class BasePresenter<M, T> {
};
}
/**
* 创建观察者
*
* @param observer
* @return
*/
protected <V> Observer baseObserver(final Observer<? super V> observer) {
return new Observer<V>() {
@Override
public void onSubscribe(Disposable d) {
mComDisposable.add(d);
}
@Override
public void onNext(V o) {
ProgressUtil.stopLoad();
try {
observer.onNext(o);
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void onError(Throwable e) {
ProgressUtil.stopLoad();
processException(e);
}
@Override
public void onComplete() {
}
};
}
private void processException(Throwable e) {
APIException.ResponeThrowable exception = APIException.APIException(e);
int code = exception.code;
......
app/src/main/java/com/dayu/bigfish/bean/Order.java
......@@ -42,6 +42,9 @@ public class Order {
private String customerTelphome;
private int status;
private int subStatus;
private int anyContacts;
private String spuName;
private String spuId;
public int getSubStatus() {
return subStatus;
......@@ -178,4 +181,27 @@ public class Order {
public void setStatus(int status) {
this.status = status;
}
public int getAnyContacts() {
return anyContacts;
}
public void setAnyContacts(int anyContacts) {
this.anyContacts = anyContacts;
}
public String getSpuName() {
return spuName;
}
public void setSpuName(String spuName) {
this.spuName = spuName;
}
public String getSpuId() {
return spuId;
}
public void setSpuId(String spuId) {
this.spuId = spuId;
}
}
app/src/main/java/com/dayu/bigfish/bean/OrderDetail.java
......@@ -71,6 +71,7 @@ public class OrderDetail {
private Object partnerNum;
private Object partnerName;
private int status;
private int subStatus;
private int repairType;
private int customerType;
private String customerName;
......@@ -121,6 +122,10 @@ public class OrderDetail {
private List<RecordBean> record;
private List<?> pic;
private String sn;
private String spuName;
private String spuId;
private List<accessories> accessories;
public int getId() {
return id;
......@@ -570,6 +575,39 @@ public class OrderDetail {
this.sn = sn;
}
public int getSubStatus() {
return subStatus;
}
public void setSubStatus(int subStatus) {
this.subStatus = subStatus;
}
public String getSpuName() {
return spuName;
}
public void setSpuName(String spuName) {
this.spuName = spuName;
}
public String getSpuId() {
return spuId;
}
public void setSpuId(String spuId) {
this.spuId = spuId;
}
public List<OrderDetail.accessories> getAccessories() {
return accessories;
}
public void setAccessories(List<OrderDetail.accessories> accessories) {
this.accessories = accessories;
}
public static class RecordBean {
/**
* id : 174
......@@ -665,4 +703,44 @@ public class OrderDetail {
this.commentInfo = commentInfo;
}
}
public class accessories {
private int id;
private String name;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
private int orderId;
private String url;
}
}
app/src/main/java/com/dayu/bigfish/managers/UserManager.java
......@@ -57,9 +57,11 @@ public class UserManager {
}
public void saveUserInfo(Context context, UserInfo info) {
if (!TextUtils.isEmpty(info.getToken())) {
SPUtils.put(context, "ACCESS_TOKEN", info.getToken());
}
SPUtils.put(context, "ACCOUNT_ID", info.getAccountId());
SPUtils.put(context, "SITE_ID", info.getSiteId());
SPUtils.put(context, "ACCESS_TOKEN", info.getToken());
SPUtils.put(context, "HXUSER_ID", info.getHxAccount());
SPUtils.put(context, "HXUSER_PWD", info.getHxPwd());
SPUtils.put(context, "IMAGE_URL", info.getHeaderImg());
......
app/src/main/java/com/dayu/bigfish/presenter/ordertwotab/OrderTwoTabPresenter.java
......@@ -18,6 +18,8 @@ import okhttp3.RequestBody;
public class OrderTwoTabPresenter extends OrderTwoTabContract.Presenter {
private Observable<Integer> observable;
@Override
public void onStart() {
}
......@@ -57,27 +59,6 @@ public class OrderTwoTabPresenter extends OrderTwoTabContract.Presenter {
params.put("orderId", orderId);
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
// mModel.startServer(body).subscribe(baseObserver(new Observer<Integer>(){
// @Override
// public void onSubscribe(Disposable d) {
//
// }
//
// @Override
// public void onNext(Integer integer) {
// onNext(integer);
// }
//
// @Override
// public void onError(Throwable e) {
//
// }
//
// @Override
// public void onComplete() {
//
// }
// }));
return mModel.startServer(body);
}
}
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderContract.java
......@@ -19,7 +19,7 @@ public interface ProcessOrderContract {
interface Model extends BaseModel {
Observable<OrderDetail> getOrderInfo(int orderId);
Observable<Boolean> commitOrder(RequestBody body);
Observable<Integer> commitOrder(RequestBody body);
Observable<List<String>> commitPhoto(String path, int orderId, MultipartBody.Part[] file);
}
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderModel.java
......@@ -22,7 +22,7 @@ public class ProcessOrderModel implements ProcessOrderContract.Model {
}
@Override
public Observable<Boolean> commitOrder(RequestBody body) {
public Observable<Integer> commitOrder(RequestBody body) {
return wrapper.commitOrder(body);
}
......
app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java
......@@ -69,9 +69,9 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
}
JSONObject jsonObject = new JSONObject(params);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
mModel.commitOrder(body).subscribe(baseObserver(new Consumer<Boolean>() {
mModel.commitOrder(body).subscribe(baseObserver(new Consumer<Integer>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
public void accept(Integer integer) throws Exception {
mView.commitOrderSuccess();
}
}));
......
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity.java
......@@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.AccountBalanceAdapter;
import com.dayu.bigfish.ui.adapter.AccountBalanceAdapter;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
......
app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java
......@@ -2,6 +2,7 @@ package com.dayu.bigfish.ui;
import android.content.Intent;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
......@@ -75,7 +76,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, LoginModel> impl
@Override
public void onError(int code, String message) {
Log.d("hx", message);
}
});
}
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -183,6 +183,7 @@ public class MainActivity extends BaseActivity<MainPresenter, MainModel> impleme
case R.id.tab_get_order:
Intent intent = new Intent(mContext, ReceivingActivity.class);
startActivity(intent);
overridePendingTransition(R.anim.slide_bottom_in, 0);
break;
default:
break;
......
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
......@@ -11,7 +11,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.ui.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.ui.fragment.OrderDatailsFragment;
import com.dayu.bigfish.ui.fragment.OrderDatailsServeFragment;
......
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java
......@@ -148,6 +148,8 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Pr
SwitchImage imageSwitch;
@BindView(R.id.ll_image)
LinearLayout mLImage;
@BindView(R.id.tv_modify_sop)
TextView mSopTipTv;
private int orderId;
private int engineerId;
private String brandName; //品牌名称
......@@ -235,9 +237,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Pr
}
@OnClick({R.id.back_order_finish, R.id.text_one_value, R.id.text_two_value, text_six_value, et_input, image_switch, R.id.up_door, R.id.up_serve, R.id.up_materials, R.id.up_other, et_up_input,
R.id.save, R.id.submit
})
@OnClick({R.id.back_order_finish, image_switch, R.id.save, R.id.submit, R.id.tv_modify_sop})
public void onViewClicked(View view) {
switch (view.getId()) {
//保存并退出
......@@ -301,6 +301,10 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Pr
serveCost, cailiaoCost, otherCost);
}
break;
case R.id.tv_modify_sop:
break;
default:
break;
}
}
......@@ -400,7 +404,11 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Pr
textOneValue.setText(categoryName);
textTwoValue.setText(brandName);
textSixValue.setText(serveName);
if (detail.getSubStatus() == 5) {
mSopTipTv.setVisibility(View.VISIBLE);
} else {
mSopTipTv.setVisibility(View.GONE);
}
}
@Override
......
app/src/main/java/com/dayu/bigfish/ui/ReceivingActivity.java
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.ReceiveAdapter;
import com.dayu.bigfish.ui.adapter.ReceiveAdapter;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
......@@ -139,4 +139,12 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter, Receivin
mPage = 1;
mPresenter.getReceiveOrder(Constants.WATING_ORDER, mPage, mPageSize, siteId, userId);
}
@Override
public void finish() {
super.finish();
overridePendingTransition(0, R.anim.slide_bottom_out);
}
}
app/src/main/java/com/dayu/bigfish/ui/WorksRecordActivity.java
......@@ -14,7 +14,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.WorksheetAdapter;
import com.dayu.bigfish.ui.adapter.WorksheetAdapter;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
......
app/src/main/java/com/dayu/bigfish/ui/adapter/AccessoriesAdapter.java 0 → 100644
package com.dayu.bigfish.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.OrderDetail;
/**
* Created by luofan on 2017/11/23.
*/
public class AccessoriesAdapter extends BaseQuickAdapter<OrderDetail.accessories, BaseViewHolder> {
public AccessoriesAdapter(int layoutResId) {
super(layoutResId);
}
@Override
protected void convert(BaseViewHolder helper, OrderDetail.accessories item) {
helper.setText(R.id.tv_accessories_name, item.getName());
}
}
app/src/main/java/com/dayu/bigfish/adapter/AccountBalanceAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/AccountBalanceAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.support.annotation.LayoutRes;
import android.support.annotation.Nullable;
......
app/src/main/java/com/dayu/bigfish/adapter/BigFishMessageAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/BigFishMessageAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.Context;
import android.content.res.AssetManager;
......
app/src/main/java/com/dayu/bigfish/adapter/FragmentHomeAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/FragmentHomeAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.view.View;
import android.view.ViewGroup;
import java.util.List;
......
app/src/main/java/com/dayu/bigfish/adapter/FragmentOrderAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/FragmentOrderAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
......@@ -6,8 +6,6 @@ import android.support.v4.app.FragmentPagerAdapter;
import java.util.List;
import static android.R.id.list;
/**
* 工单详情和服务记录两个Fragment的适配器
* on 2017/9/13.
......
app/src/main/java/com/dayu/bigfish/adapter/OrderFirstTabAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/OrderFirstTabAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.Intent;
import android.content.res.AssetManager;
......
app/src/main/java/com/dayu/bigfish/adapter/OrderFourTabAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/OrderFourTabAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.res.AssetManager;
import android.graphics.Typeface;
......
app/src/main/java/com/dayu/bigfish/adapter/OrderThreeTabAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/OrderThreeTabAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.res.AssetManager;
import android.graphics.Typeface;
......
app/src/main/java/com/dayu/bigfish/adapter/ReceiveAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/ReceiveAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.res.AssetManager;
import android.graphics.Typeface;
......
app/src/main/java/com/dayu/bigfish/adapter/ServeDatailsAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/ServeDatailsAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.Context;
import android.view.View;
......
app/src/main/java/com/dayu/bigfish/adapter/SystemMessageAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/SystemMessageAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.Context;
import android.content.res.AssetManager;
......
app/src/main/java/com/dayu/bigfish/adapter/WorksheetAdapter.java → app/src/main/java/com/dayu/bigfish/ui/adapter/WorksheetAdapter.java
package com.dayu.bigfish.adapter;
package com.dayu.bigfish.ui.adapter;
import android.content.res.AssetManager;
import android.graphics.Typeface;
......@@ -21,7 +21,7 @@ import butterknife.ButterKnife;
* on 2017/9/29.
*/
public class WorksheetAdapter extends BaseQuickAdapter<Order,WorksheetAdapter.WorksheetHolder> {
public class WorksheetAdapter extends BaseQuickAdapter<Order, WorksheetAdapter.WorksheetHolder> {
private String dateMD = null;
private String dateTime = null;
private DateUtils dateUtils = new DateUtils();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/BigFishMessageFragment.java
......@@ -12,7 +12,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.BigFishMessageAdapter;
import com.dayu.bigfish.ui.adapter.BigFishMessageAdapter;
import com.dayu.bigfish.api.ApiWrapper;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeFourTabFragment.java
......@@ -2,10 +2,13 @@ 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;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -55,18 +58,6 @@ public class HomeFourTabFragment extends BaseFragment<HomeFourPresenter, HomeFou
TextView personPhone;
@BindView(R.id.person_evaluate)
TextView personEvaluate;
@BindView(R.id.persone_xingxing)
ImageView personeXingxing;
@BindView(R.id.persone_xingxing2)
ImageView personeXingxing2;
@BindView(R.id.persone_xingxing3)
ImageView personeXingxing3;
@BindView(R.id.persone_xingxing4)
ImageView personeXingxing4;
@BindView(R.id.persone_xingxing5)
ImageView personeXingxing5;
@BindView(R.id.persone_xingxing_ban)
ImageView personeXingxingBan;
@BindView(R.id.person_evaluate_xing)
LinearLayout personEvaluateXing;
@BindView(R.id.text_yeji_num)
......@@ -205,92 +196,7 @@ public class HomeFourTabFragment extends BaseFragment<HomeFourPresenter, HomeFou
//个人评分
personEvaluate.setText(record.get评分() + "分");
evaluate = record.get评分() + "";
switch (evaluate) {
case "0":
personEvaluateXing.setVisibility(View.GONE);
break;
case "1":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.GONE);
personeXingxing2.setVisibility(View.GONE);
personeXingxing3.setVisibility(View.GONE);
personeXingxing4.setVisibility(View.GONE);
personeXingxing5.setVisibility(View.GONE);
break;
case "1.5":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.GONE);
personeXingxing3.setVisibility(View.GONE);
personeXingxing4.setVisibility(View.GONE);
personeXingxing5.setVisibility(View.GONE);
break;
case "2":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.GONE);
personeXingxing3.setVisibility(View.GONE);
personeXingxing4.setVisibility(View.GONE);
personeXingxing5.setVisibility(View.GONE);
break;
case "2.5":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.VISIBLE);
personeXingxing3.setVisibility(View.GONE);
personeXingxing4.setVisibility(View.GONE);
personeXingxing5.setVisibility(View.GONE);
break;
case "3":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.VISIBLE);
personeXingxing3.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.GONE);
personeXingxing4.setVisibility(View.GONE);
personeXingxing5.setVisibility(View.GONE);
break;
case "3.5":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.VISIBLE);
personeXingxing3.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.VISIBLE);
personeXingxing4.setVisibility(View.GONE);
personeXingxing5.setVisibility(View.GONE);
break;
case "4":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.VISIBLE);
personeXingxing3.setVisibility(View.VISIBLE);
personeXingxing4.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.GONE);
personeXingxing5.setVisibility(View.GONE);
break;
case "4.5":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.VISIBLE);
personeXingxing3.setVisibility(View.VISIBLE);
personeXingxing4.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.VISIBLE);
personeXingxing5.setVisibility(View.GONE);
break;
case "5":
personEvaluateXing.setVisibility(View.VISIBLE);
personeXingxing.setVisibility(View.VISIBLE);
personeXingxing2.setVisibility(View.VISIBLE);
personeXingxing3.setVisibility(View.VISIBLE);
personeXingxingBan.setVisibility(View.GONE);
personeXingxing4.setVisibility(View.VISIBLE);
personeXingxing5.setVisibility(View.VISIBLE);
break;
}
drawStars(personEvaluateXing, evaluate, "5");
}
@Override
......@@ -315,4 +221,71 @@ public class HomeFourTabFragment extends BaseFragment<HomeFourPresenter, HomeFou
SPUtils.put(mContext, Constants.IS_SHOW_ALIPAY_DILAOG, false);
}
}
/**
* drawStars.
*
* @param starLinearLayout .
* @param lev .
* @param totalLevel .
*/
private void drawStars(LinearLayout starLinearLayout, String lev, String totalLevel) {
String level = "0";
if (!TextUtils.isEmpty(lev)) {
level = lev;
}
int max = Integer.parseInt(totalLevel);
int beginNum = 0;
int endNum = max;
boolean isNedHalf = false;
if (!TextUtils.isEmpty(level)) {
if (Float.parseFloat(level) > max) {
beginNum = max;
endNum = max - beginNum;
} else {
Float levelf = Float.parseFloat(level);
int leveli = Math.round(levelf);
if (leveli > levelf) {
beginNum = leveli - 1;
endNum = (max - 1) - beginNum;
isNedHalf = true;
} else {
beginNum = leveli;
endNum = max - beginNum;
}
}
}
starLinearLayout.removeAllViews();
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(3, 0, 3, 0);
for (int i = 0; i < beginNum; i++) {
ImageView starImg = new ImageView(mContext);
Bitmap bm = BitmapFactory.decodeResource(mContext.getResources(), R.mipmap.
person_xingxing);
starImg.setImageBitmap(bm);
starLinearLayout.addView(starImg, layoutParams);
}
if (isNedHalf) {
ImageView starImg = new ImageView(mContext);
Bitmap bm = BitmapFactory.decodeResource(mContext.getResources(), R.mipmap.
person_banxing);
starImg.setImageBitmap(bm);
starLinearLayout.addView(starImg, layoutParams);
}
for (int i = 0; i < endNum; i++) {
ImageView starImg = new ImageView(mContext);
Bitmap bm = BitmapFactory.decodeResource(mContext.getResources(), R.mipmap.
person_xing);
starImg.setImageBitmap(bm);
starLinearLayout.addView(starImg, layoutParams);
}
}
}
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeMessageTabFragment.java
......@@ -7,7 +7,7 @@ import android.support.v4.view.ViewPager;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.ui.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.presenter.homethiirdtab.HomeThirdContract;
import com.dayu.bigfish.presenter.homethiirdtab.HomeThirdModel;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeSecondTabFragment.java
......@@ -14,7 +14,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.FragmentHomeAdapter;
import com.dayu.bigfish.ui.adapter.FragmentHomeAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.presenter.homesecondtab.HomeSecondContract;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsFragment.java
package com.dayu.bigfish.ui.fragment;
import android.graphics.Paint;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import android.widget.RelativeLayout;
......@@ -11,9 +14,11 @@ import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.presenter.orderdetail.OrderDetailContract;
import com.dayu.bigfish.presenter.orderdetail.OrderDetailModel;
import com.dayu.bigfish.presenter.orderdetail.OrderDetailPresenter;
import com.dayu.bigfish.ui.adapter.AccessoriesAdapter;
import com.dayu.bigfish.utils.ProgressUtil;
import butterknife.BindView;
import butterknife.OnClick;
import static com.dayu.bigfish.R.id.four_text_nine_text;
......@@ -66,10 +71,16 @@ public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter, Ord
TextView mForwardTimeDetail;
@BindView(R.id.tv_info_detail)
TextView mInfoDetail;
@BindView(R.id.tv_info_detail_more)
TextView mInfoMoreTv;
@BindView(R.id.tv_door_time)
TextView mDoorTime;
@BindView(R.id.tv_sn_code)
TextView mSNTv;
@BindView(R.id.tv_serve_name)
TextView mServeName;
@BindView(R.id.tv_fujian)
RecyclerView mAccessories;
private int orderId;
private int orderStatu;
private int customerType;
......@@ -80,6 +91,8 @@ public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter, Ord
private String servicePrice;
private String doorPrice;
private String totalPrice;
private boolean mFlag = true;
private AccessoriesAdapter mAdapter;
@Override
public View initView(View view) {
......@@ -125,6 +138,10 @@ public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter, Ord
} else if (orderStatu == 7) {
textTwoTwo.setText("订单关闭");
}
//服务商名称
if (!TextUtils.isEmpty(dataBean.getSpuName())) {
mServeName.setText(dataBean.getSpuName());
}
//categoryName 产品名称
textThreeThree.setText(dataBean.getCategoryName());
//providerName 工单类型
......@@ -213,6 +230,52 @@ public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter, Ord
noCharge.setVisibility(View.VISIBLE);
isCharge.setVisibility(View.GONE);
}
if (isOverFlowed(mInfoDetail)) {
mInfoMoreTv.setVisibility(View.VISIBLE);
} else {
mInfoMoreTv.setVisibility(View.GONE);
}
if (dataBean.getAccessories() != null && dataBean.getAccessories().size() != 0) {
mAdapter = new AccessoriesAdapter(R.layout.item_accessories_layout);
mAccessories.setLayoutManager(new LinearLayoutManager(mContext));
mAccessories.setAdapter(mAdapter);
mAdapter.setNewData(dataBean.getAccessories());
}
}
@OnClick(R.id.tv_info_detail_more)
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_info_detail_more:
if (mFlag) {
mFlag = false;
mInfoMoreTv.setText("收起");
mInfoDetail.setMaxLines(30);
} else {
mFlag = true;
mInfoMoreTv.setText("查看更多");
mInfoDetail.setMaxLines(2);
}
break;
default:
break;
}
}
/**
* 判断TextView的内容宽度是否超出其可用宽度
*
* @param tv
* @return
*/
public static boolean isOverFlowed(TextView tv) {
int availableWidth = tv.getWidth() - tv.getPaddingLeft() - tv.getPaddingRight();
Paint textViewPaint = tv.getPaint();
float textWidth = textViewPaint.measureText(tv.getText().toString());
if (textWidth > availableWidth) {
return true;
} else {
return false;
}
}
}
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsServeFragment.java
......@@ -4,7 +4,7 @@ import android.view.View;
import android.widget.ListView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.ServeDatailsAdapter;
import com.dayu.bigfish.ui.adapter.ServeDatailsAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.presenter.orderdetailserve.OrderDetailServeContract;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
......@@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.OrderFirstTabAdapter;
import com.dayu.bigfish.ui.adapter.OrderFirstTabAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFourTabFragment.java
......@@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.OrderFourTabAdapter;
import com.dayu.bigfish.ui.adapter.OrderFourTabAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java
......@@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.OrderSecondTabAdapter;
import com.dayu.bigfish.ui.adapter.OrderSecondTabAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
......@@ -92,8 +92,8 @@ public class OrderSecondTabFragment extends BaseFragment<OrderTwoTabPresenter, O
order.setSubStatus(1);
order.setStatus(3);
} else if (orderState.getState() == ORDER_FINISH) {
order.setSubStatus(4);
order.setStatus(6);
order.setSubStatus(6);
order.setStatus(4);
}
mAdapter.setNewData(mDatas);
mAdapter.loadMoreEnd();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderThreeTabFragment.java
......@@ -9,7 +9,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.OrderThreeTabAdapter;
import com.dayu.bigfish.ui.adapter.OrderThreeTabAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.presenter.ordererrortab.OrderErrorTabContract;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/SystemMessageFragment.java
......@@ -14,7 +14,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.SystemMessageAdapter;
import com.dayu.bigfish.ui.adapter.SystemMessageAdapter;
import com.dayu.bigfish.api.ApiWrapper;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.MessageJsonBean;
......
app/src/main/java/com/dayu/bigfish/utils/DataCleanManager.java
package com.dayu.bigfish.utils;
import java.io.File;
import java.math.BigDecimal;
import android.content.Context;
import android.os.Environment;
import android.text.TextUtils;
import java.io.File;
import java.math.BigDecimal;
/**
* Created by wjc on 2016/12/9.
*/
/** * 文 件 名: DataCleanManager.java * 描 述: 主要功能有清除内/外缓存，清除数据库，清除sharedPreference，清除files和清除自定义目录 */
/** * 本应用数据清除管理器 */
public class DataCleanManager {
/**
......@@ -29,8 +23,7 @@ public class DataCleanManager {
* @param context
*/
public static void cleanDatabases(Context context) {
deleteFilesByDirectory(new File("/data/data/"
+ context.getPackageName() + "/databases"));
deleteFilesByDirectory(new File("/data/data/" + context.getPackageName() + "/databases"));
}
/**
......@@ -39,8 +32,7 @@ public class DataCleanManager {
* @param context
*/
public static void cleanSharedPreference(Context context) {
deleteFilesByDirectory(new File("/data/data/"
+ context.getPackageName() + "/shared_prefs"));
deleteFilesByDirectory(new File("/data/data/" + context.getPackageName() + "/shared_prefs"));
}
/**
......@@ -68,16 +60,16 @@ public class DataCleanManager {
* @param context
*/
public static void cleanExternalCache(Context context) {
if (Environment.getExternalStorageState().equals(
Environment.MEDIA_MOUNTED)) {
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
deleteFilesByDirectory(context.getExternalCacheDir());
}
}
/**
* * 清除自定义路径下的文件，使用需小心，请不要误删。而且只支持目录下的文件删除 * *
*
* @param filePath
* */
*/
public static void cleanCustomCache(String filePath) {
deleteFilesByDirectory(new File(filePath));
}
......@@ -116,8 +108,10 @@ public class DataCleanManager {
}
// 获取文件
//Context.getExternalFilesDir() --> SDCard/Android/data/你的应用的包名/files/ 目录，一般放一些长时间保存的数据
//Context.getExternalCacheDir() --> SDCard/Android/data/你的应用包名/cache/目录，一般存放临时缓存数据
// Context.getExternalFilesDir() --> SDCard/Android/data/你的应用的包名/files/
// 目录，一般放一些长时间保存的数据
// Context.getExternalCacheDir() -->
// SDCard/Android/data/你的应用包名/cache/目录，一般存放临时缓存数据
public static long getFolderSize(File file) throws Exception {
long size = 0;
try {
......@@ -177,36 +171,31 @@ public class DataCleanManager {
*/
public static String getFormatSize(double size) {
double kiloByte = size / 1024;
if (kiloByte < 1) {
return size + "MB";
}
double megaByte = kiloByte / 1024;
if (megaByte < 1) {
BigDecimal result1 = new BigDecimal(Double.toString(kiloByte));
return result1.setScale(2, BigDecimal.ROUND_HALF_UP)
.toPlainString() + "KB";
return result1.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "KB";
}
double gigaByte = megaByte / 1024;
if (gigaByte < 1) {
BigDecimal result2 = new BigDecimal(Double.toString(megaByte));
return result2.setScale(2, BigDecimal.ROUND_HALF_UP)
.toPlainString() + "MB";
return result2.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "MB";
}
double teraBytes = gigaByte / 1024;
if (teraBytes < 1) {
BigDecimal result3 = new BigDecimal(Double.toString(gigaByte));
return result3.setScale(2, BigDecimal.ROUND_HALF_UP)
.toPlainString() + "GB";
return result3.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "GB";
}
BigDecimal result4 = new BigDecimal(teraBytes);
return result4.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()
+ "TB";
return result4.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "TB";
}
public static String getCacheSize(File file) throws Exception {
return getFormatSize(getFolderSize(file));
} }
\ No newline at end of file
}
}
app/src/main/res/anim/slide_bottom_in.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:fillAfter="true"
>
<translate
android:fromYDelta="100%"
android:toYDelta="0"
android:duration="300"/>
</set>
\ No newline at end of file
app/src/main/res/anim/slide_bottom_out.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:fillAfter="true"
>
<translate
android:duration="300"
android:fromYDelta="0"
android:toYDelta="100%"
/>
</set>
\ No newline at end of file
app/src/main/res/layout/activity_main_layout.xml
......@@ -114,8 +114,8 @@
<ImageView
android:id="@+id/iv_message"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_width="8.3dp"
android:layout_height="8.3dp"
android:src="@mipmap/renwu_numbg"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
......
app/src/main/res/layout/activity_order_finish.xml
......@@ -21,15 +21,26 @@
style="@style/title_image_back"/>
</RelativeLayout>
<TextView
android:id="@+id/tv_modify_sop"
android:layout_width="match_parent"
android:layout_height="26.7dp"
android:layout_below="@id/title_finish"
android:background="@color/cl_receiving_order_item_data"
android:gravity="center"
android:text="标准操作已完成，点击此处进行查看或修改"
android:textColor="@color/white"
android:textSize="13.3sp"/>
<ImageView
style="@style/card_line"
android:layout_below="@id/title_finish"
android:layout_below="@id/tv_modify_sop"
/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/title_finish"
android:layout_below="@id/tv_modify_sop"
android:layout_marginTop="@dimen/dp_10"
>
......
app/src/main/res/layout/activity_personal_center.xml
......@@ -127,55 +127,6 @@
android:orientation="horizontal"
android:padding="6dp"
>
<ImageView
android:id="@+id/persone_xingxing"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_xingxing"
/>
<ImageView
android:id="@+id/persone_xingxing2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_xingxing"
/>
<ImageView
android:id="@+id/persone_xingxing3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_xingxing"
/>
<ImageView
android:id="@+id/persone_xingxing4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_xingxing"
/>
<ImageView
android:id="@+id/persone_xingxing5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_xingxing"
/>
@mipmap/person_banxing
<ImageView
android:id="@+id/persone_xingxing_ban"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_banxing"
/>
</LinearLayout>
<ImageView
......
app/src/main/res/layout/activity_setting.xml
......@@ -75,33 +75,35 @@
>
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="13.3dp"
android:text="清理缓存"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14.7sp"
android:id="@+id/textView"/>
android:textSize="14.7sp"/>
<TextView
android:id="@+id/tv_hc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/cl_tab_read"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:textSize="@dimen/sp_15"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_34"
android:textColor="@color/cl_tab_read"
android:textSize="@dimen/sp_15"
android:visibility="gone"
/>
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="13.3dp"
android:src="@mipmap/list_more"
android:id="@+id/imageView"/>
android:src="@mipmap/list_more"/>
</RelativeLayout>
<TextView
......
app/src/main/res/layout/fragment_order_datails.xml
......@@ -71,12 +71,35 @@
android:textSize="@dimen/sp_13.3"/>
<TextView
android:id="@+id/text_three"
android:id="@+id/tv_serve"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/text_two"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="服务名称"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3"/>
<TextView
android:id="@+id/tv_serve_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/text_two"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/tv_serve"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3"/>
<TextView
android:id="@+id/text_three"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_serve_name"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="产 品"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3"/>
......@@ -85,7 +108,7 @@
android:id="@+id/text_three_three"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/text_two"
android:layout_below="@id/tv_serve_name"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_three"
......@@ -115,6 +138,7 @@
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -133,13 +157,13 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_foure"
android:maxEms="500"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3"/>
<TextView
android:id="@+id/tv_info"
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_door_time"
......@@ -149,24 +173,68 @@
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3"/>
<TextView
android:id="@+id/tv_info_detail"
android:layout_width="wrap_content"
<RelativeLayout
android:id="@+id/rl_info_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv_door_time"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_foure"
>
<TextView
android:id="@+id/tv_info_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxEms="500"
android:text="暂无数据"
android:maxLines="2"
android:text="暂无数据daaaaaaaaackahkvajclclncl.NC了》Ncl>Nc.NC.NC.出》ncNC.NC.C.NC.NC.NC.NC>NC.NC.nc>N>Cn"
android:textColor="@color/cl_home_title_text_color"
android:textSize="13.3sp"/>
<TextView
android:id="@+id/tv_info_detail_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_info_detail"
android:gravity="center_horizontal"
android:text="查看更多"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="13.3sp"
android:visibility="visible"/>
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/rl_info_detail"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="附 件"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/tv_fujian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/rl_info_detail"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_foure">
</android.support.v7.widget.RecyclerView>
<ImageView
android:id="@+id/line_one"
android:layout_width="@dimen/dp_333"
android:layout_height="@dimen/dp_0.3"
android:layout_below="@id/tv_info_detail"
android:layout_below="@id/tv_fujian"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_12"
android:background="@color/cl_order_item_line_bg"/>
......@@ -332,13 +400,13 @@
android:id="@+id/three_text_two_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3"
android:layout_alignBaseline="@+id/three_text_two"
android:layout_alignBottom="@+id/three_text_two"
android:layout_alignLeft="@+id/three_text_five_text"
android:layout_alignStart="@+id/three_text_five_text"/>
android:layout_alignStart="@+id/three_text_five_text"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3"/>
<TextView
android:id="@+id/three_two_two"
......
app/src/main/res/layout/item_accessories_layout.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_accessories_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="122233ed"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="@dimen/sp_13.3"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/values/styles.xml
......@@ -8,6 +8,10 @@
<item name="colorAccent">@color/cl_accent</item>
</style>
<style name="Transparent" parent="AppTheme">
<item name="android:windowIsTranslucent">true</item>
</style>
<declare-styleable name="CircleHead">
<attr name="circleBorderHeadWidth" format="dimension"/>
<attr name="ringHeadColor" format="color"/>
......@@ -73,9 +77,11 @@
<item name="android:layout_height">0.5dp</item>
<item name="android:background">@color/cl_order_item_line_bg</item>
</style>
<style name="TabLayoutTextStyle">
<item name="android:textSize">@dimen/sp_13.3</item>
</style>
<style name="CustomDialog" parent="Theme.AppCompat.Dialog">
<item name="android:backgroundDimEnabled">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
......
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