集成gvr-sdk

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="SingleStatementInBlock" enabled="false" level="INFORMATION" enabled_by_default="false" />
+  </profile>
+</component>

lesson03/build.gradle

@@ -1,13 +1,10 @@
 apply plugin: 'com.android.application'
 android {
     compileSdkVersion 25
-
-
-
     defaultConfig {
         applicationId "io.hsiao.lesson03"
-        minSdkVersion 19
-        targetSdkVersion 26
+        minSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
 
@@ -26,9 +23,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.9.1'
-    compile group: 'com.alibaba', name: 'fastjson', version: '1.2.45'
+    compile 'com.squareup.okhttp3:okhttp:3.9.1'
+    compile 'com.alibaba:fastjson:1.2.45'
     compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.google.vr:sdk-base:1.80.0'
+    compile 'com.google.vr:sdk-panowidget:1.70.0'
+    compile 'com.google.vr:sdk-videowidget:1.40.0'
+    compile 'com.zhihu.android:matisse:0.4.3'
 
     implementation 'com.android.support:appcompat-v7:25.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'

lesson03/proguard-rules.pro

@@ -19,3 +19,4 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-dontwarn com.bumptech.glide.**

lesson03/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
@@ -15,11 +16,14 @@
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".PanoActivity"></activity>
+        <activity
+            android:name=".PanoActivity"
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
+        <activity android:name=".PanoVideoActivity" />
+        <activity android:name=".PublishActivity"></activity>
     </application>
 
 </manifest>

lesson03/src/main/java/io/hsiao/lesson03/AlbumGridAdapter.java

@@ -0,0 +1,110 @@
+package io.hsiao.lesson03;
+
+import android.content.Context;
+import android.net.Uri;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.squareup.picasso.Picasso;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * Created by hsiao on 2018/2/4.
+ */
+
+public class AlbumGridAdapter extends BaseAdapter {
+    private  final String TAG="youmap";
+    private List<Uri> array;
+    private final Context ctx;
+
+    private SimpleDateFormat sdf;
+    private int imgHeight;
+
+    public AlbumGridAdapter(Context ctx) {
+        this.ctx = ctx;
+        this.array = new ArrayList<>();
+        this.sdf = new SimpleDateFormat("yyyy-MM-dd");
+        this.imgHeight = MainActivity.screenOutSize.x/3;
+    }
+
+    public void addAll(List<Uri> arr) {
+        this.array.addAll(arr);
+    }
+
+    public  void add(Uri uri){
+        this.array.add(uri);
+    }
+    public void remove(Uri uri){
+        for(int i=0;i<array.size();i++){
+            if(uri.equals(array.get(i)))
+                array.remove(uri);
+        }
+    }
+    @Override
+    public int getCount() {
+        return array.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return array.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final ViewHolder holder;
+        if (convertView == null) {
+            holder = new ViewHolder();
+            convertView = LayoutInflater.from(ctx).inflate(R.layout.activity_publish_grid, null);
+            holder.closeBtn = (ImageButton) convertView.findViewById(R.id.publish_grid_close);
+            holder.thumbnail = (ImageView) convertView.findViewById(R.id.publish_grid_img);
+            ViewGroup.LayoutParams layoutParams = holder.thumbnail.getLayoutParams();
+            layoutParams.height = imgHeight;
+            layoutParams.width = imgHeight;
+            holder.thumbnail.setLayoutParams(layoutParams);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        Uri uri = array.get(position);
+        holder.uri = uri;
+        Picasso.with(ctx)
+                .load(uri)
+                .fit()
+                .into(holder.thumbnail);
+
+        holder.closeBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Log.i(TAG,holder.uri.getPath());
+                remove(holder.uri);
+                notifyDataSetChanged();
+            }
+        });
+        return convertView;
+    }
+
+    public class ViewHolder {
+        ImageView thumbnail;
+        ImageButton closeBtn;
+        Uri uri;
+    }
+}

lesson03/src/main/java/io/hsiao/lesson03/MainActivity.java

@@ -1,44 +1,43 @@
 package io.hsiao.lesson03;
 
 import android.content.Intent;
+import android.graphics.Point;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
+import android.widget.GridView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
-import android.widget.SimpleAdapter;
-
-import com.alibaba.fastjson.JSONArray;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import io.hsiao.lesson03.data.AsyncListLoader;
-import io.hsiao.lesson03.data.HttpAPI;
 
 public class MainActivity extends AppCompatActivity {
+    public static Point screenOutSize = new Point();
     private final String TAG = "lesson03";
-    private ListView listView;
+    private GridView listView;
     private ProgressBar progressBar;
     private MainListAdapter adapter;
 
     private int dataOffset = 0;
-    private int pageSize = 10;
-    private AsyncListLoader loader;
+    private int pageSize = 15;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         setContentView(R.layout.activity_main);
+        setSupportActionBar( (Toolbar) this.findViewById(R.id.main_toolbar));
+        getWindowManager().getDefaultDisplay().getSize(screenOutSize);
+
         this.progressBar = (ProgressBar) this.findViewById(R.id.progressBar);
-        this.listView = (ListView) this.findViewById(R.id.main_listview);
+        this.listView = (GridView) this.findViewById(R.id.main_gridview);
         this.adapter = new MainListAdapter(this);
         listView.setAdapter(adapter);
 
@@ -74,10 +73,35 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void getData() {
-        this.loader = new AsyncListLoader(adapter, progressBar);
-        if (progressBar.getVisibility() == View.GONE && this.loader.getStatus() == AsyncTask.Status.PENDING) {
+        AsyncListLoader loader = new AsyncListLoader(adapter, progressBar);
+        if (progressBar.getVisibility() == View.GONE ) {
             progressBar.setVisibility(View.VISIBLE);
-            this.loader.execute("/feeds/hot?limit=" + pageSize + "&offset=" + dataOffset);
+            loader.execute("/feeds/hot?limit=" + pageSize + "&offset=" + dataOffset);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main,menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()){
+            case R.id.menu_publish:
+                Intent intent = new Intent(this, PublishActivity.class);
+                startActivity(intent);
+                break;
+            case R.id.menu_settings:
+                break;
+            case R.id.menu_topic:
+                break;
+            case R.id.menu_usercenter:
+                break;
+            case R.id.menu_welcome:
+                break;
         }
+        return true;
     }
 }

lesson03/src/main/java/io/hsiao/lesson03/MainListAdapter.java

@@ -1,6 +1,7 @@
 package io.hsiao.lesson03;
 
 import android.content.Context;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,6 +13,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.squareup.picasso.Picasso;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 
 /**
  * Created by hsiao on 2018/2/4.
@@ -22,9 +26,14 @@ public class MainListAdapter extends BaseAdapter {
     private  boolean dataRunUp;
     private final Context ctx;
 
+    private SimpleDateFormat sdf;
+    private int imgHeight;
+
     public MainListAdapter(Context ctx) {
         this.ctx = ctx;
         this.array = new JSONArray();
+        this.sdf = new SimpleDateFormat("yyyy-MM-dd");
+        this.imgHeight = MainActivity.screenOutSize.x/3;
     }
 
     public void setDataRunUp(boolean dataRunUp) {
@@ -65,6 +74,10 @@ public class MainListAdapter extends BaseAdapter {
             holder.desc = (TextView) convertView.findViewById(R.id.main_list_desc);
             holder.likes = (TextView) convertView.findViewById(R.id.main_list_likes);
             holder.thumbnail = (ImageView) convertView.findViewById(R.id.main_list_thumnail);
+            ViewGroup.LayoutParams layoutParams = holder.thumbnail.getLayoutParams();
+            layoutParams.height = imgHeight;
+            layoutParams.width = imgHeight;
+            holder.thumbnail.setLayoutParams(layoutParams);
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
@@ -73,12 +86,19 @@ public class MainListAdapter extends BaseAdapter {
         holder.likes.setText(json.getString("likes"));
         holder.title.setText(json.getString("name"));
         holder.desc.setText(json.getString("description"));
-        holder.date.setText(json.getString("create_time"));
+        holder.date.setText(sdf.format(new Date(1000 * json.getLongValue("create_time"))));
         holder.imgUUID = json.getString("uuid");
 
         Picasso.with(ctx)
                 .load("http://reefun.cn/real360/api/obj/thumbnail/" + json.getString("uuid"))
+                .fit()
                 .into(holder.thumbnail);
+        convertView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
 
         return convertView;
     }

lesson03/src/main/java/io/hsiao/lesson03/PanoActivity.java

@@ -1,33 +1,56 @@
 package io.hsiao.lesson03;
 
 import android.content.Intent;
-import android.media.Image;
-import android.support.v7.app.AppCompatActivity;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ImageView;
 
+import com.google.vr.sdk.widgets.pano.VrPanoramaView;
+import com.squareup.picasso.Downloader;
 import com.squareup.picasso.Picasso;
+import com.squareup.picasso.UrlConnectionDownloader;
+
+import java.io.IOException;
 
 public class PanoActivity extends AppCompatActivity {
 
     private ImageView img;
+    private String imgUrl;
+
+    private VrPanoramaView vrView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_pano);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        //setContentView(R.layout.activity_pano);
+        setContentView(R.layout.activity_gvr_view);
 
         Intent intent = this.getIntent();
-        String imgUrl = intent.getStringExtra("img_url");
-
-        this.img = (ImageView) this.findViewById(R.id.pano_imgview);
+        this.imgUrl = intent.getStringExtra("img_url");
+        this.vrView = (VrPanoramaView) this.findViewById(R.id.gvr_pano_view);
+        loadGvrPano();
 
-        Picasso p = Picasso.with(this);
-        p.setIndicatorsEnabled(true);
-
-        p.load("http://reefun.cn/real360/api/obj/fetch/"+imgUrl)
-                .rotate(45)
-
-                .into(this.img);
     }
+    private void loadGvrPano(){
+        UrlConnectionDownloader  dl = new UrlConnectionDownloader(this);
+        Uri uri = Uri.parse("http://reefun.cn/real360/api/obj/fetch/" + imgUrl);
+        try {
+            Downloader.Response resp = dl.load(uri, -1);
+            Bitmap bmp = BitmapFactory.decodeStream(resp.getInputStream());
+
+            VrPanoramaView.Options opt = new VrPanoramaView.Options();
+            opt.inputType = VrPanoramaView.Options.TYPE_MONO;
+            this.vrView.loadImageFromBitmap(bmp,opt);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
 }

lesson03/src/main/java/io/hsiao/lesson03/PanoVideoActivity.java

@@ -0,0 +1,19 @@
+package io.hsiao.lesson03;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.google.vr.sdk.widgets.video.VrVideoView;
+
+public class PanoVideoActivity extends AppCompatActivity {
+
+    private VrVideoView videoView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_gvr_video);
+
+
+    }
+}

lesson03/src/main/java/io/hsiao/lesson03/PublishActivity.java

@@ -0,0 +1,134 @@
+package io.hsiao.lesson03;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.GridView;
+import android.widget.ImageButton;
+import android.widget.ProgressBar;
+
+import com.zhihu.matisse.Matisse;
+import com.zhihu.matisse.MimeType;
+import com.zhihu.matisse.engine.impl.PicassoEngine;
+
+import java.util.List;
+
+import io.hsiao.lesson03.data.AsyncListLoader;
+
+import static io.hsiao.lesson03.R.id.publish_toolbar;
+
+public class PublishActivity extends AppCompatActivity {
+    private String TAG="youmap_publish";
+    private ImageButton chooseBtn;
+    private GridView gridView;
+    private int REQUEST_CODE_CHOOSE = 999;
+    private int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 10000;
+    private AlbumGridAdapter gridAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_publish);
+        setSupportActionBar((Toolbar) findViewById(publish_toolbar));
+        ActionBar bar = getSupportActionBar();
+        bar.setDisplayHomeAsUpEnabled(true);
+
+        this.gridView = (GridView) findViewById(R.id.publish_gridview);
+        this.gridAdapter = new AlbumGridAdapter(this);
+        this.gridView.setAdapter(gridAdapter);
+
+        this.chooseBtn = (ImageButton) findViewById(R.id.publish_choose_btn);
+        this.chooseBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+                        != PackageManager.PERMISSION_GRANTED) {
+
+                    // Should we show an explanation?
+                    if (shouldShowRequestPermissionRationale(
+                            Manifest.permission.READ_EXTERNAL_STORAGE)) {
+
+                    }
+
+                    requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+                            MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE);
+
+                    return;
+                }
+                Matisse.from(PublishActivity.this)
+                        .choose(MimeType.of(MimeType.JPEG,MimeType.PNG))
+                        .countable(true)
+                        .thumbnailScale(0.3f)
+                        .maxSelectable(9)
+                        .imageEngine(new PicassoEngine())
+                        .forResult(REQUEST_CODE_CHOOSE);
+            }
+        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_publish,menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()){
+            case android.R.id.home:
+                finish();
+                break;
+            case R.id.menu_publish_send:
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if(requestCode==MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE){
+            for(int i=0;i<permissions.length;i++){
+                if(permissions[i].equals(Manifest.permission.READ_EXTERNAL_STORAGE)
+                        && grantResults[i] == PackageManager.PERMISSION_GRANTED){
+                    Matisse.from(PublishActivity.this)
+                            .choose(MimeType.of(MimeType.JPEG,MimeType.PNG))
+                            .countable(true)
+                            .thumbnailScale(0.85f)
+                            .maxSelectable(9)
+                            .imageEngine(new PicassoEngine())
+                            .forResult(REQUEST_CODE_CHOOSE);
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if(requestCode==REQUEST_CODE_CHOOSE && data !=null){
+
+            List<Uri> uris = null;
+            try {
+                uris = Matisse.obtainResult(data);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return;
+            }
+            if(uris==null)
+                return;
+
+           this.gridAdapter.addAll(uris);
+           this.gridAdapter.notifyDataSetChanged();
+        }
+    }
+}

lesson03/src/main/java/io/hsiao/lesson03/data/AsyncListLoader.java

@@ -26,22 +26,30 @@ public class AsyncListLoader extends AsyncTask<String, Boolean, JSONArray> {
     @Override
     protected JSONArray doInBackground(String... args) {
         JSONArray data = new HttpAPI("http://reefun.cn/real360/api").testGet(args[0]);
-        if(data.size()<1){
+        if(data !=null && data.size()<1){
             adapter.setDataRunUp(true);
         }
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         publishProgress(true);
         return data;
     }
 
     @Override
     protected void onPostExecute(JSONArray data) {
-        adapter.addAll(data);
-        adapter.notifyDataSetChanged();
+        if(data !=null) {
+            adapter.addAll(data);
+            adapter.notifyDataSetChanged();
+        }
     }
 
     @Override
     protected void onProgressUpdate(Boolean... values) {
         if (values[0]) {
+            if(bar !=null)
             bar.setVisibility(View.GONE);
         }
     }

lesson03/src/main/java/io/hsiao/lesson03/data/HttpAPI.java

@@ -5,6 +5,7 @@ import android.util.Log;
 import com.alibaba.fastjson.JSONArray;
 
 import java.io.File;
+import java.io.IOException;
 
 import io.hsiao.lesson03.MainListAdapter;
 import okhttp3.Cache;
@@ -36,8 +37,8 @@ public class HttpAPI {
                 .url(reqUrl)
                 .build();
         try (Response resp = client.newCall(req).execute()) {
-            String retString = resp.body().string();
-           return JSONArray.parseArray(retString);
+                String retString = resp.body().string();
+                return JSONArray.parseArray(retString);
         } catch (Exception ex) {
             ex.printStackTrace();
         }

lesson03/src/main/res/layout/activity_gvr_video.xml

@@ -0,0 +1,13 @@
+<?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="io.hsiao.lesson03.PanoActivity">
+
+    <com.google.vr.sdk.widgets.video.VrVideoView
+        android:id="@+id/gvr_videoview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></com.google.vr.sdk.widgets.video.VrVideoView>
+</android.support.constraint.ConstraintLayout>

lesson03/src/main/res/layout/activity_gvr_view.xml

@@ -0,0 +1,16 @@
+<?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="io.hsiao.lesson03.PanoActivity">
+
+    <com.google.vr.sdk.widgets.pano.VrPanoramaView
+        android:id="@+id/gvr_pano_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="@null"
+        />
+
+</android.support.constraint.ConstraintLayout>

lesson03/src/main/res/layout/activity_main.xml

@@ -6,25 +6,37 @@
     android:layout_height="match_parent"
     tools:context="io.hsiao.lesson03.MainActivity">
 
+    <GridView
+        android:id="@+id/main_gridview"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:horizontalSpacing="1dp"
+        android:numColumns="@integer/main_grid_column_count"
+        android:verticalSpacing="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/main_toolbar" />
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/main_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme" />
+
     <ProgressBar
         android:id="@+id/progressBar"
         style="@style/Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:indeterminate="false"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/main_listview"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/main_listview" />
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <ListView
-        android:id="@+id/main_listview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:divider="@color/colorPrimary" />
 </android.support.constraint.ConstraintLayout>

lesson03/src/main/res/layout/activity_publish.xml

@@ -0,0 +1,97 @@
+<?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="io.hsiao.lesson03.PublishActivity">
+
+
+    <ScrollView
+        android:id="@+id/scrollView2"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/publish_toolbar">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <EditText
+                android:id="@+id/publish_txt_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:ems="10"
+                android:hint="标题"
+                android:inputType="textPersonName"
+                android:minLines="@integer/publish_desc_lines"
+                android:textSize="12sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <EditText
+                android:id="@+id/publish_txt_desc"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:contentDescription=" "
+                android:ems="10"
+                android:gravity="top"
+                android:hint="简述"
+                android:inputType="textMultiLine"
+                android:singleLine="false"
+                android:textSize="12sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/publish_txt_title" />
+
+            <ImageButton
+                android:id="@+id/publish_choose_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/publish_txt_desc"
+                app:srcCompat="@drawable/ic_action_collections" />
+
+            <GridView
+                android:id="@+id/publish_gridview"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:numColumns="@integer/main_grid_column_count"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/publish_choose_btn" />
+
+        </android.support.constraint.ConstraintLayout>
+
+    </ScrollView>
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/publish_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:title="发布照片"></android.support.v7.widget.Toolbar>
+
+</android.support.constraint.ConstraintLayout>

lesson03/src/main/res/layout/activity_pano.xml → lesson03/src/main/res/layout/activity_publish_grid.xml

@@ -1,22 +1,27 @@
 <?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="io.hsiao.lesson03.PanoActivity">
+    android:layout_height="match_parent">
 
     <ImageView
-        android:id="@+id/pano_imgview"
+        android:id="@+id/publish_grid_img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@android:drawable/ic_menu_report_image" />
+
+    <ImageButton
+        android:id="@+id/publish_grid_close"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
+        android:background="@color/colorWhite"
+        app:layout_constraintEnd_toEndOf="@+id/publish_grid_img"
+        app:layout_constraintTop_toTopOf="@+id/publish_grid_img"
+        app:srcCompat="@android:drawable/ic_menu_close_clear_cancel" />
 </android.support.constraint.ConstraintLayout>

lesson03/src/main/res/layout/main_listview_item.xml

@@ -2,6 +2,7 @@
 
 <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"
     android:layout_weight="1">
@@ -9,65 +10,73 @@
 
     <ImageView
         android:id="@+id/main_list_thumnail"
-        android:layout_width="150dp"
-        android:layout_height="150dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/main_list_title"
+        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@android:drawable/ic_menu_report_image" />
 
     <TextView
         android:id="@+id/main_list_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_weight="1"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
         android:text="TextView"
+        android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/main_list_thumnail"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/main_list_thumnail" />
 
     <TextView
         android:id="@+id/main_list_desc"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_weight="1"
         android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/main_list_thumnail"
+        android:textColor="@color/colorGrey"
+        android:textSize="13sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@+id/main_list_title"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/main_list_title" />
 
     <TextView
         android:id="@+id/main_list_create_time"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:layout_weight="1"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/main_list_thumnail"
-        app:layout_constraintTop_toBottomOf="@+id/main_list_desc" />
+        android:text="2018-01-01"
+        android:textColor="@color/colorWhite"
+        android:textSize="10sp"
+        app:layout_constraintBottom_toBottomOf="@+id/main_list_thumnail"
+        app:layout_constraintEnd_toEndOf="@+id/main_list_thumnail" />
 
     <TextView
         android:id="@+id/main_list_likes"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_weight="1"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/main_list_thumnail"
-        app:layout_constraintTop_toBottomOf="@+id/main_list_create_time" />
+        android:text="0"
+        android:textColor="@color/colorWhite"
+        android:textSize="10sp"
+        app:layout_constraintEnd_toEndOf="@+id/main_list_thumnail"
+        app:layout_constraintTop_toTopOf="@+id/main_list_thumnail" />
+
+    <ImageView
+        android:id="@+id/ic_likes"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        app:layout_constraintBottom_toBottomOf="@+id/main_list_likes"
+        app:layout_constraintEnd_toStartOf="@+id/main_list_likes"
+        app:srcCompat="@drawable/ic_action_favor_border" />
 
 </android.support.constraint.ConstraintLayout>

lesson03/src/main/res/menu/menu_main.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_publish"
+        android:icon="@drawable/ic_action_add"
+        android:title="发布"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/menu_topic"
+        android:icon="@drawable/ic_action_collections"
+        android:title="主题"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/menu_usercenter"
+        android:icon="@drawable/ic_action_user"
+        android:title="用户中心"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/menu_settings"
+        android:title="设置" />
+    <item
+        android:id="@+id/menu_welcome"
+        android:title="新手指南" />
+</menu>

lesson03/src/main/res/menu/menu_publish.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_publish_send"
+        android:icon="@drawable/ic_action_send"
+        android:title="发布"
+        app:showAsAction="always" />
+</menu>

lesson03/src/main/res/values-v21/styles.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
+    </style>
+</resources>

lesson03/src/main/res/values/colors.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#ebebeb</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#0cc691</color>
+    <color name="colorPrimaryDark">#0d795a</color>
+    <color name="colorAccent">#b94f14</color>
+    <color name="colorGrey">#888888</color>
+    <color name="colorWhite">#ffffff</color>
+    <color name="colorNone">#00ffffff</color>
 </resources>

lesson03/src/main/res/values/integers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="publish_desc_lines">4</integer>
+</resources>

lesson03/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
-    <string name="app_name">lesson03</string>
+    <string name="app_name">友图</string>
+    <integer name="main_grid_column_count">3</integer>
 </resources>

lesson03/src/main/res/values/styles.xml

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