Merge pull request #97 from Bai-Jie/mergeMasterToRelease

合并master分支到release分支

CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.1.3] - 2015-12-16
+### Fixed
+- 修复无法播放视频的问题
+
 ## [1.1.2] - 2015-12-06
 ### Fixed
 - 修复无法播放视频的问题
@@ -39,7 +43,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - 显示播放记录
 - 搜索视频
 
-[Unreleased]: https://github.com/OptimalOrange/CoolTechnologies/compare/v1.1.2...HEAD
+[Unreleased]: https://github.com/OptimalOrange/CoolTechnologies/compare/v1.1.3...HEAD
+[1.1.3]: https://github.com/OptimalOrange/CoolTechnologies/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/OptimalOrange/CoolTechnologies/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/OptimalOrange/CoolTechnologies/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/OptimalOrange/CoolTechnologies/compare/v1.0.0...v1.1.0

app/src/main/AndroidManifest.xml

@@ -61,7 +61,7 @@
         </activity>
 
         <activity
-                android:name=".ui.PlayYoukuVideoActivity"
+                android:name=".ui.SimpleWebViewActivity"
                 android:theme="@style/FullscreenTheme"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:screenOrientation="sensorLandscape"/>

app/src/main/java/com/optimalorange/cooltechnologies/ui/ShowVideoDetailActivity.java

@@ -101,8 +101,8 @@ public void playVideo() {
             case NO_ERROR:
                 // 保存播放历史
                 DBManager.getInstance(this).saveHistory(mVideo);
-                // 跳转到 PlayYoukuVideoActivity
-                PlayYoukuVideoActivity.start(this, mVideo.id);
+                // 跳转到 SimpleWebViewActivity
+                SimpleWebViewActivity.start(this, mVideo.link);
                 break;
             case NO_WIFI_NETWORK:
                 new NoWifiNetworkDialogFragment()

app/src/main/java/com/optimalorange/cooltechnologies/ui/SimpleWebViewActivity.java

@@ -0,0 +1,98 @@
+package com.optimalorange.cooltechnologies.ui;
+
+import com.optimalorange.cooltechnologies.R;
+import com.umeng.analytics.MobclickAgent;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+public class SimpleWebViewActivity extends Activity {
+
+    /**
+     * 应当显示的页面的url<br/>
+     * Type: {@link String}
+     */
+    public static final String EXTRA_KEY_LINK =
+            SimpleWebViewActivity.class.getName() + ".extra.KEY_VIDEO_LINK";
+
+    /** 用于重置{@link WebView}的空网页 */
+    private static final String URL_BLANK = "about:blank";
+
+    private String mLink;
+
+    private WebView mWebView;
+
+    public static Intent buildIntent(Context context, String link) {
+        final Intent result = new Intent(context, SimpleWebViewActivity.class);
+        result.putExtra(EXTRA_KEY_LINK, link);
+        return result;
+    }
+
+    public static void start(Context context, String link) {
+        context.startActivity(buildIntent(context, link));
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_simple_web_view);
+
+        mLink = getIntent().getStringExtra(EXTRA_KEY_LINK);
+        if (mLink == null) {
+            throw new IllegalStateException("Please set url link with EXTRA_KEY_LINK");
+        }
+
+        mWebView = (WebView) findViewById(R.id.web_view);
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.setWebViewClient(new WebViewClient());
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mWebView.loadUrl(mLink);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        // call it because this didn't extend BaseActivity
+        MobclickAgent.onResume(this);
+        MobclickAgent.onPageStart(getClass().getSimpleName());
+
+        mWebView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        mWebView.onPause();
+
+        MobclickAgent.onPageEnd(getClass().getSimpleName());
+        MobclickAgent.onPause(this);
+        super.onPause();
+    }
+
+    @Override
+    protected void onStop() {
+        mWebView.loadUrl(URL_BLANK);
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        final ViewParent parent = mWebView.getParent();
+        if (parent != null) {
+            ((ViewGroup) parent).removeView(mWebView);
+            mWebView.destroy();
+        }
+        mWebView = null;
+        super.onDestroy();
+    }
+
+}

app/src/main/res/layout/activity_play_youku_video.xml → app/src/main/res/layout/activity_simple_web_view.xml

@@ -5,5 +5,5 @@
         android:id="@+id/web_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.PlayYoukuVideoActivity"
+        tools:context="com.optimalorange.cooltechnologies.ui.SimpleWebViewActivity"
         />

gradle.properties

@@ -17,4 +17,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 PROJECTS_GROUP=com.optimalorange.cooltechnologies
-VERSION_NAME=1.1.2
+VERSION_NAME=1.1.3