提交查漏补缺

app/build.gradle

@@ -9,6 +9,11 @@ android {
         versionCode 2
         versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        manifestPlaceholders = [
+                JPUSH_PKGNAME: applicationId,
+                JPUSH_APPKEY : "595369d477b409e0f9096f69",
+                JPUSH_CHANNEL: "developer-default",
+        ]
     }
     buildTypes {
         release {
@@ -25,4 +30,6 @@ dependencies {
     annotationProcessor project(':laraver-compiler')
     compile 'com.facebook.stetho:stetho:1.4.2'
     compile 'com.facebook.stetho:stetho-okhttp3:1.4.2'
+    compile 'cn.jiguang.sdk:jpush:3.0.1'
+    compile 'cn.jiguang.sdk:jcore:1.1.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.kuxuan.fastbrowser">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
         android:allowBackup="true"
@@ -17,6 +28,112 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <!-- Required SDK 核心功能-->
+        <!-- 可配置android:process参数将PushService放在其他进程中 -->
+        <service
+            android:name="cn.jpush.android.service.PushService"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="cn.jpush.android.intent.REGISTER" />
+                <action android:name="cn.jpush.android.intent.REPORT" />
+                <action android:name="cn.jpush.android.intent.PushService" />
+                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
+            </intent-filter>
+        </service>
+
+        <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
+        <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
+        <service
+            android:name="cn.jpush.android.service.DaemonService"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="cn.jpush.android.intent.DaemonService" />
+                <category android:name="com.diabin.fastec.example" />
+            </intent-filter>
+        </service>
+
+        <!-- Required SDK核心功能-->
+        <receiver
+            android:name="cn.jpush.android.service.PushReceiver"
+            android:enabled="true">
+            <intent-filter android:priority="1000">
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
+                <category android:name="com.diabin.fastec.example" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.USER_PRESENT" />
+                <action
+                    android:name="android.net.conn.CONNECTIVITY_CHANGE"
+                    tools:ignore="BatteryLife" />
+            </intent-filter>
+            <!-- Optional -->
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_ADDED" />
+                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Required SDK核心功能-->
+        <activity
+            android:name="cn.jpush.android.ui.PushActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false"
+            android:theme="@android:style/Theme.NoTitleBar">
+            <intent-filter>
+                <action android:name="cn.jpush.android.ui.PushActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.diabin.fastec.example" />
+            </intent-filter>
+        </activity>
+
+        <!-- Required SDK核心功能-->
+        <service
+            android:name="cn.jpush.android.service.DownloadService"
+            android:enabled="true"
+            android:exported="false" />
+
+        <!-- Required SDK核心功能-->
+        <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
+
+        <!-- User defined. 用户自定义的广播接收器-->
+        <receiver
+            android:name=".push.PushReceiver"
+            android:enabled="true">
+            <intent-filter>
+                <!--Required 用户注册SDK的intent-->
+                <action android:name="cn.jpush.android.intent.REGISTRATION" />
+                <!--Required 用户接收SDK消息的intent-->
+                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
+                <!--Required 用户接收SDK通知栏信息的intent-->
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
+                <!--Required 用户打开自定义通知栏的intent-->
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
+                <!-- 接收网络变化 连接/断开 since 1.6.3 -->
+                <action android:name="cn.jpush.android.intent.CONNECTION" />
+                <category android:name="com.diabin.fastec.example" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Required. For publish channel feature -->
+        <!-- JPUSH_CHANNEL 是为了方便开发者统计APK分发渠道。-->
+        <!-- 例如: -->
+        <!-- 发到 Google Play 的APK可以设置为 google-play; -->
+        <!-- 发到其他市场的 APK 可以设置为 xxx-market。 -->
+        <!-- 目前这个渠道统计功能的报表还未开放。-->
+        <meta-data
+            android:name="JPUSH_CHANNEL"
+            android:value="developer-default" />
+        <!-- Required. AppKey copied from Portal -->
+        <meta-data
+            android:name="JPUSH_APPKEY"
+            android:value="595369d477b409e0f9096f69" />
+        <!--极光推送结束-->
+
     </application>
 
 </manifest>

app/src/main/java/com/kuxuan/fastbrowser/App.java

@@ -9,8 +9,12 @@ import com.kuxuan.laraver.browser.database.DatabaseManager;
 import com.kuxuan.fastbrowser.event.TextEvent;
 import com.kuxuan.laraver.net.interceptors.ReleaseInterceptor;
 
+import cn.jpush.android.api.JPushInterface;
+
 /**
- * Created by huangfuruixin on 2017/12/5.
+ *
+ * @author huangfuruixin
+ * @date 2017/12/5
  */
 
 public class App extends Application {
@@ -28,6 +32,10 @@ public class App extends Application {
                 .withWebHost("https://wwww.baidu.com/")
                 .configure();
         DatabaseManager.getInstance().init(this);
+        //开启极光推送
+        JPushInterface.setDebugMode(true);
+        JPushInterface.init(this);
+
     }
 
     private void initStetho() {

app/src/main/java/com/kuxuan/fastbrowser/MainActivity.java

@@ -8,6 +8,7 @@ import com.kuxuan.laraver.activities.ProxyActivity;
 import com.kuxuan.laraver.browser.main.EcBottomDelegate;
 import com.kuxuan.laraver.delegates.LaraverDelegate;
 
+import cn.jpush.android.api.JPushInterface;
 import qiu.niorgai.StatusBarCompat;
 
 
@@ -24,6 +25,18 @@ public class MainActivity extends ProxyActivity{
     }
 
     @Override
+    protected void onPause() {
+        super.onPause();
+        JPushInterface.onPause(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        JPushInterface.onPause(this);
+    }
+
+    @Override
     public LaraverDelegate setRootDelegate() {
         return new EcBottomDelegate();
     }

app/src/main/java/com/kuxuan/fastbrowser/push/PushReceiver.java

@@ -0,0 +1,63 @@
+package com.kuxuan.fastbrowser.push;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
+
+import com.alibaba.fastjson.JSONObject;
+import com.kuxuan.fastbrowser.MainActivity;
+import com.kuxuan.laraver.util.log.LaraverLogger;
+
+import java.util.Set;
+
+import cn.jpush.android.api.JPushInterface;
+
+/**
+ * Created by huangfuruixin on 2017/12/12.
+ */
+
+public class PushReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final Bundle bundle = intent.getExtras();
+        final Set<String> keys = bundle.keySet();
+        final JSONObject json = new JSONObject();
+        for (String key : keys) {
+            final Object val = bundle.get(key);
+            json.put(key, val);
+        }
+
+        LaraverLogger.json("PushReceiver", json.toJSONString());
+
+        final String pushAction = intent.getAction();
+        if (pushAction.equals(JPushInterface.ACTION_NOTIFICATION_RECEIVED)) {
+            //处理接收到的信息
+            onReceivedMessage(bundle);
+        } else if (pushAction.equals(JPushInterface.ACTION_NOTIFICATION_OPENED)) {
+            //打开相应的Notification
+            onOpenNotification(context, bundle);
+        }
+    }
+
+    private void onReceivedMessage(Bundle bundle) {
+        final String title = bundle.getString(JPushInterface.EXTRA_NOTIFICATION_TITLE);
+        final String msgId = bundle.getString(JPushInterface.EXTRA_MSG_ID);
+        final int notificationId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
+        final String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
+        final String extra = bundle.getString(JPushInterface.EXTRA_EXTRA);
+        final String alert = bundle.getString(JPushInterface.EXTRA_ALERT);
+    }
+
+    private void onOpenNotification(Context context, Bundle bundle) {
+        final String extra = bundle.getString(JPushInterface.EXTRA_EXTRA);
+        final Bundle openActivityBundle = new Bundle();
+        final Intent intent = new Intent(context, MainActivity.class);
+        intent.putExtras(openActivityBundle);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        ContextCompat.startActivity(context, intent, null);
+    }
+}
+
+

laraver-core/src/main/java/com/kuxuan/laraver/delegates/PermissionCheckerDelegate.java

@@ -12,6 +12,7 @@ import android.widget.Toast;
 import com.kuxuan.laraver.ui.camera.CameraImageBean;
 import com.kuxuan.laraver.ui.camera.LaraverCamera;
 import com.kuxuan.laraver.ui.camera.RequestCodes;
+import com.kuxuan.laraver.ui.scanner.ScannerDelegate;
 import com.kuxuan.laraver.util.callback.CallbackManager;
 import com.kuxuan.laraver.util.callback.CallbackType;
 import com.kuxuan.laraver.util.callback.IGlobalCallback;
@@ -30,7 +31,7 @@ import permissions.dispatcher.RuntimePermissions;
  * @date 2017/12/5
  */
 @RuntimePermissions
-public abstract class PermissionCheckerDelegate extends BaseDelegate{
+public abstract class PermissionCheckerDelegate extends BaseDelegate {
 
     //不是直接调用方法
     @NeedsPermission(Manifest.permission.CAMERA)
@@ -43,10 +44,14 @@ public abstract class PermissionCheckerDelegate extends BaseDelegate{
         PermissionCheckerDelegatePermissionsDispatcher.startCameraWithCheck(this);
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        PermissionCheckerDelegatePermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults);
+    //扫描二维码(不直接调用)
+    @NeedsPermission(Manifest.permission.CAMERA)
+    void startScan(BaseDelegate delegate) {
+        delegate.getSupportDelegate().startForResult(new ScannerDelegate(), RequestCodes.SCAN);
+    }
+
+    public void startScanWithCheck(BaseDelegate delegate) {
+        PermissionCheckerDelegatePermissionsDispatcher.startScanWithCheck(this, delegate);
     }
 
     @OnPermissionDenied(Manifest.permission.CAMERA)
@@ -63,6 +68,7 @@ public abstract class PermissionCheckerDelegate extends BaseDelegate{
     void onCameraRationale(PermissionRequest request) {
         showRationaleDialog(request);
     }
+
     private void showRationaleDialog(final PermissionRequest request) {
         new AlertDialog.Builder(getContext())
                 .setPositiveButton("同意使用", new DialogInterface.OnClickListener() {
@@ -83,6 +89,12 @@ public abstract class PermissionCheckerDelegate extends BaseDelegate{
     }
 
     @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        PermissionCheckerDelegatePermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults);
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == RESULT_OK) {
@@ -122,5 +134,4 @@ public abstract class PermissionCheckerDelegate extends BaseDelegate{
             }
         }
     }
-
 }

laraver-core/src/main/java/com/kuxuan/laraver/ui/scanner/LaraverViewFindView.java

@@ -0,0 +1,24 @@
+package com.kuxuan.laraver.ui.scanner;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.util.AttributeSet;
+
+import me.dm7.barcodescanner.core.ViewFinderView;
+
+/**
+ * @author huangfuruixin
+ */
+public class LaraverViewFindView extends ViewFinderView {
+
+    public LaraverViewFindView(Context context) {
+        this(context, null);
+    }
+
+    public LaraverViewFindView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+        mSquareViewFinder = true;
+        mBorderPaint.setColor(Color.YELLOW);
+        mLaserPaint.setColor(Color.YELLOW);
+    }
+}

laraver-core/src/main/java/com/kuxuan/laraver/ui/scanner/ScanView.java

@@ -0,0 +1,23 @@
+package com.kuxuan.laraver.ui.scanner;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import me.dm7.barcodescanner.core.IViewFinder;
+import me.dm7.barcodescanner.zbar.ZBarScannerView;
+
+public class ScanView extends ZBarScannerView {
+
+    public ScanView(Context context) {
+        this(context, null);
+    }
+
+    public ScanView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+
+    @Override
+    protected IViewFinder createViewFinderView(Context context) {
+        return new LaraverViewFindView(context);
+    }
+}

laraver-core/src/main/java/com/kuxuan/laraver/ui/scanner/ScannerDelegate.java

@@ -0,0 +1,67 @@
+package com.kuxuan.laraver.ui.scanner;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.kuxuan.laraver.delegates.LaraverDelegate;
+import com.kuxuan.laraver.util.callback.CallbackManager;
+import com.kuxuan.laraver.util.callback.CallbackType;
+import com.kuxuan.laraver.util.callback.IGlobalCallback;
+
+import me.dm7.barcodescanner.zbar.Result;
+import me.dm7.barcodescanner.zbar.ZBarScannerView;
+
+public class ScannerDelegate extends LaraverDelegate implements ZBarScannerView.ResultHandler {
+
+    private ScanView mScanView = null;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (mScanView == null) {
+            mScanView = new ScanView(getContext());
+        }
+        mScanView.setAutoFocus(true);
+        mScanView.setResultHandler(this);
+    }
+
+    @Override
+    public Object setLayout() {
+        return mScanView;
+    }
+
+    @Override
+    public void onBindView(@Nullable Bundle savedInstanceState, @NonNull View rootView) {
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mScanView != null) {
+            mScanView.startCamera();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mScanView != null) {
+            mScanView.stopCameraPreview();
+            mScanView.stopCamera();
+        }
+    }
+
+    @Override
+    public void handleResult(Result result) {
+        @SuppressWarnings("unchecked")
+        final IGlobalCallback<String> callback = CallbackManager
+                .getInstance()
+                .getCallback(CallbackType.ON_SCAN);
+        if (callback != null) {
+            callback.executeCallback(result.getContents());
+        }
+        getSupportDelegate().pop();
+    }
+}