Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Mar 20 21:36:12 CST 2018
-debugName=310
+#Wed Mar 21 15:17:22 CST 2018
+debugName=311
 versionName=624
-debugCode=310
+debugCode=311
 versionCode=163

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/MsgThirdWebActivity.java

@@ -50,13 +50,11 @@ public class MsgThirdWebActivity extends MessageWebActivity {
                 Intent intent = getIntent();
                 if (intent != null) {
                     String title = intent.getStringExtra(IntentUtils.KEY_TITLE);
-                    if (title != null && title.equals("审批知会")) {
                         String caller = intent.getStringExtra("caller");
                         int keyValue = intent.getIntExtra("keyValue", 0);
                         LogUtil.i("onJsAlert caller=" + caller);
                         LogUtil.i("onJsAlert keyValue=" + keyValue);
                         startActivity(caller, keyValue);
-                    }
                 }
                 result.cancel();
                 return true;

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/RealTimeFormActivity.java

@@ -63,7 +63,6 @@ public class RealTimeFormActivity extends BaseActivity {
                 intent.putExtra("orientation", true);
                 intent.putExtra("cookie", true);
                 startActivity(intent);
-
             }
         });
     }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/BusinessTravelAdapter.java

@@ -167,7 +167,7 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     }
 
     private void bindHotelView(HotelViewHolder holder, BusinessTravel model) {
-        String whenLongTv = "入住: " + DateFormatUtil.long2Str(model.getStartTime(), "MM-dd") + "      离店: " + DateFormatUtil.long2Str(model.getStartTime(), "MM-dd") + "     共" + model.getAllTime()+(model.getAllTime().contains("分钟")?"":"晚");
+        String whenLongTv = "入住: " + DateFormatUtil.long2Str(model.getStartTime(), "MM-dd") + "      离店: " + DateFormatUtil.long2Str(model.getStartTime(), "MM-dd") + "     共" + model.getAllTime() + (model.getAllTime().contains("分钟") ? "" : "晚");
         holder.whenLongTv.setText(whenLongTv);
         holder.businessNameTv.setText(model.getBusinessName());
         holder.numberTv.setText(model.getNumber() + "人");
@@ -389,11 +389,11 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         if (NetUtils.isNetWorkConnected(ct)) {
             String appkey = "y8gd87dsdkencgzk394k7s5c78io35c";
             String appSceret = "e212e142a5c9e0590eefb7d9f1bc91d7";
-            String baseUrl="http://124.254.45.234:8082/oa/caslogin/";
-            if (!BaseConfig.isDebug()){
+            String baseUrl = "http://124.254.45.234:8082/oa/caslogin/";
+            if (!BaseConfig.isDebug()) {
                 appkey = "fjdsfnvg6523fsgjkff879fidsf";
                 appSceret = "9891ca5330271eba81ec1332e740c210";
-                baseUrl="http://h5.auvgo.com/";
+                baseUrl = "http://h5.auvgo.com/";
             }
             String username = CommonUtil.getEmcode();
             String data = appkey + username.toUpperCase() + appSceret;
@@ -410,7 +410,6 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             }
             LogUtil.i(urlBuilder.toString());
             IntentUtils.linkCommonWeb(ct, urlBuilder.toString(), "行旅国际", "", "", false, false, false);
-
         } else {
             ToastUtil.showToast(ct, R.string.networks_out);
         }

app_modular/appworks/src/main/res/layout/item_bus_travel_hotel.xml

@@ -146,7 +146,7 @@
             android:layout_alignTop="@id/roomsTv"
             android:layout_marginRight="@dimen/padding"
             android:text="A30H"
-            android:textColor="@color/indianred"
+            android:textColor="@color/hintColor"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -215,7 +215,7 @@
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
             android:text="城市地址"
-            android:textColor="@color/text_hine" />
+            android:textColor="@color/hintColor" />
 
         <TextView
             android:id="@+id/addressTv"
@@ -237,7 +237,7 @@
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
             android:text="入住日期:"
-            android:textColor="@color/text_hine" />
+            android:textColor="@color/hintColor" />
 
         <TextView
             android:id="@+id/dateTv"
@@ -259,7 +259,7 @@
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
             android:text="人数:"
-            android:textColor="@color/text_hine" />
+            android:textColor="@color/hintColor" />
 
         <TextView
             android:id="@+id/numberSubTv"
@@ -282,7 +282,7 @@
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
             android:text="预计费用:"
-            android:textColor="@color/text_hine" />
+            android:textColor="@color/hintColor" />
 
         <TextView
             android:id="@+id/expecteFeeTv"