初始化配置服务注册

WeiChat/src/main/AndroidManifest.xml

@@ -1067,6 +1067,7 @@
             </intent-filter>
         </activity>
 
+        <service android:name="com.core.service.InitializeService"/>
     </application>
 
 </manifest>

WeiChat/src/main/res/layout/activity_search_location.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:id="@+id/search_rl"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="@drawable/bg_bar"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="horizontal"
-        android:paddingBottom="5dp"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp"
-        android:paddingTop="5dp">
-
-        <com.core.widget.ClearEditText
-            android:id="@+id/search_edit"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/search_input"
-            android:drawableLeft="@drawable/search"
-            android:drawableRight="@drawable/search_clear"
-            android:hint="@string/search"
-            android:textColor="@color/dark_grey"
-            android:textColorHint="@color/grey"
-            android:textSize="15sp" />
-    </RelativeLayout>
-
-    <com.baidu.mapapi.map.MapView
-        android:id="@+id/bmapView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:clickable="false" />
-
-    <com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/listview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="5"
-        android:divider="@color/item_line"
-        android:dividerHeight="2px"
-        android:focusableInTouchMode="false"
-        android:hardwareAccelerated="false"
-        android:scrollingCache="false" />
-
-</LinearLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jan 08 09:42:50 CST 2018
-debugName=389
+#Tue Jan 09 14:27:17 CST 2018
+debugName=410
 versionName=624
-debugCode=389
+debugCode=410
 versionCode=163

app_core/common/src/main/java/com/core/service/InitializeService.java

@@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.baidu.mapapi.SDKInitializer;
+import com.common.LogUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.preferences.SharedUtil;
 import com.core.app.AppConfig;
@@ -103,6 +104,7 @@ public class InitializeService extends IntentService {
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }*/
+        LogUtil.d("InitializeService", "InitializeService-->finish");
     }
 
     public void initShareAPI() {

app_core/common/src/main/res/layout/activity_search_location.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:focusable="true"
+              android:focusableInTouchMode="true"
+              android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/search_rl"
@@ -19,7 +19,7 @@
         android:paddingRight="15dp"
         android:paddingTop="5dp">
 
-        <com.xzjmyk.pm.activity.view.ClearEditText
+        <com.core.widget.ClearEditText
             android:id="@+id/search_edit"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app_modular/applogin/src/main/java/com/modular/login/activity/RegisterSelectActivity.java

@@ -33,7 +33,7 @@ public class RegisterSelectActivity extends BaseActivity implements View.OnClick
 //                        "https://account.ubtob.com/sso/register",
 //                        "企业注册");
                 startActivity(new Intent(mContext, EnterpriseRegisterActivity.class));
-//                finish();
+                finish();
             }
         });
     }

app_modular/applogin/src/main/res/layout/activity_admin_register.xml

@@ -10,8 +10,9 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scrollbars="none"
-        android:fillViewport="true">
+        android:fillViewport="true"
+        android:overScrollMode="never"
+        android:scrollbars="none">
 
         <LinearLayout
             android:layout_width="match_parent"

app_modular/applogin/src/main/res/layout/activity_enterprise_register.xml

@@ -12,6 +12,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:fillViewport="true"
+        android:overScrollMode="never"
         android:scrollbars="none">
 
         <LinearLayout
@@ -75,7 +76,7 @@
                 android:text="请填写正确的企业名称，2-99个字符"
                 android:textColor="@color/red"
                 android:textSize="10sp"
-                android:visibility="invisible"/>
+                android:visibility="invisible" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -123,7 +124,7 @@
                 android:text="请填写营业执照上的注册号"
                 android:textColor="@color/red"
                 android:textSize="10sp"
-                android:visibility="invisible"/>
+                android:visibility="invisible" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -180,8 +181,8 @@
                     android:id="@+id/enterprise_register_address_et"
                     style="@style/register_edittext_style"
                     android:drawableLeft="@drawable/ic_reg_address"
-                    android:hint="企业地址(例如:xx省xx市xx区xx路xx号)"
                     android:gravity="center_vertical"
+                    android:hint="企业地址(例如:xx省xx市xx区xx路xx号)"
                     android:textColor="@color/black" />
 
             </LinearLayout>
@@ -249,7 +250,7 @@
                 android:text="请选择所在行业"
                 android:textColor="@color/red"
                 android:textSize="10sp"
-                android:visibility="invisible"/>
+                android:visibility="invisible" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -288,7 +289,7 @@
                 android:text="请填写营业执照上的注册号"
                 android:textColor="@color/red"
                 android:textSize="10sp"
-                android:visibility="invisible"/>
+                android:visibility="invisible" />
 
             <LinearLayout
                 android:layout_width="match_parent"