Merge remote-tracking branch 'origin/dev' into dev

app/src/main/res/layout/app_activity_about_us.xml

@@ -66,7 +66,14 @@
                 android:text="北京大鱼创想科技有限公司  版权所有"
                 android:textSize="@dimen/dp_15"
                 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
                 android:id="@+id/tv_version"
                 android:layout_width="wrap_content"

orderCenter/src/main/java/com/dayu/order/presenter/ordermaterial/OrderMaterialPresenter.java

@@ -62,7 +62,7 @@ public class OrderMaterialPresenter extends OrderMaterialContract.Presenter {
         int mUserId = Integer.parseInt(info.getAccountId());
         Api.getService(OrderService.class).getOrderMaterialUrl(mOrderId,mUserId)
                 .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.putString(Constants.URL, url);
                             bundle.putString(Constants.TITLE, "用料");

orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java

@@ -37,6 +37,7 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
 
+import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.List;
 
@@ -89,7 +90,8 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
         mBind.tvContent.setText(detail.getComment());
         mBind.tvTime.setText(detail.getAppointmentTime());
         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.tvProName.setText(detail.getCreated());
         mBind.tvProNum.setText(detail.getCustomerTelphome());

orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderMaterialFragment.java

@@ -50,7 +50,7 @@ public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter,
 
         adapter.setOnItemClickListener((item, bind) -> {
             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.putString(Constants.URL, url);
             bundle.putString(Constants.TITLE, "用料记录");