Browse Source

1.完善若干活动;
2.上线测试。

Yumin 6 years ago
parent
commit
0b5f1561a6

+ 14 - 2
app/src/main/AndroidManifest.xml

@@ -8,9 +8,9 @@
     <application
         android:name=".ctrl.App"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
@@ -48,6 +48,18 @@
             android:name=".activities.PlayerActivity"
             android:label="课程视频"
             android:launchMode="singleTask" />
+        <activity
+            android:name=".activities.BannerActivity"
+            android:label="@string/app_name" />
+        <activity
+            android:name=".activities.MyCourseActivity"
+            android:label="我的课程" />
+        <activity
+            android:name=".activities.SearchActivity"
+            android:label="搜索课程" />
+        <activity
+            android:name=".activities.HelpActivity"
+            android:label="帮助与反馈" />
     </application>
 
 </manifest>

+ 42 - 0
app/src/main/java/cn/minbb/edu/activities/BannerActivity.java

@@ -0,0 +1,42 @@
+package cn.minbb.edu.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.webkit.WebView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cn.minbb.edu.R;
+import cn.minbb.edu.ctrl.App;
+
+public class BannerActivity extends AppCompatActivity {
+
+    @BindView(R.id.webView)
+    WebView webView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_banner);
+        ButterKnife.bind(this);
+        App.setupActionBar(this);
+        webView.loadUrl(getIntent().getStringExtra("url"));
+    }
+
+    public static void start(Context context, String url) {
+        Intent starter = new Intent(context, BannerActivity.class);
+        starter.putExtra("url", url);
+        context.startActivity(starter);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

+ 4 - 1
app/src/main/java/cn/minbb/edu/activities/CourseDetailActivity.java

@@ -47,6 +47,8 @@ public class CourseDetailActivity extends AppCompatActivity {
     TextView name;
     @BindView(R.id.introduction)
     TextView introduction;
+    @BindView(R.id.teacher)
+    TextView teacher;
 
     private ProgressDialog dialog;
 
@@ -125,8 +127,9 @@ public class CourseDetailActivity extends AppCompatActivity {
                             .into(cover);
                     SpannableStringBuilder span = new SpannableStringBuilder("缩进" + course.getIntroduction());
                     span.setSpan(new ForegroundColorSpan(Color.TRANSPARENT), 0, 2, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-                    introduction.setText(span);
                     name.setText(course.getName());
+                    introduction.setText(span);
+                    teacher.setText("主讲教师:" + course.getVoTeacher().getName());
                 });
             }
         }).get(map);

+ 33 - 0
app/src/main/java/cn/minbb/edu/activities/HelpActivity.java

@@ -0,0 +1,33 @@
+package cn.minbb.edu.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import cn.minbb.edu.R;
+import cn.minbb.edu.ctrl.App;
+
+public class HelpActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_help);
+        App.setupActionBar(this);
+    }
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, HelpActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

+ 18 - 9
app/src/main/java/cn/minbb/edu/activities/MainActivity.java

@@ -56,6 +56,7 @@ public class MainActivity extends AppCompatActivity {
     private List<View> views = new ArrayList<>(3);
     private BGABanner mainBanner;
     private SwipeRefreshLayout mainRefreshLayout, courseRefreshLayout;
+    private TextView courseHotTip, courseExcellentTip;
     private TextView name, school;
 
     private User user;
@@ -97,6 +98,8 @@ public class MainActivity extends AppCompatActivity {
         views.add(page_2);
         views.add(page_3);
         viewPager.setAdapter(new MainActivityPagerAdapter(views));
+        // 主页搜索
+        page_1.findViewById(R.id.search).setOnClickListener(view -> SearchActivity.start(MainActivity.this));
         // 主页轮播
         mainBanner = page_1.findViewById(R.id.mainBanner);
         mainBanner.setTransitionEffect(TransitionEffect.Default);       // 用 Java 代码方式设置切换动画
@@ -105,7 +108,9 @@ public class MainActivity extends AppCompatActivity {
         mainBanner.setAdapter(new MainActivityBGABannerAdapter(MainActivity.this));
         // 主页 热门课程和优秀课程
         RecyclerView courseHotView = page_1.findViewById(R.id.courseHotView);
+        courseHotTip = page_1.findViewById(R.id.courseHotTip);
         RecyclerView courseExcellentView = page_1.findViewById(R.id.courseExcellentView);
+        courseExcellentTip = page_1.findViewById(R.id.courseExcellentTip);
         // 主页 所有课程
         courseHotView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
         courseHotAdapter = new MainHotCourseAdapter(this, courseHotList);
@@ -130,6 +135,10 @@ public class MainActivity extends AppCompatActivity {
         // 设置布局管理器,参数 StaggeredGridLayoutManager,可以是 RecyclerView 实现和 StaggeredGridView 一样的效果
         courseBasicView.setLayoutManager(staggeredGridLayoutManager);
         courseBasicAdapter = new MainBasicCourseAdapter(this, courseBasicList);
+        courseBasicAdapter.setOnItemClickListener(position -> {
+            MainBasicCourseAdapter.ItemBean itemBean = courseBasicList.get(position);
+            CourseDetailActivity.start(MainActivity.this, itemBean.getCourseId());
+        });
         courseBasicView.setAdapter(courseBasicAdapter);
         // 首页刷新视图
         mainRefreshLayout = page_1.findViewById(R.id.mainRefreshLayout);
@@ -189,12 +198,7 @@ public class MainActivity extends AppCompatActivity {
         });
         courseRefreshLayout.setOnRefreshListener(this::loadCourseData);
         // 轮播监听
-        mainBanner.setDelegate((banner, itemView, model, position) -> {
-            switch (position) {
-                default:
-                    Toast.makeText(getApplicationContext(), bannerData.getLinks().get(position), Toast.LENGTH_SHORT).show();
-            }
-        });
+        mainBanner.setDelegate((banner, itemView, model, position) -> BannerActivity.start(this, bannerData.getLinks().get(position)));
     }
 
     private void loadData() {
@@ -264,6 +268,7 @@ public class MainActivity extends AppCompatActivity {
                     mainTaskCount++;
                     if (mainTaskCount == 3) mainRefreshLayout.setRefreshing(false);
                     ResponseResult result = JSONObject.parseObject(s, ResponseResult.class);
+                    courseHotTip.setText("+" + result.getMessage() + " more");
                     Collection collection = result.getDataset();
                     for (Object o : collection) {
                         Course course = JSONObject.parseObject(JSONObject.toJSONString(o), Course.class);
@@ -289,6 +294,7 @@ public class MainActivity extends AppCompatActivity {
                     mainTaskCount++;
                     if (mainTaskCount == 3) mainRefreshLayout.setRefreshing(false);
                     ResponseResult result = JSONObject.parseObject(s, ResponseResult.class);
+                    courseExcellentTip.setText("+" + result.getMessage() + " more");
                     Collection collection = result.getDataset();
                     for (Object o : collection) {
                         Course course = JSONObject.parseObject(JSONObject.toJSONString(o), Course.class);
@@ -312,11 +318,12 @@ public class MainActivity extends AppCompatActivity {
             public void success(String s) {
                 runOnUiThread(() -> {
                     courseRefreshLayout.setRefreshing(false);
+                    courseBasicList.clear();
                     ResponseResult result = JSONObject.parseObject(s, ResponseResult.class);
                     Collection collection = result.getDataset();
                     for (Object o : collection) {
                         Course course = JSONObject.parseObject(JSONObject.toJSONString(o), Course.class);
-                        courseBasicList.add(new MainBasicCourseAdapter.ItemBean(course.getCover(), course.getName(), course.getIntroduction()));
+                        courseBasicList.add(new MainBasicCourseAdapter.ItemBean(course.getId(), course.getCover(), course.getName(), course.getIntroduction()));
                     }
                     courseBasicAdapter.notifyDataSetChanged();
                 });
@@ -326,12 +333,14 @@ public class MainActivity extends AppCompatActivity {
 
     public void onViewClick(View view) {
         switch (view.getId()) {
+            case R.id.course:
+                MyCourseActivity.start(MainActivity.this);
+                break;
             case R.id.settings:
                 Toast.makeText(MainActivity.this, "设置", Toast.LENGTH_SHORT).show();
                 break;
-            case R.id.collection:
-                break;
             case R.id.help:
+                Toast.makeText(MainActivity.this, "帮助与反馈", Toast.LENGTH_SHORT).show();
                 break;
             case R.id.exit:
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);

+ 33 - 0
app/src/main/java/cn/minbb/edu/activities/MyCourseActivity.java

@@ -0,0 +1,33 @@
+package cn.minbb.edu.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import cn.minbb.edu.R;
+import cn.minbb.edu.ctrl.App;
+
+public class MyCourseActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_my_course);
+        App.setupActionBar(this);
+    }
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, MyCourseActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

+ 11 - 0
app/src/main/java/cn/minbb/edu/activities/PlayerActivity.java

@@ -5,11 +5,13 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.AppCompatDelegate;
+import android.view.MenuItem;
 import android.widget.VideoView;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cn.minbb.edu.R;
+import cn.minbb.edu.ctrl.App;
 
 public class PlayerActivity extends AppCompatActivity {
 
@@ -25,6 +27,7 @@ public class PlayerActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_player);
         ButterKnife.bind(this);
+        App.setupActionBar(this);
 
         initView();
     }
@@ -40,4 +43,12 @@ public class PlayerActivity extends AppCompatActivity {
         videoView.requestFocus();
         videoView.start();
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

+ 33 - 0
app/src/main/java/cn/minbb/edu/activities/SearchActivity.java

@@ -0,0 +1,33 @@
+package cn.minbb.edu.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import cn.minbb.edu.R;
+import cn.minbb.edu.ctrl.App;
+
+public class SearchActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_search);
+        App.setupActionBar(this);
+    }
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, SearchActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

+ 18 - 1
app/src/main/java/cn/minbb/edu/adapter/MainBasicCourseAdapter.java

@@ -19,6 +19,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cn.minbb.edu.R;
+import lombok.Getter;
 
 public class MainBasicCourseAdapter extends RecyclerView.Adapter<MainBasicCourseAdapter.ViewHolder> {
 
@@ -27,6 +28,16 @@ public class MainBasicCourseAdapter extends RecyclerView.Adapter<MainBasicCourse
     private List<ItemBean> itemBeen;
     private LayoutInflater layoutInflater;
 
+    private ItemClickListener itemClickListener;
+
+    public interface ItemClickListener {
+        void onItemClick(int position);
+    }
+
+    public void setOnItemClickListener(ItemClickListener itemClickListener) {
+        this.itemClickListener = itemClickListener;
+    }
+
     public MainBasicCourseAdapter(Context context, List<ItemBean> itemBeen) {
         this.context = context;
         this.itemBeen = itemBeen;
@@ -64,6 +75,9 @@ public class MainBasicCourseAdapter extends RecyclerView.Adapter<MainBasicCourse
                 .into(holder.courseImage);
         holder.courseName.setText(itemBeen.get(position).courseName);
         holder.courseTip.setText(itemBeen.get(position).courseTip);
+        if (null != itemClickListener) {
+            holder.itemView.setOnClickListener(view -> itemClickListener.onItemClick(holder.getAdapterPosition()));
+        }
     }
 
     @Override
@@ -89,11 +103,14 @@ public class MainBasicCourseAdapter extends RecyclerView.Adapter<MainBasicCourse
 
     public static class ItemBean {
 
+        @Getter
+        Integer courseId;
         String courseImage;
         String courseName;
         String courseTip;
 
-        public ItemBean(String courseImage, String courseName, String courseTip) {
+        public ItemBean(Integer courseId, String courseImage, String courseName, String courseTip) {
+            this.courseId = courseId;
             this.courseImage = courseImage;
             this.courseName = courseName;
             this.courseTip = courseTip;

+ 1 - 1
app/src/main/java/cn/minbb/edu/app/Const.java

@@ -7,6 +7,6 @@ public class Const {
     public static final String SERVER_HOST;
 
     static {
-        SERVER_HOST = "http://my.minbb.cn:80";
+        SERVER_HOST = "http://123.207.151.92:8080";
     }
 }

+ 1 - 1
app/src/main/java/cn/minbb/edu/util/HttpRequestUtil.java

@@ -80,7 +80,7 @@ public class HttpRequestUtil {
             @Override
             public void onFailure(Call call, IOException e) {
                 e.printStackTrace();
-                Log.e(TAG, e.getMessage());
+                Log.e(TAG, e.getMessage() + "");
                 if (null != requestCallback) requestCallback.failed("请求失败 " + e.getMessage());
             }
 

BIN
app/src/main/res/drawable/ic_launcher.png


BIN
app/src/main/res/drawable/ic_launcher_round.png


+ 17 - 0
app/src/main/res/layout/activity_banner.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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=".activities.BannerActivity">
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</android.support.constraint.ConstraintLayout>

+ 9 - 0
app/src/main/res/layout/activity_help.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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=".activities.HelpActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 9 - 0
app/src/main/res/layout/activity_my_course.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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=".activities.MyCourseActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 9 - 0
app/src/main/res/layout/activity_search.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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=".activities.SearchActivity">
+
+</android.support.constraint.ConstraintLayout>

+ 3 - 1
app/src/main/res/layout/content_course_detail.xml

@@ -32,12 +32,14 @@
             android:text="课程介绍" />
 
         <TextView
+            android:id="@+id/teacher"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/text_margin"
             android:layout_marginRight="@dimen/text_margin"
             android:layout_marginBottom="@dimen/text_margin"
-            android:text="主讲教师" />
+            android:text="主讲教师"
+            android:textStyle="bold" />
     </LinearLayout>
 
 </android.support.v4.widget.NestedScrollView>

+ 6 - 8
app/src/main/res/layout/page_1.xml

@@ -31,6 +31,7 @@
                 android:textStyle="bold" />
 
             <com.joanzapata.iconify.widget.IconTextView
+                android:id="@+id/search"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
@@ -85,10 +86,9 @@
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginRight="16dp"
-                    android:background="@color/colorPrimary"
                     android:padding="4dp"
                     android:text="{fa-bell} 重要通知:在这里"
-                    android:textColor="@android:color/white" />
+                    android:textColor="@android:color/black" />
 
                 <RelativeLayout
                     android:id="@+id/courseHot"
@@ -99,7 +99,6 @@
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginRight="16dp"
-                    android:background="@color/colorPrimary"
                     android:padding="8dp">
 
                     <TextView
@@ -107,7 +106,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="热门课程推荐"
-                        android:textColor="@android:color/white"
+                        android:textColor="@android:color/black"
                         android:textStyle="bold" />
 
                     <TextView
@@ -117,7 +116,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:text="+123 more"
-                        android:textColor="@android:color/white" />
+                        android:textColor="@android:color/black" />
 
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/courseHotView"
@@ -137,7 +136,6 @@
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginRight="16dp"
-                    android:background="@color/colorPrimary"
                     android:padding="8dp">
 
                     <TextView
@@ -145,7 +143,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="名师课程推荐"
-                        android:textColor="@android:color/white"
+                        android:textColor="@android:color/black"
                         android:textStyle="bold" />
 
                     <TextView
@@ -155,7 +153,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:text="+123 more"
-                        android:textColor="@android:color/white" />
+                        android:textColor="@android:color/black" />
 
                     <android.support.v7.widget.RecyclerView
                         android:id="@+id/courseExcellentView"

+ 7 - 7
app/src/main/res/layout/page_3.xml

@@ -112,7 +112,7 @@
             android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/settings"
+                android:id="@+id/course"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:foreground="?android:attr/selectableItemBackground"
@@ -123,7 +123,7 @@
                 <com.joanzapata.iconify.widget.IconTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="{fa-cog spin}"
+                    android:text="{fa-book}"
                     android:textColor="@android:color/black"
                     android:textSize="16sp" />
 
@@ -132,14 +132,14 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="20dp"
                     android:layout_marginLeft="20dp"
-                    android:text="通用设置"
+                    android:text="我的课程"
                     android:textColor="@android:color/black"
                     android:textSize="16sp" />
 
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/collection"
+                android:id="@+id/settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:foreground="?android:attr/selectableItemBackground"
@@ -150,7 +150,7 @@
                 <com.joanzapata.iconify.widget.IconTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="{fa-heart}"
+                    android:text="{fa-cog spin}"
                     android:textColor="@android:color/black"
                     android:textSize="16sp" />
 
@@ -159,7 +159,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="20dp"
                     android:layout_marginLeft="20dp"
-                    android:text="我的收藏"
+                    android:text="通用设置"
                     android:textColor="@android:color/black"
                     android:textSize="16sp" />
 
@@ -186,7 +186,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="20dp"
                     android:layout_marginLeft="20dp"
-                    android:text="帮助"
+                    android:text="帮助与反馈"
                     android:textColor="@android:color/black"
                     android:textSize="16sp" />
 

+ 1 - 1
app/src/main/res/menu/navigation.xml

@@ -9,7 +9,7 @@
     <item
         android:id="@+id/navigation_2"
         android:icon="@drawable/ic_import_contacts_white_24dp"
-        android:title="我的课程" />
+        android:title="课程中心" />
 
     <item
         android:id="@+id/navigation_3"

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">知学教育</string>
-    <string name="app_course">我的课程</string>
+    <string name="app_course">课程中心</string>
     <string name="app_center">个人中心</string>
 
     <string name="user_instructions">

+ 1 - 1
build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         
 
         // NOTE: Do not place your application dependencies here; they belong

+ 2 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Apr 25 11:04:30 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip