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

# Conflicts:
#	WeiChat/src/main/res/values-en/strings.xml
#	WeiChat/src/main/res/values-zh-rCN/strings.xml
#	WeiChat/src/main/res/values-zh-rTW/strings.xml
#	WeiChat/version.properties

WeiChat/src/main/AndroidManifest.xml

@@ -127,7 +127,9 @@
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" />
         <!-- 启动页面 -->
-        <activity android:name=".ui.SplashActivity">
+        <activity
+            android:icon="@drawable/uuu"
+            android:name=".ui.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.modular.main.SplashActivity" />

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 08 17:49:38 CST 2018
-debugName=446
-versionName=613
-debugCode=446
-versionCode=152
+#Fri Feb 09 11:09:03 CST 2018
+debugName=461
+versionName=617
+debugCode=461
+versionCode=156

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceSearchActivity.java

@@ -110,7 +110,6 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-                // TODO: 2017/9/30 加载更多
                 mPageIndex++;
                 loadListData(mPageIndex);
             }
@@ -142,7 +141,7 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
 
         mBServiceList = new ArrayList<>();
         mBserviceListAdapter = new ItemBserviceListAdapter(this, mBServiceList);
-        mSearchListView = (PullToRefreshListView) findViewById(R.id.book_service_search_ptlv);
+        mSearchListView =  findViewById(R.id.book_service_search_ptlv);
         mSearchListView.setMode(PullToRefreshBase.Mode.PULL_FROM_END);
         mSearchListView.setAdapter(mBserviceListAdapter);
 
@@ -203,13 +202,16 @@ public class BServiceSearchActivity extends OABaseActivity implements View.OnCli
                             if (mPageIndex > 1)
                                 mPageIndex--;
                         }
+                        LogUtil.d("mBServiceList","mBServiceList.size:"+mBServiceList.size());
+                        mBserviceListAdapter.setObjects(mBServiceList);
                         mBserviceListAdapter.notifyDataSetChanged();
                         if (mBServiceList.size() == 0) {
                             mEmptyLayout.showEmpty();
                         }
                     }
                 } catch (Exception e) {
-
+                    LogUtil.d("o.toString 发生异常" + e.toString());
+                    e.printStackTrace();
                 }
             }
         }));

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -525,7 +525,11 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
             onBackPressed();
         } else if (id == R.id.book_service_et) {
             Intent intent = new Intent();
-            intent.setClass(this, BServiceSearchActivity.class);
+//            intent.setClass(this, BServiceSearchActivity.class);
+            intent.setClass(this, BServiceListActivity.class);
+            SBMenuModel menuModel=new SBMenuModel();
+            menuModel.setCode("0");
+            intent.putExtra("SBMenuModel", menuModel);
             startActivity(intent);
         } else if (id == R.id.tv_distance) {
             //搜索距离-showPopupWindow

app_third/librarytbs/.gitignore

@@ -1 +0,0 @@
-/build

app_third/librarytbs/build.gradle

@@ -1,24 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
-    defaultConfig {
-        minSdkVersion rootProject.ext.android.minSdkVersion
-        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode rootProject.ext.android.versionCode
-        versionName rootProject.ext.android.versionName
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile deps.junit
-    compile deps.appcompatV7
-}

app_third/librarytbs/proguard-rules.pro

@@ -1,25 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/xianfeng/Develop/SDK/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

app_third/librarytbs/src/main/AndroidManifest.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yifeng.sample.tbs">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-    <application
-        android:allowBackup="true"
-        android:supportsRtl="true">
-        <activity android:name=".TBSFilesActivity">
-            <intent-filter>
-                <action android:name="com.yifeng.sample.tbs.TBSFilesActivity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-  
-    </application>
-
-</manifest>

app_third/librarytbs/src/main/res/layout/activity_index.xml

@@ -1,18 +0,0 @@
-<?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"
-    tools:context="com.yifeng.sample.tbs.IndexActivity">
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-       android:layout_centerInParent="true"
-       
-        android:text="Button" />
-</RelativeLayout>

app_third/librarytbs/src/main/res/layout/activity_tbsfile.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/rl_root"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-    <com.tencent.smtt.sdk.WebView
-        android:id="@+id/mSimpleWebView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</RelativeLayout>

app_third/librarytbs/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="colorPrimary">#3F51B5</color>
-  <color name="colorPrimaryDark">#303F9F</color>
-  <color name="colorAccent">#FF4081</color>
-</resources>

app_third/librarytbs/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">TbsFileSamples</string>
-</resources>

app_third/librarytbs/src/main/res/values/styles.xml

@@ -1,11 +0,0 @@
-<resources>
-
-  <!-- Base application theme. -->
-  <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-    <!-- Customize your theme here. -->
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-  </style>
-
-</resources>

app_third/librarytbs/src/test/java/com/yifeng/sample/tbs/ExampleUnitTest.java

@@ -1,18 +0,0 @@
-package com.yifeng.sample.tbs;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-
-  @Test
-  public void addition_isCorrect() throws Exception {
-    assertEquals(4, 2 + 2);
-  }
-}

settings.gradle

@@ -19,7 +19,7 @@ include ':apptasks'
 include ':apputils'
 
 //第三库模块
-include ':librarytbs'
+
 include ':lib-zxing'
 include ':libbdupdatesdk'
 include ':libedittextformlibrary'
@@ -51,7 +51,7 @@ project(':apptasks').projectDir = new File('app_modular/apptasks')
 project(':apputils').projectDir = new File('app_modular/apputils')
 
 //第三库模块
-project(':librarytbs').projectDir = new File('app_third/librarytbs')
+
 project(':lib-zxing').projectDir = new File('app_third/lib-zxing')
 project(':libbdupdatesdk').projectDir = new File('app_third/libbdupdatesdk')
 project(':library-viewpager-indicator').projectDir = new File('app_third/library-viewpager-indicator')