增加欢迎页，修改顶部UI

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
 
     signingConfigs {
-       /* debug {
+        /* debug {
             storeFile file('D:\\project\\huahang_project\\app\\xuetubao.jks')
             storePassword '111111'
             keyAlias = 'xuetubao'

@@ -8,25 +8,31 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission
         android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-        tools:ignore="ProtectedPermissions" />
-    <!-- 允许程序访问WiFi网络信息 -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <!-- 允许程序读写手机状态和身份 -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!-- 允许程序访问CellID或WiFi热点来获取粗略的位置 -->
+        tools:ignore="ProtectedPermissions" /> <!-- 允许程序访问WiFi网络信息 -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 允许程序读写手机状态和身份 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- 允许程序访问CellID或WiFi热点来获取粗略的位置 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
-
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/xuetubao"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/NoTheme"
         android:usesCleartextTraffic="true">
+        <activity
+            android:name=".activity.login.WelcomeActivity"
+            android:screenOrientation="portrait" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <meta-data
             android:name="com.amap.api.v2.apikey"
             android:value="64d9479176ae933006f461633143e1a6" />
@@ -37,47 +43,34 @@
             android:name=".activity.study.StudyActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".activity.study.CourseDetailActivity_Video"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".activity.study.VipActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTask">
-
-        </activity>
-
-        <!-- 绑定微信 -->
+            android:launchMode="singleTask"></activity> <!-- 绑定微信 -->
         <activity
             android:name=".activity.login.BdsjActivity"
-            android:screenOrientation="portrait" />
-
-        <!-- 机构登录 -->
+            android:screenOrientation="portrait" /> <!-- 机构登录 -->
         <activity
             android:name=".activity.login.JgdlActivity"
-            android:screenOrientation="portrait" />
-
-        <!-- 忘记密码 -->
+            android:screenOrientation="portrait" /> <!-- 忘记密码 -->
         <activity
             android:name=".activity.login.ForgetPasActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".activity.personal.InfromationActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.personal.ResumeActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".activity.study.WebActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".activity.personal.MessageActivity"
             android:screenOrientation="portrait" />
@@ -116,13 +109,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.login.LoginActivity"
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.personal.MoneyHistoryActivity"
             android:screenOrientation="portrait" />
@@ -155,16 +142,12 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.pratice.c"
-            android:screenOrientation="portrait" />
-
-        <!-- 微信 -->
+            android:screenOrientation="portrait" /> <!-- 微信 -->
         <activity
             android:name=".wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
     </application>
 
-
 </manifest>
\ No newline at end of file

+package com.hh.xuetubao.activity.login;
+
+import android.content.Intent;
+import android.os.CountDownTimer;
+
+import com.hh.xuetubao.R;
+import com.hh.xuetubao.model.AccountModel;
+import com.hh.xuetubao.mvp.BaseMvpActivity;
+import com.hh.xuetubao.mvp.CommonPresenter;
+import com.hh.xuetubao.mvp.ICommonView;
+
+public class WelcomeActivity extends BaseMvpActivity<CommonPresenter, AccountModel> implements ICommonView {
+
+    private CountDownTimer timer;
+
+    @Override
+    public void initView() {
+
+        timer = new CountDownTimer(3000, 1000) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+
+            }
+
+            @Override
+            public void onFinish() {
+                Intent intent=new Intent(WelcomeActivity.this,LoginActivity.class);
+                startActivity(intent);
+            }
+        }.start();
+    }
+
+    @Override
+    public int initLayout() {
+        return R.layout.activity_welcome;
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+    @Override
+    public CommonPresenter getPresenter() {
+        return new CommonPresenter();
+    }
+
+    @Override
+    public AccountModel getModel() {
+        return new AccountModel();
+    }
+
+    @Override
+    public void getData(Object o, int api, int intent) {
+
+    }
+
+    @Override
+    public void onComplete(int api) {
+
+    }
+
+    @Override
+    public void onError(Throwable e, int api) {
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        timer.cancel();
+    }
+}

@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/lin_tab"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2"
         android:orientation="horizontal">
 

@@ -23,7 +23,7 @@
     <LinearLayout
         android:id="@+id/lin_tab"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2"
         android:orientation="horizontal">
 

@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/lin_tab"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2"
         android:orientation="horizontal">
 

@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/lin_tab"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2"
         android:orientation="horizontal">
 

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:id="@+id/rl_search"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:layout_alignParentTop="true"
         android:background="#F2F2F2">
 

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -10,7 +10,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -7,7 +7,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2"
         android:gravity="center_vertical"
         android:orientation="horizontal">

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -18,7 +18,7 @@
             <RelativeLayout
                 android:id="@+id/lin_tab"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_68"
+                android:layout_height="@dimen/dp_48"
                 android:background="#F2F2F2"
                 android:orientation="horizontal">
 

@@ -8,7 +8,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:layout_alignParentTop="true"
         android:background="#F2F2F2">
 

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.login.WelcomeActivity">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@mipmap/welcome"/>
+</LinearLayout>
\ No newline at end of file

@@ -7,7 +7,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -9,7 +9,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -9,7 +9,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -7,7 +7,7 @@
     <RelativeLayout
         android:id="@+id/rl_top"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_68"
+        android:layout_height="@dimen/dp_48"
         android:background="#F2F2F2">
 
         <LinearLayout

@@ -8,17 +8,16 @@
     <RelativeLayout
         android:id="@+id/rl_search"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_45"
+        android:layout_height="@dimen/dp_48"
         android:layout_alignParentTop="true"
         android:background="#F2F2F2">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_30"
-            android:layout_alignParentBottom="true"
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginRight="@dimen/dp_15"
-            android:layout_marginBottom="@dimen/dp_7"
+            android:layout_centerVertical="true"
             android:background="@drawable/circle_concers"
             android:orientation="horizontal">