Commit 12387f75 by han xu

页面调整

parent 0a7085fa
...@@ -66,7 +66,14 @@ ...@@ -66,7 +66,14 @@
android:text="北京大鱼创想科技有限公司 版权所有" android:text="北京大鱼创想科技有限公司 版权所有"
android:textSize="@dimen/dp_15" android:textSize="@dimen/dp_15"
android:textColor="@color/text_color"/> android:textColor="@color/text_color"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_10"
android:text="备案号:京ICP备17057454号-4A"
android:textSize="@dimen/dp_15"
android:textColor="@color/text_color"/>
<TextView <TextView
android:id="@+id/tv_version" android:id="@+id/tv_version"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
...@@ -62,7 +62,7 @@ public class OrderMaterialPresenter extends OrderMaterialContract.Presenter { ...@@ -62,7 +62,7 @@ public class OrderMaterialPresenter extends OrderMaterialContract.Presenter {
int mUserId = Integer.parseInt(info.getAccountId()); int mUserId = Integer.parseInt(info.getAccountId());
Api.getService(OrderService.class).getOrderMaterialUrl(mOrderId,mUserId) Api.getService(OrderService.class).getOrderMaterialUrl(mOrderId,mUserId)
.compose(Api.applySchedulers()).subscribe(baseObserver(str -> { .compose(Api.applySchedulers()).subscribe(baseObserver(str -> {
String url = str + "?accountId=" + info.getAccountId() + "&token=" + info.getToken(); String url = str +"&token=" + info.getToken();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url); bundle.putString(Constants.URL, url);
bundle.putString(Constants.TITLE, "用料"); bundle.putString(Constants.TITLE, "用料");
......
...@@ -37,6 +37,7 @@ import com.tbruyelle.rxpermissions2.RxPermissions; ...@@ -37,6 +37,7 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject; import org.json.JSONObject;
import java.text.DecimalFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -89,7 +90,8 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres ...@@ -89,7 +90,8 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
mBind.tvContent.setText(detail.getComment()); mBind.tvContent.setText(detail.getComment());
mBind.tvTime.setText(detail.getAppointmentTime()); mBind.tvTime.setText(detail.getAppointmentTime());
mBind.tvDays.setText(detail.getReferenceTime()); mBind.tvDays.setText(detail.getReferenceTime());
mBind.tvPrice.setText(detail.getSpuSettlementPrice() + "元"); DecimalFormat decimalFormat = new DecimalFormat("#.##");
mBind.tvPrice.setText(String.valueOf(detail.getPrice()) + "元");
mBind.tvProvider.setText(detail.getCreatedProvider()); mBind.tvProvider.setText(detail.getCreatedProvider());
mBind.tvProName.setText(detail.getCreated()); mBind.tvProName.setText(detail.getCreated());
mBind.tvProNum.setText(detail.getCustomerTelphome()); mBind.tvProNum.setText(detail.getCustomerTelphome());
......
...@@ -50,7 +50,7 @@ public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter, ...@@ -50,7 +50,7 @@ public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter,
adapter.setOnItemClickListener((item, bind) -> { adapter.setOnItemClickListener((item, bind) -> {
UserInfo info = UserManager.getInstance().getUser(); UserInfo info = UserManager.getInstance().getUser();
String url = item.getFormUrl() + "?accountId=" + info.getAccountId() + "&token=" + info.getToken(); String url = item.getFormUrl() +"&token=" + info.getToken();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(Constants.URL, url); bundle.putString(Constants.URL, url);
bundle.putString(Constants.TITLE, "用料记录"); bundle.putString(Constants.TITLE, "用料记录");
......
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