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

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

@@ -56,8 +56,9 @@ public class RvClientApplication extends FrameApp {
             ShareInstall.getInstance().init(this);
             ShareInstall.getInstance().reportRegister();
         }
-        LogUtil.setLogEnable(true, getApplicationContext());
-        CrashHandler.getInstance().init(getApplicationContext());
+        LogUtil.setLogEnable(false, getApplicationContext());
+
+//        CrashHandler.getInstance().init(getApplicationContext());
         // 在使用 SDK 各组间之前初始化 context 信息，传入 ApplicationContext
         SDKInitializer.initialize(this);
         //自4.3.0起，百度地图SDK所有接口均支持百度坐标和国测局坐标，用此方法设置您使用的坐标类型.

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

@@ -34,10 +34,9 @@ public class WakeUpActivity extends AppCompatActivity {
         ShareInstall.getInstance().getInfo(intent, listener);
     }
 
-    private AppGetInfoListener listener = new AppGetInfoListener() {
-        @Override
-        public void onGetInfoFinish(String info) {
+    private AppGetInfoListener listener = info -> {
         LogUtil.d("ShareInstall", "info = " + info);
+        Intent intent = new Intent(getApplicationContext(), MainActivity.class);
         if (info.contains("code"))
             try {
                 JSONObject object = new JSONObject(info);
@@ -50,17 +49,14 @@ public class WakeUpActivity extends AppCompatActivity {
                 String title = URLDecoder.decode(object.optString("title"), "UTF-8");
                 LogUtil.d("唤醒传过来的tile=" + title);
                 if (!TextUtils.isEmpty(url) && !TextUtils.isEmpty(title)) {
-                        Intent intent = new Intent(getApplicationContext(), MainActivity.class);
                     intent.putExtra("to", "webView");
                     intent.putExtra("url", url);
                     intent.putExtra("title", title);
-                        startActivity(intent);
-                        finish();
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
-
-        }
+        startActivity(intent);
+        finish();
     };
 }

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

@@ -1066,11 +1066,9 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
             CityPickerBean bean = new Gson().fromJson(json, CityPickerBean.class);
             for (CityPickerBean.CityBean cityBean : bean.getCity()) {
                 for (ListsBean lsBean : cityBean.getLists()) {
-                    if (starCity.equals(lsBean.getName())) {
+                    if (!TextUtils.isEmpty(starCity) && starCity.equals(lsBean.getName())) {
                         dataBean.setStartCity(lsBean.getId());
-                    }
-
-                    if (endCity.equals(lsBean.getName())) {
+                    } else if (!TextUtils.isEmpty(endCity) && endCity.equals(lsBean.getName())) {
                         dataBean.setEndCity(lsBean.getId());
                     }
                 }

module_tourism/src/main/res/layout/activity_travel_details.xml

@@ -72,17 +72,20 @@
         android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
         android:visibility="gone"></ProgressBar>
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
         <WebView
             android:id="@+id/webView"
             android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
+            android:layout_height="match_parent" />
 
         <LinearLayout
             android:id="@+id/ll_item_bottom"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
             android:orientation="vertical">
 
             <include layout="@layout/common_line" />
@@ -94,6 +97,7 @@
 
 
                 <TextView
+                    android:background="@color/white"
                     android:id="@+id/tv_customer_service"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -111,9 +115,12 @@
                     android:background="@color/colorAuxiliaryYellow"
                     android:gravity="center"
                     android:text="立即预订"
+
                     android:textColor="@color/colorWrite"
                     android:textSize="@dimen/text_14" />
 
             </LinearLayout>
         </LinearLayout>
+
+    </FrameLayout>
 </LinearLayout>