Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

RvClient/src/main/AndroidManifest.xml

@@ -123,6 +123,10 @@
             android:enabled="true"
             android:process=":remote" />
 
+        <service android:name="com.tencent.smtt.export.external.DexClassLoaderProviderService"
+            android:label="dexopt"
+            android:process=":dexopt" />
+
         <meta-data
             android:name="com.shareinstall.APP_KEY"
             android:value="@string/share_install_key" />

RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java

@@ -24,12 +24,14 @@ import com.rv.component.utils.LogUtil;
 import com.sh.sdk.shareinstall.ShareInstall;
 import com.squareup.leakcanary.LeakCanary;
 import com.tencent.bugly.crashreport.CrashReport;
+import com.tencent.smtt.export.external.TbsCoreSettings;
 import com.tencent.smtt.sdk.QbSdk;
 import com.tencent.smtt.sdk.TbsListener;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
 import com.yuyife.okgo.OkGoUtil;
 
+import java.util.HashMap;
 import java.util.Locale;
 
 import cn.pedant.SweetAlert.SweetAlertDialog;
@@ -147,8 +149,14 @@ public class RvClientApplication extends FrameApp {
                 Log.d("apptbs", "onDownloadProgress:" + i);
             }
         });
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
+        QbSdk.initTbsSettings(map);
+
         //x5内核初始化接口
         QbSdk.initX5Environment(getApplicationContext(), cb);
+        QbSdk.setDownloadWithoutWifi(true);
     }
 
 

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

@@ -919,6 +919,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                         outCompanyName = data.getStringExtra("company");
                         outCompanyId = data.getIntExtra("company_id", 1);
                         outCityName = requestData;
+                        outCityId = data.getIntExtra("id", 0);
                         StringBuffer buffer = new StringBuffer();
                         if (!TextUtils.isEmpty(outCompanyName)) {
                             buffer.append(outCompanyName);
@@ -1168,9 +1169,11 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         if (dataBean == null) {
             dataBean = new OrderDataBean();
         }
-        if (getCityId > 0 && outCityId > 0) {
-            dataBean.setEndCity(outCityId);
+        if (getCityId > 0) {
             dataBean.setStartCity(getCityId);
+        }
+        if (outCityId > 0) {
+            dataBean.setEndCity(outCityId);
         } else {
             String json = UtilsManager.getInstance().getJson(getContext(), "city.json");
             CityPickerBean bean = new Gson().fromJson(json, CityPickerBean.class);