修改无法选择驾驶人的问题

RvClient/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.xxfc.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 113
-        versionName "1.1.3"
+        versionCode 112
+        versionName "1.1.2"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvClient/src/main/AndroidManifest.xml

@@ -109,7 +109,7 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="shareinstall为当前应用分配的scheme" />
+                <data android:scheme="pdfd6612" />
             </intent-filter>
         </activity> <!-- 百度地图相关 -->
         <!-- 声明service组件 -->
@@ -118,6 +118,11 @@
             android:enabled="true"
             android:process=":remote" />
 
+
+        <meta-data
+            android:name="com.shareinstall.APP_KEY"
+            android:value="B7BK2A6722BAH6"/>
+
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="QaN98C5rV8hawNLVix0FAPLSsz7uh2q1" /> <!-- <meta-data -->

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -294,7 +294,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
         } else if (id == R.id.tv_get_car_address) {
         } else if (id == R.id.tv_out_car_address) {
         } else if (id == R.id.iv_add_driving) {
-            startActivityForResult(DrivingListActivity.getIntent(mActivity, drivingListBean), TYPE_REQUEST_DRIVING);
+            startActivityForResult(DrivingListActivity.getIntent(mActivity, drivingListBean,1), TYPE_REQUEST_DRIVING);
         } else if (id == R.id.tv_detail) {
             showOrderDetail(llBottom);
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingListActivity.java

@@ -44,6 +44,11 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
                 .putExtra("data", dataBean);
     }
 
+    public static Intent getIntent(Context context, DrivingListBean.DataBeanX.DataBean dataBean, int openType) {
+        return getIntent(context, dataBean)
+                .putExtra("openType", openType);
+    }
+
     @Override
     protected int setLayout() {
         return R.layout.rv_act_driving_list;
@@ -53,6 +58,7 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(mActivity.getString(R.string.rv_driving));
         dataBean = (DrivingListBean.DataBeanX.DataBean) intent.getSerializableExtra("data");
+        openType = intent.getIntExtra("openType", 0);
         titleView.setImageResource(R.id.iv_title_right, R.drawable.rv_common_icon_thestaff);
         titleView.setChildClickListener(R.id.iv_title_right, new View.OnClickListener() {
             @Override
@@ -68,7 +74,7 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
         mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                if (dataBean != null) {
+                if (openType != 0) {
                     getIntent().putExtra("bean", mAdapter.getItem(position));
                     setResult(RESULT_OK, getIntent());
                     finish();

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -195,7 +195,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
 
     @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying,
             R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information,
-            R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler, R2.id.rl_item_my_pat, R2.id.tv_view_privileges})
+            R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler,
+            R2.id.tv_view_privileges})
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.iv_avatar) {
@@ -264,9 +265,11 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
             //出游人
             if (isLogin()) return;
             startActivity(new Intent(_mActivity, ChooseAVisitorActivity.class));
-        } else if (id == R.id.rl_item_my_pat) {
-            //我的拍拍
-        } else if (id == R.id.tv_view_privileges) {
+        }
+//        else if (id == R.id.rl_item_my_pat) {
+//            //我的拍拍
+//        }
+        else if (id == R.id.tv_view_privileges) {
             startActivity(MemberCenterActivity.getIntent(_mActivity));
         }
     }

module_mine/src/main/java/com/rv/rvmine/traveler/ChooseAVisitorActivity.java

@@ -70,8 +70,8 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
     private DeletePopupWindow deletePopupWindow;
     private List<TravelerListBean.DataBean> visitors = new ArrayList<>();
     private TravelerListBean.DataBean deletBean = null;
-    private List<TravelerListBean.DataBean> adults = null;
-    private List<TravelerListBean.DataBean> childs = null;
+    private List<TravelerListBean.DataBean> adults = new ArrayList<>();
+    private List<TravelerListBean.DataBean> childs = new ArrayList<>();
 
     private String hasChoIdCards; // 传过来的已经选择的身份证
     private int adultNumber; //成人数量
@@ -88,15 +88,27 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
         if (openType != 0) {
             adultNumber = intent.getIntExtra("adult_number", 0);
             childBumber = intent.getIntExtra("child_number", 0);
-            if (adultNumber != 0) {
+            if (adultNumber > 0) {
+                adults = new ArrayList<>(adultNumber);
+            }
+            if (childBumber > 0) {
+                childs = new ArrayList<>(childBumber);
+            }
+
             StringBuilder builder = new StringBuilder();
-                builder.append("请选择").append(adultNumber).append("位成人");
+            builder.append("请选择");
+
+            if (adultNumber != 0) {
+                builder.append(adultNumber).append("位成人");
+            }
             if (childBumber > 0) {
-                    builder.append(",").append(childBumber).append("位儿童");
+                if (builder.length() == 3) {
+                    builder.append(",");
+                }
+                builder.append(childBumber).append("位儿童");
             }
             tvSelelctResult.setVisibility(View.VISIBLE);
             tvSelelctResult.setText(builder.toString());
-            }
             btnConfim.setVisibility(View.VISIBLE);
         }
 
@@ -149,7 +161,7 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
             deletePopupWindow.getContentView().measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
         }
         deletePopupWindow.showAsDropDown(view, view.getWidth() / 2 - deletePopupWindow.getContentView().getMeasuredWidth() / 2,
-                -deletePopupWindow.getContentView().getHeight() / 2);
+                -deletePopupWindow.getContentView().getHeight());
 
     }
 
@@ -283,15 +295,9 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
             if (!TextUtils.isEmpty(hasChoIdCards) && hasChoIdCards.contains(b.getIdCard())) {
                 b.setStatus(true);
                 if (b.getIsChild() == 0) {
-                    if (adults == null && adultNumber > 0) {
-                        adults = new ArrayList<>(adultNumber);
-                    }
                     if (adults != null)
                         adults.add(b);
                 } else {
-                    if (childs == null && childBumber > 0) {
-                        childs = new ArrayList<>(childBumber);
-                    }
                     if (childs != null)
                         childs.add(b);
                 }
@@ -302,7 +308,6 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
         Collections.sort(visitors, new Comparator<TravelerListBean.DataBean>() {
             @Override
             public int compare(TravelerListBean.DataBean bean, TravelerListBean.DataBean t1) {
-
                 long crT = Long.valueOf(bean.getCrtTime());
                 long crT1 = Long.valueOf(t1.getCrtTime());
                 return (int) (crT1 - crT);
@@ -330,9 +335,6 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
         public boolean select(TravelerListBean.DataBean bean, int action) {
             if (bean != null) {
                 if (bean.getIsChild() == 0) {  // 成人
-                    if (adults == null && adultNumber > 0) {
-                        adults = new ArrayList<>(adultNumber);
-                    }
                     if (adultNumber == 0) {
                         return false;
                     }
@@ -351,9 +353,6 @@ public class ChooseAVisitorActivity extends BaseStatusActivity<CommonPresenter>
                     if (childBumber == 0) {
                         return false;
                     }
-                    if (childs == null && childBumber > 0) {
-                        childs = new ArrayList<>(childBumber);
-                    }
                     if (action == 0) {
                         return childs.remove(bean);
                     } else {

plugin_share/src/main/AndroidManifest.xml

@@ -5,10 +5,6 @@
     <application>
         <activity android:name=".ShareActivity" />
 
-        <meta-data
-            android:name="com.shareinstall.APP_KEY"
-            android:value="shareinstall为当前应用分配的appkey" />
-
         <activity android:name=".BillActivity"></activity>
     </application>