工单详情增加跳转到服务说明

app/build.gradle

@@ -24,8 +24,8 @@ android {
         applicationId "com.dayu.bigfish"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 6
-        versionName "1.2.0"
+        versionCode 7
+        versionName "1.3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/com/dayu/bigfish/Constants.java

@@ -33,6 +33,7 @@ public class Constants {
 //    public static final String BASE_URL = "https://mobile.dayu.ai";
 //    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
 //    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
+//    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
 //    public static final boolean UM_DEBUG = false;
     /*****************/
     /**

app/src/main/java/com/dayu/bigfish/presenter/processorder/ProcessOrderPresenter.java

@@ -57,14 +57,12 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
     private OrderInfo mOrderInfo;
     private int isPay;//是否支付费用,默认=1 不支付费用
     private int mAnyContacts;
-    private int mSpuId;
 
     @Override
     public void onAttached() {
         Bundle bundle = mView.getBundle();
         mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
         mPosition = bundle.getInt(Constants.ORDER_POSTION, 0);
-        mSpuId = bundle.getInt(Constants.ID, 0);
         UserInfo userInfo = UserManager.getInstance().getUser();
         mAccountId = Integer.parseInt(userInfo.getAccountId());
         mOrderInfoDao = GreenDaoManager.getInstance().getmDaoSession().getOrderInfoDao();
@@ -242,7 +240,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
     @Override
     public void dumpToServerInstruction() {
         Bundle bundle = new Bundle();
-        bundle.putInt(Constants.ID, mSpuId);
+        bundle.putInt(Constants.ID, mDetail.get().getSpuId());
         mView.startActivity(ServerInstructionActivity.class, bundle);
     }
 

app/src/main/java/com/dayu/bigfish/ui/adapter/OrderAdapter.java

@@ -329,7 +329,6 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
         Intent intent = new Intent(mContext, ProcessOrderActivity.class);
         Bundle bundle = new Bundle();
         bundle.putInt(Constants.ORDER_ID, detail.getId());
-        bundle.putInt(Constants.ID, detail.getSpuId());
         bundle.putInt(Constants.ORDER_POSTION, adapterPosition);
         intent.putExtra(Constants.BUNDLE, bundle);
         mContext.startActivity(intent);

app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java

@@ -12,6 +12,7 @@ import com.dayu.bigfish.base.DataBindingFragment;
 import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding;
 import com.dayu.bigfish.ui.QrCodeActivity;
+import com.dayu.bigfish.ui.ServerInstructionActivity;
 import com.dayu.bigfish.utils.UIUtils;
 import com.umeng.analytics.MobclickAgent;
 
@@ -52,6 +53,7 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
     public void initDataView(OrderDetail dataBean) {
         mBind.tvOrderState.setText(getStaus(dataBean.getStatus()));
         mBind.tvLookMore.setOnClickListener(o -> lookMore());
+        mBind.llServerInstruction.setOnClickListener(v -> dumpToServerInstruction());
         if (dataBean.getStatus() == 4 && dataBean.getSubStatus() == 6) {
             mBind.customerAcceptance.setVisibility(View.VISIBLE);
         } else {
@@ -125,4 +127,12 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
             MobclickAgent.onPageStart(TAG);
         }
     }
+
+    public void dumpToServerInstruction() {
+        Bundle bundle = new Bundle();
+        bundle.putInt(Constants.ID, mDetail.getSpuId());
+        Intent intent = new Intent(mActivity, ServerInstructionActivity.class);
+        intent.putExtra(Constants.BUNDLE,bundle);
+        startActivity(intent);
+    }
 }

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

@@ -12,6 +12,10 @@
             type="com.dayu.bigfish.bean.OrderDetail" />
     </data>
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -363,7 +367,7 @@
                             android:layout_marginTop="@dimen/dp_13"
                             android:layout_toRightOf="@id/two_text_five"
                             android:ellipsize="end"
-                        android:maxLines="1"
+                            android:maxLines="2"
                             android:text='@{item.provinceName+item.cityName+item.districtName+item.address}'
                             android:textColor="@color/cl_home_title_text_color"
                             android:textSize="@dimen/sp_13.3" />
@@ -701,4 +705,30 @@
                 android:textColor="@color/white"
                 android:textSize="16sp" />
         </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_server_instruction"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/tab_blue_react"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/icon_order_server" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/order_instruction"
+                android:textColor="@color/white"
+                android:textSize="12sp" />
+        </LinearLayout>
+    </RelativeLayout>
 </layout>
\ No newline at end of file

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

@@ -25,7 +25,7 @@
                 android:id="@+id/tv_right_title"
                 style="@style/title_right_text"
                 android:onClick="@{()->presenter.dumpToOrderRecordActivity()}"
-                android:text="@string/order_history"
+                android:text="@string/history_order"
                 android:textColor="#3faafc"
                 android:textSize="@dimen/dp_13.3" />
         </RelativeLayout>