2023.3.15 17:24

app/src/main/AndroidManifest.xml

@@ -75,7 +75,7 @@
         tools:ignore="AllowBackup,LockedOrientationActivity"
         tools:replace="android:allowBackup,android:supportsRtl,android:label"
         tools:targetApi="n">
-       <!-- 表示当前已经适配了分区存储 -->
+        <!-- 表示当前已经适配了分区存储 -->
         <meta-data
             android:name="ScopedStorage"
             android:value="true" /> <!-- 适配 Android 7.0 文件意图 -->
@@ -232,24 +232,54 @@
             android:screenOrientation="portrait" /> <!-- 车辆信息填写 -->
         <activity
             android:name=".project.ui.activity.evaluate.YwblEvaluateActivity"
+            android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="false"> <!-- 业务满意度评价 -->
+            android:screenOrientation="portrait"> <!-- 业务满意度评价 -->
         </activity>
         <activity
             android:name=".project.ui.activity.evaluate.YWYServicePJActivity"
+            android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="false"> <!-- 业务员服务评价 -->
+            android:screenOrientation="portrait"> <!-- 业务员服务评价 -->
+        </activity>
+        <activity android:name=".project.ui.activity.obu.ObuActivationHintActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"><!-- obu温馨提示 -->
+        </activity>
+        <activity android:name=".project.ui.activity.obu.ObuActivationUploadActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"><!-- obu图片上传 -->
+        </activity>
+        <activity android:name=".project.ui.activity.obu.ObuActivationBLESearchActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"><!-- obu蓝牙搜索 -->
+        </activity>
+        <activity android:name=".project.ui.activity.obu.ObuActivationChooseActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"><!-- obu蓝牙设备选择 -->
+        </activity>
+        <activity android:name=".project.ui.activity.obu.ObuActivationSuccessOrFailActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"><!-- obu激活成功或失败 -->
+        </activity>
+        <activity android:name=".project.ui.activity.obu.SendGoodInfoActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"><!-- 发货信息 -->
+        </activity>
+        <activity android:name=".project.ui.activity.obu.SendGoodSuccessActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"><!-- 发货成功 -->
         </activity>
         <activity
             android:name=".project.ui.activity.evaluate.UserEvaluateActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 发布评价 -->
+            android:screenOrientation="portrait" />
+        <!-- 发布评价 -->
         <activity
             android:name=".project.ui.activity.evaluate.ProductPublishPJActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" /> <!-- 问题建议 -->
+            android:screenOrientation="portrait" />
+        <!-- 问题建议 -->
         <activity
             android:name=".project.ui.activity.evaluate.QuestionAndSuggestionActivity"
             android:launchMode="singleTop"
@@ -384,4 +414,5 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
     </application>
+
 </manifest>

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/evaluate/ProductPublishPJActivity.java

@@ -2,6 +2,7 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity.evaluate;
 
 import android.os.Bundle;
 import android.view.View;
+import android.widget.RadioGroup;
 
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityProductPublishPjactivityBinding;
@@ -36,7 +37,20 @@ public class ProductPublishPJActivity extends AppActivity {
     protected void initView() {
         setTitle("满意度评价");
         binding.tvSpin.setOnClickListener(this);
+        binding.radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup radioGroup, int i) {
+                if (i==R.id.rbtn_1){
 
+                }else if (i==R.id.rbtn_2){
+
+                }else if (i==R.id.rbtn_3){
+
+                }else if(i==R.id.rbtn_4){
+
+                }
+            }
+        });
     }
 
     @Override

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationBLESearchActivity.java

@@ -0,0 +1,40 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
+
+import android.view.View;
+
+import com.huntersun.vkyes.etcopencard.databinding.ActivityObuActivationBlesearchBinding;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+ /**
+  *
+  * @ClassName:      ObuActivationBLESearchActivity
+  * @Description:    OBU搜索页面
+  * @Author:         lujin
+  * @CreateDate:     2023/3/15 14:43
+  */
+
+public class ObuActivationBLESearchActivity extends AppActivity {
+    private ActivityObuActivationBlesearchBinding binding;
+    @Override
+    protected View getLayoutView() {
+        binding = ActivityObuActivationBlesearchBinding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        setTitle("激活设备");
+        binding.btnSearch.setOnClickListener(this);
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+     @Override
+     public void onClick(View view) {
+         if (view==binding.btnSearch){
+             startActivity(ObuActivationChooseActivity.class);
+         }
+     }
+ }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationChooseActivity.java

@@ -0,0 +1,42 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
+
+import android.view.View;
+
+import com.huntersun.vkyes.etcopencard.databinding.ActivityObuActivationChooseBinding;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+
+/**
+  *
+  * @ClassName:      ObuActivationChooseActivity
+  * @Description:    OBU设备选择页面
+  * @Author:         lujin
+  * @CreateDate:     2023/3/15 14:42
+  */
+
+public class ObuActivationChooseActivity extends AppActivity {
+    private ActivityObuActivationChooseBinding binding;
+
+    @Override
+    protected View getLayoutView() {
+        binding = ActivityObuActivationChooseBinding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        setTitle("激活设备");
+        binding.btnSearch.setOnClickListener(this);
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view==binding.btnSearch){
+            startActivity(ObuActivationSuccessOrFailActivity.class);
+        }
+    }
+}

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationHintActivity.java

@@ -0,0 +1,46 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
+
+import android.view.View;
+
+import com.huntersun.vkyes.etcopencard.databinding.ActivityObuActivationHintBinding;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+
+/**
+ *
+ * @ClassName:      ObuActivationHintActivity
+ * @Description:    obu温馨提示
+ * @Author:         lujin
+ * @CreateDate:     2023/3/15 10:54
+ */
+
+public class ObuActivationHintActivity extends AppActivity {
+   private ActivityObuActivationHintBinding binding;
+   @Override
+   protected View getLayoutView() {
+       binding = ActivityObuActivationHintBinding.inflate(getLayoutInflater());
+       return binding.getRoot();
+   }
+
+   @Override
+   protected void initView() {
+       setTitle("设备激活");
+       binding.btnNext.setOnClickListener(this);
+   }
+
+   @Override
+   protected void initData() {
+
+   }
+
+   @Override
+   public void onClick(View view) {
+       if (view==binding.btnNext){
+           startActivity(ObuActivationUploadActivity.class);
+       }
+   }
+   //    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.activity_obu_activation_hint);
+//    }
+}

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationSuccessOrFailActivity.java

@@ -0,0 +1,45 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
+
+import android.view.View;
+
+import com.huntersun.vkyes.etcopencard.databinding.ActivityObuActivationSuccessOrFailBinding;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+
+/**
+  *
+  * @ClassName:      ObuActivationSuccessOrFailActivity
+  * @Description:    Obu激活成功或者失败页面
+  * @Author:         lujin
+  * @CreateDate:     2023/3/15 15:09
+  */
+
+public class ObuActivationSuccessOrFailActivity extends AppActivity {
+    private ActivityObuActivationSuccessOrFailBinding binding;
+    @Override
+    protected View getLayoutView() {
+        binding = ActivityObuActivationSuccessOrFailBinding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        setTitle("激活设备");
+        binding.btnJjjh.setOnClickListener(this);
+        binding.btnBack2.setOnClickListener(this);//激活失败返回
+        binding.btnBack.setOnClickListener(this);//激活成功返回
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view==binding.btnJjjh){
+            startActivity(SendGoodInfoActivity.class);
+        }else if(view== binding.btnBack2||view==binding.btnBack){
+
+        }
+    }
+}

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationUploadActivity.java

@@ -0,0 +1,42 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
+
+import android.view.View;
+
+import com.huntersun.vkyes.etcopencard.databinding.ActivityObuActivationUploadBinding;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+ /**
+  *
+  * @ClassName:      ObuActivationUploadActivity
+  * @Description:    图片上传
+  * @Author:         lujin
+  * @CreateDate:     2023/3/15 10:53
+  */
+
+public class ObuActivationUploadActivity extends AppActivity {
+    private ActivityObuActivationUploadBinding binding;
+
+
+    @Override
+    protected View getLayoutView() {
+        binding = ActivityObuActivationUploadBinding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        setTitle("激活设备");
+        binding.btnNext.setOnClickListener(this);
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+     @Override
+     public void onClick(View view) {
+         if (view==binding.btnNext){
+             startActivity(ObuActivationBLESearchActivity.class);
+         }
+     }
+ }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/SendGoodInfoActivity.java

@@ -0,0 +1,41 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
+
+import android.view.View;
+
+import com.huntersun.vkyes.etcopencard.databinding.ActivitySendGoodInfoBinding;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+
+/**
+  *
+  * @ClassName:      SendGoodInfoActivity
+  * @Description:    发货信息填写页面
+  * @Author:         lujin
+  * @CreateDate:     2023/3/15 15:29
+  */
+
+public class SendGoodInfoActivity extends AppActivity {
+    private ActivitySendGoodInfoBinding binding;
+    @Override
+    protected View getLayoutView() {
+        binding = ActivitySendGoodInfoBinding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        setTitle("发货");
+        binding.btnSure.setOnClickListener(this);
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view==binding.btnSure){
+            startActivity(SendGoodSuccessActivity.class);
+        }
+    }
+}

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/SendGoodSuccessActivity.java

@@ -0,0 +1,33 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
+
+import android.view.View;
+
+import com.huntersun.vkyes.etcopencard.databinding.ActivitySendGoodSuccessBinding;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+
+/**
+  *
+  * @ClassName:      SendGoodSuccessActivity
+  * @Description:    发货成功页面
+  * @Author:         lujin
+  * @CreateDate:     2023/3/15 16:20
+  */
+
+public class SendGoodSuccessActivity extends AppActivity {
+    private ActivitySendGoodSuccessBinding binding;
+    @Override
+    protected View getLayoutView() {
+        binding = ActivitySendGoodSuccessBinding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        setTitle("发货");
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+}

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java

@@ -18,9 +18,9 @@ import com.huntersun.vkyes.etcopencard.project.ui.activity.after.CancellationAct
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.DevicePendingActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.EquipmentLossReportActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.TopUpActivity;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.evaluate.UserEvaluateActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.InfoTabActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.ListDeliveryActivity;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.obu.ObuActivationHintActivity;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppFragment;
 import com.huntersun.vkyes.etcopencard.src.app.TitleBarFragment;
@@ -135,7 +135,7 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
                             startActivity(DevicePendingActivity.class);
                             break;
                         case "发行检测":
-                            startActivity(UserEvaluateActivity.class);
+                            startActivity(ObuActivationHintActivity.class);
                             break;
                         default:
                             new Utils().showMessDialog(getActivity(), "功能正在开发中...");

app/src/main/res/drawable-v2/compound_normal_ic3.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="@color/gray07"
+        android:pathData="M512 128c211.2 0 384 172.8 384 384S723.2 896 512 896 128 723.2 128 512s172.8-384 384-384m0-64C262.4 64 64 262.4 64 512s198.4 448 448 448 448-198.4 448-448S761.6 64 512 64z" />
+</vector>

app/src/main/res/drawable-v2/radio_btn_1.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:drawable="@drawable/checkbox_checked_ic"/>
+    <item android:state_checked="false" android:drawable="@drawable/compound_normal_ic3"/>
+</selector>

app/src/main/res/layout-v4/activity_obu_activation_blesearch.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    tools:context=".project.ui.activity.obu.ObuActivationBLESearchActivity">
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:id="@+id/title"
+        app:title="激活设备"
+        app:lineVisible="false"
+        app:titleColor="@color/black01" />
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0.5dp"
+        android:id="@+id/line1"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_13"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_wxts"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_wxts"
+        app:layout_constraintRight_toLeftOf="@+id/tv_wxts"
+        android:background="@color/gray03"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="温馨提示"
+        android:layout_marginTop="@dimen/dp_20"
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:id="@+id/tv_wxts"
+        style="@style/gray06TextStyle13"/>
+    <View
+        android:layout_width="0dp"
+        android:layout_height="@dimen/dp_0_5"
+        android:layout_below="@+id/title"
+        android:background="@color/gray03"
+        app:layout_constraintLeft_toRightOf="@+id/tv_wxts"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginLeft="@dimen/dp_13"
+        android:layout_marginRight="@dimen/dp_20"
+        app:layout_constraintTop_toTopOf="@+id/line1"
+        android:id="@+id/line2"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/tv_wxts"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginLeft="@dimen/dp_28"
+        android:layout_marginRight="@dimen/dp_28"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginTop="@dimen/dp_13"
+        style="@style/gray07TextStyle13"
+        android:text="@string/obu_warm_tips"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        app:background_normal="@color/green01"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        style="@style/whiteTextStyle15"
+        android:id="@+id/btn_search"
+        app:corner_radius="@dimen/dp_20"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
+        android:text="点击重新搜索蓝牙"
+        android:gravity="center"
+        android:layout_marginBottom="@dimen/dp_37"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-v4/activity_obu_activation_choose.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color"
+    tools:context=".project.ui.activity.obu.ObuActivationBLESearchActivity">
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
+        app:layout_constraintTop_toTopOf="parent"
+        android:id="@+id/title"
+        app:title="激活设备"
+        app:lineVisible="false"
+        app:titleColor="@color/black01" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        android:text="设备选择"
+        android:id="@+id/tv1"
+        style="@style/blackTextStyleBold16"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_15"/>
+    <com.hjq.widget.layout.WrapRecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/tv1"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginTop="@dimen/dp_13"
+        android:id="@+id/recycler"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        app:background_normal="@color/green01"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        style="@style/whiteTextStyle15"
+        android:id="@+id/btn_search"
+        app:corner_radius="@dimen/dp_20"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
+        android:text="点击重新搜索蓝牙"
+        android:gravity="center"
+        android:layout_marginBottom="@dimen/dp_37"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-v4/activity_obu_activation_hint.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color"
+    tools:context=".project.ui.activity.obu.ObuActivationHintActivity">
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
+        android:id="@+id/title"
+        app:title="设备激活"
+        app:lineVisible="false"
+        app:titleColor="@color/black01" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/title"
+        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:id="@+id/tv_wxts"
+        android:text="温馨提示"
+        style="@style/blackTextStyleBold16"
+        android:layout_marginBottom="@dimen/dp_11"/>
+    <com.ruffian.library.widget.RLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:background_normal="@color/white"
+        app:corner_radius="@dimen/dp_10"
+        android:id="@+id/linear_1"
+        android:layout_below="@+id/tv_wxts"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginRight="@dimen/dp_15"
+        android:padding="@dimen/dp_15"
+        android:orientation="vertical">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/ic_obu_1"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="1.请您在激活前将OBU贴在申办车辆挡风玻璃后视镜附近阴影区域。"
+            android:layout_marginTop="@dimen/dp_13"
+            style="@style/black02TextStyle13"/>
+    </com.ruffian.library.widget.RLinearLayout>
+    <com.ruffian.library.widget.RLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:background_normal="@color/white"
+        app:corner_radius="@dimen/dp_10"
+        android:layout_below="@+id/linear_1"
+        android:layout_margin="@dimen/dp_15"
+        android:padding="@dimen/dp_15"
+        android:orientation="vertical">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/ic_obu_2"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2.激活时，需要录入您的车牌号和手机号，并确保OBU蓝牙和手机蓝牙处于打开状态。"
+            android:layout_marginTop="@dimen/dp_13"
+            style="@style/black02TextStyle13"/>
+    </com.ruffian.library.widget.RLinearLayout>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
+        android:layout_alignParentBottom="true"
+        app:background_normal="@color/green01"
+        app:corner_radius="@dimen/dp_20"
+        android:id="@+id/btn_next"
+        android:text="已知悉，下一步"
+        android:gravity="center"
+        style="@style/whiteTextStyle15"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_37"/>
+</RelativeLayout>

app/src/main/res/layout-v4/activity_obu_activation_success_or_fail.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color"
+    tools:context=".project.ui.activity.obu.ObuActivationSuccessOrFailActivity">
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
+        app:layout_constraintTop_toTopOf="parent"
+        android:id="@+id/title"
+        app:title="激活设备"
+        app:lineVisible="false"
+        app:titleColor="@color/black01" />
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/ic_obu_6"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/title"
+        android:layout_marginTop="@dimen/dp_48"
+        android:id="@+id/img_state"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="激活成功"
+        android:id="@+id/tv_stated"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/img_state"
+        android:layout_marginTop="@dimen/dp_15"
+        style="@style/blackTextStyleBold17"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="您的ETC已激活"
+        style="@style/black02TextStyle13"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/tv_stated"
+        android:layout_marginTop="@dimen/dp_20"
+        android:id="@+id/tv_content"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="@dimen/dp_150"
+        android:layout_height="@dimen/dp_40"
+        android:layout_below="@+id/tv_content"
+        android:layout_centerHorizontal="true"
+        app:background_normal="@color/green01"
+        app:corner_radius="@dimen/dp_20"
+        android:id="@+id/btn_back"
+        android:visibility="invisible"
+        android:text="返回订单"
+        android:gravity="center"
+        style="@style/whiteTextStyle15"
+        android:layout_marginTop="@dimen/dp_36"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/btn_back"
+        android:id="@+id/linear"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+        <com.ruffian.library.widget.RTextView
+            android:layout_width="@dimen/dp_130"
+            android:layout_height="@dimen/dp_40"
+            android:layout_below="@+id/tv_content"
+            android:layout_centerHorizontal="true"
+            app:background_normal="@color/green01"
+            app:corner_radius="@dimen/dp_20"
+            android:id="@+id/btn_jjjh"
+            android:text="继续激活"
+            android:gravity="center"
+            style="@style/whiteTextStyle15" />
+        <com.ruffian.library.widget.RTextView
+            android:layout_width="@dimen/dp_130"
+            android:layout_height="@dimen/dp_40"
+            android:layout_below="@+id/tv_content"
+            android:layout_centerHorizontal="true"
+            app:background_normal="@color/transparent"
+            app:corner_radius="@dimen/dp_20"
+            android:layout_marginLeft="@dimen/dp_45"
+            android:id="@+id/btn_back2"
+            android:text="返回订单"
+            android:gravity="center"
+            app:border_color_normal="@color/green01"
+            app:border_width_normal="@dimen/dp_0_5"
+            style="@style/greenTextStyle15" />
+    </LinearLayout>
+</RelativeLayout>

app/src/main/res/layout-v4/activity_obu_activation_upload.xml

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color"
+    tools:context=".project.ui.activity.obu.ObuActivationUploadActivity">
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
+        android:id="@+id/title"
+        app:title="激活设备"
+        app:lineVisible="false"
+        app:titleColor="@color/black01" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/tv1"
+        android:text="上传以下信息"
+        style="@style/blackTextStyleBold16"
+        android:layout_below="@+id/title"
+        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginBottom="@dimen/dp_11"/>
+    <com.ruffian.library.widget.RRelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/dp_15"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginRight="@dimen/dp_15"
+        android:layout_marginBottom="@dimen/dp_12"
+        android:id="@+id/rrelative"
+        app:background_normal="@color/white"
+        app:corner_radius="@dimen/dp_10"
+        android:layout_below="@+id/tv1">
+        <com.ruffian.library.widget.RConstraintLayout
+            android:layout_width="@dimen/dp_134"
+            android:layout_height="@dimen/dp_111"
+            android:layout_marginTop="@dimen/dp_15"
+            android:layout_marginLeft="@dimen/dp_25"
+            android:id="@+id/rcly"
+            app:corner_radius="@dimen/dp_5"
+            app:background_normal="@color/photochoosebg">
+            <com.ruffian.library.widget.RImageView
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_90"
+                app:corner_radius_top_left="@dimen/dp_5"
+                app:corner_radius_top_right="@dimen/dp_5"
+                android:id="@+id/img_up_1"/>
+            <com.ruffian.library.widget.RTextView
+                android:layout_width="@dimen/dp_25"
+                android:layout_height="@dimen/dp_25"
+                app:background_normal="@color/gray05"
+                app:layout_constraintTop_toTopOf="@+id/img_up_1"
+                app:layout_constraintBottom_toBottomOf="@+id/img_up_1"
+                app:layout_constraintLeft_toLeftOf="@+id/img_up_1"
+                app:layout_constraintRight_toRightOf="@+id/img_up_1"
+                app:corner_radius="@dimen/dp_12"
+                android:id="@+id/photo_bg1"/>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/ic_obu_3"
+                app:layout_constraintTop_toTopOf="@+id/img_up_1"
+                app:layout_constraintBottom_toBottomOf="@+id/img_up_1"
+                app:layout_constraintLeft_toLeftOf="@+id/img_up_1"
+                app:layout_constraintRight_toRightOf="@+id/img_up_1"
+                android:id="@+id/img_photo1"/>
+
+            <com.ruffian.library.widget.RTextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toBottomOf="@+id/img_up_1"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_below="@+id/img_up_1"
+                app:background_normal="@color/green01"
+                android:text="车头照"
+                app:corner_radius_bottom_left="@dimen/dp_5"
+                app:corner_radius_bottom_right="@dimen/dp_5"
+                android:gravity="center"
+                style="@style/whiteTextStyle12"/>
+        </com.ruffian.library.widget.RConstraintLayout>
+        <com.ruffian.library.widget.RConstraintLayout
+            android:layout_width="@dimen/dp_134"
+            android:layout_height="@dimen/dp_111"
+            android:layout_marginTop="@dimen/dp_15"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/dp_25"
+            app:corner_radius="@dimen/dp_5"
+            app:background_normal="@color/photochoosebg">
+            <com.ruffian.library.widget.RImageView
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_90"
+                app:corner_radius_top_left="@dimen/dp_5"
+                app:corner_radius_top_right="@dimen/dp_5"
+                android:id="@+id/img_up_2"/>
+            <com.ruffian.library.widget.RTextView
+                android:layout_width="@dimen/dp_25"
+                android:layout_height="@dimen/dp_25"
+                app:background_normal="@color/gray05"
+                app:layout_constraintTop_toTopOf="@+id/img_up_2"
+                app:layout_constraintBottom_toBottomOf="@+id/img_up_2"
+                app:layout_constraintLeft_toLeftOf="@+id/img_up_2"
+                app:layout_constraintRight_toRightOf="@+id/img_up_2"
+                app:corner_radius="@dimen/dp_12"
+                android:id="@+id/photo_bg2"/>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/ic_obu_3"
+                app:layout_constraintTop_toTopOf="@+id/img_up_2"
+                app:layout_constraintBottom_toBottomOf="@+id/img_up_2"
+                app:layout_constraintLeft_toLeftOf="@+id/img_up_2"
+                app:layout_constraintRight_toRightOf="@+id/img_up_2"
+                android:id="@+id/img_photo2"/>
+
+            <com.ruffian.library.widget.RTextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toBottomOf="@+id/img_up_2"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_below="@+id/img_up_2"
+                app:background_normal="@color/green01"
+                android:text="车身45°照"
+                app:corner_radius_bottom_left="@dimen/dp_5"
+                app:corner_radius_bottom_right="@dimen/dp_5"
+                android:gravity="center"
+                style="@style/whiteTextStyle12"/>
+        </com.ruffian.library.widget.RConstraintLayout>
+        <com.ruffian.library.widget.RConstraintLayout
+            android:layout_width="@dimen/dp_134"
+            android:layout_height="@dimen/dp_111"
+            android:layout_marginTop="@dimen/dp_15"
+            android:layout_alignLeft="@+id/rcly"
+            android:layout_below="@+id/rcly"
+            app:corner_radius="@dimen/dp_5"
+            app:background_normal="@color/photochoosebg">
+            <com.ruffian.library.widget.RImageView
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_90"
+                app:corner_radius_top_left="@dimen/dp_5"
+                app:corner_radius_top_right="@dimen/dp_5"
+                android:id="@+id/img_up_3"/>
+            <com.ruffian.library.widget.RTextView
+                android:layout_width="@dimen/dp_25"
+                android:layout_height="@dimen/dp_25"
+                app:background_normal="@color/gray05"
+                app:layout_constraintTop_toTopOf="@+id/img_up_3"
+                app:layout_constraintBottom_toBottomOf="@+id/img_up_3"
+                app:layout_constraintLeft_toLeftOf="@+id/img_up_3"
+                app:layout_constraintRight_toRightOf="@+id/img_up_3"
+                app:corner_radius="@dimen/dp_12"
+                android:id="@+id/photo_bg3"/>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/ic_obu_3"
+                app:layout_constraintTop_toTopOf="@+id/img_up_3"
+                app:layout_constraintBottom_toBottomOf="@+id/img_up_3"
+                app:layout_constraintLeft_toLeftOf="@+id/img_up_3"
+                app:layout_constraintRight_toRightOf="@+id/img_up_3"
+                android:id="@+id/img_photo3"/>
+
+            <com.ruffian.library.widget.RTextView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toBottomOf="@+id/img_up_3"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_below="@+id/img_up_2"
+                app:background_normal="@color/green01"
+                android:text="安装照"
+                app:corner_radius_bottom_left="@dimen/dp_5"
+                app:corner_radius_bottom_right="@dimen/dp_5"
+                android:gravity="center"
+                style="@style/whiteTextStyle12"/>
+        </com.ruffian.library.widget.RConstraintLayout>
+    </com.ruffian.library.widget.RRelativeLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/rrelative"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:text="请打开手机蓝牙后再进行下一步操作"
+        style="@style/orangeTextStyle10"
+        android:drawableLeft="@mipmap/tips"
+        android:drawablePadding="@dimen/dp_10"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="@dimen/dp_150"
+        android:layout_height="@dimen/dp_40"
+        android:layout_alignParentBottom="true"
+        android:text="下一步"
+        app:background_normal="@color/green01"
+        app:corner_radius="@dimen/dp_20"
+        android:id="@+id/btn_next"
+        android:gravity="center"
+        style="@style/whiteTextStyle15"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="@dimen/dp_50"/>
+</RelativeLayout>

app/src/main/res/layout-v4/activity_product_publish_pjactivity.xml

@@ -20,6 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_15"
+            android:id="@+id/radioGroup"
             android:checkedButton="@id/rbtn_1"
             android:orientation="horizontal">
             <com.ruffian.library.widget.RRadioButton

app/src/main/res/layout-v4/activity_send_good_info.xml

@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_color"
+    tools:context=".project.ui.activity.obu.SendGoodInfoActivity">
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
+        app:layout_constraintTop_toTopOf="parent"
+        android:id="@+id/title"
+        app:title="发货"
+        app:lineVisible="false"
+        app:titleColor="@color/black01" />
+
+    <com.ruffian.library.widget.RLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/title"
+        android:layout_marginStart="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginEnd="@dimen/dp_15"
+        android:layout_marginBottom="@dimen/dp_15"
+        android:orientation="vertical"
+        app:background_normal="@color/white"
+        app:corner_radius="@dimen/dp_10">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/redStar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="发货方式" />
+
+            <RadioGroup
+                android:id="@+id/radioGroup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/dp_25"
+                android:checkedButton="@+id/radio1"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/radio1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:button="@null"
+                    android:drawableLeft="@drawable/radio_btn_1"
+                    android:drawablePadding="@dimen/dp_12"
+                    android:text="线上" />
+
+                <RadioButton
+                    android:id="@+id/radio2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_20"
+                    android:button="@null"
+                    android:drawableLeft="@drawable/radio_btn_1"
+                    android:drawablePadding="@dimen/dp_12"
+                    android:text="线下" />
+            </RadioGroup>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/redStar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="@dimen/dp_127"
+                android:layout_height="wrap_content"
+                android:text="物流公司" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="请选择"
+                android:id="@+id/tv_wl"
+                android:gravity="center_vertical"
+                style="@style/gray07TextStyle14"/>
+            <ImageView
+                android:layout_width="@dimen/dp_7"
+                android:layout_height="@dimen/dp_13"
+                android:src="@mipmap/the_right"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/redStar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="@dimen/dp_127"
+                android:layout_height="wrap_content"
+                android:text="物流单号" />
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:hint="请输入"
+                android:textColorHint="@color/gray07"
+                style="@style/blackTextStyle14"
+                android:id="@+id/et_wldh"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/redStar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="@dimen/dp_127"
+                android:layout_height="wrap_content"
+                android:text="收货人姓名" />
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:hint="请输入"
+                android:textColorHint="@color/gray07"
+                style="@style/blackTextStyle14"
+                android:id="@+id/et_shr_name"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/redStar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="@dimen/dp_127"
+                android:layout_height="wrap_content"
+                android:text="收货人电话" />
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:hint="请输入"
+                android:inputType="number"
+                android:textColorHint="@color/gray07"
+                style="@style/blackTextStyle14"
+                android:id="@+id/et_shr_phone"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/redStar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="@dimen/dp_127"
+                android:layout_height="wrap_content"
+                android:text="地区" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="请选择"
+                android:id="@+id/tv_address"
+                android:gravity="center_vertical"
+                style="@style/gray07TextStyle14"/>
+            <ImageView
+                android:layout_width="@dimen/dp_7"
+                android:layout_height="@dimen/dp_13"
+                android:src="@mipmap/the_right"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/redStar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="@dimen/dp_127"
+                android:layout_height="wrap_content"
+                android:text="详细地址" />
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:hint="请输入"
+                android:textColorHint="@color/gray07"
+                style="@style/blackTextStyle14"
+                android:id="@+id/et_detail_address"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="@dimen/dp_15">
+
+            <TextView
+                style="@style/blackTextStyle14"
+                android:layout_width="@dimen/dp_133"
+                android:layout_height="wrap_content"
+                android:text="邮政编码" />
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:hint="请输入"
+                android:inputType="number"
+                android:textColorHint="@color/gray07"
+                style="@style/blackTextStyle14"
+                android:id="@+id/et_yzbm"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_0_5"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@color/common_line_color" />
+
+    </com.ruffian.library.widget.RLinearLayout>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="@dimen/dp_150"
+        android:layout_height="@dimen/dp_40"
+        app:background_normal="@color/green01"
+        android:text="确认发货"
+        style="@style/whiteTextStyle15"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:gravity="center"
+        app:corner_radius="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_37"
+        android:id="@+id/btn_sure"/>
+</RelativeLayout>

app/src/main/res/layout-v4/activity_send_good_success.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:background="@color/background_color"
+    tools:context=".project.ui.activity.obu.SendGoodSuccessActivity">
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        app:leftIcon="@mipmap/back_black"
+        app:layout_constraintTop_toTopOf="parent"
+        android:id="@+id/title"
+        app:title="发货"
+        app:lineVisible="false"
+        app:titleColor="@color/black01" />
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/ic_obu_7"
+        android:id="@+id/img_send_state"
+        android:layout_marginTop="@dimen/dp_48"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="发货成功"
+        style="@style/blackTextStyleBold17"
+        android:layout_marginTop="@dimen/dp_24"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="@dimen/dp_150"
+        android:layout_height="@dimen/dp_40"
+        app:background_normal="@color/green01"
+        app:corner_radius="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_68"
+        android:text="返回订单"
+        android:id="@+id/btn_back"
+        android:gravity="center"
+        style="@style/whiteTextStyle15"/>
+</LinearLayout>

app/src/main/res/layout-v5/item_obu_1.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.ruffian.library.widget.RRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    app:background_normal="@color/white"
+    app:corner_radius="@dimen/dp_10"
+    android:padding="@dimen/dp_12"
+    android:layout_height="wrap_content">
+    <com.ruffian.library.widget.RLinearLayout
+        android:layout_width="@dimen/dp_90"
+        android:layout_height="@dimen/dp_73"
+        app:background_normal="@color/green01_10"
+        android:gravity="center"
+        android:id="@+id/linear"
+        android:orientation="vertical"
+        app:corner_radius="@dimen/dp_3">
+        <com.ruffian.library.widget.RImageView
+            android:layout_width="@dimen/dp_61"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/ic_obu_4"/>
+    </com.ruffian.library.widget.RLinearLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="设备品牌:"
+        android:layout_toRightOf="@+id/linear"
+        style="@style/black02TextStyle13"
+        android:layout_marginLeft="@dimen/dp_14"
+        android:id="@+id/tv1"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/tv_obu_pp"
+        android:text="聚力"
+        style="@style/black02TextStyle13"
+        android:layout_toRightOf="@+id/tv1"
+        android:layout_marginLeft="@dimen/dp_6"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="设备编号:"
+        android:layout_marginTop="@dimen/dp_11"
+        android:layout_toRightOf="@+id/linear"
+        style="@style/black02TextStyle13"
+        android:layout_below="@+id/tv1"
+        android:layout_marginLeft="@dimen/dp_14"
+        android:id="@+id/tv2"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/tv_obu_bh"
+        android:text="5202032810310034"
+        style="@style/black02TextStyle13"
+        android:layout_alignTop="@+id/tv2"
+        android:layout_toRightOf="@+id/tv1"
+        android:layout_marginLeft="@dimen/dp_6"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="@dimen/dp_67"
+        android:layout_height="@dimen/dp_25"
+        app:background_normal="@color/green01"
+        android:text="选择设备"
+        android:gravity="center"
+        style="@style/whiteTextStyle12"
+        app:corner_radius="@dimen/dp_12"
+        android:layout_alignLeft="@+id/tv2"
+        android:layout_alignBottom="@+id/linear"/>
+</com.ruffian.library.widget.RRelativeLayout>

app/src/main/res/values/colors.xml

@@ -80,6 +80,7 @@
     <!--    浅绿色背景-->
     <color name="background_color">#EEF7F7</color>
     <!--    绿色-->
+    <color name="green01_10">#1A00B38B</color>
     <color name="green01">#00B38B</color>
     <color name="green02">#39CC81</color>
 
@@ -92,6 +93,9 @@
     <color name="gray02">#999999</color>
     <color name="gray03">#CCCCCC</color>
     <color name="gray04">#DCDCDC</color>
+    <color name="gray05">#D6D6D6</color>
+    <color name="gray06">#888888</color>
+    <color name="gray07">#B3B3B3</color>
 
     <!--    红色-->
     <color name="red01">#FF5353</color>
@@ -99,6 +103,9 @@
     <!--    橘色-->
     <color name="orange01">#FA8C16</color>
 
+    <!-- 选择图片背景框背景 -->
+    <color name="photochoosebg">#F7FAFD</color>
+
     <!--    分割线颜色-->
     <color name="common_divider">#e3e3e3</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -266,4 +266,9 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
+    <string name="obu_warm_tips">ETC设备蓝牙打开方式分为两种：
+
+①查看设备上是否有蓝牙按钮，若有蓝牙按钮，轻按按钮，设备显示“蓝牙已打开”。
+
+②若设备无蓝牙按钮，对设备两次插拔卡方式，详情“操作手册”，打开蓝牙后设备显示“蓝牙已打开”。</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -182,6 +182,10 @@
         <item name="android:textSize">@dimen/sp_14</item>
         <item name="android:textColor">@color/green01</item>
     </style>
+    <style name="greenTextStyle15">
+        <item name="android:textSize">@dimen/sp_15</item>
+        <item name="android:textColor">@color/green01</item>
+    </style>
     <!--    红色-->
     <style name="redTextStyle14">
         <item name="android:textSize">@dimen/sp_14</item>
@@ -249,6 +253,10 @@
         <item name="android:textSize">@dimen/sp_14</item>
         <item name="android:textColor">@color/text98</item>
     </style>
+    <style name="gray07TextStyle14">
+        <item name="android:textSize">@dimen/sp_14</item>
+        <item name="android:textColor">@color/gray07</item>
+    </style>
     <style name="gray02TextStyle12">
         <item name="android:textSize">@dimen/sp_12</item>
         <item name="android:textColor">@color/gray02</item>
@@ -257,6 +265,14 @@
         <item name="android:textSize">@dimen/sp_13</item>
         <item name="android:textColor">@color/gray02</item>
     </style>
+    <style name="gray06TextStyle13">
+        <item name="android:textSize">@dimen/sp_13</item>
+        <item name="android:textColor">@color/gray06</item>
+    </style>
+    <style name="gray07TextStyle13">
+        <item name="android:textSize">@dimen/sp_13</item>
+        <item name="android:textColor">@color/gray07</item>
+    </style>
     <!--    橘色-->
     <style name="orangeTextStyle10">
         <item name="android:textSize">@dimen/dp_10</item>