Error

éåºç»å½

diff --git a/platforms/android/app/src/main/java/com/bitpay/cordova/qrscanner/QRScanner.java b/platforms/android/app/src/main/java/com/bitpay/cordova/qrscanner/QRScanner.java index f2e37d7..c5cfe08 100755 --- a/platforms/android/app/src/main/java/com/bitpay/cordova/qrscanner/QRScanner.java +++ b/platforms/android/app/src/main/java/com/bitpay/cordova/qrscanner/QRScanner.java @@ -9,12 +9,11 @@ import android.hardware.camera2.CameraAccessException; import android.net.Uri; import com.google.zxing.BarcodeFormat; -import com.google.zxing.ResultPoint; -import com.journeyapps.barcodescanner.BarcodeCallback; -import com.journeyapps.barcodescanner.BarcodeResult; import com.journeyapps.barcodescanner.BarcodeView; -import com.journeyapps.barcodescanner.DefaultDecoderFactory; import com.journeyapps.barcodescanner.camera.CameraSettings; +import com.visionsmarts.VSBarcodeReader; +import com.visionsmarts.pic2shop.view.ScannerLiveView; + import org.apache.cordova.CallbackContext; import org.apache.cordova.CordovaPlugin; import org.apache.cordova.PluginResult; @@ -35,8 +34,8 @@ import java.util.List; @SuppressWarnings("deprecation") -public class QRScanner extends CordovaPlugin implements BarcodeCallback { - +public class QRScanner extends CordovaPlugin { + private ScannerLiveView scannerLiveView; private CallbackContext callbackContext; private boolean cameraClosing; private static Boolean flashAvailable; @@ -60,7 +59,49 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { private boolean oneTime = true; private boolean keepDenied = false; private boolean appPausedWithActivePreview = false; - + private ScannerLiveView.Listener listener = new ScannerLiveView.Listener() { + @Override + public void onCodeScanned(String str, String data) { + if (nextScanCallback == null) { + return; + } + + if(data != null) { + scanning = false; + nextScanCallback.success(data); + nextScanCallback = null; + } + else { + scan(nextScanCallback); + } + } + + @Override + public void onCameraIssue() { + + } + }; + + public void onCodeScanned(String type, String data) { + //PluginResult result = new PluginResult(PluginResult.Status.OK, data); + //callbackContext.sendPluginResult(result); + if (this.nextScanCallback == null) { + return; + } + + if(data != null) { + scanning = false; + this.nextScanCallback.success(data); + this.nextScanCallback = null; + } + else { + scan(this.nextScanCallback); + } + } + public void onCameraIssue() { + + } + static class QRScannerError { private static final int UNEXPECTED_ERROR = 0, CAMERA_ACCESS_DENIED = 1, @@ -293,6 +334,13 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { else lightOn = false; } + if(scannerLiveView!=null){ + scannerLiveView.setTorch(toggleLight); + if (toggleLight) + lightOn = true; + else + lightOn = false; + } getStatus(callbackContext); } }); @@ -451,25 +499,29 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { @Override public void run() { // Create our Preview view and set it as the content of our activity. - mBarcodeView = new BarcodeView(cordova.getActivity()); + //mBarcodeView = new BarcodeView(cordova.getActivity()); + scannerLiveView = new ScannerLiveView(cordova.getActivity(),listener); + VSBarcodeReader.VSinit(); + VSBarcodeReader.setBlurryAcceptanceThresholdWithAF(0.0d); //Configure the decoder ArrayList formatList = new ArrayList(); formatList.add(BarcodeFormat.QR_CODE); - mBarcodeView.setDecoderFactory(new DefaultDecoderFactory(formatList, null, null)); + //mBarcodeView.setDecoderFactory(new DefaultDecoderFactory(formatList, null, null)); //Configure the camera (front/back) CameraSettings settings = new CameraSettings(); settings.setRequestedCameraId(getCurrentCameraId()); - mBarcodeView.setCameraSettings(settings); + //mBarcodeView.setCameraSettings(settings); FrameLayout.LayoutParams cameraPreviewParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT); - ((ViewGroup) webView.getView().getParent()).addView(mBarcodeView, cameraPreviewParams); - + //((ViewGroup) webView.getView().getParent()).addView(mBarcodeView, cameraPreviewParams); + ((ViewGroup) webView.getView().getParent()).addView(scannerLiveView, cameraPreviewParams); cameraPreviewing = true; webView.getView().bringToFront(); - mBarcodeView.resume(); + //mBarcodeView.resume(); + //scannerLiveView.onResume(); } }); prepared = true; @@ -479,7 +531,7 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { } - @Override + /*@Override public void barcodeResult(BarcodeResult barcodeResult) { if (this.nextScanCallback == null) { return; @@ -497,7 +549,7 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { @Override public void possibleResultPoints(List list) { - } + }*/ // ---- BEGIN EXTERNAL API ---- private void prepare(final CallbackContext callbackContext) { @@ -588,7 +640,7 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { } shouldScanAgain = false; this.nextScanCallback = callbackContext; - final BarcodeCallback b = this; + /*final BarcodeCallback b = this; this.cordova.getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -596,7 +648,11 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { mBarcodeView.decodeSingle(b); } } - }); + });*/ + + if(scannerLiveView!=null){ + scannerLiveView.onResume(); + } } } @@ -620,6 +676,9 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { @Override public void run() { webView.getView().setBackgroundColor(Color.argb(1, 0, 0, 0)); + if(scannerLiveView!=null){ + scannerLiveView.startCamera(); + } showing = true; getStatus(callbackContext); } @@ -777,8 +836,10 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { this.cordova.getActivity().runOnUiThread(new Runnable() { @Override public void run() { + if(mBarcodeView!=null) { ((ViewGroup) mBarcodeView.getParent()).removeView(mBarcodeView); cameraPreviewing = false; + } } }); } @@ -788,6 +849,9 @@ public class QRScanner extends CordovaPlugin implements BarcodeCallback { } closeCamera(); currentCameraId = 0; + if(scannerLiveView!=null){ + scannerLiveView.onPause(); + } getStatus(callbackContext); } } diff --git a/platforms/android/app/src/main/java/com/supwisdom/dlapp/MainActivity.java b/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java similarity index 97% rename from platforms/android/app/src/main/java/com/supwisdom/dlapp/MainActivity.java rename to platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java index c48c351..7b7fe6b 100644 --- a/platforms/android/app/src/main/java/com/supwisdom/dlapp/MainActivity.java +++ b/platforms/android/app/src/main/java/com/dalicitycard/app/MainActivity.java @@ -17,7 +17,7 @@ under the License. */ -package com.supwisdom.dlapp; +package com.dalicitycard.app; import android.os.Bundle; import org.apache.cordova.*; diff --git a/platforms/android/app/src/main/java/com/visionsmarts/VSBarcodeReader.java b/platforms/android/app/src/main/java/com/visionsmarts/VSBarcodeReader.java new file mode 100644 index 0000000..feb3b33 --- /dev/null +++ b/platforms/android/app/src/main/java/com/visionsmarts/VSBarcodeReader.java @@ -0,0 +1,90 @@ +package com.visionsmarts; + +public class VSBarcodeReader { + public static final int BARCODE_TYPE_CODABAR = 64; + public static final int BARCODE_TYPE_CODE128 = 32; + public static final int BARCODE_TYPE_CODE39 = 16; + public static final int BARCODE_TYPE_CODE93 = 128; + public static final int BARCODE_TYPE_EAN_13_UPC_A = 1; + public static final int BARCODE_TYPE_EAN_8 = 2; + public static final String BARCODE_TYPE_ID_CODABAR = "CODABAR"; + public static final String BARCODE_TYPE_ID_CODE128 = "CODE128"; + public static final String BARCODE_TYPE_ID_CODE39 = "CODE39"; + public static final String BARCODE_TYPE_ID_CODE93 = "CODE93"; + public static final String BARCODE_TYPE_ID_EAN_13_UPC_A = "EAN13"; + public static final String BARCODE_TYPE_ID_EAN_8 = "EAN8"; + public static final String BARCODE_TYPE_ID_ITF = "ITF"; + public static final String BARCODE_TYPE_ID_STD2OF5 = "STD2OF5"; + public static final String BARCODE_TYPE_ID_UPC_E = "UPCE"; + public static final int BARCODE_TYPE_INVALID = -1; + public static final int BARCODE_TYPE_ITF = 8; + public static final String BARCODE_TYPE_NAME_CODABAR = "Codabar"; + public static final String BARCODE_TYPE_NAME_CODE128 = "Code 128"; + public static final String BARCODE_TYPE_NAME_CODE39 = "Code 39"; + public static final String BARCODE_TYPE_NAME_CODE93 = "Code 93"; + public static final String BARCODE_TYPE_NAME_EAN_13_UPC_A = "EAN-13/UPC-A"; + public static final String BARCODE_TYPE_NAME_EAN_8 = "EAN-8"; + public static final String BARCODE_TYPE_NAME_ITF = "ITF"; + public static final String BARCODE_TYPE_NAME_STD2OF5 = "STD 2 of 5"; + public static final String BARCODE_TYPE_NAME_UPC_E = "UPC-E"; + public static final int BARCODE_TYPE_STD2OF5 = 256; + public static final int BARCODE_TYPE_UPC_E = 4; + + public static class DecoderValues { + public int evaluationDays; + public int left; + public Point lineEnd; + public Point lineStart; + public int right; + public int type; + + public DecoderValues() { + this.lineStart = new Point(); + this.lineEnd = new Point(); + } + } + + public static class Point { + public int x; + public int y; + } + + public static native int VSinit(); + + public static native String decodeNextImage(byte[] bArr, int i, int i2, DecoderValues decoderValues); + + public static native String decodeNextImageOmnidirectional(byte[] bArr, int i, int i2, int i3, DecoderValues decoderValues); + + public static native int reset(); + + public static native int setBlurryAcceptanceThresholdWithAF(double d); + + static { + System.loadLibrary("VSBarcodeReader"); + } + + public static String format(String barcode, int type) { + Object[] objArr; + switch (type) { + case BARCODE_TYPE_EAN_13_UPC_A /*1*/: + if (barcode.substring(0, BARCODE_TYPE_EAN_13_UPC_A).equals("0")) { + objArr = new Object[BARCODE_TYPE_UPC_E]; + objArr[0] = barcode.substring(BARCODE_TYPE_EAN_13_UPC_A, BARCODE_TYPE_EAN_8); + objArr[BARCODE_TYPE_EAN_13_UPC_A] = barcode.substring(BARCODE_TYPE_EAN_8, 7); + objArr[BARCODE_TYPE_EAN_8] = barcode.substring(7, 12); + objArr[3] = barcode.substring(12, 13); + return String.format("%s-%s-%s-%s", objArr); + } + return String.format("%s-%s-%s", new Object[]{barcode.substring(0, BARCODE_TYPE_EAN_13_UPC_A), barcode.substring(BARCODE_TYPE_EAN_13_UPC_A, 7), barcode.substring(7, 13)}); + case BARCODE_TYPE_EAN_8 /*2*/: + objArr = new Object[BARCODE_TYPE_EAN_8]; + objArr[0] = barcode.substring(0, BARCODE_TYPE_UPC_E); + objArr[BARCODE_TYPE_EAN_13_UPC_A] = barcode.substring(BARCODE_TYPE_UPC_E, BARCODE_TYPE_ITF); + return String.format("%s-%s", objArr); + case BARCODE_TYPE_UPC_E /*4*/: + return String.format("%s-%s-%s", new Object[]{barcode.substring(0, BARCODE_TYPE_EAN_13_UPC_A), barcode.substring(BARCODE_TYPE_EAN_13_UPC_A, 7), barcode.substring(7, BARCODE_TYPE_ITF)}); + default: + return barcode; + } + } +} diff --git a/platforms/android/app/src/main/java/com/visionsmarts/VSReaderQR.java b/platforms/android/app/src/main/java/com/visionsmarts/VSReaderQR.java new file mode 100644 index 0000000..12acf68 --- /dev/null +++ b/platforms/android/app/src/main/java/com/visionsmarts/VSReaderQR.java @@ -0,0 +1,190 @@ +package com.visionsmarts; + +import java.nio.ByteBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.Charset; + +public class VSReaderQR { + public static final int MODE_ALPHANUMERIC = 2; + public static final int MODE_BYTE = 4; + public static final int MODE_KANJI = 8; + public static final int MODE_NUMERIC = 1; + public static final String QR_CODE_TYPE_ID = "QR"; + + public static class DecoderValues { + public Point corner1; + public Point corner2; + public Point corner3; + public Point corner4; + public int evaluationDays; + public int mode; + + public DecoderValues() { + this.corner1 = new Point(); + this.corner2 = new Point(); + this.corner3 = new Point(); + this.corner4 = new Point(); + } + } + + private static class ECIMarker { + public int eci; + public int position; + + private ECIMarker() { + } + } + + public static class Point { + public int x; + public int y; + } + + public static native byte[] decodeImage(byte[] bArr, int i, int i2, DecoderValues decoderValues); + + static { + System.loadLibrary("VSReaderQR"); + } + + public static String format(byte[] data, int mode) { + Charset charset = Charset.forName("UTF-8"); + if ((mode & MODE_KANJI) == MODE_KANJI) { + charset = Charset.forName("Shift_JIS"); + } + int position = 0; + if (data.length > 3 && data[0] == 93 && data[MODE_NUMERIC] == 81) { + if (data[MODE_ALPHANUMERIC] == 51 || data[MODE_ALPHANUMERIC] == 52) { + position = 0 + 3; + } + if ((data[MODE_ALPHANUMERIC] == 53 || data[MODE_ALPHANUMERIC] == 54) && data.length > 5) { + position += 5; + } + } + StringBuilder result = new StringBuilder(data.length); + do { + ECIMarker nextMarker = findFirstECIMarker(data, position); + String next = decodeData(ByteBuffer.wrap(data, position, Math.min(nextMarker.position, data.length) - position), charset); + if (next != null) { + result.append(next); + } + if (nextMarker.position != data.length) { + position = nextMarker.position + 7; + charset = getCharsetForECI(nextMarker.eci); + if (charset == null) { + charset = getCharsetForECI(0); + } + } + if (nextMarker.position == data.length) { + break; + } + } while (position < data.length); + return result.toString(); + } + + private static ECIMarker findFirstECIMarker(byte[] data, int fromPosition) { + ECIMarker eciMarker = new ECIMarker(); + eciMarker.position = data.length; + int position = fromPosition; + while (position < data.length - 6) { + if (data[position] == 92 && Character.isDigit(data[position + MODE_NUMERIC]) && Character.isDigit(data[position + MODE_ALPHANUMERIC]) && Character.isDigit(data[position + 3]) && Character.isDigit(data[position + MODE_BYTE]) && Character.isDigit(data[position + 5]) && Character.isDigit(data[position + 6])) { + eciMarker.position = position; + eciMarker.eci = ((((((data[position + MODE_NUMERIC] - 48) * 100000) + ((data[position + MODE_ALPHANUMERIC] - 48) * 10000)) + ((data[position + 3] - 48) * 1000)) + ((data[position + MODE_BYTE] - 48) * 100)) + ((data[position + 5] - 48) * 10)) + (data[position + 6] - 48); + break; + } + position += MODE_NUMERIC; + } + return eciMarker; + } + + private static Charset getCharsetForECI(int eci) { + switch (eci) { + + case MODE_NUMERIC /*1*/: + return Charset.forName("ISO-8859-1"); + case MODE_ALPHANUMERIC /*2*/: + return Charset.forName("ISO-8859-1"); + case MODE_BYTE /*4*/: + return Charset.forName("ISO-8859-2"); + case 5: + return Charset.forName("ISO-8859-3"); + case 6: + return Charset.forName("ISO-8859-4"); + case 7: + return Charset.forName("ISO-8859-5"); + case MODE_KANJI /*8*/: + return Charset.forName("ISO-8859-6"); + case 9: + return Charset.forName("ISO-8859-7"); + case 10: + return Charset.forName("ISO-8859-8"); + case 11: + return Charset.forName("ISO-8859-9"); + case 12: + return Charset.forName("ISO-8859-10"); + case 13: + return Charset.forName("ISO-8859-11"); + case 15: + return Charset.forName("ISO-8859-13"); + case VSBarcodeReader.BARCODE_TYPE_CODE39 /*16*/: + return Charset.forName("ISO-8859-14"); + case 17: + return Charset.forName("ISO-8859-15"); + case 18: + return Charset.forName("ISO-8859-16"); + case 20: + return Charset.forName("Shift_JIS"); + case 21: + return Charset.forName("windows-1250"); + case 22: + return Charset.forName("windows-1251"); + case 23: + return Charset.forName("windows-1252"); + case 24: + return Charset.forName("windows-1256"); + case 25: + return Charset.forName("UTF-16BE"); + case 26: + return Charset.forName("UTF-8"); + case 27: + return Charset.forName("EUC-JP"); + case 28: + return Charset.forName("Big5"); + case 29: + return Charset.forName("x-EUC-CN"); + case 30: + return Charset.forName("EUC-KR"); + case 899: + return Charset.forName("UTF-8"); + default: + return null; + } + } + + public static String decodeData(ByteBuffer data, Charset charset) { + try { + return charset.newDecoder().decode(data).toString(); + } catch (CharacterCodingException e) { + data.rewind(); + try { + return Charset.forName("Shift_JIS").newDecoder().decode(data).toString(); + } catch (CharacterCodingException e2) { + data.rewind(); + try { + return Charset.forName("UTF-8").newDecoder().decode(data).toString(); + } catch (CharacterCodingException e3) { + data.rewind(); + try { + return Charset.forName("ISO-8859-1").newDecoder().decode(data).toString(); + } catch (CharacterCodingException e4) { + data.rewind(); + try { + return Charset.forName("US-ASCII").newDecoder().decode(data).toString(); + } catch (CharacterCodingException e5) { + return null; + } + } + } + } + } + } +} diff --git a/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/BarQrCodeUtil.java b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/BarQrCodeUtil.java new file mode 100644 index 0000000..222d7e2 --- /dev/null +++ b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/BarQrCodeUtil.java @@ -0,0 +1,27 @@ +package com.visionsmarts.pic2shop.view; + +import com.visionsmarts.VSReaderQR; + +import java.nio.ByteBuffer; +import java.nio.charset.Charset; + +public class BarQrCodeUtil { + public static String qrToString(byte[] qrData) { + ByteBuffer qrBuffer; + if (qrData[qrData.length - 1] == 0) { + qrBuffer = ByteBuffer.wrap(qrData, 0, qrData.length - 1); + } else { + qrBuffer = ByteBuffer.wrap(qrData); + } + return VSReaderQR.decodeData(qrBuffer, Charset.forName("UTF-8")); + } + + public static final int DECODE = 100; + public static final int QUIT = 101; + public static final int NOTFOUND = 102; + + public static final int BARCODE = 103; + public static final int QRCODE = 104; + + public static final int AUTO_FOCUS = 105; +} diff --git a/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveView.java b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveView.java new file mode 100644 index 0000000..a45ba8b --- /dev/null +++ b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveView.java @@ -0,0 +1,784 @@ +package com.visionsmarts.pic2shop.view; + +import android.app.Activity; +import android.content.Context; +import android.graphics.ImageFormat; +import android.graphics.Point; +import android.hardware.Camera; +import android.hardware.Camera.AutoFocusCallback; +import android.hardware.Camera.Parameters; +import android.hardware.Camera.PreviewCallback; +import android.hardware.Camera.Size; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.util.AttributeSet; +import android.util.Log; +import android.view.Display; +import android.view.SurfaceHolder; +import android.view.SurfaceHolder.Callback; +import android.view.SurfaceView; +import android.view.WindowManager; + +import com.google.zxing.client.android.camera.CameraConfigurationUtils; +import com.visionsmarts.VSBarcodeReader; +import com.visionsmarts.VSBarcodeReader.DecoderValues; +import com.visionsmarts.VSReaderQR; + +import java.io.IOException; +import java.util.regex.Pattern; + +public class ScannerLiveView extends SurfaceView implements Callback { + private Point screen; + private static final int BARCODE_TYPES_MASK = 7; + private static final Pattern COMMA_PATTERN; + private static final int DESIRED_ZOOM_X10 = 27; + private static final String TAG; + private AutoFocusCallback mAutoFocusCallback; + private volatile byte[] mCallbackBuffer; + private volatile Camera mCamera; + private DecodingThread mDecodingThread; + volatile boolean mFoundBarcodeOrQRCode; + volatile byte[] mFrameData; + volatile boolean mFrameDataIsAutoFocusInProgress; + volatile boolean mHasCameraAutoFocus; + volatile boolean mIsAutoFocusInProgress; + volatile boolean mIsPreviewStarted; + Listener mListener; + private PreviewCallback mPreviewCallback; + private int mPreviewFrameSize; + volatile Size mPreviewSize; + final ScannerHandler mScannerHandler; + private volatile int mCameraDisplayOrientation; + + public interface Listener { + void onCodeScanned(String str, String str2); + void onCameraIssue(); + } + + /* renamed from: com.visionsmarts.pic2shop.view.ScannerLiveView.1 */ + class ScanAutoFocusCallback implements AutoFocusCallback { + ScanAutoFocusCallback() { + } + + public void onAutoFocus(boolean success, Camera camera) { + ScannerLiveView.this.mIsAutoFocusInProgress = false; + } + } + + /* renamed from: com.visionsmarts.pic2shop.view.ScannerLiveView.2 */ + class ScanPreviewCallback implements PreviewCallback { + ScanPreviewCallback() { + } + + public synchronized void onPreviewFrame(byte[] frameData, Camera camera) { + if (!(!ScannerLiveView.this.mIsPreviewStarted || ScannerLiveView.this.mDecodingThread == null || ScannerLiveView.this.mFoundBarcodeOrQRCode)) { + boolean shouldSendDecodeRequest = ScannerLiveView.this.mFrameData == null; + ScannerLiveView.this.mFrameData = frameData; + ScannerLiveView.this.mFrameDataIsAutoFocusInProgress = ScannerLiveView.this.mIsAutoFocusInProgress; + if (shouldSendDecodeRequest) { + ScannerLiveView.this.mDecodingThread.getHandler().obtainMessage(BarQrCodeUtil.DECODE).sendToTarget(); + } + } + } + } + + private class DecodingThread extends Thread { + DecoderValues mBarcodeDecoderValues; + private Handler mHandler; + private int mNumberConsecutiveFailedDecodingSinceFocusEnded; + private byte[] mPreviewLine; + VSReaderQR.DecoderValues mQRDecoderValues; + + /* renamed from: com.visionsmarts.pic2shop.view.ScannerLiveView.DecodingThread.1 */ + class DecodeMessageHandler extends Handler { + DecodeMessageHandler() { + } + + public void handleMessage(Message message) { + switch (message.what) { + case BarQrCodeUtil.DECODE: + if (ScannerLiveView.this.mIsPreviewStarted && !ScannerLiveView.this.mFoundBarcodeOrQRCode) { + DecodingThread.this.decode(); + } + break; + case BarQrCodeUtil.QUIT: + Looper.myLooper().quit(); + break; + default: + } + } + } + + public DecodingThread() { + this.mNumberConsecutiveFailedDecodingSinceFocusEnded = 0; + this.mBarcodeDecoderValues = new DecoderValues(); + this.mQRDecoderValues = new VSReaderQR.DecoderValues(); + setPriority(10); + initialize(); + } + + synchronized Handler getHandler() { + if (this.mHandler == null) { + try { + ScannerLiveView.this.mDecodingThread.wait(1000); + } catch (InterruptedException e) { + } + } + return this.mHandler; + } + + public void initialize() { + if (ScannerLiveView.this.mPreviewSize != null && (this.mPreviewLine == null || this.mPreviewLine.length != ScannerLiveView.this.mPreviewSize.height)) { + this.mPreviewLine = new byte[ScannerLiveView.this.mPreviewSize.height]; + } + this.mNumberConsecutiveFailedDecodingSinceFocusEnded = 0; + ScannerLiveView.this.mFoundBarcodeOrQRCode = false; + VSBarcodeReader.reset(); + } + + public void run() { + Looper.prepare(); + synchronized (this) { + this.mHandler = new DecodeMessageHandler(); + notify(); + } + Looper.loop(); + } + + private void decode() { + byte[] previewLine = this.mPreviewLine; + int width = ScannerLiveView.this.mPreviewSize.width; + int height = ScannerLiveView.this.mPreviewSize.height; + synchronized (ScannerLiveView.this.mPreviewCallback) { + if (ScannerLiveView.this.mFrameData == null) { + return; + } + byte[] frameData = ScannerLiveView.this.mFrameData; + boolean wasAutoFocusInProgress = ScannerLiveView.this.mFrameDataIsAutoFocusInProgress; + int offset = Math.round((float) (screen.y / 2)); + Log.e(TAG,"offset="+offset); + try { + for (int i = previewLine.length - 1; i >= 0; i--) { + previewLine[i] = frameData[offset]; + offset += width; + } + } catch (ArrayIndexOutOfBoundsException e) { + } + if (ScannerLiveView.this.mFrameData != null) { + String barcode = VSBarcodeReader.decodeNextImage(previewLine, ScannerLiveView.this.mHasCameraAutoFocus ? 1 : 0, ScannerLiveView.BARCODE_TYPES_MASK, this.mBarcodeDecoderValues); + if (ScannerLiveView.this.mFrameData != null) { + if (barcode.length() > 0) { + ScannerLiveView.this.mFoundBarcodeOrQRCode = true; + ScannerLiveView.this.mScannerHandler.obtainMessage(BarQrCodeUtil.BARCODE, barcode).sendToTarget(); + } else { + try { + byte[] qrData = VSReaderQR.decodeImage(frameData, width, height, this.mQRDecoderValues); + if (qrData.length > 0) { + ScannerLiveView.this.mFoundBarcodeOrQRCode = true; + ScannerLiveView.this.mScannerHandler.obtainMessage(BarQrCodeUtil.QRCODE, qrData).sendToTarget(); + } else if (wasAutoFocusInProgress) { + this.mNumberConsecutiveFailedDecodingSinceFocusEnded = 0; + } else { + this.mNumberConsecutiveFailedDecodingSinceFocusEnded++; + if (ScannerLiveView.this.mHasCameraAutoFocus && !ScannerLiveView.this.mIsAutoFocusInProgress && this.mNumberConsecutiveFailedDecodingSinceFocusEnded >= 4) { + ScannerLiveView.this.mScannerHandler.obtainMessage(BarQrCodeUtil.AUTO_FOCUS).sendToTarget(); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + synchronized (ScannerLiveView.this.mPreviewCallback) { + ScannerLiveView.this.mFrameData = null; + if (!(ScannerLiveView.this.mFoundBarcodeOrQRCode || ScannerLiveView.this.mCallbackBuffer == null)) { + ScannerLiveView.this.mCamera.addCallbackBuffer(ScannerLiveView.this.mCallbackBuffer); + } + } + } + } + } + } + } + + private class ScannerHandler extends Handler { + private ScannerHandler() { + } + + public void handleMessage(Message message) { + switch (message.what) { + case BarQrCodeUtil.AUTO_FOCUS: + ScannerLiveView.this.requestAutoFocus(); + break; + case BarQrCodeUtil.BARCODE: + if (ScannerLiveView.this.mIsPreviewStarted) { + ScannerLiveView.this.stopCamera(); + ScannerLiveView.this.mListener.onCodeScanned("BAR", (String)message.obj); + } + break; + case BarQrCodeUtil.QRCODE: + if (ScannerLiveView.this.mIsPreviewStarted) { + ScannerLiveView.this.stopCamera(); + ScannerLiveView.this.mListener.onCodeScanned("QR", BarQrCodeUtil.qrToString((byte[])message.obj)); + } + break; + default: + } + } + } + + public ScannerLiveView(Context context,Listener mListener) { + super(context); + this.mPreviewFrameSize = 0; + this.mScannerHandler = new ScannerHandler(); + this.mIsPreviewStarted = false; + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + this.mFrameDataIsAutoFocusInProgress = false; + this.mFoundBarcodeOrQRCode = false; + this.mListener = mListener; + initialize(context); + } + + public ScannerLiveView(Context context, AttributeSet attrs) { + super(context, attrs); + this.mPreviewFrameSize = 0; + this.mScannerHandler = new ScannerHandler(); + this.mIsPreviewStarted = false; + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + this.mFrameDataIsAutoFocusInProgress = false; + this.mFoundBarcodeOrQRCode = false; + + initialize(context); + } + + public ScannerLiveView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + this.mPreviewFrameSize = 0; + this.mScannerHandler = new ScannerHandler(); + this.mIsPreviewStarted = false; + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + this.mFrameDataIsAutoFocusInProgress = false; + this.mFoundBarcodeOrQRCode = false; + initialize(context); + } + + private void initialize(Context context) { + //this.mListener = (Listener) context; + SurfaceHolder holder = getHolder(); + holder.addCallback(this); + holder.setType(3); + holder.setKeepScreenOn(true); + this.mAutoFocusCallback = new ScanAutoFocusCallback(); + this.mPreviewCallback = new ScanPreviewCallback(); + Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); + screen = new Point(); + display.getSize(screen); + } + + + public void surfaceCreated(SurfaceHolder holder) { + if (holder == null) { + throw new IllegalStateException("No SurfaceHolder provided"); + } else if (this.mCamera == null) { + try { + this.mCamera = null; + try { + Camera.CameraInfo cameraInfo = new Camera.CameraInfo(); + int cameraCount = Camera.getNumberOfCameras(); + for (int camIdx = 0; camIdx < cameraCount; camIdx++) { + Camera.getCameraInfo(camIdx, cameraInfo); + if (cameraInfo.facing == 0) { + this.mCamera = Camera.open(camIdx); + //this.mCamera.setDisplayOrientation(90); + setCameraDisplayOrientation(camIdx); + break; + } + } + } catch (LinkageError e) { + } + if (this.mCamera == null) { + try { + this.mCamera = Camera.open(0); + //this.mCamera.setDisplayOrientation(90); + setCameraDisplayOrientation(0); + } catch (LinkageError e2) { + } + } + if (this.mCamera == null) { + this.mCamera = Camera.open(); + } + this.mCamera.setPreviewDisplay(holder); + this.mIsPreviewStarted = false; + } catch (IOException e3) { + this.mListener.onCameraIssue(); + } catch (RuntimeException e4) { + this.mListener.onCameraIssue(); + } + } + } + + public void setCameraDisplayOrientation(int cameraId) { + Camera.CameraInfo info = new Camera.CameraInfo(); + Camera.getCameraInfo(cameraId, info); + int degrees = 0; + switch (((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation()) { + case 0: + degrees = 0; + break; + case 1: + degrees = 90; + break; + case 2: + degrees = 180; + break; + case 3: + degrees = 270; + break; + } + if (info.facing == 1) { + this.mCameraDisplayOrientation = (info.orientation + degrees) % 360; + this.mCameraDisplayOrientation = (360 - this.mCameraDisplayOrientation) % 360; + } else { + this.mCameraDisplayOrientation = ((info.orientation - degrees) + 360) % 360; + } + this.mCamera.setDisplayOrientation(this.mCameraDisplayOrientation); + } + + public void surfaceDestroyed(SurfaceHolder holder) { + if (this.mCamera != null) { + stopCamera(); + this.mPreviewFrameSize = 0; + } + } + + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { + if (this.mCamera != null) { + stopCamera(); + setCameraParameters(screen.y,screen.x); + if (isShown()) { + startCamera(); + } + } + } + + public void onPause() { + stopCamera(); + if (this.mCamera != null) { + this.mCamera.release(); + this.mCamera = null; + } + if(this.mDecodingThread!=null) { + Message.obtain(this.mDecodingThread.getHandler(), BarQrCodeUtil.QUIT).sendToTarget(); + try { + this.mDecodingThread.join(); + } catch (InterruptedException e) { + } + } + if(this.mScannerHandler!=null) { + this.mScannerHandler.removeMessages(BarQrCodeUtil.AUTO_FOCUS); + this.mScannerHandler.removeMessages(BarQrCodeUtil.BARCODE); + this.mScannerHandler.removeMessages(BarQrCodeUtil.QRCODE); + } + this.mDecodingThread = null; + } + + public void setTorch(boolean on) { + if (this.mCamera != null) { + boolean isOn = isTorchOn(); + if (on != isOn) { + + Camera.Parameters parameters = this.mCamera.getParameters(); + CameraConfigurationUtils.setTorch(parameters, on); + this.mCamera.setParameters(parameters); + } + } + } + + public boolean isTorchOn() { + Camera.Parameters parameters = this.mCamera.getParameters(); + if (parameters != null) { + String flashMode = parameters.getFlashMode(); + return flashMode != null && + (Camera.Parameters.FLASH_MODE_ON.equals(flashMode) || + Camera.Parameters.FLASH_MODE_TORCH.equals(flashMode)); + } else { + return false; + } + } + + public void onResume() { + /*this.mScannerOverlay = (ScannerOverlay) ((Activity) getContext()).findViewById(R.id.scanner_overlay); + this.mScannerOverlay.setBarcodeLocation(-1, -1);*/ + this.mDecodingThread = new DecodingThread(); + this.mDecodingThread.start(); + startCamera(); + } + + public void startCamera() { + if (this.mCamera != null && !this.mIsPreviewStarted) { + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + if (this.mDecodingThread != null) { + this.mDecodingThread.initialize(); + } + if (this.mPreviewFrameSize > 0) { + try { + this.mCallbackBuffer = new byte[this.mPreviewFrameSize]; + } catch (OutOfMemoryError e) { + this.mCallbackBuffer = null; + } + } + if (this.mCallbackBuffer != null) { + this.mCamera.setPreviewCallbackWithBuffer(this.mPreviewCallback); + this.mCamera.addCallbackBuffer(this.mCallbackBuffer); + } else { + this.mCamera.setPreviewCallback(this.mPreviewCallback); + } + try { + this.mCamera.startPreview(); + this.mIsPreviewStarted = true; + requestAutoFocus(); + } catch (RuntimeException e2) { + this.mCamera.setPreviewCallback(null); + this.mCallbackBuffer = null; + this.mListener.onCameraIssue(); + } + } + } + + public void stopCamera() { + /*if (this.mCamera != null && this.mIsPreviewStarted) { + this.mCamera.setPreviewCallback(null); + this.mCamera.stopPreview(); + this.mIsPreviewStarted = false; + if (this.mDecodingThread.getHandler() != null) { + this.mDecodingThread.getHandler().removeMessages(R.id.decode); + } + this.mScannerHandler.removeMessages(R.id.auto_focus); + this.mScannerHandler.removeMessages(R.id.msg_barcode_found); + }*/ + + if (this.mCamera != null && this.mIsPreviewStarted) { + synchronized (this.mPreviewCallback) { + this.mCamera.setPreviewCallback(null); + this.mCamera.stopPreview(); + this.mIsPreviewStarted = false; + this.mCamera.cancelAutoFocus(); + this.mFrameData = null; + this.mCallbackBuffer = null; + } + if (!(this.mDecodingThread == null || this.mDecodingThread.getHandler() == null)) { + this.mDecodingThread.getHandler().removeMessages(BarQrCodeUtil.DECODE); + } + this.mScannerHandler.removeMessages(BarQrCodeUtil.AUTO_FOCUS); + this.mScannerHandler.removeMessages(BarQrCodeUtil.BARCODE); + this.mScannerHandler.removeMessages(BarQrCodeUtil.QRCODE); + } + + } + + void requestAutoFocus() { + if (this.mCamera != null && this.mHasCameraAutoFocus && this.mIsPreviewStarted && !this.mIsAutoFocusInProgress) { + try { + this.mCamera.autoFocus(this.mAutoFocusCallback); + this.mIsAutoFocusInProgress = true; + } catch (RuntimeException e) { + Log.e(TAG, "Camera auto-focus failed: " + e.getLocalizedMessage()); + } + } + } + + + private void setCameraParameters(int screenWidth, int screenHeight) { + Parameters parameters = this.mCamera.getParameters(); + Log.e(TAG,"screenWidth="+screenWidth+",screenHeight="+screenHeight); + setPreviewSize(screenWidth, screenHeight, parameters); + setZoom(parameters); + String focusModeValues = parameters.get("focus-mode-values"); + if (focusModeValues != null && focusModeValues.contains("macro")) { + parameters.set("focus-mode", "macro"); + this.mHasCameraAutoFocus = true; + } else if (focusModeValues == null || !focusModeValues.contains("auto")) { + this.mHasCameraAutoFocus = false; + } else { + parameters.set("focus-mode", "auto"); + this.mHasCameraAutoFocus = true; + } + try { + this.mCamera.setParameters(parameters); + } catch (RuntimeException e) { + this.mListener.onCameraIssue(); + } + parameters = this.mCamera.getParameters(); + this.mPreviewSize = parameters.getPreviewSize(); + this.mPreviewFrameSize = ((this.mPreviewSize.width * this.mPreviewSize.height) * ImageFormat.getBitsPerPixel(parameters.getPreviewFormat())) / 8; + } + + private void setPreviewSize(int screenWidth, int screenHeight, Parameters parameters) { + String previewSizeValuesString = parameters.get("preview-size-values"); + if (previewSizeValuesString == null) { + previewSizeValuesString = parameters.get("preview-size-value"); + } + Point bestPreviewSize = null; + if (previewSizeValuesString != null) { + bestPreviewSize = findBestPreviewSize(previewSizeValuesString, screenWidth, screenHeight); + } + if (bestPreviewSize != null) { + parameters.setPreviewSize(bestPreviewSize.x, bestPreviewSize.y); + } else { + parameters.setPreviewSize((screenWidth >> 4) << 4, (screenHeight >> 1) << 1); + } + } + + private static Point findBestPreviewSize(CharSequence previewSizeValuesString, int screenWidth, int screenHeight) { + int bestPreviewWidth = 0; + int bestPreviewHeight = 0; + int minDifference = Integer.MAX_VALUE; + for (String previewSizeValueString : COMMA_PATTERN.split(previewSizeValuesString)) { + String previewSizeValueString2 = previewSizeValueString.trim(); + int separatorPosition = previewSizeValueString2.indexOf(120); + if (separatorPosition >= 0) { + try { + int previewSizeValueWidth = Integer.parseInt(previewSizeValueString2.substring(0, separatorPosition)); + int previewSizeValueHeight = Integer.parseInt(previewSizeValueString2.substring(separatorPosition + 1)); + int difference = Math.abs(previewSizeValueWidth - screenWidth) + Math.abs(previewSizeValueHeight - screenHeight); + if (difference == 0) { + bestPreviewWidth = previewSizeValueWidth; + bestPreviewHeight = previewSizeValueHeight; + break; + } else if (difference < minDifference) { + bestPreviewWidth = previewSizeValueWidth; + bestPreviewHeight = previewSizeValueHeight; + minDifference = difference; + } + } catch (NumberFormatException e) { + } + } + } + if (bestPreviewWidth <= 0 || bestPreviewHeight <= 0) { + return null; + } + Log.e(TAG,"bestPreviewWidth="+bestPreviewWidth+",bestPreviewHeight="+bestPreviewHeight); + return new Point(bestPreviewWidth, bestPreviewHeight); + } + + private void setZoom(Parameters parameters) { + String zoomSupportedString = parameters.get("zoom-supported"); + if (zoomSupportedString == null || Boolean.parseBoolean(zoomSupportedString)) { + int maxZoomX10; + int desiredZoomX10 = DESIRED_ZOOM_X10; + String maxZoomString = parameters.get("max-zoom"); + if (maxZoomString != null) { + try { + maxZoomX10 = (int) (10.0d * Double.parseDouble(maxZoomString)); + if (DESIRED_ZOOM_X10 > maxZoomX10) { + desiredZoomX10 = maxZoomX10; + } + } catch (NumberFormatException e) { + } + } + String takingPictureZoomMaxString = parameters.get("taking-picture-zoom-max"); + if (takingPictureZoomMaxString != null) { + try { + maxZoomX10 = Integer.parseInt(takingPictureZoomMaxString); + if (desiredZoomX10 > maxZoomX10) { + desiredZoomX10 = maxZoomX10; + } + } catch (NumberFormatException e2) { + } + } + String motZoomValuesString = parameters.get("mot-zoom-values"); + if (motZoomValuesString != null) { + desiredZoomX10 = findBestMotZoomX10(motZoomValuesString, desiredZoomX10); + } + String motZoomStepString = parameters.get("mot-zoom-step"); + if (motZoomStepString != null) { + try { + int motZoomStepX10 = (int) (10.0d * Double.parseDouble(motZoomStepString.trim())); + if (motZoomStepX10 > 1) { + desiredZoomX10 -= desiredZoomX10 % motZoomStepX10; + } + } catch (NumberFormatException e3) { + } + } + if (!(maxZoomString == null && motZoomValuesString == null)) { + parameters.set("zoom", String.valueOf(((double) desiredZoomX10) / 10.0d)); + } + if (takingPictureZoomMaxString != null) { + parameters.set("taking-picture-zoom", desiredZoomX10); + } + } + } + + private static int findBestMotZoomX10(CharSequence motZoomValuesString, int desiredZoomX10) { + int bestMotZoomX10 = 0; + String[] split = COMMA_PATTERN.split(motZoomValuesString); + int length = split.length; + int i = 0; + while (i < length) { + try { + int motZoomValueX10 = (int) (10.0d * Double.parseDouble(split[i].trim())); + if (Math.abs(desiredZoomX10 - motZoomValueX10) < Math.abs(desiredZoomX10 - bestMotZoomX10)) { + bestMotZoomX10 = motZoomValueX10; + } + i++; + } catch (NumberFormatException e) { + return desiredZoomX10; + } + } + return bestMotZoomX10; + } + /*private void setCameraParameters(int screenWidth, int screenHeight) { + Parameters parameters = this.mCamera.getParameters(); + setPreviewSize(screenWidth, screenHeight, parameters); + parameters.set("flash-mode", "off"); + parameters.set("flash-value", 2); + setZoom(parameters); + int apiLevel = Integer.parseInt(VERSION.SDK); + if (apiLevel <= 3) { + this.mHasCameraAutoFocus = true; + } else if (apiLevel >= 5) { + String focusModeValues = parameters.get("focus-mode-values"); + if (focusModeValues != null && focusModeValues.contains("macro")) { + parameters.set("focus-mode", "macro"); + this.mHasCameraAutoFocus = true; + } else if (focusModeValues == null || !focusModeValues.contains("auto")) { + this.mHasCameraAutoFocus = false; + } else { + parameters.set("focus-mode", "auto"); + this.mHasCameraAutoFocus = true; + } + } else { + String model = Build.MODEL.toLowerCase(); + if (model.contains("devour") || model.contains("tattoo")) { + this.mHasCameraAutoFocus = false; + } else { + this.mHasCameraAutoFocus = true; + } + } + this.mCamera.setParameters(parameters); + this.mPreviewSize = parameters.getPreviewSize(); + } + + private void setPreviewSize(int screenWidth, int screenHeight, Parameters parameters) { + String previewSizeValuesString = parameters.get("preview-size-values"); + if (previewSizeValuesString == null) { + previewSizeValuesString = parameters.get("preview-size-value"); + } + Point bestPreviewSize = null; + if (previewSizeValuesString != null) { + bestPreviewSize = findBestPreviewSize(previewSizeValuesString, screenWidth, screenHeight); + } + if (bestPreviewSize != null) { + parameters.setPreviewSize(bestPreviewSize.x, bestPreviewSize.y); + } else { + parameters.setPreviewSize((screenWidth >> 3) << 3, (screenHeight >> 3) << 3); + } + } + + private static Point findBestPreviewSize(CharSequence previewSizeValuesString, int screenWidth, int screenHeight) { + int bestPreviewWidth = 0; + int bestPreviewHeight = 0; + int minDifference = Integer.MAX_VALUE; + for (String previewSizeValueString : COMMA_PATTERN.split(previewSizeValuesString)) { + String previewSizeValueString2 = previewSizeValueString.trim(); + int separatorPosition = previewSizeValueString2.indexOf(120); + if (separatorPosition >= 0) { + try { + int previewSizeValueWidth = Integer.parseInt(previewSizeValueString2.substring(0, separatorPosition)); + int previewSizeValueHeight = Integer.parseInt(previewSizeValueString2.substring(separatorPosition + 1)); + int difference = Math.abs(previewSizeValueWidth - screenWidth) + Math.abs(previewSizeValueHeight - screenHeight); + if (difference == 0) { + bestPreviewWidth = previewSizeValueWidth; + bestPreviewHeight = previewSizeValueHeight; + break; + } else if (difference < minDifference) { + bestPreviewWidth = previewSizeValueWidth; + bestPreviewHeight = previewSizeValueHeight; + minDifference = difference; + } + } catch (NumberFormatException e) { + } + } + } + if (bestPreviewWidth <= 0 || bestPreviewHeight <= 0) { + return null; + } + return new Point(bestPreviewWidth, bestPreviewHeight); + } + + private void setZoom(Parameters parameters) { + String zoomSupportedString = parameters.get("zoom-supported"); + if (zoomSupportedString == null || Boolean.parseBoolean(zoomSupportedString)) { + int maxZoomX10; + int desiredZoomX10 = DESIRED_ZOOM_X10; + String maxZoomString = parameters.get("max-zoom"); + if (maxZoomString != null) { + try { + maxZoomX10 = (int) (10.0d * Double.parseDouble(maxZoomString)); + if (DESIRED_ZOOM_X10 > maxZoomX10) { + desiredZoomX10 = maxZoomX10; + } + } catch (NumberFormatException e) { + } + } + String takingPictureZoomMaxString = parameters.get("taking-picture-zoom-max"); + if (takingPictureZoomMaxString != null) { + try { + maxZoomX10 = Integer.parseInt(takingPictureZoomMaxString); + if (desiredZoomX10 > maxZoomX10) { + desiredZoomX10 = maxZoomX10; + } + } catch (NumberFormatException e2) { + } + } + String motZoomValuesString = parameters.get("mot-zoom-values"); + if (motZoomValuesString != null) { + desiredZoomX10 = findBestMotZoomX10(motZoomValuesString, desiredZoomX10); + } + String motZoomStepString = parameters.get("mot-zoom-step"); + if (motZoomStepString != null) { + try { + int motZoomStepX10 = (int) (10.0d * Double.parseDouble(motZoomStepString.trim())); + if (motZoomStepX10 > 1) { + desiredZoomX10 -= desiredZoomX10 % motZoomStepX10; + } + } catch (NumberFormatException e3) { + } + } + if (!(maxZoomString == null && motZoomValuesString == null)) { + parameters.set("zoom", String.valueOf(((double) desiredZoomX10) / 10.0d)); + } + if (takingPictureZoomMaxString != null) { + parameters.set("taking-picture-zoom", desiredZoomX10); + } + } + } + + private static int findBestMotZoomX10(CharSequence motZoomValuesString, int desiredZoomX10) { + int bestMotZoomX10 = 0; + String[] split = COMMA_PATTERN.split(motZoomValuesString); + int length = split.length; + int i = 0; + while (i < length) { + try { + int motZoomValueX10 = (int) (10.0d * Double.parseDouble(split[i].trim())); + if (Math.abs(desiredZoomX10 - motZoomValueX10) < Math.abs(desiredZoomX10 - bestMotZoomX10)) { + bestMotZoomX10 = motZoomValueX10; + } + i++; + } catch (NumberFormatException e) { + return desiredZoomX10; + } + } + return bestMotZoomX10; + }*/ + + static { + TAG = ScannerLiveView.class.getSimpleName(); + COMMA_PATTERN = Pattern.compile(","); + } +} diff --git a/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveViewLiner.java b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveViewLiner.java new file mode 100644 index 0000000..08a211c --- /dev/null +++ b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerLiveViewLiner.java @@ -0,0 +1,601 @@ +package com.visionsmarts.pic2shop.view; + +import android.annotation.TargetApi; +import android.app.Activity; +import android.content.Context; +import android.graphics.ImageFormat; +import android.graphics.Point; +import android.hardware.Camera; +import android.hardware.Camera.AutoFocusCallback; +import android.hardware.Camera.CameraInfo; +import android.hardware.Camera.Parameters; +import android.hardware.Camera.PreviewCallback; +import android.hardware.Camera.Size; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.util.AttributeSet; +import android.util.Log; +import android.view.SurfaceHolder; +import android.view.SurfaceHolder.Callback; +import android.view.SurfaceView; + +import com.visionsmarts.VSBarcodeReader; +import com.visionsmarts.VSBarcodeReader.DecoderValues; +import com.visionsmarts.VSReaderQR; + +import java.io.IOException; +import java.util.regex.Pattern; + +public class ScannerLiveViewLiner extends SurfaceView implements Callback { + private static final int BARCODE_TYPES_MASK = 7; + private static final Pattern COMMA_PATTERN; + private static final int DESIRED_ZOOM_X10 = 27; + private static final String TAG; + private AutoFocusCallback mAutoFocusCallback; + private volatile byte[] mCallbackBuffer; + private volatile Camera mCamera; + private volatile int mCameraDisplayOrientation; + private DecodingThread mDecodingThread; + volatile boolean mFoundBarcodeOrQRCode; + volatile byte[] mFrameData; + volatile boolean mFrameDataIsAutoFocusInProgress; + volatile boolean mHasCameraAutoFocus; + volatile boolean mIsAutoFocusInProgress; + volatile boolean mIsPreviewStarted; + Listener mListener; + private PreviewCallback mPreviewCallback; + private int mPreviewFrameSize; + volatile Size mPreviewSize; + final ScannerHandler mScannerHandler; + ScannerOverlay mScannerOverlay; + + /* renamed from: com.visionsmarts.pic2shop.view.ScannerLiveViewLiner.1 */ + class C01731 implements AutoFocusCallback { + C01731() { + } + + public void onAutoFocus(boolean success, Camera camera) { + ScannerLiveViewLiner.this.mIsAutoFocusInProgress = false; + } + } + + /* renamed from: com.visionsmarts.pic2shop.view.ScannerLiveViewLiner.2 */ + class C01742 implements PreviewCallback { + C01742() { + } + + public synchronized void onPreviewFrame(byte[] frameData, Camera camera) { + if (!(!ScannerLiveViewLiner.this.mIsPreviewStarted || ScannerLiveViewLiner.this.mDecodingThread == null || ScannerLiveViewLiner.this.mFoundBarcodeOrQRCode)) { + boolean shouldSendDecodeRequest = ScannerLiveViewLiner.this.mFrameData == null; + ScannerLiveViewLiner.this.mFrameData = frameData; + ScannerLiveViewLiner.this.mFrameDataIsAutoFocusInProgress = ScannerLiveViewLiner.this.mIsAutoFocusInProgress; + if (shouldSendDecodeRequest) { + ScannerLiveViewLiner.this.mDecodingThread.getHandler().obtainMessage(BarQrCodeUtil.DECODE).sendToTarget(); + } + } + } + } + + private class DecodingThread extends Thread { + DecoderValues mBarcodeDecoderValues; + private Handler mHandler; + private int mNumberConsecutiveFailedDecodingSinceFocusEnded; + private byte[] mPreviewLine; + VSReaderQR.DecoderValues mQRDecoderValues; + + /* renamed from: com.visionsmarts.pic2shop.view.ScannerLiveViewLiner.DecodingThread.1 */ + class C01751 extends Handler { + C01751() { + } + + public void handleMessage(Message message) { + switch (message.what) { + case BarQrCodeUtil.DECODE: + if (ScannerLiveViewLiner.this.mIsPreviewStarted && !ScannerLiveViewLiner.this.mFoundBarcodeOrQRCode) { + DecodingThread.this.decode(); + } + break; + case BarQrCodeUtil.QUIT: + Looper.myLooper().quit(); + break; + default: + } + } + } + + public DecodingThread() { + this.mNumberConsecutiveFailedDecodingSinceFocusEnded = 0; + this.mBarcodeDecoderValues = new DecoderValues(); + this.mQRDecoderValues = new VSReaderQR.DecoderValues(); + setPriority(10); + initialize(); + } + + synchronized Handler getHandler() { + if (this.mHandler == null) { + try { + ScannerLiveViewLiner.this.mDecodingThread.wait(1000); + } catch (InterruptedException e) { + } + } + return this.mHandler; + } + + public void initialize() { + if (ScannerLiveViewLiner.this.mPreviewSize != null && (this.mPreviewLine == null || this.mPreviewLine.length != ScannerLiveViewLiner.this.mPreviewSize.height)) { + this.mPreviewLine = new byte[ScannerLiveViewLiner.this.mPreviewSize.height]; + } + this.mNumberConsecutiveFailedDecodingSinceFocusEnded = 0; + ScannerLiveViewLiner.this.mFoundBarcodeOrQRCode = false; + VSBarcodeReader.reset(); + } + + public void run() { + Looper.prepare(); + synchronized (this) { + this.mHandler = new C01751(); + notify(); + } + Looper.loop(); + } + + @TargetApi(8) + private void decode() { + byte[] previewLine = this.mPreviewLine; + int width = ScannerLiveViewLiner.this.mPreviewSize.width; + int height = ScannerLiveViewLiner.this.mPreviewSize.height; + synchronized (ScannerLiveViewLiner.this.mPreviewCallback) { + if (ScannerLiveViewLiner.this.mFrameData == null) { + return; + } + byte[] frameData = ScannerLiveViewLiner.this.mFrameData; + boolean wasAutoFocusInProgress = ScannerLiveViewLiner.this.mFrameDataIsAutoFocusInProgress; + int offset = Math.round(ScannerLiveViewLiner.this.mScannerOverlay.getNormalizedLaserLinePosition() * ((float) width)); + Log.e(TAG,"offset="+offset); + int i = previewLine.length - 1; + while (i >= 0) { + try { + previewLine[i] = frameData[offset]; + offset += width; + i--; + } catch (ArrayIndexOutOfBoundsException e) { + throw new ArrayIndexOutOfBoundsException(e.getMessage() + "; width=" + width + "; height=" + height + "; previewLine.length=" + previewLine.length + "; initOffset=" + Math.round(ScannerLiveViewLiner.this.mScannerOverlay.getNormalizedLaserLinePosition() * ((float) width))); + } + } + if (ScannerLiveViewLiner.this.mFrameData != null) { + String barcode = VSBarcodeReader.decodeNextImage(previewLine, ScannerLiveViewLiner.this.mHasCameraAutoFocus ? 1 : 0, ScannerLiveViewLiner.BARCODE_TYPES_MASK, this.mBarcodeDecoderValues); + if (ScannerLiveViewLiner.this.mFrameData != null) { + if (this.mBarcodeDecoderValues.left >= 0) { + int left = this.mBarcodeDecoderValues.left; + int right = this.mBarcodeDecoderValues.right; + float lineLength = (float) previewLine.length; + if (ScannerLiveViewLiner.this.mCameraDisplayOrientation == 180) { + ScannerLiveViewLiner.this.mScannerOverlay.setNormalizedBarcodeLocation(((float) (height - right)) / lineLength, ((float) (height - left)) / lineLength); + } else { + ScannerLiveViewLiner.this.mScannerOverlay.setNormalizedBarcodeLocation(((float) left) / lineLength, ((float) right) / lineLength); + } + } else { + ScannerLiveViewLiner.this.mScannerOverlay.setNoBarcodeLocation(); + } + if (barcode.length() > 0) { + ScannerLiveViewLiner.this.mFoundBarcodeOrQRCode = true; + ScannerLiveViewLiner.this.mScannerHandler.obtainMessage(BarQrCodeUtil.BARCODE, barcode).sendToTarget(); + } else { + byte[] qrData = VSReaderQR.decodeImage(frameData, width, height, this.mQRDecoderValues); + if (qrData.length > 0) { + ScannerLiveViewLiner.this.mFoundBarcodeOrQRCode = true; + ScannerLiveViewLiner.this.mScannerHandler.obtainMessage(BarQrCodeUtil.QRCODE, qrData).sendToTarget(); + } else if (wasAutoFocusInProgress) { + this.mNumberConsecutiveFailedDecodingSinceFocusEnded = 0; + } else { + this.mNumberConsecutiveFailedDecodingSinceFocusEnded++; + if (ScannerLiveViewLiner.this.mHasCameraAutoFocus && !ScannerLiveViewLiner.this.mIsAutoFocusInProgress && this.mNumberConsecutiveFailedDecodingSinceFocusEnded >= 4) { + ScannerLiveViewLiner.this.mScannerHandler.obtainMessage(BarQrCodeUtil.AUTO_FOCUS).sendToTarget(); + } + } + } + synchronized (ScannerLiveViewLiner.this.mPreviewCallback) { + ScannerLiveViewLiner.this.mFrameData = null; + if (!(ScannerLiveViewLiner.this.mFoundBarcodeOrQRCode || ScannerLiveViewLiner.this.mCallbackBuffer == null)) { + ScannerLiveViewLiner.this.mCamera.addCallbackBuffer(ScannerLiveViewLiner.this.mCallbackBuffer); + } + } + } + } + } + } + } + + public interface Listener { + void onCameraIssue(); + + void onCodeScanned(String str, String str2); + } + + private class ScannerHandler extends Handler { + private ScannerHandler() { + } + + public void handleMessage(Message message) { + switch (message.what) { + case BarQrCodeUtil.AUTO_FOCUS: + ScannerLiveViewLiner.this.requestAutoFocus(); + break; + case BarQrCodeUtil.BARCODE: + if (ScannerLiveViewLiner.this.mIsPreviewStarted) { + ScannerLiveViewLiner.this.stopCamera(); + ScannerLiveViewLiner.this.mListener.onCodeScanned("BAR", (String)message.obj); + } + break; + case BarQrCodeUtil.QRCODE: + if (ScannerLiveViewLiner.this.mIsPreviewStarted) { + ScannerLiveViewLiner.this.stopCamera(); + ScannerLiveViewLiner.this.mListener.onCodeScanned("QR", BarQrCodeUtil.qrToString((byte[])message.obj)); + } + break; + default: + } + } + } + + public ScannerLiveViewLiner(Context context) { + super(context); + this.mPreviewFrameSize = 0; + this.mScannerHandler = new ScannerHandler(); + this.mIsPreviewStarted = false; + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + this.mFrameDataIsAutoFocusInProgress = false; + this.mFoundBarcodeOrQRCode = false; + initialize(context); + } + + public ScannerLiveViewLiner(Context context, AttributeSet attrs) { + super(context, attrs); + this.mPreviewFrameSize = 0; + this.mScannerHandler = new ScannerHandler(); + this.mIsPreviewStarted = false; + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + this.mFrameDataIsAutoFocusInProgress = false; + this.mFoundBarcodeOrQRCode = false; + initialize(context); + } + + public ScannerLiveViewLiner(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + this.mPreviewFrameSize = 0; + this.mScannerHandler = new ScannerHandler(); + this.mIsPreviewStarted = false; + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + this.mFrameDataIsAutoFocusInProgress = false; + this.mFoundBarcodeOrQRCode = false; + initialize(context); + } + + private void initialize(Context context) { + this.mListener = (Listener) context; + SurfaceHolder holder = getHolder(); + holder.addCallback(this); + holder.setType(3); + holder.setKeepScreenOn(true); + this.mAutoFocusCallback = new C01731(); + this.mPreviewCallback = new C01742(); + } + + @TargetApi(9) + public void surfaceCreated(SurfaceHolder holder) { + if (holder == null) { + throw new IllegalStateException("No SurfaceHolder provided"); + } else if (this.mCamera == null) { + try { + this.mCamera = null; + try { + CameraInfo cameraInfo = new CameraInfo(); + int cameraCount = Camera.getNumberOfCameras(); + for (int camIdx = 0; camIdx < cameraCount; camIdx++) { + Camera.getCameraInfo(camIdx, cameraInfo); + if (cameraInfo.facing == 0) { + this.mCamera = Camera.open(camIdx); + setCameraDisplayOrientation(camIdx); + break; + } + } + } catch (LinkageError e) { + } + if (this.mCamera == null) { + try { + this.mCamera = Camera.open(0); + setCameraDisplayOrientation(0); + } catch (LinkageError e2) { + } + } + if (this.mCamera == null) { + this.mCamera = Camera.open(); + } + this.mCamera.setPreviewDisplay(holder); + this.mIsPreviewStarted = false; + } catch (IOException e3) { + this.mListener.onCameraIssue(); + } catch (RuntimeException e4) { + this.mListener.onCameraIssue(); + } + } + } + + public void surfaceDestroyed(SurfaceHolder holder) { + if (this.mCamera != null) { + stopCamera(); + this.mPreviewFrameSize = 0; + } + } + + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { + if (this.mCamera != null) { + stopCamera(); + setCameraParameters(width, height); + if (isShown()) { + startCamera(); + } + } + } + + public void onPause() { + stopCamera(); + if (this.mCamera != null) { + this.mCamera.release(); + this.mCamera = null; + } + Message.obtain(this.mDecodingThread.getHandler(), BarQrCodeUtil.QUIT).sendToTarget(); + try { + this.mDecodingThread.join(); + } catch (InterruptedException e) { + } + this.mScannerHandler.removeMessages(BarQrCodeUtil.AUTO_FOCUS); + this.mScannerHandler.removeMessages(BarQrCodeUtil.BARCODE); + this.mScannerHandler.removeMessages(BarQrCodeUtil.QRCODE); + this.mDecodingThread = null; + } + + @TargetApi(8) + public void startCamera() { + if (this.mCamera != null && !this.mIsPreviewStarted) { + this.mIsAutoFocusInProgress = false; + this.mFrameData = null; + if (this.mDecodingThread != null) { + this.mDecodingThread.initialize(); + } + if (this.mScannerOverlay != null) { + this.mScannerOverlay.setNoBarcodeLocation(); + } + if (this.mPreviewFrameSize > 0) { + try { + this.mCallbackBuffer = new byte[this.mPreviewFrameSize]; + } catch (OutOfMemoryError e) { + this.mCallbackBuffer = null; + } + } + if (this.mCallbackBuffer != null) { + this.mCamera.setPreviewCallbackWithBuffer(this.mPreviewCallback); + this.mCamera.addCallbackBuffer(this.mCallbackBuffer); + } else { + this.mCamera.setPreviewCallback(this.mPreviewCallback); + } + try { + this.mCamera.startPreview(); + this.mIsPreviewStarted = true; + requestAutoFocus(); + } catch (RuntimeException e2) { + this.mCamera.setPreviewCallback(null); + this.mCallbackBuffer = null; + this.mListener.onCameraIssue(); + } + } + } + + public void stopCamera() { + if (this.mCamera != null && this.mIsPreviewStarted) { + synchronized (this.mPreviewCallback) { + this.mCamera.setPreviewCallback(null); + this.mCamera.stopPreview(); + this.mIsPreviewStarted = false; + this.mCamera.cancelAutoFocus(); + this.mFrameData = null; + this.mCallbackBuffer = null; + } + if (!(this.mDecodingThread == null || this.mDecodingThread.getHandler() == null)) { + this.mDecodingThread.getHandler().removeMessages(BarQrCodeUtil.DECODE); + } + this.mScannerHandler.removeMessages(BarQrCodeUtil.AUTO_FOCUS); + this.mScannerHandler.removeMessages(BarQrCodeUtil.BARCODE); + this.mScannerHandler.removeMessages(BarQrCodeUtil.QRCODE); + } + } + + void requestAutoFocus() { + if (this.mCamera != null && this.mHasCameraAutoFocus && this.mIsPreviewStarted && !this.mIsAutoFocusInProgress) { + try { + this.mCamera.autoFocus(this.mAutoFocusCallback); + this.mIsAutoFocusInProgress = true; + } catch (RuntimeException e) { + Log.e(TAG, "Camera auto-focus failed: " + e.getLocalizedMessage()); + } + } + } + + @TargetApi(9) + public void setCameraDisplayOrientation(int cameraId) { + CameraInfo info = new CameraInfo(); + Camera.getCameraInfo(cameraId, info); + int degrees = 0; + switch (((Activity) getContext()).getWindowManager().getDefaultDisplay().getRotation()) { + case 0 /*0*/: + degrees = 0; + break; + case 1 /*1*/: + degrees = 90; + break; + case 2 /*2*/: + degrees = 180; + break; + case 3 /*3*/: + degrees = 270; + break; + } + if (info.facing == 1) { + this.mCameraDisplayOrientation = (info.orientation + degrees) % 360; + this.mCameraDisplayOrientation = (360 - this.mCameraDisplayOrientation) % 360; + } else { + this.mCameraDisplayOrientation = ((info.orientation - degrees) + 360) % 360; + } + this.mCamera.setDisplayOrientation(this.mCameraDisplayOrientation); + } + + @TargetApi(8) + private void setCameraParameters(int screenWidth, int screenHeight) { + Log.e(TAG,"screenWidth="+screenWidth+",screenHeight="+screenHeight); + Parameters parameters = this.mCamera.getParameters(); + setPreviewSize(screenWidth, screenHeight, parameters); + setZoom(parameters); + String focusModeValues = parameters.get("focus-mode-values"); + if (focusModeValues != null && focusModeValues.contains("macro")) { + parameters.set("focus-mode", "macro"); + this.mHasCameraAutoFocus = true; + } else if (focusModeValues == null || !focusModeValues.contains("auto")) { + this.mHasCameraAutoFocus = false; + } else { + parameters.set("focus-mode", "auto"); + this.mHasCameraAutoFocus = true; + } + try { + this.mCamera.setParameters(parameters); + } catch (RuntimeException e) { + this.mListener.onCameraIssue(); + } + parameters = this.mCamera.getParameters(); + this.mPreviewSize = parameters.getPreviewSize(); + this.mPreviewFrameSize = ((this.mPreviewSize.width * this.mPreviewSize.height) * ImageFormat.getBitsPerPixel(parameters.getPreviewFormat())) / 8; + } + + private void setPreviewSize(int screenWidth, int screenHeight, Parameters parameters) { + String previewSizeValuesString = parameters.get("preview-size-values"); + if (previewSizeValuesString == null) { + previewSizeValuesString = parameters.get("preview-size-value"); + } + Point bestPreviewSize = null; + if (previewSizeValuesString != null) { + bestPreviewSize = findBestPreviewSize(previewSizeValuesString, screenWidth, screenHeight); + } + if (bestPreviewSize != null) { + parameters.setPreviewSize(bestPreviewSize.x, bestPreviewSize.y); + } else { + parameters.setPreviewSize((screenWidth >> 4) << 4, (screenHeight >> 1) << 1); + } + } + + private static Point findBestPreviewSize(CharSequence previewSizeValuesString, int screenWidth, int screenHeight) { + int bestPreviewWidth = 0; + int bestPreviewHeight = 0; + int minDifference = Integer.MAX_VALUE; + for (String previewSizeValueString : COMMA_PATTERN.split(previewSizeValuesString)) { + String previewSizeValueString2 = previewSizeValueString.trim(); + int separatorPosition = previewSizeValueString2.indexOf(120); + if (separatorPosition >= 0) { + try { + int previewSizeValueWidth = Integer.parseInt(previewSizeValueString2.substring(0, separatorPosition)); + int previewSizeValueHeight = Integer.parseInt(previewSizeValueString2.substring(separatorPosition + 1)); + int difference = Math.abs(previewSizeValueWidth - screenWidth) + Math.abs(previewSizeValueHeight - screenHeight); + if (difference == 0) { + bestPreviewWidth = previewSizeValueWidth; + bestPreviewHeight = previewSizeValueHeight; + break; + } else if (difference < minDifference) { + bestPreviewWidth = previewSizeValueWidth; + bestPreviewHeight = previewSizeValueHeight; + minDifference = difference; + } + } catch (NumberFormatException e) { + } + } + } + if (bestPreviewWidth <= 0 || bestPreviewHeight <= 0) { + return null; + } + Log.e(TAG,"bestPreviewWidth="+bestPreviewWidth+",bestPreviewHeight="+bestPreviewHeight); + return new Point(bestPreviewWidth, bestPreviewHeight); + } + + private void setZoom(Parameters parameters) { + String zoomSupportedString = parameters.get("zoom-supported"); + if (zoomSupportedString == null || Boolean.parseBoolean(zoomSupportedString)) { + int maxZoomX10; + int desiredZoomX10 = DESIRED_ZOOM_X10; + String maxZoomString = parameters.get("max-zoom"); + if (maxZoomString != null) { + try { + maxZoomX10 = (int) (10.0d * Double.parseDouble(maxZoomString)); + if (DESIRED_ZOOM_X10 > maxZoomX10) { + desiredZoomX10 = maxZoomX10; + } + } catch (NumberFormatException e) { + } + } + String takingPictureZoomMaxString = parameters.get("taking-picture-zoom-max"); + if (takingPictureZoomMaxString != null) { + try { + maxZoomX10 = Integer.parseInt(takingPictureZoomMaxString); + if (desiredZoomX10 > maxZoomX10) { + desiredZoomX10 = maxZoomX10; + } + } catch (NumberFormatException e2) { + } + } + String motZoomValuesString = parameters.get("mot-zoom-values"); + if (motZoomValuesString != null) { + desiredZoomX10 = findBestMotZoomX10(motZoomValuesString, desiredZoomX10); + } + String motZoomStepString = parameters.get("mot-zoom-step"); + if (motZoomStepString != null) { + try { + int motZoomStepX10 = (int) (10.0d * Double.parseDouble(motZoomStepString.trim())); + if (motZoomStepX10 > 1) { + desiredZoomX10 -= desiredZoomX10 % motZoomStepX10; + } + } catch (NumberFormatException e3) { + } + } + if (!(maxZoomString == null && motZoomValuesString == null)) { + parameters.set("zoom", String.valueOf(((double) desiredZoomX10) / 10.0d)); + } + if (takingPictureZoomMaxString != null) { + parameters.set("taking-picture-zoom", desiredZoomX10); + } + } + } + + private static int findBestMotZoomX10(CharSequence motZoomValuesString, int desiredZoomX10) { + int bestMotZoomX10 = 0; + String[] split = COMMA_PATTERN.split(motZoomValuesString); + int length = split.length; + int i = 0; + while (i < length) { + try { + int motZoomValueX10 = (int) (10.0d * Double.parseDouble(split[i].trim())); + if (Math.abs(desiredZoomX10 - motZoomValueX10) < Math.abs(desiredZoomX10 - bestMotZoomX10)) { + bestMotZoomX10 = motZoomValueX10; + } + i++; + } catch (NumberFormatException e) { + return desiredZoomX10; + } + } + return bestMotZoomX10; + } + + static { + TAG = ScannerLiveViewLiner.class.getSimpleName(); + COMMA_PATTERN = Pattern.compile(","); + } +} diff --git a/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerOverlay.java b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerOverlay.java new file mode 100644 index 0000000..696fe7d --- /dev/null +++ b/platforms/android/app/src/main/java/com/visionsmarts/pic2shop/view/ScannerOverlay.java @@ -0,0 +1,124 @@ +package com.visionsmarts.pic2shop.view; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Paint.Align; +import android.graphics.Paint.Style; +import android.graphics.Point; +import android.graphics.Rect; +import android.graphics.Typeface; +import android.text.Layout.Alignment; +import android.text.StaticLayout; +import android.text.TextPaint; +import android.util.AttributeSet; +import android.view.Display; +import android.view.View; +import android.view.WindowManager; + +public class ScannerOverlay extends View { + private static final float LASER_LINE_WIDTH_160_DPI = 7.0f; + private static final float TEXT_FONT_SIZE = 20.0f; + private Paint mBarcodeLinePaint; + private Rect mBarcodeLineRect; + private Rect mCanvasClipRect; + private Paint mLaserLinePaint; + private int mLaserLinePosition; + private Rect mLaserLineRect; + private float mScreenDensity; + private Point mScreenResolution; + private Paint mTextBackgroundPaint; + private StaticLayout mTextLayout; + + public ScannerOverlay(Context context) { + super(context); + this.mCanvasClipRect = new Rect(); + this.mLaserLineRect = new Rect(); + this.mBarcodeLineRect = new Rect(-1, -1, -1, -1); + initialize(context); + } + + public ScannerOverlay(Context context, AttributeSet attrs) { + super(context, attrs); + this.mCanvasClipRect = new Rect(); + this.mLaserLineRect = new Rect(); + this.mBarcodeLineRect = new Rect(-1, -1, -1, -1); + initialize(context); + } + + public ScannerOverlay(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + this.mCanvasClipRect = new Rect(); + this.mLaserLineRect = new Rect(); + this.mBarcodeLineRect = new Rect(-1, -1, -1, -1); + initialize(context); + } + + private void initialize(Context context) { + this.mTextBackgroundPaint = new Paint(); + this.mTextBackgroundPaint.setStyle(Style.FILL); + this.mTextBackgroundPaint.setColor(Color.GREEN); + this.mTextBackgroundPaint.setAlpha(204); + TextPaint textPaint = new TextPaint(); + textPaint.setStyle(Style.FILL); + textPaint.setStrokeWidth(1.0f); + textPaint.setColor(-1); + textPaint.setAlpha(204); + textPaint.setAntiAlias(true); + textPaint.setTypeface(Typeface.DEFAULT_BOLD); + textPaint.setTextSize(TEXT_FONT_SIZE * context.getResources().getDisplayMetrics().scaledDensity); + textPaint.setTextAlign(Align.CENTER); + this.mTextLayout = new StaticLayout("å°äºç»´ç /æ¡å½¢ç æ¾å¥æ¡å, å³å¯èªå¨æ«æ", textPaint, context.getResources().getDisplayMetrics().heightPixels, Alignment.ALIGN_NORMAL, 1.0f, 0.0f, true); + this.mLaserLinePaint = new Paint(); + this.mLaserLinePaint.setStyle(Style.FILL); + this.mLaserLinePaint.setColor(-65536); + this.mLaserLinePaint.setAlpha(255); + this.mBarcodeLinePaint = new Paint(); + this.mBarcodeLinePaint.setStyle(Style.FILL); + this.mBarcodeLinePaint.setColor(-16711936); + this.mBarcodeLinePaint.setAlpha(255); + Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); + this.mScreenResolution = new Point(display.getWidth(), display.getHeight()); + this.mScreenDensity = getContext().getResources().getDisplayMetrics().density; + this.mLaserLinePosition = Math.round((float) (this.mScreenResolution.x / 2)); + } + + protected void onDraw(Canvas canvas) { + float center = ((float) canvas.getHeight()) / 2.0f; + canvas.rotate(-90.0f, center, center); + if (canvas.getClipBounds(this.mCanvasClipRect)) { + if (this.mCanvasClipRect.height() == canvas.getWidth()) { + canvas.drawRect(0.0f, (float) (this.mCanvasClipRect.bottom - this.mTextLayout.getHeight()), (float) this.mCanvasClipRect.right, (float) this.mCanvasClipRect.bottom, this.mTextBackgroundPaint); + canvas.save(); + canvas.translate(this.mCanvasClipRect.exactCenterX(), (float) (this.mCanvasClipRect.bottom - this.mTextLayout.getHeight())); + this.mTextLayout.draw(canvas); + canvas.restore(); + int lineWidth = Math.round(LASER_LINE_WIDTH_160_DPI * this.mScreenDensity); + this.mLaserLineRect.set(this.mCanvasClipRect.width() / 8, this.mLaserLinePosition - (lineWidth / 2), (this.mCanvasClipRect.width() * 7) / 8, this.mLaserLinePosition + ((lineWidth - 1) / 2)); + this.mBarcodeLineRect.top = this.mLaserLineRect.top; + this.mBarcodeLineRect.bottom = this.mLaserLineRect.bottom; + } + canvas.drawRect(this.mLaserLineRect, this.mLaserLinePaint); + if (this.mBarcodeLineRect.left >= 0 && this.mBarcodeLineRect.right >= 0) { + canvas.drawRect(this.mBarcodeLineRect, this.mBarcodeLinePaint); + } + } + } + + public float getNormalizedLaserLinePosition() { + return ((float) this.mLaserLinePosition) / ((float) this.mScreenResolution.x); + } + + public void setNormalizedBarcodeLocation(float left, float right) { + this.mBarcodeLineRect.left = Math.round(((float) this.mScreenResolution.y) * left); + this.mBarcodeLineRect.right = Math.round(((float) this.mScreenResolution.y) * right); + postInvalidate(this.mLaserLineRect.top, 0, this.mLaserLineRect.bottom, this.mScreenResolution.y - 1); + } + + public void setNoBarcodeLocation() { + this.mBarcodeLineRect.left = -1; + this.mBarcodeLineRect.right = -1; + postInvalidate(this.mLaserLineRect.top, 0, this.mLaserLineRect.bottom, this.mScreenResolution.y - 1); + } +} diff --git a/platforms/android/app/src/main/java/uk/co/whiteoctober/cordova/AppVersion.java b/platforms/android/app/src/main/java/uk/co/whiteoctober/cordova/AppVersion.java new file mode 100644 index 0000000..204ed7e --- /dev/null +++ b/platforms/android/app/src/main/java/uk/co/whiteoctober/cordova/AppVersion.java @@ -0,0 +1,45 @@ +package uk.co.whiteoctober.cordova; + +import org.apache.cordova.CordovaPlugin; +import org.apache.cordova.CallbackContext; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PackageManager; + +public class AppVersion extends CordovaPlugin { + @Override + public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { + + try { + if (action.equals("getAppName")) { + PackageManager packageManager = this.cordova.getActivity().getPackageManager(); + ApplicationInfo app = packageManager.getApplicationInfo(this.cordova.getActivity().getPackageName(), 0); + callbackContext.success((String)packageManager.getApplicationLabel(app)); + return true; + } + if (action.equals("getPackageName")) { + callbackContext.success(this.cordova.getActivity().getPackageName()); + return true; + } + if (action.equals("getVersionNumber")) { + PackageManager packageManager = this.cordova.getActivity().getPackageManager(); + callbackContext.success(packageManager.getPackageInfo(this.cordova.getActivity().getPackageName(), 0).versionName); + return true; + } + if (action.equals("getVersionCode")) { + PackageManager packageManager = this.cordova.getActivity().getPackageManager(); + callbackContext.success(packageManager.getPackageInfo(this.cordova.getActivity().getPackageName(), 0).versionCode); + return true; + } + return false; + } catch (NameNotFoundException e) { + callbackContext.success("N/A"); + return true; + } + } + +} diff --git a/platforms/android/app/src/main/jniLibs/armeabi/libVSBarcodeReader.so b/platforms/android/app/src/main/jniLibs/armeabi/libVSBarcodeReader.so new file mode 100644 index 0000000..aa3d33b Binary files /dev/null and b/platforms/android/app/src/main/jniLibs/armeabi/libVSBarcodeReader.so differ diff --git a/platforms/android/app/src/main/jniLibs/armeabi/libVSReaderQR.so b/platforms/android/app/src/main/jniLibs/armeabi/libVSReaderQR.so new file mode 100644 index 0000000..f6cd34d Binary files /dev/null and b/platforms/android/app/src/main/jniLibs/armeabi/libVSReaderQR.so differ diff --git a/platforms/android/app/src/main/res/drawable/back.png b/platforms/android/app/src/main/res/drawable/back.png new file mode 100644 index 0000000..51bac9f Binary files /dev/null and b/platforms/android/app/src/main/res/drawable/back.png differ diff --git a/platforms/android/app/src/main/res/drawable/close.png b/platforms/android/app/src/main/res/drawable/close.png new file mode 100644 index 0000000..3fb7db5 Binary files /dev/null and b/platforms/android/app/src/main/res/drawable/close.png differ diff --git a/platforms/android/app/src/main/res/xml/config.xml b/platforms/android/app/src/main/res/xml/config.xml index a0b93ed..cda74bc 100644 --- a/platforms/android/app/src/main/res/xml/config.xml +++ b/platforms/android/app/src/main/res/xml/config.xml @@ -1,5 +1,5 @@ - + @@ -37,6 +37,9 @@ + + + dlapp A sample Apache Cordova application that responds to the deviceready event. @@ -59,6 +62,9 @@ APPéè¦ä½¿ç¨æ¨çç¸æºæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½ + + APPéè¦ä½¿ç¨æ¨çç¸åæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½ +

@@ -70,4 +76,5 @@ +

diff --git a/platforms/android/cordova-plugin-qrscanner/dlapp-qrscanner.gradle b/platforms/android/cordova-plugin-qrscanner/dlapp-qrscanner.gradle index df682e7..6188e34 100644 --- a/platforms/android/cordova-plugin-qrscanner/dlapp-qrscanner.gradle +++ b/platforms/android/cordova-plugin-qrscanner/dlapp-qrscanner.gradle @@ -3,8 +3,8 @@ repositories { } dependencies { - compile 'com.journeyapps:zxing-android-embedded:3.3.0' - compile 'com.android.support:appcompat-v7:23.1.0' + implementation 'com.journeyapps:zxing-android-embedded:3.3.0' + implementation 'com.android.support:appcompat-v7:23.1.0' } android { diff --git a/platforms/android/platform_www/cordova_plugins.js b/platforms/android/platform_www/cordova_plugins.js index 595ecb1..ee6832d 100644 --- a/platforms/android/platform_www/cordova_plugins.js +++ b/platforms/android/platform_www/cordova_plugins.js @@ -327,6 +327,14 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "clobbers": [ "JPush" ] + }, + { + "id": "cordova-plugin-app-version.AppVersionPlugin", + "file": "plugins/cordova-plugin-app-version/www/AppVersionPlugin.js", + "pluginId": "cordova-plugin-app-version", + "clobbers": [ + "cordova.getAppVersion" + ] } ]; module.exports.metadata = { @@ -344,6 +352,8 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "cordova-plugin-device": "2.0.2", "cordova-plugin-themeablebrowser": "0.2.17", "cordova-plugin-jcore": "1.3.0", - "jpush-phonegap-plugin": "3.7.2" + "jpush-phonegap-plugin": "3.7.2", + "cordova-plugin-app-version": "0.1.9", + "cordova-plugin-wkwebview-engine": "1.2.1" }; }); \ No newline at end of file diff --git a/platforms/android/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js b/platforms/android/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js new file mode 100644 index 0000000..430f50d --- /dev/null +++ b/platforms/android/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js @@ -0,0 +1,68 @@ +cordova.define("cordova-plugin-app-version.AppVersionPlugin", function(require, exports, module) { +/*jslint indent: 2 */ +/*global window, jQuery, angular, cordova */ +"use strict"; + +// Returns a jQuery or AngularJS deferred object, or pass a success and fail callbacks if you don't want to use jQuery or AngularJS +var getPromisedCordovaExec = function (command, success, fail) { + var toReturn, deferred, injector, $q; + if (success === undefined) { + if (window.jQuery) { + deferred = jQuery.Deferred(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred; + } else if (window.angular) { + injector = angular.injector(["ng"]); + $q = injector.get("$q"); + deferred = $q.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.when && window.when.promise) { + deferred = when.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.Promise) { + toReturn = new Promise(function(c, e) { + success = c; + fail = e; + }); + } else if (window.WinJS && window.WinJS.Promise) { + toReturn = new WinJS.Promise(function(c, e) { + success = c; + fail = e; + }); + } else { + return console.error('AppVersion either needs a success callback, or jQuery/AngularJS/Promise/WinJS.Promise defined for using promises'); + } + } + // 5th param is NOT optional. must be at least empty array + cordova.exec(success, fail, "AppVersion", command, []); + return toReturn; +}; + +var getAppVersion = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getAppName = function (success, fail) { + return getPromisedCordovaExec('getAppName', success, fail); +}; + +getAppVersion.getPackageName = function (success, fail) { + return getPromisedCordovaExec('getPackageName', success, fail); +}; + +getAppVersion.getVersionNumber = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getVersionCode = function (success, fail) { + return getPromisedCordovaExec('getVersionCode', success, fail); +}; + +module.exports = getAppVersion; + +}); diff --git a/platforms/browser/browser.json b/platforms/browser/browser.json index 9416cfc..13a6fc8 100644 --- a/platforms/browser/browser.json +++ b/platforms/browser/browser.json @@ -36,6 +36,14 @@ "mode": "merge", "id": "config.xml" } + ], + "NSPhotoLibraryUsageDescription": [ + { + "xml": "APPéè¦ä½¿ç¨æ¨çç¸åæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½", + "count": 1, + "mode": "merge", + "id": "config.xml" + } ] } } @@ -85,9 +93,15 @@ "PACKAGE_NAME": "com.supwisdom.dlapp" }, "jpush-phonegap-plugin": { - "APP_KEY": "your_jpush_appkey", + "APP_KEY": "bd22b85f247a6e2ca307d3c5", "CHANNEL": "developer-default", "PACKAGE_NAME": "com.supwisdom.dlapp" + }, + "cordova-plugin-app-version": { + "PACKAGE_NAME": "com.supwisdom.dlapp" + }, + "cordova-plugin-wkwebview-engine": { + "PACKAGE_NAME": "com.supwisdom.dlapp" } }, "dependent_plugins": {}, @@ -445,6 +459,14 @@ "clobbers": [ "JPush" ] + }, + { + "file": "plugins/cordova-plugin-app-version/www/AppVersionPlugin.js", + "id": "cordova-plugin-app-version.AppVersionPlugin", + "pluginId": "cordova-plugin-app-version", + "clobbers": [ + "cordova.getAppVersion" + ] } ], "plugin_metadata": { @@ -462,6 +484,8 @@ "cordova-plugin-device": "2.0.2", "cordova-plugin-themeablebrowser": "0.2.17", "cordova-plugin-jcore": "1.3.0", - "jpush-phonegap-plugin": "3.7.2" + "jpush-phonegap-plugin": "3.7.2", + "cordova-plugin-app-version": "0.1.9", + "cordova-plugin-wkwebview-engine": "1.2.1" } } diff --git a/platforms/browser/config.xml b/platforms/browser/config.xml index 11d63b1..b0a0bfa 100644 --- a/platforms/browser/config.xml +++ b/platforms/browser/config.xml @@ -1,5 +1,5 @@ - + dlapp A sample Apache Cordova application that responds to the deviceready event. @@ -22,6 +22,9 @@ APPéè¦ä½¿ç¨æ¨çç¸æºæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½ + + APPéè¦ä½¿ç¨æ¨çç¸åæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½ + diff --git a/platforms/browser/platform_www/cordova_plugins.js b/platforms/browser/platform_www/cordova_plugins.js index 30be43a..3f30e69 100644 --- a/platforms/browser/platform_www/cordova_plugins.js +++ b/platforms/browser/platform_www/cordova_plugins.js @@ -353,6 +353,14 @@ module.exports = [ "clobbers": [ "JPush" ] + }, + { + "file": "plugins/cordova-plugin-app-version/www/AppVersionPlugin.js", + "id": "cordova-plugin-app-version.AppVersionPlugin", + "pluginId": "cordova-plugin-app-version", + "clobbers": [ + "cordova.getAppVersion" + ] } ]; module.exports.metadata = @@ -372,7 +380,9 @@ module.exports.metadata = "cordova-plugin-device": "2.0.2", "cordova-plugin-themeablebrowser": "0.2.17", "cordova-plugin-jcore": "1.3.0", - "jpush-phonegap-plugin": "3.7.2" + "jpush-phonegap-plugin": "3.7.2", + "cordova-plugin-app-version": "0.1.9", + "cordova-plugin-wkwebview-engine": "1.2.1" } // BOTTOM OF METADATA }); \ No newline at end of file diff --git a/platforms/browser/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js b/platforms/browser/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js new file mode 100644 index 0000000..c62fc27 --- /dev/null +++ b/platforms/browser/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js @@ -0,0 +1,67 @@ +cordova.define("cordova-plugin-app-version.AppVersionPlugin", function(require, exports, module) { /*jslint indent: 2 */ +/*global window, jQuery, angular, cordova */ +"use strict"; + +// Returns a jQuery or AngularJS deferred object, or pass a success and fail callbacks if you don't want to use jQuery or AngularJS +var getPromisedCordovaExec = function (command, success, fail) { + var toReturn, deferred, injector, $q; + if (success === undefined) { + if (window.jQuery) { + deferred = jQuery.Deferred(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred; + } else if (window.angular) { + injector = angular.injector(["ng"]); + $q = injector.get("$q"); + deferred = $q.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.when && window.when.promise) { + deferred = when.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.Promise) { + toReturn = new Promise(function(c, e) { + success = c; + fail = e; + }); + } else if (window.WinJS && window.WinJS.Promise) { + toReturn = new WinJS.Promise(function(c, e) { + success = c; + fail = e; + }); + } else { + return console.error('AppVersion either needs a success callback, or jQuery/AngularJS/Promise/WinJS.Promise defined for using promises'); + } + } + // 5th param is NOT optional. must be at least empty array + cordova.exec(success, fail, "AppVersion", command, []); + return toReturn; +}; + +var getAppVersion = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getAppName = function (success, fail) { + return getPromisedCordovaExec('getAppName', success, fail); +}; + +getAppVersion.getPackageName = function (success, fail) { + return getPromisedCordovaExec('getPackageName', success, fail); +}; + +getAppVersion.getVersionNumber = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getVersionCode = function (success, fail) { + return getPromisedCordovaExec('getVersionCode', success, fail); +}; + +module.exports = getAppVersion; + +}); diff --git a/platforms/ios/dlapp.xcarchive/Info.plist b/platforms/ios/dlapp.xcarchive/Info.plist index cb9e5c4..f54150d 100644 --- a/platforms/ios/dlapp.xcarchive/Info.plist +++ b/platforms/ios/dlapp.xcarchive/Info.plist @@ -7,20 +7,20 @@ ApplicationPath Applications/dlapp.app CFBundleIdentifier - com.supwisdom.dlapp + com.dalicitycard.app CFBundleShortVersionString - 1.0.0 + 1.0.4 CFBundleVersion - 1.0.0 + 1.0.4 SigningIdentity - iPhone Developer: wang sheng (5Z23CVC58F) + iPhone Developer: chuan xu (8FWH8QKULT) Team - 74UNETA6B2 + 58ZC23SH57 ArchiveVersion 2 CreationDate - 2019-07-12T05:53:30Z + 2019-09-25T06:49:04Z Name dlapp SchemeName diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x.png index 89f0031..b6d39e0 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x~ipad.png index 89f0031..b6d39e0 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@2x~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@3x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@3x.png index b4f7708..6c57027 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@3x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20@3x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20~ipad.png index 97fe2a7..cf8d677 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon20x20~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29.png index 26b9f7d..0300838 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x.png index 695a56a..f0b5e77 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x~ipad.png index 695a56a..f0b5e77 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@2x~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@3x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@3x.png index 6856c41..4b12f07 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@3x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29@3x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29~ipad.png index 26b9f7d..0300838 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon29x29~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x.png index 5616521..0eed434 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x~ipad.png index 5616521..0eed434 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@2x~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@3x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@3x.png index d8be90e..d7269ae 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@3x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40@3x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40~ipad.png index 89f0031..b6d39e0 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon40x40~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50@2x~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50@2x~ipad.png deleted file mode 100644 index 3c6aab8..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50@2x~ipad.png and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50~ipad.png deleted file mode 100644 index fd39d52..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon50x50~ipad.png and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57.png deleted file mode 100644 index aac8369..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57.png and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57@2x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57@2x.png deleted file mode 100644 index 122e1e5..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon57x57@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@2x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@2x.png index d8be90e..d7269ae 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@2x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@2x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@3x.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@3x.png index 5442493..23fc9e6 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@3x.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon60x60@3x.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72@2x~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72@2x~ipad.png deleted file mode 100644 index 4c9c847..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72@2x~ipad.png and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72~ipad.png deleted file mode 100644 index 7b71834..0000000 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon72x72~ipad.png and /dev/null differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76@2x~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76@2x~ipad.png index 11b7fce..95c031b 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76@2x~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76@2x~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76~ipad.png index fa527b6..c9fb74c 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon76x76~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon83.5x83.5@2x~ipad.png b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon83.5x83.5@2x~ipad.png index 6ece2a1..c9e7e72 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon83.5x83.5@2x~ipad.png and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/AppIcon83.5x83.5@2x~ipad.png differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car index 223d896..694b01d 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Assets.car differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib index bb010a6..24c2de2 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftAVFoundation.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib index 11a6c1b..e2b92ee 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCore.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib index fdbd59d..4a8696c 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreAudio.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib index 6dde0a6..6c6db60 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreFoundation.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib index e852e20..dbdda11 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreGraphics.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib index 9a5d5a1..a270cb7 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreImage.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib index 58fdcb0..d69a005 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftCoreMedia.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib index 16bfa7a..6757d90 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDarwin.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib index 56c2c05..589e184 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftDispatch.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib index 20ac92a..637c518 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftFoundation.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib index 2fafbb3..b563931 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftMetal.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib index 34de80c..c260f2c 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftObjectiveC.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib index 4b37bfa..ca49fd4 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftQuartzCore.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib index a1aa841..4ca3c94 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftSwiftOnoneSupport.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib index 7b1df0a..44d9a82 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftUIKit.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib index c9713b5..7cb498f 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftos.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib index 0abe019..4763208 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Frameworks/libswiftsimd.dylib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist index ecc0335..08ebb57 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/Info.plist differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/JPushConfig.plist b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/JPushConfig.plist new file mode 100644 index 0000000..96bc470 Binary files /dev/null and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/JPushConfig.plist differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib index 953b2d2..47321ea 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/MainViewController.nib differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources index 47cd0b7..8083a0e 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/_CodeSignature/CodeResources @@ -6,175 +6,155 @@ AppIcon20x20@2x.png - DjEAtviupMghxdL+fkyb3vVUBOI= + 4s3iHwVtc4D5rEDx0dsVP3Ccp+M= AppIcon20x20@2x~ipad.png - DjEAtviupMghxdL+fkyb3vVUBOI= + 4s3iHwVtc4D5rEDx0dsVP3Ccp+M= AppIcon20x20@3x.png - BfVRyLrHGHJm+0WuwuOPqz2aCas= + inNMZ0LYnXYtiXOTodGWImyL6MU= AppIcon20x20~ipad.png - H6rZilBJB9YKOyY97leKlTxy6XM= + QgEmJmozGUfF6Gxc90W4zVT/ZEk= AppIcon29x29.png - otncBRMMKVzMW+iwsSzrGJYek6w= + HHDfUCqu1hpJ1qn2R16w+JzH8/k= AppIcon29x29@2x.png - Ro2/nf0nqrSy4vCWu94qHBsgntU= + dpGzXh2r7rpz2qmVWfS/drJRxFk= AppIcon29x29@2x~ipad.png - Ro2/nf0nqrSy4vCWu94qHBsgntU= + dpGzXh2r7rpz2qmVWfS/drJRxFk= AppIcon29x29@3x.png - QDnu1K3zTpRFbUpH1pc06nQXP/4= + gcxHkRSzkCsIG42uKL9uYXOrdJE= AppIcon29x29~ipad.png - otncBRMMKVzMW+iwsSzrGJYek6w= + HHDfUCqu1hpJ1qn2R16w+JzH8/k= AppIcon40x40@2x.png - bqhTfe/UUsLmwqwKtmYfpBNyHHE= + BcBek5g6jsOqa0ibWCnC1JTgL+c= AppIcon40x40@2x~ipad.png - bqhTfe/UUsLmwqwKtmYfpBNyHHE= + BcBek5g6jsOqa0ibWCnC1JTgL+c= AppIcon40x40@3x.png - 7bf8dqKMlGV9BeNvI9Z4FC+62EU= + +0oGxBUPkB+c6Z7XyUmtZpCo2lU= AppIcon40x40~ipad.png - DjEAtviupMghxdL+fkyb3vVUBOI= - - AppIcon50x50@2x~ipad.png - - 04wFY+JbiDwIxpPmec88nEldiCY= - - AppIcon50x50~ipad.png - - +ULYPtkyH7TWwGxGEFNW6M8jLYE= - - AppIcon57x57.png - - PbF/1dvCpOLYNWV+g1MRQWl4WnE= - - AppIcon57x57@2x.png - - V0sslzjLj1HAL3zLlk8dvEctXT0= + 4s3iHwVtc4D5rEDx0dsVP3Ccp+M= AppIcon60x60@2x.png - 7bf8dqKMlGV9BeNvI9Z4FC+62EU= + +0oGxBUPkB+c6Z7XyUmtZpCo2lU= AppIcon60x60@3x.png - u4hDZJNq/M9gB/k7ZWPGCQh1dlY= - - AppIcon72x72@2x~ipad.png - - 6XXlAQJ+2YZtK4XZVDeAXCGQAjs= - - AppIcon72x72~ipad.png - - qt7V3ayH99MYvDNK/r88oIVhpxI= + 2N92m9WnIZ8k7WASphMkppCl7HA= AppIcon76x76@2x~ipad.png - dPM76DtwjHUolue6BdDUn6RQXnQ= + iMfY34hWth/mR2xKqlWonHWYrDQ= AppIcon76x76~ipad.png - mVA2cm+ufolVC0dfMnpXBt7NFYw= + z6rQV98PVDRhQUXa/DwAbinm0SA= AppIcon83.5x83.5@2x~ipad.png - F3/BziTbXcn/vpTHvub/+Txde8U= + oJtSiDfNgPpCB0QhhFClnkrbXcQ= Assets.car - r9rUGcVj88K1Zc51XtyyT15hnfk= + KKAirXh8K/ModwnSXLShV5/etr0= Frameworks/libswiftAVFoundation.dylib - ukqktZJa/8A+eCPL/P22HQgAC1k= + uDfYCHXGi4LJJ7PehI1sKbZqVf4= Frameworks/libswiftCore.dylib - GREBcl8kDXtAsOe5ywfZW3xto9k= + hnZxV4PUHdqbt8IOBCPhBpfSwUE= Frameworks/libswiftCoreAudio.dylib - hT5I0SMVXfebWk6J/t2JG8P9cLw= + /mmLx8jrVORtoTACElCyWqzqYfA= Frameworks/libswiftCoreFoundation.dylib - LDYTh6fyuPjxuyAKIBufA7E4nDw= + v7BE4evcLJt3iFrwd9m33m5rFI8= Frameworks/libswiftCoreGraphics.dylib - ZD7SY7zfzZOkv/ex3o4soLRgyKU= + qxYPH4/wxggOGD73Xj6EkCR0xkY= Frameworks/libswiftCoreImage.dylib - pDi7kJiFWg8POUcZ02wMhGdzpEU= + vlRBCfDqtrrwzkBLtGs2HbO4YbI= Frameworks/libswiftCoreMedia.dylib - rs4o8hPdZsIaykGs8h6jw9/bEac= + CyOREkCX0hnTg5JHbY6kdrfAERI= Frameworks/libswiftDarwin.dylib - nqFz221Io6AgWQK2mjBZH53FOBQ= + nd3vDcLn6YQQrhlqobWhMV/sLAE= Frameworks/libswiftDispatch.dylib - 5SUy+afr0k0FIaWpa01vu9OoYsk= + Xlup3R5V6sXScSmXMkAysKJWVXk= Frameworks/libswiftFoundation.dylib - 4KLJXVVgDMFE0WIsT9hLmcA7DNo= + 6FQCjaFEt9vOMPGkD3Bi4b9USw0= Frameworks/libswiftMetal.dylib - sLaCL5cSVZgN2tzYV0APfk1uaRM= + JJGt6xWjffN+5mM0q0dDOmJ8dDE= Frameworks/libswiftObjectiveC.dylib - aKLtw+VhPxXGVOKvhsUQPeGTNW0= + OIdIVW04vwXmE+cHkwyzMTkbvnU= Frameworks/libswiftQuartzCore.dylib - DAih33A0MVtJw87+AJ1vZeye528= + cshqKXNDw3S4IFGWYenc+0CqhCk= Frameworks/libswiftSwiftOnoneSupport.dylib - yXFysLEA844zanH61b0YqEDGMks= + T9TevUnkeG5ZEUxj0Pdl4fF0vUE= Frameworks/libswiftUIKit.dylib - 0IIDJ+kZElM4TpEU9I1GwOCQUvQ= + TrQW8qKOdy8IEbHkKhWe3R+o2ZM= Frameworks/libswiftos.dylib - v5ybt8/g6uVCJbKKlrL6rvz9cMM= + TQ11eqpSTjqthNmaPsfIeasSdUk= Frameworks/libswiftsimd.dylib - A8vh5DhJOdsNjcnMpf8HZmtFLt0= + 3yFMAEujHZwmMLxWNEPsqtRI7l8= Info.plist - xCcMK6i5qsOv40GndCWSWjMi70w= + ptakydEySnuUqGLwmDSThlf9kP8= + + JPushConfig.plist + + qV/PQh+d737riAnpOVOo2BJPYKw= LaunchImage-1100-Landscape-2436h@3x.png @@ -218,7 +198,7 @@ MainViewController.nib - c8qwsmtNPeDXR5piUQXUJZV4NkU= + Hbj+jg8kHggfQilLv2funLLiKdE= PkgInfo @@ -226,11 +206,11 @@ config.xml - O33IIDUH183cwlV6v9zaOFqmJ1o= + IgESgLidVuYaBKc1zJzsW9K32uo= embedded.mobileprovision - WNm5zuPz65rrY9t5qIL1iJgFcQ8= + OuWZMIad+tog0ZMleeOfjgsQuoo= www/bill.html @@ -238,7 +218,7 @@ www/billdetail.html - cqHtFm0XLXtu3pFFlRV0wqo3bLo= + x+c/i1RxokvMGRSy2owEyEKzgmg= www/bindcard.html @@ -278,7 +258,7 @@ www/cordova_plugins.js - 5yQtgIC/T2E5OFopQG2kN+WdYrI= + mjZMhcaV9rGT+gEJycqyUiJiwp8= www/css/aui-iconfont.ttf @@ -398,7 +378,7 @@ www/js/billdetail.js - ICgW8NAQBBEJmmNYuELt2HMjRtk= + sxiH889o1dm1Uaqbq7ReLFK47h0= www/js/bindcard.js @@ -438,7 +418,7 @@ www/js/index.js - asyakUNRxlJpE4P7WMiyTJTY97Y= + B5X6EPmPRDoyX3Z9Eq1q8rmGSGQ= www/js/lib/aui-actionsheet.js @@ -542,11 +522,11 @@ www/js/login.js - GnaACCIZ8j2xg8PJGAWxS4CymgM= + ldWa4XoqiR3SZsamE16ZBUrQDT4= www/js/main.js - I2Jj7RTovo4kH11m8CRuakKi3nk= + QSdOeA6BefLzgiGbSEou4rGjHqo= www/js/mobile.js @@ -566,23 +546,23 @@ www/js/qrcode.js - nUamfLQSBc/NAzOMJP5WwXnZGxI= + Cx6iRRJAH08QlPBBT//jwM7LZP4= www/js/register.js - aPLw5ln4ElwhbTzbdXZpyILJBiY= + kEIN8Lt6KbeSEYmiYk47uhchWg8= www/js/scan.js - xRDtmYCYmFtZu+H1/SjTBlennsM= + Cea6nn8OF3hogSuEpiL+IkVdO0I= www/js/security.js - s52wwGEv5fJuX8ngkR5GGqdAXMg= + B2Cv1FDNaUjne/EkpPvlr5Cve88= www/js/server.js - 6JlWzinRBn6MsREucfIEiCvn5oA= + jp9NlgHW1O72GXbxGb4cmcCVw+w= www/js/signxy.js @@ -908,6 +888,10 @@ 09a/If3TGPR46gxmzbSwdbcSvBc= + www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js + + V7Ywjbu2Kj4wesp8mWW2lF5aDpE= + www/plugins/cordova-plugin-camera/www/Camera.js /Tl12sGFo/UZbPqnupaaV0Hg0vU= @@ -1040,17 +1024,29 @@ oGafU2UdHnS6q3vnNz3WB2an0TY= + www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js + + Jf+80xptQsEGhUiGLgqUT/RQinI= + + www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js + + uSpOoBJtw3huMClDN2UUZQOjz/Y= + + www/plugins/jpush-phonegap-plugin/www/JPushPlugin.js + + WbD83XEtIdDDWazehjb7DykZYCE= + www/pwdset.html V3rync0T0/WyYm1RxOmrQ0VHwls= www/qrcode.html - /T8vAhNAeCOJv1Hw6L4detL0zZE= + FK8oc1oB59vB31qmvZp+SzcB9/U= www/register.html - q/NP40bBQOZfbeq+nId2UNahWqk= + j0E17LezraXxL2i9s0tnnWrl9vw= www/scan.html @@ -1058,7 +1054,7 @@ www/security.html - LQqkVW0wcKOsVTN4GeoIHaLFmHA= + 3isNUT+DEogiz2Le39n8VyG+mRQ= www/signxy.html @@ -1079,462 +1075,407 @@ hash - DjEAtviupMghxdL+fkyb3vVUBOI= + 4s3iHwVtc4D5rEDx0dsVP3Ccp+M= hash2 - 8gs3eoIb4H9cpuPaDkErBai6L4FZOZfyttI/pYM3Hw4= + /jx2HIiBG+oNpd+0usVeIZxAvkA27ZpiSAex3riWFHQ= AppIcon20x20@2x~ipad.png hash - DjEAtviupMghxdL+fkyb3vVUBOI= + 4s3iHwVtc4D5rEDx0dsVP3Ccp+M= hash2 - 8gs3eoIb4H9cpuPaDkErBai6L4FZOZfyttI/pYM3Hw4= + /jx2HIiBG+oNpd+0usVeIZxAvkA27ZpiSAex3riWFHQ= AppIcon20x20@3x.png hash - BfVRyLrHGHJm+0WuwuOPqz2aCas= + inNMZ0LYnXYtiXOTodGWImyL6MU= hash2 - wB8DRUnh3AMIUfOsoN2UakYsGsGtVsCMKPqymkIfzys= + BR1eZknKOY1H7MAyXZld2yKSOCayLZBdlj5QRFNTSws= AppIcon20x20~ipad.png hash - H6rZilBJB9YKOyY97leKlTxy6XM= + QgEmJmozGUfF6Gxc90W4zVT/ZEk= hash2 - sDvITbxB8+WSbGLw2hi9wNucw935HeGWu6F47RDuyDo= + Ck2d8ewvZ1cjSx6Vo6hRiwiKcwV7Khb61Rslp5EBorE= AppIcon29x29.png hash - otncBRMMKVzMW+iwsSzrGJYek6w= + HHDfUCqu1hpJ1qn2R16w+JzH8/k= hash2 - j3+Oyaoj9BUqxemeJFSZ5I6ZMXcDWGER+zX0zKI5qXk= + lFwBNCRgbv9HY1G5bOKNhPiyURhYafyWeI84Xcl8ljg= AppIcon29x29@2x.png hash - Ro2/nf0nqrSy4vCWu94qHBsgntU= + dpGzXh2r7rpz2qmVWfS/drJRxFk= hash2 - bGGPXkSeFsyh7eAmq5YgeHYkFDjIsqsr4Yt3dpj09N0= + nqN/EqFaooiXfy5K9WhOXvone1cRRvxgsXw4DnLmVlA= AppIcon29x29@2x~ipad.png hash - Ro2/nf0nqrSy4vCWu94qHBsgntU= + dpGzXh2r7rpz2qmVWfS/drJRxFk= hash2 - bGGPXkSeFsyh7eAmq5YgeHYkFDjIsqsr4Yt3dpj09N0= + nqN/EqFaooiXfy5K9WhOXvone1cRRvxgsXw4DnLmVlA= AppIcon29x29@3x.png hash - QDnu1K3zTpRFbUpH1pc06nQXP/4= + gcxHkRSzkCsIG42uKL9uYXOrdJE= hash2 - 2TxWQw5j1QBbjE38vdn2xOMy4knvqkZ/nNLUWNt0sCI= + 4VwirX+1pgq35pmm0UyXcG2+NXkxl6DvDAFQ9dvqiLs= AppIcon29x29~ipad.png hash - otncBRMMKVzMW+iwsSzrGJYek6w= + HHDfUCqu1hpJ1qn2R16w+JzH8/k= hash2 - j3+Oyaoj9BUqxemeJFSZ5I6ZMXcDWGER+zX0zKI5qXk= + lFwBNCRgbv9HY1G5bOKNhPiyURhYafyWeI84Xcl8ljg= AppIcon40x40@2x.png hash - bqhTfe/UUsLmwqwKtmYfpBNyHHE= + BcBek5g6jsOqa0ibWCnC1JTgL+c= hash2 - tFvg6swsA5hwLRDfRCDi7CMI0P+ViFf6IgRScxSlb/0= + 9WHfcGm0K8HueWfC1UjexYAfaBhvFKeDZfsEyFCEtx4= AppIcon40x40@2x~ipad.png hash - bqhTfe/UUsLmwqwKtmYfpBNyHHE= + BcBek5g6jsOqa0ibWCnC1JTgL+c= hash2 - tFvg6swsA5hwLRDfRCDi7CMI0P+ViFf6IgRScxSlb/0= + 9WHfcGm0K8HueWfC1UjexYAfaBhvFKeDZfsEyFCEtx4= AppIcon40x40@3x.png hash - 7bf8dqKMlGV9BeNvI9Z4FC+62EU= + +0oGxBUPkB+c6Z7XyUmtZpCo2lU= hash2 - 5V8UjSCgkmKRVOYu+FRB0+yhTL1NtlVCTmBhpUNWgC0= + F6dGIPQp/X9Huj5SI1FnfRlgqZsfJ8plPgS5DLXmyHc= AppIcon40x40~ipad.png hash - DjEAtviupMghxdL+fkyb3vVUBOI= + 4s3iHwVtc4D5rEDx0dsVP3Ccp+M= hash2 - 8gs3eoIb4H9cpuPaDkErBai6L4FZOZfyttI/pYM3Hw4= - - - AppIcon50x50@2x~ipad.png - - hash - - 04wFY+JbiDwIxpPmec88nEldiCY= - - hash2 - - Fgd22lgmtvaG3tzLwnbu57xZPQfGb7kA8fw+v4xYq7M= - - - AppIcon50x50~ipad.png - - hash - - +ULYPtkyH7TWwGxGEFNW6M8jLYE= - - hash2 - - EZireyXQZ2BAg+xIagkCS36vnwTAT9Gj4klrLYnBaK0= - - - AppIcon57x57.png - - hash - - PbF/1dvCpOLYNWV+g1MRQWl4WnE= - - hash2 - - iSorb6M7XrIIMpCBr6awOme1bCqhFhETsVuGfC9jVjo= - - - AppIcon57x57@2x.png - - hash - - V0sslzjLj1HAL3zLlk8dvEctXT0= - - hash2 - - 3GoBd/2HILd1AINYIZ2VN5SyJll0gGaeOlrrU1Ca78A= + /jx2HIiBG+oNpd+0usVeIZxAvkA27ZpiSAex3riWFHQ= AppIcon60x60@2x.png hash - 7bf8dqKMlGV9BeNvI9Z4FC+62EU= + +0oGxBUPkB+c6Z7XyUmtZpCo2lU= hash2 - 5V8UjSCgkmKRVOYu+FRB0+yhTL1NtlVCTmBhpUNWgC0= + F6dGIPQp/X9Huj5SI1FnfRlgqZsfJ8plPgS5DLXmyHc= AppIcon60x60@3x.png hash - u4hDZJNq/M9gB/k7ZWPGCQh1dlY= - - hash2 - - r8K3AZPdn6icGj4YUVtCtXHNle4pibhlywI7n8aG/Io= - - - AppIcon72x72@2x~ipad.png - - hash - - 6XXlAQJ+2YZtK4XZVDeAXCGQAjs= - - hash2 - - 5WyvqaFUnD6nIdPHQmezpma8HivvHieK/L954As389E= - - - AppIcon72x72~ipad.png - - hash - - qt7V3ayH99MYvDNK/r88oIVhpxI= + 2N92m9WnIZ8k7WASphMkppCl7HA= hash2 - /1yzmm2Ovvhnj5fOlzXwken4Gpd7Uskb1KN4X1Eh5wI= + dQmhVBOE7LllJ1jQuS6MlUwqAY9rw3N83U9OpTvQmUI= AppIcon76x76@2x~ipad.png hash - dPM76DtwjHUolue6BdDUn6RQXnQ= + iMfY34hWth/mR2xKqlWonHWYrDQ= hash2 - J9GAry/RDwypFKcWaJ/7THn0XDTXf1vkmuaPFHrNAuQ= + zDK30NWfjipDfaQp5rJ1roBf5sk1HCHP1AHfE8Koa3c= AppIcon76x76~ipad.png hash - mVA2cm+ufolVC0dfMnpXBt7NFYw= + z6rQV98PVDRhQUXa/DwAbinm0SA= hash2 - nE7QwQcdQpQt4n1d27B67A4367MV7J8kEhrSETTNr3g= + SEIGmphMB4mPWfJUCc/8/OEHXuPaOTnpwx7fqG/I01U= AppIcon83.5x83.5@2x~ipad.png hash - F3/BziTbXcn/vpTHvub/+Txde8U= + oJtSiDfNgPpCB0QhhFClnkrbXcQ= hash2 - +mzLV5S6RSIPr6LMndIfUYIEt1cTLOqITJ2VIkQ6SdM= + p9CZ5DH6P6Cwm2CIRfkZRVd5VcVYXRhHPP0Zdeujh7o= Assets.car hash - r9rUGcVj88K1Zc51XtyyT15hnfk= + KKAirXh8K/ModwnSXLShV5/etr0= hash2 - ZgQ1nWHWv23ukJB2SDcb1etq4KuOI3kJmGMZHGsiVvw= + nReIXWpgV9Kb7kvFFviDa0ldEsVlJYZnX3sW+zEIOoE= Frameworks/libswiftAVFoundation.dylib hash - ukqktZJa/8A+eCPL/P22HQgAC1k= + uDfYCHXGi4LJJ7PehI1sKbZqVf4= hash2 - M4OlrFfFLzLudxsH7utEaY6yys55xfptVE8j4xlWL+M= + uBXupAH/nHa8Xn0vQL18OKMoz5nwtyOQyRrDYywnT2Y= Frameworks/libswiftCore.dylib hash - GREBcl8kDXtAsOe5ywfZW3xto9k= + hnZxV4PUHdqbt8IOBCPhBpfSwUE= hash2 - NmIKl3IuKEnfk6TQDfg/hxldLif8PPCSgyk/b7+XSI4= + p6+Hu5nJHIAgwObOZvX2YVFv9uZmIAdxaXpuKk99HsQ= Frameworks/libswiftCoreAudio.dylib hash - hT5I0SMVXfebWk6J/t2JG8P9cLw= + /mmLx8jrVORtoTACElCyWqzqYfA= hash2 - 7GhBnOiJ5bhxhV91S0ekBpUrvRIZ0L5ApDWhlnDQ8uI= + p9sdnJpMpkRQ+jg6wuB9bs/n5/l0uNQQlya0Vspe5Y4= Frameworks/libswiftCoreFoundation.dylib hash - LDYTh6fyuPjxuyAKIBufA7E4nDw= + v7BE4evcLJt3iFrwd9m33m5rFI8= hash2 - uovqNi2JxzxSDIoNaNMtcS7y/IyXBqf6098wTkXhsb0= + A8VfO5EJH/1XaYYpedcjFu0C8tPp6sULSQkH6c9Snk8= Frameworks/libswiftCoreGraphics.dylib hash - ZD7SY7zfzZOkv/ex3o4soLRgyKU= + qxYPH4/wxggOGD73Xj6EkCR0xkY= hash2 - tcHnlq2aVlHKRNtP9ohq6XGGo25HoGgsJPHifGTZ1Ac= + MATi1ECxIR33VrEed+K9v0VXz+qfWvzXZoZhaCeiA8c= Frameworks/libswiftCoreImage.dylib hash - pDi7kJiFWg8POUcZ02wMhGdzpEU= + vlRBCfDqtrrwzkBLtGs2HbO4YbI= hash2 - WDLdEDB3zi2tGexRfz08LjEVT3j8og+6wyTPQHTQHT8= + K47oJc8r9dJYRsWzi+BIhDtLTFCZihsGFBh+/mHQuVk= Frameworks/libswiftCoreMedia.dylib hash - rs4o8hPdZsIaykGs8h6jw9/bEac= + CyOREkCX0hnTg5JHbY6kdrfAERI= hash2 - AEdy6S/GUVhBVUHOrRHE5g3OrW4pUnI0thDZOQOZxZQ= + /fidqVROE0ZTPK+z2Ivl0fr9LvkZtMM+k/HfToN/S1A= Frameworks/libswiftDarwin.dylib hash - nqFz221Io6AgWQK2mjBZH53FOBQ= + nd3vDcLn6YQQrhlqobWhMV/sLAE= hash2 - BUgrEq27PObBjaOoTj+G+u+hFuEq7M3vlkY/s8O5a7o= + +jx6Y88pLiTayhNHrKV+cvGDubsban8mTTSKAFyxXtc= Frameworks/libswiftDispatch.dylib hash - 5SUy+afr0k0FIaWpa01vu9OoYsk= + Xlup3R5V6sXScSmXMkAysKJWVXk= hash2 - wHUgmYozNY3bfu4CpL6djba9He3bckof8G1ofo8nMic= + kf3F5hCOQjxwhh0bnjLpfQ0at4IYiQXRnFA0GHgdKTM= Frameworks/libswiftFoundation.dylib hash - 4KLJXVVgDMFE0WIsT9hLmcA7DNo= + 6FQCjaFEt9vOMPGkD3Bi4b9USw0= hash2 - f6J5y+1XugEsZTcUTZq8FYg9jrT7NEWnFgapee7nFb4= + buTkqHRqLULyfmgfMfODWvRvz4dt1Cg/1Hrv5ndbJjk= Frameworks/libswiftMetal.dylib hash - sLaCL5cSVZgN2tzYV0APfk1uaRM= + JJGt6xWjffN+5mM0q0dDOmJ8dDE= hash2 - p14LLUwjoLf9mz5K4GdxzVpoa8o+wZhnbmxF5t5KJv8= + Q/eqOi5Bts/4DzykQhKDZEEmvs0P0XeelFxTIwKhuRY= Frameworks/libswiftObjectiveC.dylib hash - aKLtw+VhPxXGVOKvhsUQPeGTNW0= + OIdIVW04vwXmE+cHkwyzMTkbvnU= hash2 - nxEgKw/jGB/7OCCJAne8SPV33Gps2WecjqmARUKTxvE= + 09Rh2HZy1FxjpKjOdWogDCPxC77vqjKOmnxFWTYTTbg= Frameworks/libswiftQuartzCore.dylib hash - DAih33A0MVtJw87+AJ1vZeye528= + cshqKXNDw3S4IFGWYenc+0CqhCk= hash2 - yPy4rgLRB2rXdHq4yEvupkl8k+pqFtHmGvfKRoNRP/8= + d6iUBJvHmPEduWaf3mresVZuJx5f0uDmj/Q6yKRf9xE= Frameworks/libswiftSwiftOnoneSupport.dylib hash - yXFysLEA844zanH61b0YqEDGMks= + T9TevUnkeG5ZEUxj0Pdl4fF0vUE= hash2 - Jn3taRNXsbgzubW9PHTU2xXZEq91hp8c72H3vME9OwA= + ZGaqmTrf9sdGpU6nQ3WEQmC/NopTbMZ9hbX1MW6WXXY= Frameworks/libswiftUIKit.dylib hash - 0IIDJ+kZElM4TpEU9I1GwOCQUvQ= + TrQW8qKOdy8IEbHkKhWe3R+o2ZM= hash2 - KywBZaL/xBgq9w4HH7GynFaqSaYzCjIu9ct2h9atUEw= + f5qWx1UwiW+tVgxmWY2uRxr0eTEkWMqis3s5hJnUAIM= Frameworks/libswiftos.dylib hash - v5ybt8/g6uVCJbKKlrL6rvz9cMM= + TQ11eqpSTjqthNmaPsfIeasSdUk= hash2 - YAzhxDFbrJV7k5BjI+ZmIH1y0PzRtAoD2+/FzBkZU6o= + Ql7Bw3we9SVQ5fEOtjrVgHsY5hhGuGNKvi3jPv8/ZLI= Frameworks/libswiftsimd.dylib hash - A8vh5DhJOdsNjcnMpf8HZmtFLt0= + 3yFMAEujHZwmMLxWNEPsqtRI7l8= + + hash2 + + QBy+8Rh3zSljUjUo1mnDhNzyp0XPtzHOidN4SwhRDkI= + + + JPushConfig.plist + + hash + + qV/PQh+d737riAnpOVOo2BJPYKw= hash2 - f+qELgXajnOIxDkqFZypP1/0Ei8s3RRcdrhbCdli9QU= + EZrU0KO5QFZ5fTHAAt0PId1Li/EE+hZexiOezt6CDmw= LaunchImage-1100-Landscape-2436h@3x.png @@ -1651,33 +1592,33 @@ hash - c8qwsmtNPeDXR5piUQXUJZV4NkU= + Hbj+jg8kHggfQilLv2funLLiKdE= hash2 - sbviKnlZlk3hGOQDhZ1GgEWVTsKa9Ga1SqqNRShbVGw= + AQvB0y4SawJMCUT1q06CQjD/NgLijaua3CvtGzExEUo= config.xml hash - O33IIDUH183cwlV6v9zaOFqmJ1o= + IgESgLidVuYaBKc1zJzsW9K32uo= hash2 - ExbxvWR+hO0yJrjtxpQRzs4QKpPR2lD4ssUd6lHa2DU= + SbLdTrUoZlolkwamhFCqAvtbQUU/oaBoDoDAZGW4rCI= embedded.mobileprovision hash - WNm5zuPz65rrY9t5qIL1iJgFcQ8= + OuWZMIad+tog0ZMleeOfjgsQuoo= hash2 - 8dIWw9eXozB2DtbVPRHN3hu7yhjI74L3184XxOY586k= + I2c1ltNORy7u1b/+E+Kpg2ZJa3OfvEte5B1AHhc7eTo= www/bill.html @@ -1695,11 +1636,11 @@ hash - cqHtFm0XLXtu3pFFlRV0wqo3bLo= + x+c/i1RxokvMGRSy2owEyEKzgmg= hash2 - eBgSw3AJ1XGN6ICOgI4lpS0w5l9Rt4WghqVHpJoWORY= + TN8DM8733V4VhlGaP+O7pprJgjL3F67OTMwD7xV84KI= www/bindcard.html @@ -1805,11 +1746,11 @@ hash - 5yQtgIC/T2E5OFopQG2kN+WdYrI= + mjZMhcaV9rGT+gEJycqyUiJiwp8= hash2 - x1upHfUuBcJ6Tke/ngdf2mnxo6x26sRTpS6VlyHRa0U= + NAGln7mA1gWlhX8EULmd8KjWEz3VwOZVBK1TutRZiQ4= www/css/aui-iconfont.ttf @@ -2135,11 +2076,11 @@ hash - ICgW8NAQBBEJmmNYuELt2HMjRtk= + sxiH889o1dm1Uaqbq7ReLFK47h0= hash2 - PNjIMH7Xh1rt0BEaJDkghE6nzhKQ1LeXA9vvohMWl0E= + paloTqVUqu4fEFrGgM/JR2+QJ1THc8JIxLDdeboE8d4= www/js/bindcard.js @@ -2245,11 +2186,11 @@ hash - asyakUNRxlJpE4P7WMiyTJTY97Y= + B5X6EPmPRDoyX3Z9Eq1q8rmGSGQ= hash2 - /E23wKzs+L6w6sRklGOiQqSAtMN20zBHMCvJDzaTtA4= + VmLo1aaDK/43gHQNmMq4GPwLubbtbB/4RSLKpMauduU= www/js/lib/aui-actionsheet.js @@ -2531,22 +2472,22 @@ hash - GnaACCIZ8j2xg8PJGAWxS4CymgM= + ldWa4XoqiR3SZsamE16ZBUrQDT4= hash2 - w2bwoTKwQ/CsM9LtLjMEPahT2ZOL7o02CiG2oiurI/Q= + cvJ4ODIeH3tt0OLA57ehOIuVVGcGPrkXTit5x33MLsE= www/js/main.js hash - I2Jj7RTovo4kH11m8CRuakKi3nk= + QSdOeA6BefLzgiGbSEou4rGjHqo= hash2 - +3DiCEwGQX3VJAAfi0B9bkRsfSwDHXtcmO6S/jaoZFs= + 1nAaMqlGuQgqChazP2EJpnb7aP34936TRvAuddhZZFw= www/js/mobile.js @@ -2597,55 +2538,55 @@ hash - nUamfLQSBc/NAzOMJP5WwXnZGxI= + Cx6iRRJAH08QlPBBT//jwM7LZP4= hash2 - bonfkrWCjMv5LWiAp1sfmRvU0wFfN0bYRwBLbFijF/k= + y5y66ieXeEONknB6UKddmxUSVsTEKM0JD/kEZBuBQ+I= www/js/register.js hash - aPLw5ln4ElwhbTzbdXZpyILJBiY= + kEIN8Lt6KbeSEYmiYk47uhchWg8= hash2 - iyaJXQRZwYysUd//j42epM6Y+Bqkm8S+ZOuGUwhfFn8= + SWhxKePIt9pzPkMUPoRj0WTaXD4Z7GYBGqdsoqvRyuo= www/js/scan.js hash - xRDtmYCYmFtZu+H1/SjTBlennsM= + Cea6nn8OF3hogSuEpiL+IkVdO0I= hash2 - s2KUAXjrg/ljg8IoSBtI3V2xcRU57DBSC4OGz/NYnBg= + boEwP89p0NKOJH9RNkGe9B9GsagQ2Ug8esVLc2s5oP8= www/js/security.js hash - s52wwGEv5fJuX8ngkR5GGqdAXMg= + B2Cv1FDNaUjne/EkpPvlr5Cve88= hash2 - sasPlhOHyLhEjRoUQpmieOq/IW8v9yLbzXcckfySGjg= + OGZtj/+XWJJTY2txmB7Gvzwn4YOehMFaeYM7ju+IPwI= www/js/server.js hash - 6JlWzinRBn6MsREucfIEiCvn5oA= + jp9NlgHW1O72GXbxGb4cmcCVw+w= hash2 - 9BIwn+Du4nx0VxOUv39nWFXNeN9k5+QoZyWWWetbBIA= + xkxp3hfX0I2FABTvDz6d8u4ZnwK6XUy2IrW6YX4VK14= www/js/signxy.js @@ -3539,6 +3480,17 @@ PwOMlqlVzVgIZXZ1SbMCjBbNhPUtIEmbS1IuHC4X+FE= + www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js + + hash + + V7Ywjbu2Kj4wesp8mWW2lF5aDpE= + + hash2 + + hULEK/sXXYA5Q+DEGduyGZlT2gUtMhRcybSoo9TWM+0= + + www/plugins/cordova-plugin-camera/www/Camera.js hash @@ -3902,6 +3854,39 @@ pw9ge6okwHZeP0dHYYlBTFuDJUkZQDPAKRM006KG8ek= + www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js + + hash + + Jf+80xptQsEGhUiGLgqUT/RQinI= + + hash2 + + 30rJ9tZXBbfE/VcYCAuJHI8E7YpVPHFcxXVT9nbhkUo= + + + www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js + + hash + + uSpOoBJtw3huMClDN2UUZQOjz/Y= + + hash2 + + snCU5zVffeqnWk/2NWikUz5/ywm8VWiiKUujPDpj0Yw= + + + www/plugins/jpush-phonegap-plugin/www/JPushPlugin.js + + hash + + WbD83XEtIdDDWazehjb7DykZYCE= + + hash2 + + 8tb7CZsUzCwsaMSrBEosFu+/pgVWFbZptbW/ilTlAPs= + + www/pwdset.html hash @@ -3917,22 +3902,22 @@ hash - /T8vAhNAeCOJv1Hw6L4detL0zZE= + FK8oc1oB59vB31qmvZp+SzcB9/U= hash2 - owfyBn4pS5DnYeA3edJ/WmjW1ANLhwT8SdO2fRM3yqQ= + hKaZe4Brj53BLM4b10F58QehbRHB4aCSmOpVeXW/8sM= www/register.html hash - q/NP40bBQOZfbeq+nId2UNahWqk= + j0E17LezraXxL2i9s0tnnWrl9vw= hash2 - WsYPx/6kDCp5gr/e4lMTJvGzW/VDXMwvnHlWa3MjS5w= + Iu5z6Xp9qSJxhhkhGheMQI9Ns2tMH0hhOpULa3eMjek= www/scan.html @@ -3950,11 +3935,11 @@ hash - LQqkVW0wcKOsVTN4GeoIHaLFmHA= + 3isNUT+DEogiz2Le39n8VyG+mRQ= hash2 - xzEaRg38D+hgjxJoKsj3oFwfrqsYIm4s4H7MDEAsXNY= + S9+OZm7tir1iQxoRsBfSKv1+p+2avVkKfHLJtDZJZAs= www/signxy.html diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml index ed6c95a..89c5991 100755 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/config.xml @@ -1,5 +1,5 @@ - + @@ -55,6 +55,15 @@ + + + + + + + + + dlapp A sample Apache Cordova application that responds to the deviceready event. @@ -77,6 +86,9 @@ APPéè¦ä½¿ç¨æ¨çç¸æºæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½ + + APPéè¦ä½¿ç¨æ¨çç¸åæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½ +

@@ -102,4 +114,5 @@ +

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp index 388e661..e2e075e 100755 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/dlapp differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/embedded.mobileprovision b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/embedded.mobileprovision index abda867..1b86fa4 100644 Binary files a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/embedded.mobileprovision and b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/embedded.mobileprovision differ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html index e419a98..8289dbf 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/billdetail.html @@ -16,7 +16,7 @@

- +

è´¦åè¯¦æ

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/cordova_plugins.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/cordova_plugins.js index 79df2d5..99f7689 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/cordova_plugins.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/cordova_plugins.js @@ -319,6 +319,38 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "clobbers": [ "cordova.ThemeableBrowser" ] + }, + { + "id": "jpush-phonegap-plugin.JPushPlugin", + "file": "plugins/jpush-phonegap-plugin/www/JPushPlugin.js", + "pluginId": "jpush-phonegap-plugin", + "clobbers": [ + "JPush" + ] + }, + { + "id": "cordova-plugin-app-version.AppVersionPlugin", + "file": "plugins/cordova-plugin-app-version/www/AppVersionPlugin.js", + "pluginId": "cordova-plugin-app-version", + "clobbers": [ + "cordova.getAppVersion" + ] + }, + { + "id": "cordova-plugin-wkwebview-engine.ios-wkwebview-exec", + "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js", + "pluginId": "cordova-plugin-wkwebview-engine", + "clobbers": [ + "cordova.exec" + ] + }, + { + "id": "cordova-plugin-wkwebview-engine.ios-wkwebview", + "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js", + "pluginId": "cordova-plugin-wkwebview-engine", + "clobbers": [ + "window.WkWebView" + ] } ]; module.exports.metadata = { @@ -334,6 +366,10 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "cordova-plugin-camera": "4.0.3", "cordova-plugin-inappbrowser": "3.0.0", "cordova-plugin-device": "2.0.2", - "cordova-plugin-themeablebrowser": "0.2.17" + "cordova-plugin-themeablebrowser": "0.2.17", + "cordova-plugin-jcore": "1.3.0", + "jpush-phonegap-plugin": "3.7.2", + "cordova-plugin-app-version": "0.1.9", + "cordova-plugin-wkwebview-engine": "1.2.1" }; }); \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js index 3615234..51579aa 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/billdetail.js @@ -9,7 +9,8 @@ var app = { this.loadBill() }, toBack: function (){ - window.history.back(); + //window.history.back(); + window.history.go(-1) }, loadBill: function() { var refno = window.localStorage.getItem("currentrefno"); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js index 112a927..db3d7ce 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/index.js @@ -34,15 +34,10 @@ var app = { console.log(ret) if (ok) { if(ret.code==200){ - var exp = window.localStorage.getItem("tokenexpire"); - var t = parseInt(exp); - //token å°äº10åéäºï¼éè¦å·æ° - console.log((ret.now-t)) - if(ret.now-t>1000*60*10){ - window.location = "login.html"; - }else{ - window.location = "main.html"; + if(!isEmpty(ret.token)){ + window.localStorage.setItem("token",ret.token); } + window.location = "main.html"; }else{ window.location = "login.html"; } diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/login.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/login.js index 77b8b2a..7931a48 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/login.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/login.js @@ -33,7 +33,8 @@ var app = { $.showLoading("ç»å½ä¸"); var param={ "username":phone, - "password":pwd + "password":pwd, + "platform":device.platform } Login(param,function(ok,ret){ console.log(ret) @@ -47,6 +48,7 @@ var app = { window.localStorage.setItem("phone",phone); window.localStorage.setItem("phoneX",ret.phone); window.localStorage.setItem("token",ret.token); + window.localStorage.setItem("uid",ret.uid); window.localStorage.setItem("tenantid",ret.tenantid); window.localStorage.setItem("tokenexpire",ret.expire); window.localStorage.setItem("tokentime",ret.now); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js index 3b01a2a..90977da 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/main.js @@ -4,11 +4,61 @@ var app = { initialize: function() { this.initTab(); document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); + document.addEventListener('jpush.receiveRegistrationId', function(event) { + console.log(event.registrationId) + }, false) + document.addEventListener("jpush.openNotification", function (event) { + var refno + console.log("openNotify:"+event); + if(device.platform == "Android") { + refno = event.extras.refno + } else { + refno = event.refno + window.JPush.setApplicationIconBadgeNumber(0); + } + app.openBill(refno); + console.log("openNotify:"+refno); + }, false) + }, + openBill:function(billno){ + window.localStorage.setItem("currentrefno",billno); + window.location='billdetail.html'; + }, + initJpush: function() { + if(device.platform == "Android") { + } else { + window.JPush.setApplicationIconBadgeNumber(0); + } + window.JPush.init(); + window.JPush.setDebugMode(true); + window.JPush.isPushStopped(function(result) { + if (result == 0) { + //window.JPush.resumePush(); + } else { + window.JPush.resumePush(); + } + }); + window.JPush.getUserNotificationSettings(function(result) { + if(result == 0) { + } else if(result > 0) { + } + }); + var uid = window.localStorage.getItem("uid"); + window.JPush.setAlias({ sequence: 1, alias: uid }, + (result) => { + var sequence = result.sequence + var alias = result.alias + //alert(JSON.stringify(result)) + }, (error) => { + var sequence = error.sequence + var errorCode = error.code + //alert(JSON.stringify(error)) + }) }, onDeviceReady: function() { var uid = window.localStorage.getItem("token"); - console.log(CURRENT_INDEX); + this.initJpush(); $('#scanBtn').click(function() { //window.location = "scan.html"; app.checkBefore(function() { @@ -42,11 +92,12 @@ var app = { }) }); $('#secBtn').click(function() { - app.checkBefore(function() { + window.location = "security.html"; + /*app.checkBefore(function() { app.checkOther(function() { window.location = "security.html"; }) - }) + })*/ }); $('#usersec').click(function() { app.checkBefore(function() { @@ -57,22 +108,23 @@ var app = { }); this.initData(); }, - initTab:function(){ + initTab: function() { $("#maincontent").css("top", $("#maintop").height()) var tab = new auiTab({ element: document.getElementById("footer"), }, function(ret) { - window.localStorage.setItem("tabindex",ret.index); - + window.localStorage.setItem("tabindex", ret.index); + changeTab(ret.index); }); - var tabindex = window.localStorage.getItem("tabindex"); - if(!tabindex||tabindex==0){ + var tabindex = window.localStorage.getItem("tabindex"); + if (!tabindex || tabindex == 0) { tabindex = 1 } changeTab(tabindex); tab.setActive(tabindex) - function changeTab(index){ + + function changeTab(index) { if (index == 1) { $("#main1").show(); $("#main2").hide(); @@ -93,8 +145,9 @@ var app = { } V1Bills(param, function(ok, ret) { if (ok) { - console.log(ret) + //console.log(ret) if (ret.code == 200) { + app.checkVersion(ret.version,ret.minversion,ret.versionmsg); $("#maingt").text(ret.t + "ï¼") $("#user-amount").text(ret.amount) $("#user-point").text(ret.point) @@ -131,7 +184,17 @@ var app = { } }) }, - + checkVersion:function(ver,minver,msg){ + cordova.getAppVersion.getVersionNumber(function (version) { + //alert(version); + if(versionversion){ + alert("ææ°ççæ¬"); + } + }); + }, initBillView: function(page) { var html = ''; for (var i = 0; i < page.data.length; i++) { @@ -255,4 +318,4 @@ var app = { } } }; -app.initialize(); \ No newline at end of file +app.initialize(); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/qrcode.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/qrcode.js index 35fe7a3..4664a9b 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/qrcode.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/qrcode.js @@ -7,17 +7,58 @@ var app = { onDeviceReady: function() { var uid = window.localStorage.getItem("token"); - var qrcode = new QRCode(document.getElementById("qrcode"), { - text: uid, - width: 150, - height: 150, - colorDark : "#000000", - colorLight : "#ffffff", - correctLevel : QRCode.CorrectLevel.L - }); + this.loadQrcode(); + setInterval(function () { + window.location.reload(); + },100000); }, - toBillDetail :function(refno){ - + loadQrcode: function() { + $.showLoading("å è½½ä¸"); + V1Qrcode(function(ok, ret) { + if (ok) { + console.log(ret) + if (ret.code == 200) { + $.hideLoading(); + var qrcode = new QRCode(document.getElementById("qrcode"), { + text: ret.qrcode, + width: 150, + height: 150, + colorDark: "#000000", + colorLight: "#ffffff", + correctLevel: QRCode.CorrectLevel.L + }); + } else { + $.hideLoading(); + $.alert("è¯·æ±å¤±è´¥ï¼è¯·ç¨ååè¯", "éè¯¯"); + } + } else { + $.hideLoading(); + $.alert("è¯·æ±å¤±è´¥äº:" + ret.status + "è¯·ç¨ååè¯", "éè¯¯"); + } + }) + }, + refresh:function(){ + V1Qrcode(function(ok, ret) { + if (ok) { + if (ret.code == 200) { + $.hideLoading(); + var qrcode = new QRCode(document.getElementById("qrcode"), { + text: ret.qrcode, + width: 150, + height: 150, + colorDark: "#000000", + colorLight: "#ffffff", + correctLevel: QRCode.CorrectLevel.L + }); + } else { + $.hideLoading(); + $.alert("è¯·æ±å¤±è´¥ï¼è¯·ç¨ååè¯", "éè¯¯"); + } + } else { + $.hideLoading(); + $.alert("è¯·æ±å¤±è´¥äº:" + ret.status + "è¯·ç¨ååè¯", "éè¯¯"); + } + }) } }; app.initialize(); \ No newline at end of file diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/register.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/register.js index e0214ab..d10558e 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/register.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/register.js @@ -33,7 +33,6 @@ var app = { $.hideLoading(); console.log(ret) if(ret.code==200){ - window.localStorage.setItem("phone",phone); window.localStorage.setItem("uid",ret.uid); window.localStorage.setItem("code",ret.randcode); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js index e75eba8..0bde5cd 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/scan.js @@ -78,9 +78,9 @@ function showRet(url) { } var userid = window.localStorage.getItem("userid"); if(url.indexOf("?")>0){ - url=url+'&uid='+userid; + url=url+'&userid='+userid; }else{ - url=url+'?uid='+userid; + url=url+'?userid='+userid; } inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', { statusbar: { diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/security.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/security.js index 3586930..f12a1cc 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/security.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/security.js @@ -4,11 +4,7 @@ var app = { initialize: function() { document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); }, - onDeviceReady: function() { - var uid = window.localStorage.getItem("uid"); - var phone = window.localStorage.getItem("phoneX"); - }, editPwd: function() { window.location = "editpwd.html"; @@ -19,6 +15,13 @@ var app = { logout:function(){ window.localStorage.removeItem("token"); window.location = "login.html"; + }, + loginByTouchId: function() { + Fingerprint.isAvailable(function(result){ + alert("Fingerprint available"); + }, function(message){ + alert(message); + }); } }; app.initialize(); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js index 94f7c65..c8eb688 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/js/server.js @@ -1,10 +1,14 @@ -var dev = true; -var SERVER = ""; +var dev = false; +var SERVER = "https://yy.dlsmk.cn/payapi/mobileapi"; var GLOBAL_TODAY=""; var GLOBAL_YESTERDAY=""; var CURRENT_INDEX=1; if (dev) { - SERVER = "http://172.28.43.3:8099/payapi/mobileapi"; + SERVER = "http://172.28.201.70:10010/payapi/mobileapi"; +} + +function V1Qrcode(callback) { + ajaxPost("/v1/qrcode", {}, callback) } function V1Idtypes(callback) { ajaxPost("/v1/idtypes", {}, callback) diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js new file mode 100644 index 0000000..430f50d --- /dev/null +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js @@ -0,0 +1,68 @@ +cordova.define("cordova-plugin-app-version.AppVersionPlugin", function(require, exports, module) { +/*jslint indent: 2 */ +/*global window, jQuery, angular, cordova */ +"use strict"; + +// Returns a jQuery or AngularJS deferred object, or pass a success and fail callbacks if you don't want to use jQuery or AngularJS +var getPromisedCordovaExec = function (command, success, fail) { + var toReturn, deferred, injector, $q; + if (success === undefined) { + if (window.jQuery) { + deferred = jQuery.Deferred(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred; + } else if (window.angular) { + injector = angular.injector(["ng"]); + $q = injector.get("$q"); + deferred = $q.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.when && window.when.promise) { + deferred = when.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.Promise) { + toReturn = new Promise(function(c, e) { + success = c; + fail = e; + }); + } else if (window.WinJS && window.WinJS.Promise) { + toReturn = new WinJS.Promise(function(c, e) { + success = c; + fail = e; + }); + } else { + return console.error('AppVersion either needs a success callback, or jQuery/AngularJS/Promise/WinJS.Promise defined for using promises'); + } + } + // 5th param is NOT optional. must be at least empty array + cordova.exec(success, fail, "AppVersion", command, []); + return toReturn; +}; + +var getAppVersion = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getAppName = function (success, fail) { + return getPromisedCordovaExec('getAppName', success, fail); +}; + +getAppVersion.getPackageName = function (success, fail) { + return getPromisedCordovaExec('getPackageName', success, fail); +}; + +getAppVersion.getVersionNumber = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getVersionCode = function (success, fail) { + return getPromisedCordovaExec('getVersionCode', success, fail); +}; + +module.exports = getAppVersion; + +}); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js new file mode 100644 index 0000000..dc7595d --- /dev/null +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js @@ -0,0 +1,177 @@ +cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview-exec", function(require, exports, module) { +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +/** + * Creates the exec bridge used to notify the native code of + * commands. + */ +var cordova = require('cordova'); +var utils = require('cordova/utils'); +var base64 = require('cordova/base64'); + +function massageArgsJsToNative (args) { + if (!args || utils.typeName(args) !== 'Array') { + return args; + } + var ret = []; + args.forEach(function (arg, i) { + if (utils.typeName(arg) === 'ArrayBuffer') { + ret.push({ + 'CDVType': 'ArrayBuffer', + 'data': base64.fromArrayBuffer(arg) + }); + } else { + ret.push(arg); + } + }); + return ret; +} + +function massageMessageNativeToJs (message) { + if (message.CDVType === 'ArrayBuffer') { + var stringToArrayBuffer = function (str) { + var ret = new Uint8Array(str.length); + for (var i = 0; i < str.length; i++) { + ret[i] = str.charCodeAt(i); + } + return ret.buffer; + }; + var base64ToArrayBuffer = function (b64) { + return stringToArrayBuffer(atob(b64)); // eslint-disable-line no-undef + }; + message = base64ToArrayBuffer(message.data); + } + return message; +} + +function convertMessageToArgsNativeToJs (message) { + var args = []; + if (!message || !message.hasOwnProperty('CDVType')) { + args.push(message); + } else if (message.CDVType === 'MultiPart') { + message.messages.forEach(function (e) { + args.push(massageMessageNativeToJs(e)); + }); + } else { + args.push(massageMessageNativeToJs(message)); + } + return args; +} + +var iOSExec = function () { + // detect change in bridge, if there is a change, we forward to new bridge + + // if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) { + // bridgeMode = jsToNativeModes.WK_WEBVIEW_BINDING; + // } + + var successCallback, failCallback, service, action, actionArgs; + var callbackId = null; + if (typeof arguments[0] !== 'string') { + // FORMAT ONE + successCallback = arguments[0]; + failCallback = arguments[1]; + service = arguments[2]; + action = arguments[3]; + actionArgs = arguments[4]; + + // Since we need to maintain backwards compatibility, we have to pass + // an invalid callbackId even if no callback was provided since plugins + // will be expecting it. The Cordova.exec() implementation allocates + // an invalid callbackId and passes it even if no callbacks were given. + callbackId = 'INVALID'; + } else { + throw new Error('The old format of this exec call has been removed (deprecated since 2.1). Change to: ' + // eslint-disable-line + 'cordova.exec(null, null, \'Service\', \'action\', [ arg1, arg2 ]);'); + } + + // If actionArgs is not provided, default to an empty array + actionArgs = actionArgs || []; + + // Register the callbacks and add the callbackId to the positional + // arguments if given. + if (successCallback || failCallback) { + callbackId = service + cordova.callbackId++; + cordova.callbacks[callbackId] = + {success: successCallback, fail: failCallback}; + } + + actionArgs = massageArgsJsToNative(actionArgs); + + // CB-10133 DataClone DOM Exception 25 guard (fast function remover) + var command = [callbackId, service, action, JSON.parse(JSON.stringify(actionArgs))]; + window.webkit.messageHandlers.cordova.postMessage(command); +}; + +iOSExec.nativeCallback = function (callbackId, status, message, keepCallback, debug) { + var success = status === 0 || status === 1; + var args = convertMessageToArgsNativeToJs(message); + Promise.resolve().then(function () { + cordova.callbackFromNative(callbackId, success, status, args, keepCallback); // eslint-disable-line + }); +}; + +// for backwards compatibility +iOSExec.nativeEvalAndFetch = function (func) { + try { + func(); + } catch (e) { + console.log(e); + } +}; + +// Proxy the exec for bridge changes. See CB-10106 + +function cordovaExec () { + var cexec = require('cordova/exec'); + var cexec_valid = (typeof cexec.nativeFetchMessages === 'function') && (typeof cexec.nativeEvalAndFetch === 'function') && (typeof cexec.nativeCallback === 'function'); + return (cexec_valid && execProxy !== cexec) ? cexec : iOSExec; +} + +function execProxy () { + cordovaExec().apply(null, arguments); +} + +execProxy.nativeFetchMessages = function () { + return cordovaExec().nativeFetchMessages.apply(null, arguments); +}; + +execProxy.nativeEvalAndFetch = function () { + return cordovaExec().nativeEvalAndFetch.apply(null, arguments); +}; + +execProxy.nativeCallback = function () { + return cordovaExec().nativeCallback.apply(null, arguments); +}; + +module.exports = execProxy; + +if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) { + // unregister the old bridge + cordova.define.remove('cordova/exec'); + // redefine bridge to our new bridge + cordova.define('cordova/exec', function (require, exports, module) { + module.exports = execProxy; + }); +} + +}); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js new file mode 100644 index 0000000..0dac749 --- /dev/null +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js @@ -0,0 +1,33 @@ +cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview", function(require, exports, module) { +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +var exec = require('cordova/exec'); + +var WkWebKit = { + allowsBackForwardNavigationGestures: function (allow) { + exec(null, null, 'CDVWKWebViewEngine', 'allowsBackForwardNavigationGestures', [allow]); + } +}; + +module.exports = WkWebKit; + +}); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/jpush-phonegap-plugin/www/JPushPlugin.js b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/jpush-phonegap-plugin/www/JPushPlugin.js new file mode 100644 index 0000000..773b885 --- /dev/null +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/plugins/jpush-phonegap-plugin/www/JPushPlugin.js @@ -0,0 +1,489 @@ +cordova.define("jpush-phonegap-plugin.JPushPlugin", function(require, exports, module) { +var JPushPlugin = function() {}; + +// private plugin function + +JPushPlugin.prototype.receiveMessage = {}; +JPushPlugin.prototype.openNotification = {}; +JPushPlugin.prototype.receiveNotification = {}; + +JPushPlugin.prototype.isPlatformIOS = function() { + return ( + device.platform === "iPhone" || + device.platform === "iPad" || + device.platform === "iPod touch" || + device.platform === "iOS" + ); +}; + +JPushPlugin.prototype.errorCallback = function(msg) { + console.log("JPush Callback Error: " + msg); +}; + +JPushPlugin.prototype.callNative = function( + name, + args, + successCallback, + errorCallback +) { + if (errorCallback) { + cordova.exec(successCallback, errorCallback, "JPushPlugin", name, args); + } else { + cordova.exec( + successCallback, + this.errorCallback, + "JPushPlugin", + name, + args + ); + } +}; + +// Common methods +JPushPlugin.prototype.init = function() { + if (this.isPlatformIOS()) { + this.callNative("initial", [], null); + } else { + this.callNative("init", [], null); + } +}; + +JPushPlugin.prototype.setDebugMode = function(mode) { + if (device.platform === "Android") { + this.callNative("setDebugMode", [mode], null); + } else { + if (mode === true) { + this.setDebugModeFromIos(); + } else { + this.setLogOFF(); + } + } +}; + +JPushPlugin.prototype.getRegistrationID = function(successCallback) { + this.callNative("getRegistrationID", [], successCallback); +}; + +JPushPlugin.prototype.stopPush = function() { + this.callNative("stopPush", [], null); +}; + +JPushPlugin.prototype.resumePush = function() { + this.callNative("resumePush", [], null); +}; + +JPushPlugin.prototype.isPushStopped = function(successCallback) { + this.callNative("isPushStopped", [], successCallback); +}; + +JPushPlugin.prototype.clearLocalNotifications = function() { + if (device.platform === "Android") { + this.callNative("clearLocalNotifications", [], null); + } else { + this.clearAllLocalNotifications(); + } +}; + +/** + * è®¾ç½®æ ç¾ã + * æ³¨æï¼è¯¥æ¥å£æ¯è¦çé»è¾ï¼èä¸æ¯å¢éé»è¾ãå³æ°çè°ç¨ä¼è¦çä¹åçè®¾ç½®ã + * + * @param params = { 'sequence': number, 'tags': ['tag1', 'tag2'] } + */ +JPushPlugin.prototype.setTags = function( + params, + successCallback, + errorCallback +) { + this.callNative("setTags", [params], successCallback, errorCallback); +}; + +/** + * æ°å¢æ ç¾ã + * + * @param params = { 'sequence': number, 'tags': ['tag1', 'tag2'] } + */ +JPushPlugin.prototype.addTags = function( + params, + successCallback, + errorCallback +) { + this.callNative("addTags", [params], successCallback, errorCallback); +}; + +/** + * å é¤æå®æ ç¾ã + * + * @param params = { 'sequence': number, 'tags': ['tag1', 'tag2'] } + */ +JPushPlugin.prototype.deleteTags = function( + params, + successCallback, + errorCallback +) { + this.callNative("deleteTags", [params], successCallback, errorCallback); +}; + +/** + * æ¸é¤æææ ç¾ã + * + * @param params = { 'sequence': number } + */ +JPushPlugin.prototype.cleanTags = function( + params, + successCallback, + errorCallback +) { + this.callNative("cleanTags", [params], successCallback, errorCallback); +}; + +/** + * æ¥è¯¢æææ ç¾ã + * + * @param params = { 'sequence': number } + */ +JPushPlugin.prototype.getAllTags = function( + params, + successCallback, + errorCallback +) { + this.callNative("getAllTags", [params], successCallback, errorCallback); +}; + +/** + * æ¥è¯¢æå®æ ç¾ä¸å½åç¨æ·çç»å®ç¶æã + * + * @param params = { 'sequence': number, 'tag': string } + */ +JPushPlugin.prototype.checkTagBindState = function( + params, + successCallback, + errorCallback +) { + this.callNative( + "checkTagBindState", + [params], + successCallback, + errorCallback + ); +}; + +/** + * è®¾ç½®å«åã + * æ³¨æï¼è¯¥æ¥å£æ¯è¦çé»è¾ï¼èä¸æ¯å¢éé»è¾ãå³æ°çè°ç¨ä¼è¦çä¹åçè®¾ç½®ã + * + * @param params = { 'sequence': number, 'alias': string } + */ +JPushPlugin.prototype.setAlias = function( + params, + successCallback, + errorCallback +) { + this.callNative("setAlias", [params], successCallback, errorCallback); +}; + +/** + * å é¤å«åã + * + * @param params = { 'sequence': number } + */ +JPushPlugin.prototype.deleteAlias = function( + params, + successCallback, + errorCallback +) { + this.callNative("deleteAlias", [params], successCallback, errorCallback); +}; + +/** + * æ¥è¯¢å½åç»å®çå«åã + * + * @param params = { 'sequence': number } + */ +JPushPlugin.prototype.getAlias = function( + params, + successCallback, + errorCallback +) { + this.callNative("getAlias", [params], successCallback, errorCallback); +}; + +// å¤æç³»ç»è®¾ç½®ä¸æ¯å¦å¯¹æ¬åºç¨å¯ç¨éç¥ã +// iOS: è¿åå¼å¦æå¤§äº 0ï¼ä»£è¡¨éç¥å¼å¯ï¼0: éç¥å³éã +// UIRemoteNotificationTypeNone = 0, +// UIRemoteNotificationTypeBadge = 1 << 0, +// UIRemoteNotificationTypeSound = 1 << 1, +// UIRemoteNotificationTypeAlert = 1 << 2, +// UIRemoteNotificationTypeNewsstandContentAvailability = 1 << 3, +// Android: è¿åå¼ 1 ä»£è¡¨éç¥å¯ç¨ï¼0: éç¥å³éã +JPushPlugin.prototype.getUserNotificationSettings = function(successCallback) { + if (this.isPlatformIOS()) { + this.callNative("getUserNotificationSettings", [], successCallback); + } else if (device.platform === "Android") { + this.callNative("areNotificationEnabled", [], successCallback); + } +}; + +// iOS methods + +JPushPlugin.prototype.startJPushSDK = function() { + this.callNative("startJPushSDK", [], null); +}; + +JPushPlugin.prototype.setBadge = function(value) { + if (this.isPlatformIOS()) { + this.callNative("setBadge", [value], null); + } +}; + +JPushPlugin.prototype.resetBadge = function() { + if (this.isPlatformIOS()) { + this.callNative("resetBadge", [], null); + } +}; + +JPushPlugin.prototype.setDebugModeFromIos = function() { + if (this.isPlatformIOS()) { + this.callNative("setDebugModeFromIos", [], null); + } +}; + +JPushPlugin.prototype.setLogOFF = function() { + if (this.isPlatformIOS()) { + this.callNative("setLogOFF", [], null); + } +}; + +JPushPlugin.prototype.setCrashLogON = function() { + if (this.isPlatformIOS()) { + this.callNative("crashLogON", [], null); + } +}; + +JPushPlugin.prototype.addLocalNotificationForIOS = function( + delayTime, + content, + badge, + notificationID, + extras +) { + if (this.isPlatformIOS()) { + this.callNative( + "setLocalNotification", + [delayTime, content, badge, notificationID, extras], + null + ); + } +}; + +JPushPlugin.prototype.deleteLocalNotificationWithIdentifierKeyInIOS = function( + identifierKey +) { + if (this.isPlatformIOS()) { + this.callNative( + "deleteLocalNotificationWithIdentifierKey", + [identifierKey], + null + ); + } +}; + +JPushPlugin.prototype.clearAllLocalNotifications = function() { + if (this.isPlatformIOS()) { + this.callNative("clearAllLocalNotifications", [], null); + } +}; + +JPushPlugin.prototype.setLocation = function(latitude, longitude) { + if (this.isPlatformIOS()) { + this.callNative("setLocation", [latitude, longitude], null); + } +}; + +JPushPlugin.prototype.startLogPageView = function(pageName) { + if (this.isPlatformIOS()) { + this.callNative("startLogPageView", [pageName], null); + } +}; + +JPushPlugin.prototype.stopLogPageView = function(pageName) { + if (this.isPlatformIOS()) { + this.callNative("stopLogPageView", [pageName], null); + } +}; + +JPushPlugin.prototype.beginLogPageView = function(pageName, duration) { + if (this.isPlatformIOS()) { + this.callNative("beginLogPageView", [pageName, duration], null); + } +}; + +JPushPlugin.prototype.setApplicationIconBadgeNumber = function(badge) { + if (this.isPlatformIOS()) { + this.callNative("setApplicationIconBadgeNumber", [badge], null); + } +}; + +JPushPlugin.prototype.getApplicationIconBadgeNumber = function(callback) { + if (this.isPlatformIOS()) { + this.callNative("getApplicationIconBadgeNumber", [], callback); + } +}; + +JPushPlugin.prototype.addDismissActions = function(actions, categoryId) { + this.callNative("addDismissActions", [actions, categoryId]); +}; + +JPushPlugin.prototype.addNotificationActions = function(actions, categoryId) { + this.callNative("addNotificationActions", [actions, categoryId]); +}; + +// Android methods +JPushPlugin.prototype.getConnectionState = function(successCallback) { + if (device.platform === "Android") { + this.callNative("getConnectionState", [], successCallback); + } +}; + +JPushPlugin.prototype.setBasicPushNotificationBuilder = function() { + if (device.platform === "Android") { + this.callNative("setBasicPushNotificationBuilder", [], null); + } +}; + +JPushPlugin.prototype.setCustomPushNotificationBuilder = function() { + if (device.platform === "Android") { + this.callNative("setCustomPushNotificationBuilder", [], null); + } +}; + +JPushPlugin.prototype.receiveRegistrationIdInAndroidCallback = function(data) { + if (device.platform === "Android") { + data = JSON.stringify(data); + var event = JSON.parse(data); + cordova.fireDocumentEvent("jpush.receiveRegistrationId", event); + } +}; + +JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data) { + data = JSON.stringify(data); + this.receiveMessage = JSON.parse(data); + cordova.fireDocumentEvent("jpush.receiveMessage", this.receiveMessage); +}; + +JPushPlugin.prototype.openNotificationInAndroidCallback = function(data) { + data = JSON.stringify(data); + this.openNotification = JSON.parse(data); + cordova.fireDocumentEvent("jpush.openNotification", this.openNotification); +}; + +JPushPlugin.prototype.receiveNotificationInAndroidCallback = function(data) { + data = JSON.stringify(data); + this.receiveNotification = JSON.parse(data); + cordova.fireDocumentEvent( + "jpush.receiveNotification", + this.receiveNotification + ); +}; + +JPushPlugin.prototype.clearAllNotification = function() { + if (device.platform === "Android") { + this.callNative("clearAllNotification", [], null); + } +}; + +JPushPlugin.prototype.clearNotificationById = function(id) { + if (device.platform === "Android") { + this.callNative("clearNotificationById", [id], null); + } +}; + +JPushPlugin.prototype.setLatestNotificationNum = function(num) { + if (device.platform === "Android") { + this.callNative("setLatestNotificationNum", [num], null); + } +}; + +JPushPlugin.prototype.addLocalNotification = function( + builderId, + content, + title, + notificationID, + broadcastTime, + extras +) { + if (device.platform === "Android") { + this.callNative( + "addLocalNotification", + [builderId, content, title, notificationID, broadcastTime, extras], + null + ); + } +}; + +JPushPlugin.prototype.removeLocalNotification = function(notificationID) { + if (device.platform === "Android") { + this.callNative("removeLocalNotification", [notificationID], null); + } +}; + +JPushPlugin.prototype.reportNotificationOpened = function(msgID) { + if (device.platform === "Android") { + this.callNative("reportNotificationOpened", [msgID], null); + } +}; + +/** + * ç¨äºå¨ Android 6.0 åä»¥ä¸ç³»ç»ï¼ç³è¯·ä¸äºæé + * å·ä½å¯çï¼http://docs.jpush.io/client/android_api/#android-60 + */ +JPushPlugin.prototype.requestPermission = function() { + if (device.platform === "Android") { + this.callNative("requestPermission", [], null); + } +}; + +JPushPlugin.prototype.setSilenceTime = function( + startHour, + startMinute, + endHour, + endMinute +) { + if (device.platform === "Android") { + this.callNative( + "setSilenceTime", + [startHour, startMinute, endHour, endMinute], + null + ); + } +}; + +JPushPlugin.prototype.setPushTime = function(weekdays, startHour, endHour) { + if (device.platform === "Android") { + this.callNative("setPushTime", [weekdays, startHour, endHour], null); + } +}; + +JPushPlugin.prototype.setGeofenceInterval = function(interval) { + if (device.platform === "Android") { + this.callNative("setGeofenceInterval", [interval], null); + } +}; + +JPushPlugin.prototype.setMaxGeofenceNumber = function(maxNumber) { + if (device.platform === "Android") { + this.callNative("setMaxGeofenceNumber", [maxNumber], null); + } +}; + +if (!window.plugins) { + window.plugins = {}; +} + +if (!window.plugins.jPushPlugin) { + window.plugins.jPushPlugin = new JPushPlugin(); +} + +module.exports = new JPushPlugin(); + +}); diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/qrcode.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/qrcode.html index 3391537..ca6cb07 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/qrcode.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/qrcode.html @@ -23,10 +23,10 @@

è¯·å°äºç»´ç å¯¹åæ«æè®¾å¤

æå¨å·æ°äºç»´ç

è¯·å°äºç»´ç å¯¹åæ«æè®¾å¤

+ diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html index 640b3ee..34e5998 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/register.html @@ -15,7 +15,7 @@

- +

æ³¨å

diff --git a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html index 6994b22..39a40ca 100644 --- a/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html +++ b/platforms/ios/dlapp.xcarchive/Products/Applications/dlapp.app/www/security.html @@ -31,6 +31,15 @@

éåºç»å½

diff --git a/platforms/ios/dlapp.xcodeproj/project.pbxproj b/platforms/ios/dlapp.xcodeproj/project.pbxproj index 6560ea3..88f42ff 100644 --- a/platforms/ios/dlapp.xcodeproj/project.pbxproj +++ b/platforms/ios/dlapp.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ 0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; }; + 04347BD0ABAC4EE0B4CDDDB6 /* jcore-ios-2.1.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 444DBF371D8346D7BC7EE35D /* jcore-ios-2.1.1.a */; }; 0FBFC45D12B44FF79785B959 /* UIImage+CropScaleOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 281DF600F6B747808087E4FC /* UIImage+CropScaleOrientation.m */; }; 1D3623260D0F684500981E51 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* AppDelegate.m */; }; 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; @@ -15,6 +16,10 @@ 302D95F114D2391D003F00A1 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 302D95EF14D2391D003F00A1 /* MainViewController.m */; }; 302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 302D95F014D2391D003F00A1 /* MainViewController.xib */; }; 3772C27945674D8D9D6BA455 /* AFURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF1AE7251084FD2876E0BF5 /* AFURLRequestSerialization.m */; }; + 3BE6767AAFDC4926A08E6690 /* JPushConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9D260B7FB6C49A3AE6CD0DB /* JPushConfig.plist */; }; + 3C00FC06B74E49CFBABD0CFF /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD6EA74C612474DA862E146 /* libresolv.tbd */; settings = {ATTRIBUTES = (Weak, ); }; }; + 3EBABAA2209349F6AF91DF03 /* JPushPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = CD3E9CB7CBA54989AB62BA7F /* JPushPlugin.m */; }; + 432FFA418F2F4247BE9C8472 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1F790D5B00B4F178F835DE1 /* CoreTelephony.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 4F83621E48F143429B20FB3A /* CDVThemeableBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 28B91F31B6FD410AAF87BBDC /* CDVThemeableBrowser.m */; }; 5E2BDB8CFE4E41F39241956C /* CordovaHttpPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 07B9D06BD3024E0FBFF74967 /* CordovaHttpPlugin.m */; }; 5F67F2BDBB534EF4A4F1F319 /* BinaryResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F753C8AE424EAE851FA1FD /* BinaryResponseSerializer.m */; }; @@ -22,63 +27,63 @@ 6561A2871EB1420892CDE701 /* AFHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B5E1A8BB504B8FB8CE9627 /* AFHTTPSessionManager.m */; }; 6F6B3ADF72094BF58EF5C4AC /* CDVJpegHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1836D178C8A74923B944A79E /* CDVJpegHeaderWriter.m */; }; 6FB343627AC8409CB2AA79B7 /* CDVInAppBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 607F51FCFC7C4062A93BD011 /* CDVInAppBrowser.m */; }; + 7352A67D82B2499FBFFF8A2A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B080F410C164D6582A23E36 /* Foundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 74A56CC7F6724870ABD136F2 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11A34CB026314A2AA98A0044 /* AVFoundation.framework */; }; 74C07CC128F9457AB281916E /* TextRequestSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = DBDBB5C64D17465C9452AF28 /* TextRequestSerializer.m */; }; + 77CDF61132F44B81B0064744 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59D1F618C1ED464283B7B2E6 /* UserNotifications.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 78A785FAE16943908BA7B6DB /* CDVFile.m in Sources */ = {isa = PBXBuildFile; fileRef = DD3651F245114E52ABEB9060 /* CDVFile.m */; }; 7D8430D010A848FBBA5FB7ED /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5192EB17EA164DFD80D433E4 /* ImageIO.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 7EC1B4999B2E48C098BA1BBB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C44E29C3B190445C98BBAB84 /* CoreFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 8A202CA89E434389BBA0AD60 /* AppVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AAC7231E47A434EAF06A5B0 /* AppVersion.m */; }; 8ABB6F36D85243238622D4F8 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3A85B8119074F699E1A15CD /* LocalAuthentication.framework */; }; 8E2516CFE16944B8B9702955 /* AFSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = BA6C5B1A6A6A488790CA41EB /* AFSecurityPolicy.m */; }; 90E2E49D3A2449AB8D4D82D0 /* TextResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 57E66D7A151D45828ED66B7F /* TextResponseSerializer.m */; }; 9224D3CE70AE4072BBEB170D /* CDVLocalFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A8DD2DDC8694A97A56F9FA7 /* CDVLocalFilesystem.m */; }; 94868B10923A4508B06A4310 /* CDVAssetLibraryFilesystem.m in Sources */ = {isa = PBXBuildFile; fileRef = A719A69FD70D4CC9B8104FF6 /* CDVAssetLibraryFilesystem.m */; }; + A15A414BEE7A48538C758317 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D5F2FFCAD8E4A4392B781A3 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; A42AE846FF7B482FB889AAEB /* QRScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8478FFD487C4004A1CEFCA8 /* QRScanner.swift */; }; A50EB04ADB24A5CBB680802F /* libPods-dlapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D992375F52889311A88544EF /* libPods-dlapp.a */; }; + A54A9FED843144C887EA4286 /* AppDelegate+JPush.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E044FC8377488C886C818B /* AppDelegate+JPush.m */; }; B69FF513D1EE4772AFF6050B /* Fingerprint.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2099240B64744E08C91C285 /* Fingerprint.swift */; }; B8EFB66D03A44372A240B05B /* CDVCamera.m in Sources */ = {isa = PBXBuildFile; fileRef = 80B448E71F8941268B78692C /* CDVCamera.m */; }; BC39BA77AF0D4F94BC27666A /* CDVDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = A50DE9801E5E4302A78D569C /* CDVDevice.m */; }; BC998F935D174204820F4015 /* AFURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AE2683802B4CB1BAF69ABF /* AFURLSessionManager.m */; }; + BFA0CF013EEC44F9B2C6FA6E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0162975BB3964038A51EDED4 /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + C04B4EC2FAAD4D328ABA0C95 /* jpush-ios-3.2.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CCDEFB0C0632436FA86F0F31 /* jpush-ios-3.2.1.a */; }; C61263FC7FE642E9B25A81E5 /* DisableStatusbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 61106E22F1D348DDBDC4DC0B /* DisableStatusbar.m */; }; CAE5A91F948A472F9D872EC8 /* CDVStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ABBE12B040548F8909BFC7B /* CDVStatusBar.m */; }; + CDD6F217CA274CF18EC146D3 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 048B6FC037E1479790969D83 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; D2F2072984AE43BCBD0A430D /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D1F25845F964D87B880BFA9 /* CoreLocation.framework */; }; + D3E822CFC71546E191C10DA7 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DF35565BBA44B1980FFAF5 /* libz.tbd */; settings = {ATTRIBUTES = (Weak, ); }; }; D404D18DD0114DA787E0BB43 /* SDNetworkActivityIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 148A2122F3E242E4AF09A28D /* SDNetworkActivityIndicator.m */; }; D834895F80744E0F96D59047 /* TouchID.m in Sources */ = {isa = PBXBuildFile; fileRef = B3CE13EED96B44C0B06B1B2C /* TouchID.m */; }; F46AE1B50D8B4A81B05D4100 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A673D8D8920E4086A9152FC4 /* Security.framework */; }; F939AD8D22BB769B006B371B /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F939AD8C22BB769B006B371B /* libsqlite3.0.tbd */; }; FDE92C386167415E8040F8AB /* AFURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = FDEE8379D7A34C55A616F700 /* AFURLResponseSerialization.m */; }; - 04347BD0ABAC4EE0B4CDDDB6 /* jcore-ios-2.1.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 444DBF371D8346D7BC7EE35D /* jcore-ios-2.1.1.a */; }; - 3EBABAA2209349F6AF91DF03 /* JPushPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = CD3E9CB7CBA54989AB62BA7F /* JPushPlugin.m */; }; - A54A9FED843144C887EA4286 /* AppDelegate+JPush.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E044FC8377488C886C818B /* AppDelegate+JPush.m */; }; - C04B4EC2FAAD4D328ABA0C95 /* jpush-ios-3.2.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CCDEFB0C0632436FA86F0F31 /* jpush-ios-3.2.1.a */; }; - 3BE6767AAFDC4926A08E6690 /* JPushConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9D260B7FB6C49A3AE6CD0DB /* JPushConfig.plist */; }; - BFA0CF013EEC44F9B2C6FA6E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0162975BB3964038A51EDED4 /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 7EC1B4999B2E48C098BA1BBB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C44E29C3B190445C98BBAB84 /* CoreFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 432FFA418F2F4247BE9C8472 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1F790D5B00B4F178F835DE1 /* CoreTelephony.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 7352A67D82B2499FBFFF8A2A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B080F410C164D6582A23E36 /* Foundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - A15A414BEE7A48538C758317 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D5F2FFCAD8E4A4392B781A3 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - D3E822CFC71546E191C10DA7 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DF35565BBA44B1980FFAF5 /* libz.tbd */; settings = {ATTRIBUTES = (Weak, ); }; }; - CDD6F217CA274CF18EC146D3 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 048B6FC037E1479790969D83 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 77CDF61132F44B81B0064744 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59D1F618C1ED464283B7B2E6 /* UserNotifications.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 3C00FC06B74E49CFBABD0CFF /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD6EA74C612474DA862E146 /* libresolv.tbd */; settings = {ATTRIBUTES = (Weak, ); }; }; + 562D29FCB1FB4F86B95BB2BC /* CDVWKWebViewEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 59FDAA2CEE4540A3913846E4 /* CDVWKWebViewEngine.m */; }; + F68EA21E51A3463A8FE2EE92 /* CDVWKWebViewUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B73EA28E46846FF84E6AF02 /* CDVWKWebViewUIDelegate.m */; }; + 1F969D21D7EF4CF1A547A1DF /* CDVWKProcessPoolFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 473FEFEEBB2C4F5EAF594EBD /* CDVWKProcessPoolFactory.m */; }; + 8C09122A89C14C5FB0C28636 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE0B455916A4481681D59FE0 /* WebKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ 301BF534109A57CC0062928A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; + containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; proxyType = 2; remoteGlobalIDString = D2AAC07E0554694100DB518D; remoteInfo = CordovaLib; }; 301BF550109A68C00062928A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; + containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; proxyType = 1; remoteGlobalIDString = D2AAC07D0554694100DB518D; remoteInfo = CordovaLib; }; 907D8123214C687600058A10 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; + containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; proxyType = 2; remoteGlobalIDString = C0C01EB21E3911D50056E6CB; remoteInfo = Cordova; @@ -86,30 +91,35 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0162975BB3964038A51EDED4 /* CFNetwork.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 0207DA571B56EA530066E2B4 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = dlapp/Images.xcassets; sourceTree = SOURCE_ROOT; }; + 048B6FC037E1479790969D83 /* AdSupport.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; 04B5E1A8BB504B8FB8CE9627 /* AFHTTPSessionManager.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFHTTPSessionManager.m; path = "cordova-plugin-advanced-http/AFHTTPSessionManager.m"; sourceTree = ""; }; 07B9D06BD3024E0FBFF74967 /* CordovaHttpPlugin.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CordovaHttpPlugin.m; path = "cordova-plugin-advanced-http/CordovaHttpPlugin.m"; sourceTree = ""; }; 08B9BD113EDF4024B1F6D5CE /* AFURLRequestSerialization.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFURLRequestSerialization.h; path = "cordova-plugin-advanced-http/AFURLRequestSerialization.h"; sourceTree = ""; }; 09B4181C53154D9D8E1A2C4B /* AFHTTPSessionManager.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFHTTPSessionManager.h; path = "cordova-plugin-advanced-http/AFHTTPSessionManager.h"; sourceTree = ""; }; + 0EFE153A83734473AE4D0E4C /* AppDelegate+JPush.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "AppDelegate+JPush.h"; path = "jpush-phonegap-plugin/AppDelegate+JPush.h"; sourceTree = ""; }; 11A34CB026314A2AA98A0044 /* AVFoundation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 130AB7839C2A4FFF9F13C3DE /* CDVCamera.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVCamera.h; path = "cordova-plugin-camera/CDVCamera.h"; sourceTree = ""; }; 148A2122F3E242E4AF09A28D /* SDNetworkActivityIndicator.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = SDNetworkActivityIndicator.m; path = "cordova-plugin-advanced-http/SDNetworkActivityIndicator.m"; sourceTree = ""; }; 15879A58684B40158EC7A2CA /* CDVJpegHeaderWriter.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVJpegHeaderWriter.h; path = "cordova-plugin-camera/CDVJpegHeaderWriter.h"; sourceTree = ""; }; 17FD8EDA2EC0424192F6CA79 /* AFSecurityPolicy.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFSecurityPolicy.h; path = "cordova-plugin-advanced-http/AFSecurityPolicy.h"; sourceTree = ""; }; 1836D178C8A74923B944A79E /* CDVJpegHeaderWriter.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVJpegHeaderWriter.m; path = "cordova-plugin-camera/CDVJpegHeaderWriter.m"; sourceTree = ""; }; + 1AAC7231E47A434EAF06A5B0 /* AppVersion.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AppVersion.m; path = "cordova-plugin-app-version/AppVersion.m"; sourceTree = ""; }; 1ABBE12B040548F8909BFC7B /* CDVStatusBar.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVStatusBar.m; path = "cordova-plugin-statusbar/CDVStatusBar.m"; sourceTree = ""; }; 1D1F25845F964D87B880BFA9 /* CoreLocation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 1D6058910D05DD3D006BFB54 /* dlapp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dlapp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 22AE2683802B4CB1BAF69ABF /* AFURLSessionManager.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFURLSessionManager.m; path = "cordova-plugin-advanced-http/AFURLSessionManager.m"; sourceTree = ""; }; + 22DF35565BBA44B1980FFAF5 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 2625E3AABA8145E6901F06D3 /* SystemConfiguration.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 265BE52D975B49ACA2F7B3FE /* CDVDevice.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVDevice.h; path = "cordova-plugin-device/CDVDevice.h"; sourceTree = ""; }; 281DF600F6B747808087E4FC /* UIImage+CropScaleOrientation.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = "UIImage+CropScaleOrientation.m"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.m"; sourceTree = ""; }; 28B91F31B6FD410AAF87BBDC /* CDVThemeableBrowser.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVThemeableBrowser.m; path = "cordova-plugin-themeablebrowser/CDVThemeableBrowser.m"; sourceTree = ""; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 2F977C7D2E4448098AA27AE8 /* CDVAssetLibraryFilesystem.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVAssetLibraryFilesystem.h; path = "cordova-plugin-file/CDVAssetLibraryFilesystem.h"; sourceTree = ""; }; - 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = CordovaLib/CordovaLib.xcodeproj; sourceTree = ""; }; + 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = CordovaLib/CordovaLib.xcodeproj; sourceTree = ""; }; 301BF56E109A69640062928A /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = SOURCE_ROOT; }; 302D95EE14D2391D003F00A1 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = ""; }; 302D95EF14D2391D003F00A1 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; @@ -117,18 +127,23 @@ 3047A50F1AB8059700498E2A /* build-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "build-debug.xcconfig"; path = "cordova/build-debug.xcconfig"; sourceTree = SOURCE_ROOT; }; 3047A5101AB8059700498E2A /* build-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "build-release.xcconfig"; path = "cordova/build-release.xcconfig"; sourceTree = SOURCE_ROOT; }; 3047A5111AB8059700498E2A /* build.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = build.xcconfig; path = cordova/build.xcconfig; sourceTree = SOURCE_ROOT; }; + 3291AEB63DCC45B58959915F /* JPushPlugin.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = JPushPlugin.h; path = "jpush-phonegap-plugin/JPushPlugin.h"; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* dlapp-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "dlapp-Prefix.pch"; sourceTree = ""; }; + 331EEE6AB06B4F35BFBC8120 /* AppVersion.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AppVersion.h; path = "cordova-plugin-app-version/AppVersion.h"; sourceTree = ""; }; 3BE5364CD5E74AFDAB853364 /* AFURLResponseSerialization.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFURLResponseSerialization.h; path = "cordova-plugin-advanced-http/AFURLResponseSerialization.h"; sourceTree = ""; }; 3D1EDC804D3646E7BE4A92BF /* AFNetworking.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFNetworking.h; path = "cordova-plugin-advanced-http/AFNetworking.h"; sourceTree = ""; }; 3FD6ED94AE9243B29217547A /* CDVLocalFilesystem.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVLocalFilesystem.h; path = "cordova-plugin-file/CDVLocalFilesystem.h"; sourceTree = ""; }; 41DFF309018A479EA8F43611 /* CDVInAppBrowser.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVInAppBrowser.h; path = "cordova-plugin-inappbrowser/CDVInAppBrowser.h"; sourceTree = ""; }; + 444DBF371D8346D7BC7EE35D /* jcore-ios-2.1.1.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; name = "jcore-ios-2.1.1.a"; path = "dlapp/Plugins/cordova-plugin-jcore/jcore-ios-2.1.1.a"; sourceTree = ""; }; 4BF1AE7251084FD2876E0BF5 /* AFURLRequestSerialization.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFURLRequestSerialization.m; path = "cordova-plugin-advanced-http/AFURLRequestSerialization.m"; sourceTree = ""; }; 5192EB17EA164DFD80D433E4 /* ImageIO.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; 57E66D7A151D45828ED66B7F /* TextResponseSerializer.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = TextResponseSerializer.m; path = "cordova-plugin-advanced-http/TextResponseSerializer.m"; sourceTree = ""; }; + 59D1F618C1ED464283B7B2E6 /* UserNotifications.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; 607F51FCFC7C4062A93BD011 /* CDVInAppBrowser.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVInAppBrowser.m; path = "cordova-plugin-inappbrowser/CDVInAppBrowser.m"; sourceTree = ""; }; 61106E22F1D348DDBDC4DC0B /* DisableStatusbar.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = DisableStatusbar.m; path = "cordova-plugin-disable-ios11-statusbar/DisableStatusbar.m"; sourceTree = ""; }; 62C24B1E8F294AC587C6D051 /* UIImage+CropScaleOrientation.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "UIImage+CropScaleOrientation.h"; path = "cordova-plugin-camera/UIImage+CropScaleOrientation.h"; sourceTree = ""; }; 683645F69456461BB8712924 /* AFNetworkReachabilityManager.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = AFNetworkReachabilityManager.h; path = "cordova-plugin-advanced-http/AFNetworkReachabilityManager.h"; sourceTree = ""; }; + 6D5F2FFCAD8E4A4392B781A3 /* UIKit.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 6DC53FCFEEFD4EC89C2073E0 /* TextRequestSerializer.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = TextRequestSerializer.h; path = "cordova-plugin-advanced-http/TextRequestSerializer.h"; sourceTree = ""; }; 6FEED8E986814AC1AC60FC28 /* AFNetworkReachabilityManager.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFNetworkReachabilityManager.m; path = "cordova-plugin-advanced-http/AFNetworkReachabilityManager.m"; sourceTree = ""; }; 7601E9450D7240078C98ED9D /* CordovaHttpPlugin.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CordovaHttpPlugin.h; path = "cordova-plugin-advanced-http/CordovaHttpPlugin.h"; sourceTree = ""; }; @@ -139,20 +154,29 @@ 8BFF0D502E2241F0A89DF67F /* CDVStatusBar.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVStatusBar.h; path = "cordova-plugin-statusbar/CDVStatusBar.h"; sourceTree = ""; }; 8D1107310486CEB800E47090 /* dlapp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "dlapp-Info.plist"; path = "dlapp/dlapp-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = SOURCE_ROOT; }; 901AB970F8AB4CEF82C6DC1B /* BinaryResponseSerializer.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = BinaryResponseSerializer.h; path = "cordova-plugin-advanced-http/BinaryResponseSerializer.h"; sourceTree = ""; }; + 91E044FC8377488C886C818B /* AppDelegate+JPush.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = "AppDelegate+JPush.m"; path = "jpush-phonegap-plugin/AppDelegate+JPush.m"; sourceTree = ""; }; + 9B080F410C164D6582A23E36 /* Foundation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + A32F7333BFEB461B9C84F6E5 /* JPUSHService.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = JPUSHService.h; path = "jpush-phonegap-plugin/JPUSHService.h"; sourceTree = ""; }; A50DE9801E5E4302A78D569C /* CDVDevice.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVDevice.m; path = "cordova-plugin-device/CDVDevice.m"; sourceTree = ""; }; A673D8D8920E4086A9152FC4 /* Security.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; A719A69FD70D4CC9B8104FF6 /* CDVAssetLibraryFilesystem.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVAssetLibraryFilesystem.m; path = "cordova-plugin-file/CDVAssetLibraryFilesystem.m"; sourceTree = ""; }; B19E413F59714C6285552E82 /* TouchID.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = TouchID.h; path = "cordova-plugin-touch-id/TouchID.h"; sourceTree = ""; }; + B1F790D5B00B4F178F835DE1 /* CoreTelephony.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; B3CE13EED96B44C0B06B1B2C /* TouchID.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = TouchID.m; path = "cordova-plugin-touch-id/TouchID.m"; sourceTree = ""; }; B3F9D30FB27A4B26A445BA84 /* CDVExif.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVExif.h; path = "cordova-plugin-camera/CDVExif.h"; sourceTree = ""; }; BA6C5B1A6A6A488790CA41EB /* AFSecurityPolicy.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFSecurityPolicy.m; path = "cordova-plugin-advanced-http/AFSecurityPolicy.m"; sourceTree = ""; }; C2099240B64744E08C91C285 /* Fingerprint.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = Fingerprint.swift; path = "cordova-plugin-fingerprint-aio/Fingerprint.swift"; sourceTree = ""; }; + C44E29C3B190445C98BBAB84 /* CoreFoundation.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; C8478FFD487C4004A1CEFCA8 /* QRScanner.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = QRScanner.swift; path = "cordova-plugin-qrscanner/QRScanner.swift"; sourceTree = ""; }; + CBD6EA74C612474DA862E146 /* libresolv.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; + CCDEFB0C0632436FA86F0F31 /* jpush-ios-3.2.1.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; name = "jpush-ios-3.2.1.a"; path = "dlapp/Plugins/jpush-phonegap-plugin/jpush-ios-3.2.1.a"; sourceTree = ""; }; + CD3E9CB7CBA54989AB62BA7F /* JPushPlugin.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = JPushPlugin.m; path = "jpush-phonegap-plugin/JPushPlugin.m"; sourceTree = ""; }; D4DBE4512BAD4694B7EB5217 /* SDNetworkActivityIndicator.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = SDNetworkActivityIndicator.h; path = "cordova-plugin-advanced-http/SDNetworkActivityIndicator.h"; sourceTree = ""; }; D992375F52889311A88544EF /* libPods-dlapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-dlapp.a"; sourceTree = BUILT_PRODUCTS_DIR; }; DBDBB5C64D17465C9452AF28 /* TextRequestSerializer.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = TextRequestSerializer.m; path = "cordova-plugin-advanced-http/TextRequestSerializer.m"; sourceTree = ""; }; DD3651F245114E52ABEB9060 /* CDVFile.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVFile.m; path = "cordova-plugin-file/CDVFile.m"; sourceTree = ""; }; DE50527E757F47D08F4E076C /* CDVFile.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = CDVFile.h; path = "cordova-plugin-file/CDVFile.h"; sourceTree = ""; }; + E9D260B7FB6C49A3AE6CD0DB /* JPushConfig.plist */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; path = JPushConfig.plist; sourceTree = ""; }; E9F753C8AE424EAE851FA1FD /* BinaryResponseSerializer.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = BinaryResponseSerializer.m; path = "cordova-plugin-advanced-http/BinaryResponseSerializer.m"; sourceTree = ""; }; EB87FDF31871DA8E0020F90C /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../../www; sourceTree = ""; }; EB87FDF41871DAF40020F90C /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = ../../config.xml; sourceTree = ""; }; @@ -161,26 +185,16 @@ F3A85B8119074F699E1A15CD /* LocalAuthentication.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = System/Library/Frameworks/LocalAuthentication.framework; sourceTree = SDKROOT; }; F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = dlapp/config.xml; sourceTree = ""; }; F939AD8C22BB769B006B371B /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; }; + FC8EA7F3637547AD8BC62127 /* JPushDefine.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = JPushDefine.h; path = "jpush-phonegap-plugin/JPushDefine.h"; sourceTree = ""; }; FCC7E279D80D4FB9BCF2530A /* Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "cordova-plugin-fingerprint-aio/Bridging-Header.h"; sourceTree = ""; }; FDEE8379D7A34C55A616F700 /* AFURLResponseSerialization.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = AFURLResponseSerialization.m; path = "cordova-plugin-advanced-http/AFURLResponseSerialization.m"; sourceTree = ""; }; - 444DBF371D8346D7BC7EE35D /* jcore-ios-2.1.1.a */ = {isa = PBXFileReference; name = "jcore-ios-2.1.1.a"; path = "dlapp/Plugins/cordova-plugin-jcore/jcore-ios-2.1.1.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; - CD3E9CB7CBA54989AB62BA7F /* JPushPlugin.m */ = {isa = PBXFileReference; name = "JPushPlugin.m"; path = "jpush-phonegap-plugin/JPushPlugin.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; - 91E044FC8377488C886C818B /* AppDelegate+JPush.m */ = {isa = PBXFileReference; name = "AppDelegate+JPush.m"; path = "jpush-phonegap-plugin/AppDelegate+JPush.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; - CCDEFB0C0632436FA86F0F31 /* jpush-ios-3.2.1.a */ = {isa = PBXFileReference; name = "jpush-ios-3.2.1.a"; path = "dlapp/Plugins/jpush-phonegap-plugin/jpush-ios-3.2.1.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; - FC8EA7F3637547AD8BC62127 /* JPushDefine.h */ = {isa = PBXFileReference; name = "JPushDefine.h"; path = "jpush-phonegap-plugin/JPushDefine.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; - 3291AEB63DCC45B58959915F /* JPushPlugin.h */ = {isa = PBXFileReference; name = "JPushPlugin.h"; path = "jpush-phonegap-plugin/JPushPlugin.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; - 0EFE153A83734473AE4D0E4C /* AppDelegate+JPush.h */ = {isa = PBXFileReference; name = "AppDelegate+JPush.h"; path = "jpush-phonegap-plugin/AppDelegate+JPush.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; - A32F7333BFEB461B9C84F6E5 /* JPUSHService.h */ = {isa = PBXFileReference; name = "JPUSHService.h"; path = "jpush-phonegap-plugin/JPUSHService.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; - E9D260B7FB6C49A3AE6CD0DB /* JPushConfig.plist */ = {isa = PBXFileReference; name = "JPushConfig.plist"; path = "JPushConfig.plist"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = text.plist.xml; explicitFileType = undefined; includeInIndex = 0; }; - 0162975BB3964038A51EDED4 /* CFNetwork.framework */ = {isa = PBXFileReference; name = "CFNetwork.framework"; path = "System/Library/Frameworks/CFNetwork.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; - C44E29C3B190445C98BBAB84 /* CoreFoundation.framework */ = {isa = PBXFileReference; name = "CoreFoundation.framework"; path = "System/Library/Frameworks/CoreFoundation.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; - B1F790D5B00B4F178F835DE1 /* CoreTelephony.framework */ = {isa = PBXFileReference; name = "CoreTelephony.framework"; path = "System/Library/Frameworks/CoreTelephony.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; - 9B080F410C164D6582A23E36 /* Foundation.framework */ = {isa = PBXFileReference; name = "Foundation.framework"; path = "System/Library/Frameworks/Foundation.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; - 6D5F2FFCAD8E4A4392B781A3 /* UIKit.framework */ = {isa = PBXFileReference; name = "UIKit.framework"; path = "System/Library/Frameworks/UIKit.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; - 22DF35565BBA44B1980FFAF5 /* libz.tbd */ = {isa = PBXFileReference; name = "libz.tbd"; path = "usr/lib/libz.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; }; - 048B6FC037E1479790969D83 /* AdSupport.framework */ = {isa = PBXFileReference; name = "AdSupport.framework"; path = "System/Library/Frameworks/AdSupport.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; - 59D1F618C1ED464283B7B2E6 /* UserNotifications.framework */ = {isa = PBXFileReference; name = "UserNotifications.framework"; path = "System/Library/Frameworks/UserNotifications.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; - CBD6EA74C612474DA862E146 /* libresolv.tbd */ = {isa = PBXFileReference; name = "libresolv.tbd"; path = "usr/lib/libresolv.tbd"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = sourcecode.text-based-dylib-definition; explicitFileType = undefined; includeInIndex = 0; }; + 59FDAA2CEE4540A3913846E4 /* CDVWKWebViewEngine.m */ = {isa = PBXFileReference; name = "CDVWKWebViewEngine.m"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; + 3B73EA28E46846FF84E6AF02 /* CDVWKWebViewUIDelegate.m */ = {isa = PBXFileReference; name = "CDVWKWebViewUIDelegate.m"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; + 473FEFEEBB2C4F5EAF594EBD /* CDVWKProcessPoolFactory.m */ = {isa = PBXFileReference; name = "CDVWKProcessPoolFactory.m"; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; explicitFileType = undefined; includeInIndex = 0; }; + 648BD3182CD64A77AD2D447B /* CDVWKWebViewEngine.h */ = {isa = PBXFileReference; name = "CDVWKWebViewEngine.h"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; + 1E5CB6025B2E4D14ABFDB037 /* CDVWKWebViewUIDelegate.h */ = {isa = PBXFileReference; name = "CDVWKWebViewUIDelegate.h"; path = "cordova-plugin-wkwebview-engine/CDVWKWebViewUIDelegate.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; + 7DC7711D3C76485B9E422E3A /* CDVWKProcessPoolFactory.h */ = {isa = PBXFileReference; name = "CDVWKProcessPoolFactory.h"; path = "cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h"; sourceTree = ""; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; explicitFileType = undefined; includeInIndex = 0; }; + FE0B455916A4481681D59FE0 /* WebKit.framework */ = {isa = PBXFileReference; name = "WebKit.framework"; path = "System/Library/Frameworks/WebKit.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -208,6 +222,7 @@ CDD6F217CA274CF18EC146D3 /* AdSupport.framework in Frameworks */, 77CDF61132F44B81B0064744 /* UserNotifications.framework in Frameworks */, 3C00FC06B74E49CFBABD0CFF /* libresolv.tbd in Frameworks */, + 8C09122A89C14C5FB0C28636 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -235,13 +250,13 @@ name = Products; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA = { + 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( EB87FDF41871DAF40020F90C /* config.xml */, EB87FDF31871DA8E0020F90C /* www */, EB87FDF11871DA420020F90C /* Staging */, - 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */, + 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */, 080E96DDFE201D6D7F000001 /* Classes */, 307C750510C5A3420062BCA9 /* Plugins */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -298,6 +313,7 @@ 048B6FC037E1479790969D83 /* AdSupport.framework */, 59D1F618C1ED464283B7B2E6 /* UserNotifications.framework */, CBD6EA74C612474DA862E146 /* libresolv.tbd */, + FE0B455916A4481681D59FE0 /* WebKit.framework */, ); name = Frameworks; sourceTree = ""; @@ -380,6 +396,14 @@ 3291AEB63DCC45B58959915F /* JPushPlugin.h */, 0EFE153A83734473AE4D0E4C /* AppDelegate+JPush.h */, A32F7333BFEB461B9C84F6E5 /* JPUSHService.h */, + 1AAC7231E47A434EAF06A5B0 /* AppVersion.m */, + 331EEE6AB06B4F35BFBC8120 /* AppVersion.h */, + 59FDAA2CEE4540A3913846E4 /* CDVWKWebViewEngine.m */, + 3B73EA28E46846FF84E6AF02 /* CDVWKWebViewUIDelegate.m */, + 473FEFEEBB2C4F5EAF594EBD /* CDVWKProcessPoolFactory.m */, + 648BD3182CD64A77AD2D447B /* CDVWKWebViewEngine.h */, + 1E5CB6025B2E4D14ABFDB037 /* CDVWKWebViewUIDelegate.h */, + 7DC7711D3C76485B9E422E3A /* CDVWKProcessPoolFactory.h */, ); name = Plugins; path = dlapp/Plugins; @@ -433,8 +457,13 @@ LastUpgradeCheck = 510; TargetAttributes = { 1D6058900D05DD3D006BFB54 = { - DevelopmentTeam = 74UNETA6B2; + DevelopmentTeam = 58ZC23SH57; ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Push = { + enabled = 1; + }; + }; }; }; }; @@ -446,13 +475,13 @@ English, en, ); - mainGroup = 29B97314FDCFA39411CA2CEA; + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; projectReferences = ( { ProductGroup = 301BF52E109A57CC0062928A /* Products */; - ProjectRef = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; + ProjectRef = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; }, ); projectRoot = ""; @@ -563,6 +592,10 @@ 4F83621E48F143429B20FB3A /* CDVThemeableBrowser.m in Sources */, 3EBABAA2209349F6AF91DF03 /* JPushPlugin.m in Sources */, A54A9FED843144C887EA4286 /* AppDelegate+JPush.m in Sources */, + 8A202CA89E434389BBA0AD60 /* AppVersion.m in Sources */, + 562D29FCB1FB4F86B95BB2BC /* CDVWKWebViewEngine.m in Sources */, + F68EA21E51A3463A8FE2EE92 /* CDVWKWebViewUIDelegate.m in Sources */, + 1F969D21D7EF4CF1A547A1DF /* CDVWKProcessPoolFactory.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -587,8 +620,10 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = 74UNETA6B2; + DEVELOPMENT_TEAM = 58ZC23SH57; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -598,17 +633,18 @@ INFOPLIST_FILE = "dlapp/dlapp-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.supwisdom.dlapp; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = 1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)/Plugins/cordova-plugin-jcore\"", "\"$(SRCROOT)/$(TARGET_NAME)/Plugins/jpush-phonegap-plugin\"", ); + PRODUCT_BUNDLE_IDENTIFIER = com.dalicitycard.app; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -622,8 +658,10 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = YES; - DEVELOPMENT_TEAM = 74UNETA6B2; + DEVELOPMENT_TEAM = 58ZC23SH57; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "dlapp/dlapp-Prefix.pch"; GCC_THUMB_SUPPORT = NO; @@ -631,16 +669,17 @@ INFOPLIST_FILE = "dlapp/dlapp-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.supwisdom.dlapp; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = 1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/$(TARGET_NAME)/Plugins/cordova-plugin-jcore\"", "\"$(SRCROOT)/$(TARGET_NAME)/Plugins/jpush-phonegap-plugin\"", ); + PRODUCT_BUNDLE_IDENTIFIER = com.dalicitycard.app; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; @@ -682,7 +721,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.supwisdom.dlapp; + PRODUCT_BUNDLE_IDENTIFIER = com.dalicitycard.app; SDKROOT = iphoneos; SKIP_INSTALL = NO; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; @@ -727,7 +766,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.supwisdom.dlapp; + PRODUCT_BUNDLE_IDENTIFIER = com.dalicitycard.app; SDKROOT = iphoneos; SKIP_INSTALL = NO; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/$(PROJECT_NAME)/Bridging-Header.h"; diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon24x24@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon24x24@2x.png deleted file mode 100644 index ed81661..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon24x24@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon27.5x27.5@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon27.5x27.5@2x.png deleted file mode 100644 index ec313ad..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon27.5x27.5@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png deleted file mode 100644 index d9c5f4b..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png deleted file mode 100644 index ba532dd..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png deleted file mode 100644 index 678fba0..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon44x44@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon44x44@2x.png deleted file mode 100644 index b6fbccf..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon44x44@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon86x86@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon86x86@2x.png deleted file mode 100644 index b0f903c..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon86x86@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon98x98@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon98x98@2x.png deleted file mode 100644 index 3bca15b..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/AppIcon98x98@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Contents.json b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 index 2ce78c1..99f7a0c --- a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,241 +1,128 @@ { - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "icon-20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "icon-20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "icon-40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "icon-60@2x.png", - "scale" : "3x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "icon-60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "icon-60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "icon-20.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "icon-20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "icon-29.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "icon-29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "icon-40.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "icon-40@2x.png", - "scale" : "2x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50.png", - "scale" : "1x" - }, - { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50@2x.png", - "scale" : "2x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72.png", - "scale" : "1x" - }, - { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "icon-76.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "icon-76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "icon-83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "icon-1024.png", - "scale" : "1x" - }, - { - "size" : "24x24", - "idiom" : "watch", - "filename" : "icon-24@2x.png", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "38mm" - }, - { - "size" : "27.5x27.5", - "idiom" : "watch", - "filename" : "icon-27.5@2x.png", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "42mm" - }, - { - "size" : "29x29", - "idiom" : "watch", - "filename" : "icon-29@2x.png", - "role" : "companionSettings", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "watch", - "filename" : "icon-29@3x.png", - "role" : "companionSettings", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "watch", - "filename" : "icon-40@2x.png", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "38mm" - }, - { - "size" : "44x44", - "idiom" : "watch", - "filename" : "icon-44@2x.png", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "40mm" - }, - { - "size" : "50x50", - "idiom" : "watch", - "filename" : "icon-50@2x.png", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "44mm" - }, - { - "size" : "86x86", - "idiom" : "watch", - "filename" : "icon-86@2x.png", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "38mm" - }, - { - "size" : "98x98", - "idiom" : "watch", - "filename" : "icon-98@2x.png", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "42mm" - }, - { - "size" : "108x108", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "44mm" - }, - { - "size" : "1024x1024", - "idiom" : "watch-marketing", - "filename" : "icon-1024.png", - "scale" : "1x" + "images":[ + { + "idiom":"iphone", + "size":"20x20", + "scale":"2x", + "filename":"Icon-App-20x20@2x.png" + }, + { + "idiom":"iphone", + "size":"20x20", + "scale":"3x", + "filename":"Icon-App-20x20@3x.png" + }, + { + "idiom":"iphone", + "size":"29x29", + "scale":"1x", + "filename":"Icon-App-29x29@1x.png" + }, + { + "idiom":"iphone", + "size":"29x29", + "scale":"2x", + "filename":"Icon-App-29x29@2x.png" + }, + { + "idiom":"iphone", + "size":"29x29", + "scale":"3x", + "filename":"Icon-App-29x29@3x.png" + }, + { + "idiom":"iphone", + "size":"40x40", + "scale":"2x", + "filename":"Icon-App-40x40@2x.png" + }, + { + "idiom":"iphone", + "size":"40x40", + "scale":"3x", + "filename":"Icon-App-40x40@3x.png" + }, + { + "idiom":"iphone", + "size":"60x60", + "scale":"2x", + "filename":"Icon-App-60x60@2x.png" + }, + { + "idiom":"iphone", + "size":"60x60", + "scale":"3x", + "filename":"Icon-App-60x60@3x.png" + }, + { + "idiom":"iphone", + "size":"76x76", + "scale":"2x", + "filename":"Icon-App-76x76@2x.png" + }, + { + "idiom":"ipad", + "size":"20x20", + "scale":"1x", + "filename":"Icon-App-20x20@1x.png" + }, + { + "idiom":"ipad", + "size":"20x20", + "scale":"2x", + "filename":"Icon-App-20x20@2x.png" + }, + { + "idiom":"ipad", + "size":"29x29", + "scale":"1x", + "filename":"Icon-App-29x29@1x.png" + }, + { + "idiom":"ipad", + "size":"29x29", + "scale":"2x", + "filename":"Icon-App-29x29@2x.png" + }, + { + "idiom":"ipad", + "size":"40x40", + "scale":"1x", + "filename":"Icon-App-40x40@1x.png" + }, + { + "idiom":"ipad", + "size":"40x40", + "scale":"2x", + "filename":"Icon-App-40x40@2x.png" + }, + { + "idiom":"ipad", + "size":"76x76", + "scale":"1x", + "filename":"Icon-App-76x76@1x.png" + }, + { + "idiom":"ipad", + "size":"76x76", + "scale":"2x", + "filename":"Icon-App-76x76@2x.png" + }, + { + "idiom":"ipad", + "size":"83.5x83.5", + "scale":"2x", + "filename":"Icon-App-83.5x83.5@2x.png" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "scale" : "1x", + "filename" : "ItunesArtwork@2x.png" + } + ], + "info":{ + "version":1, + "author":"makeappicon" } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file +} diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..ccdc491 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..5b1a340 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..d233176 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..908f73c Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..7716580 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..0d3a8dc Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..5b1a340 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..d0ec9ec Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..35bb3ba Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..35bb3ba Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..cb4580a Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..65bf622 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..6b6e1b1 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..3a0d3be Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png new file mode 100644 index 0000000..e347795 Binary files /dev/null and b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-1024.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-1024.png deleted file mode 100644 index ab1a5c0..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-1024.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20.png deleted file mode 100644 index 256350a..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@2x.png deleted file mode 100644 index cb6b99f..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@3x.png deleted file mode 100644 index 5d8dbc8..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-20@3x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-24@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-24@2x.png deleted file mode 100644 index f0babf9..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-24@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-27.5@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-27.5@2x.png deleted file mode 100644 index 78f21bb..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-27.5@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29.png deleted file mode 100644 index 5dff98e..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@2x.png deleted file mode 100644 index 34b3908..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@3x.png deleted file mode 100644 index c63fd77..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-29@3x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40.png deleted file mode 100644 index cb6b99f..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40@2x.png deleted file mode 100644 index 678fba0..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-40@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-44@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-44@2x.png deleted file mode 100644 index 01c5af7..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-44@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50.png deleted file mode 100644 index 49fd544..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50@2x.png deleted file mode 100644 index e0a0caa..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-50@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@2x.png deleted file mode 100644 index a723c4a..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@3x.png deleted file mode 100644 index 8649aad..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-60@3x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72.png deleted file mode 100644 index 4edb4c6..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72@2x.png deleted file mode 100644 index 3c7efa4..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-72@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76.png deleted file mode 100644 index a2630ad..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76@2x.png deleted file mode 100644 index a0335db..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-76@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png deleted file mode 100644 index 2dd5230..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-86@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-86@2x.png deleted file mode 100644 index f32a034..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-86@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-98@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-98@2x.png deleted file mode 100644 index 85ec9e3..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-98@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small.png deleted file mode 100644 index 3a3ba64..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@2x.png deleted file mode 100644 index d9c5f4b..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@3x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@3x.png deleted file mode 100644 index ba532dd..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon-small@3x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon.png deleted file mode 100644 index 051cfb3..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon.png and /dev/null differ diff --git a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon@2x.png b/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon@2x.png deleted file mode 100644 index dcb403f..0000000 Binary files a/platforms/ios/dlapp/Images.xcassets/AppIcon.appiconset/icon@2x.png and /dev/null differ diff --git a/platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.h b/platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.h new file mode 100644 index 0000000..87c0330 --- /dev/null +++ b/platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.h @@ -0,0 +1,13 @@ +#import + +@interface AppVersion : CDVPlugin + +- (void)getAppName:(CDVInvokedUrlCommand*)command; + +- (void)getPackageName:(CDVInvokedUrlCommand*)command; + +- (void)getVersionNumber:(CDVInvokedUrlCommand*)command; + +- (void)getVersionCode:(CDVInvokedUrlCommand*)command; + +@end diff --git a/platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.m b/platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.m new file mode 100644 index 0000000..a73c78f --- /dev/null +++ b/platforms/ios/dlapp/Plugins/cordova-plugin-app-version/AppVersion.m @@ -0,0 +1,47 @@ +#import "AppVersion.h" +#import + +@implementation AppVersion + +- (void)getAppName : (CDVInvokedUrlCommand *)command +{ + NSString * callbackId = command.callbackId; + NSString * version =[[[NSBundle mainBundle]infoDictionary]objectForKey :@"CFBundleDisplayName"]; + CDVPluginResult * pluginResult =[CDVPluginResult resultWithStatus : CDVCommandStatus_OK messageAsString : version]; + [self.commandDelegate sendPluginResult : pluginResult callbackId : callbackId]; +} + +- (void)getPackageName:(CDVInvokedUrlCommand*)command +{ + NSString* callbackId = command.callbackId; + NSString* packageName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]; + CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:packageName]; + [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId]; +} + +- (void)getVersionNumber:(CDVInvokedUrlCommand*)command +{ + NSString* callbackId = command.callbackId; + NSString* version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; + if (version == nil) { + NSLog(@"CFBundleShortVersionString was nil, attempting CFBundleVersion"); + version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]; + if (version == nil) { + NSLog(@"CFBundleVersion was also nil, giving up"); + // not calling error callback here to maintain backward compatibility + } + } + + CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:version]; + [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId]; +} + +- (void)getVersionCode:(CDVInvokedUrlCommand*)command +{ + NSString* callbackId = command.callbackId; + NSString* version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]; + CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:version]; + [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId]; +} + +@end diff --git a/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h new file mode 100644 index 0000000..f4f8816 --- /dev/null +++ b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.h @@ -0,0 +1,27 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import + +@interface CDVWKProcessPoolFactory : NSObject +@property (nonatomic, retain) WKProcessPool* sharedPool; + ++(instancetype) sharedFactory; +-(WKProcessPool*) sharedProcessPool; +@end diff --git a/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m new file mode 100644 index 0000000..48ac09e --- /dev/null +++ b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKProcessPoolFactory.m @@ -0,0 +1,49 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import +#import +#import "CDVWKProcessPoolFactory.h" + +static CDVWKProcessPoolFactory *factory = nil; + +@implementation CDVWKProcessPoolFactory + ++ (instancetype)sharedFactory +{ + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + factory = [[CDVWKProcessPoolFactory alloc] init]; + }); + + return factory; +} + +- (instancetype)init +{ + if (self = [super init]) { + _sharedPool = [[WKProcessPool alloc] init]; + } + return self; +} + +- (WKProcessPool*) sharedProcessPool { + return _sharedPool; +} +@end diff --git a/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h new file mode 100644 index 0000000..c71f4e2 --- /dev/null +++ b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.h @@ -0,0 +1,29 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import +#import + +@interface CDVWKWebViewEngine : CDVPlugin + +@property (nonatomic, strong, readonly) id uiDelegate; + +- (void)allowsBackForwardNavigationGestures:(CDVInvokedUrlCommand*)command; + +@end diff --git a/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m new file mode 100644 index 0000000..16a0cb7 --- /dev/null +++ b/platforms/ios/dlapp/Plugins/cordova-plugin-wkwebview-engine/CDVWKWebViewEngine.m @@ -0,0 +1,494 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import "CDVWKWebViewEngine.h" +#import "CDVWKWebViewUIDelegate.h" +#import "CDVWKProcessPoolFactory.h" +#import + +#import + +#define CDV_BRIDGE_NAME @"cordova" +#define CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR @"loadFileURL:allowingReadAccessToURL:" + +@interface CDVWKWeakScriptMessageHandler : NSObject + +@property (nonatomic, weak, readonly) idscriptMessageHandler; + +- (instancetype)initWithScriptMessageHandler:(id)scriptMessageHandler; + +@end + + +@interface CDVWKWebViewEngine () + +@property (nonatomic, strong, readwrite) UIView* engineWebView; +@property (nonatomic, strong, readwrite) id uiDelegate; +@property (nonatomic, weak) id weakScriptMessageHandler; + +@end + +// see forwardingTargetForSelector: selector comment for the reason for this pragma +#pragma clang diagnostic ignored "-Wprotocol" + +@implementation CDVWKWebViewEngine + +@synthesize engineWebView = _engineWebView; + +- (instancetype)initWithFrame:(CGRect)frame +{ + self = [super init]; + if (self) { + if (NSClassFromString(@"WKWebView") == nil) { + return nil; + } + + self.engineWebView = [[WKWebView alloc] initWithFrame:frame]; + } + + return self; +} + +- (WKWebViewConfiguration*) createConfigurationFromSettings:(NSDictionary*)settings +{ + WKWebViewConfiguration* configuration = [[WKWebViewConfiguration alloc] init]; + configuration.processPool = [[CDVWKProcessPoolFactory sharedFactory] sharedProcessPool]; + if (settings == nil) { + return configuration; + } + + configuration.allowsInlineMediaPlayback = [settings cordovaBoolSettingForKey:@"AllowInlineMediaPlayback" defaultValue:NO]; + configuration.mediaPlaybackRequiresUserAction = [settings cordovaBoolSettingForKey:@"MediaPlaybackRequiresUserAction" defaultValue:YES]; + configuration.suppressesIncrementalRendering = [settings cordovaBoolSettingForKey:@"SuppressesIncrementalRendering" defaultValue:NO]; + configuration.mediaPlaybackAllowsAirPlay = [settings cordovaBoolSettingForKey:@"MediaPlaybackAllowsAirPlay" defaultValue:YES]; + return configuration; +} + +- (void)pluginInitialize +{ + // viewController would be available now. we attempt to set all possible delegates to it, by default + NSDictionary* settings = self.commandDelegate.settings; + + self.uiDelegate = [[CDVWKWebViewUIDelegate alloc] initWithTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]]; + + CDVWKWeakScriptMessageHandler *weakScriptMessageHandler = [[CDVWKWeakScriptMessageHandler alloc] initWithScriptMessageHandler:self]; + + WKUserContentController* userContentController = [[WKUserContentController alloc] init]; + [userContentController addScriptMessageHandler:weakScriptMessageHandler name:CDV_BRIDGE_NAME]; + + WKWebViewConfiguration* configuration = [self createConfigurationFromSettings:settings]; + configuration.userContentController = userContentController; + + // re-create WKWebView, since we need to update configuration + WKWebView* wkWebView = [[WKWebView alloc] initWithFrame:self.engineWebView.frame configuration:configuration]; + wkWebView.UIDelegate = self.uiDelegate; + self.engineWebView = wkWebView; + + if (IsAtLeastiOSVersion(@"9.0") && [self.viewController isKindOfClass:[CDVViewController class]]) { + wkWebView.customUserAgent = ((CDVViewController*) self.viewController).userAgent; + } + + if ([self.viewController conformsToProtocol:@protocol(WKUIDelegate)]) { + wkWebView.UIDelegate = (id )self.viewController; + } + + if ([self.viewController conformsToProtocol:@protocol(WKNavigationDelegate)]) { + wkWebView.navigationDelegate = (id )self.viewController; + } else { + wkWebView.navigationDelegate = (id )self; + } + + if ([self.viewController conformsToProtocol:@protocol(WKScriptMessageHandler)]) { + [wkWebView.configuration.userContentController addScriptMessageHandler:(id < WKScriptMessageHandler >)self.viewController name:CDV_BRIDGE_NAME]; + } + + [self updateSettings:settings]; + + // check if content thread has died on resume + NSLog(@"%@", @"CDVWKWebViewEngine will reload WKWebView if required on resume"); + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(onAppWillEnterForeground:) + name:UIApplicationWillEnterForegroundNotification object:nil]; + + NSLog(@"Using WKWebView"); + + [self addURLObserver]; +} + +- (void)onReset { + [self addURLObserver]; +} + +static void * KVOContext = &KVOContext; + +- (void)addURLObserver { + if(!IsAtLeastiOSVersion(@"9.0")){ + [self.webView addObserver:self forKeyPath:@"URL" options:0 context:KVOContext]; + } +} + +- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context +{ + if (context == KVOContext) { + if (object == [self webView] && [keyPath isEqualToString: @"URL"] && [object valueForKeyPath:keyPath] == nil){ + NSLog(@"URL is nil. Reloading WKWebView"); + [(WKWebView*)_engineWebView reload]; + } + } else { + [super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; + } +} + +- (void) onAppWillEnterForeground:(NSNotification*)notification { + if ([self shouldReloadWebView]) { + NSLog(@"%@", @"CDVWKWebViewEngine reloading!"); + [(WKWebView*)_engineWebView reload]; + } +} + +- (BOOL)shouldReloadWebView +{ + WKWebView* wkWebView = (WKWebView*)_engineWebView; + return [self shouldReloadWebView:wkWebView.URL title:wkWebView.title]; +} + +- (BOOL)shouldReloadWebView:(NSURL*)location title:(NSString*)title +{ + BOOL title_is_nil = (title == nil); + BOOL location_is_blank = [[location absoluteString] isEqualToString:@"about:blank"]; + + BOOL reload = (title_is_nil || location_is_blank); + +#ifdef DEBUG + NSLog(@"%@", @"CDVWKWebViewEngine shouldReloadWebView::"); + NSLog(@"CDVWKWebViewEngine shouldReloadWebView title: %@", title); + NSLog(@"CDVWKWebViewEngine shouldReloadWebView location: %@", [location absoluteString]); + NSLog(@"CDVWKWebViewEngine shouldReloadWebView reload: %u", reload); +#endif + + return reload; +} + + +- (id)loadRequest:(NSURLRequest*)request +{ + if ([self canLoadRequest:request]) { // can load, differentiate between file urls and other schemes + if (request.URL.fileURL) { + SEL wk_sel = NSSelectorFromString(CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR); + NSURL* readAccessUrl = [request.URL URLByDeletingLastPathComponent]; + return ((id (*)(id, SEL, id, id))objc_msgSend)(_engineWebView, wk_sel, request.URL, readAccessUrl); + } else { + return [(WKWebView*)_engineWebView loadRequest:request]; + } + } else { // can't load, print out error + NSString* errorHtml = [NSString stringWithFormat: + @"" + @"Error" + @"

" + @"

The WebView engine '%@' is unable to load the request: %@

" + @"

Most likely the cause of the error is that the loading of file urls is not supported in iOS %@.

" + @"

@@ -105,4 +114,5 @@ +

diff --git a/platforms/ios/dlapp/dlapp-Info.plist b/platforms/ios/dlapp/dlapp-Info.plist index 67584e9..fc16293 100644 --- a/platforms/ios/dlapp/dlapp-Info.plist +++ b/platforms/ios/dlapp/dlapp-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 1.0.4 CFBundleSignature ???? CFBundleVersion - 1.0.0 + 1.0.4 LSRequiresIPhoneOS NSAppTransportSecurity @@ -45,6 +45,10 @@ NSMainNibFile~ipad + UIBackgroundModes + + remote-notification + UIInterfaceOrientation UIInterfaceOrientationPortrait @@ -63,9 +67,7 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown - UIBackgroundModes - - remote-notification - + NSPhotoLibraryUsageDescription + APPéè¦ä½¿ç¨æ¨çç¸åæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½ \ No newline at end of file diff --git a/platforms/ios/frameworks.json b/platforms/ios/frameworks.json index d1a9e95..c15fc84 100644 --- a/platforms/ios/frameworks.json +++ b/platforms/ios/frameworks.json @@ -13,5 +13,6 @@ "libz.tbd": 1, "AdSupport.framework": 1, "UserNotifications.framework": 1, - "libresolv.tbd": 1 + "libresolv.tbd": 1, + "WebKit.framework": 1 } \ No newline at end of file diff --git a/platforms/ios/ios.json b/platforms/ios/ios.json index 8bd066d..3a70ab7 100644 --- a/platforms/ios/ios.json +++ b/platforms/ios/ios.json @@ -67,6 +67,18 @@ { "xml": "", "count": 1 + }, + { + "xml": "", + "count": 1 + }, + { + "xml": "", + "count": 1 + }, + { + "xml": "", + "count": 1 } ] } @@ -96,6 +108,14 @@ "xml": "remote-notification", "count": 1 } + ], + "NSPhotoLibraryUsageDescription": [ + { + "xml": "APPéè¦ä½¿ç¨æ¨çç¸åæéï¼æ²¡æè¯¥æéå°æ æ³å®ææ«ä¸æ«åè½", + "count": 1, + "mode": "merge", + "id": "config.xml" + } ] } }, @@ -123,7 +143,7 @@ "parents": { "Appkey": [ { - "xml": "your_jpush_appkey", + "xml": "d644d997f2cab0551ff704a3", "count": 1 } ] @@ -177,9 +197,15 @@ "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" }, "jpush-phonegap-plugin": { - "APP_KEY": "your_jpush_appkey", + "APP_KEY": "d644d997f2cab0551ff704a3", "CHANNEL": "developer-default", "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" + }, + "cordova-plugin-app-version": { + "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" + }, + "cordova-plugin-wkwebview-engine": { + "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" } }, "dependent_plugins": {}, @@ -511,6 +537,30 @@ "clobbers": [ "JPush" ] + }, + { + "id": "cordova-plugin-app-version.AppVersionPlugin", + "file": "plugins/cordova-plugin-app-version/www/AppVersionPlugin.js", + "pluginId": "cordova-plugin-app-version", + "clobbers": [ + "cordova.getAppVersion" + ] + }, + { + "id": "cordova-plugin-wkwebview-engine.ios-wkwebview-exec", + "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js", + "pluginId": "cordova-plugin-wkwebview-engine", + "clobbers": [ + "cordova.exec" + ] + }, + { + "id": "cordova-plugin-wkwebview-engine.ios-wkwebview", + "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js", + "pluginId": "cordova-plugin-wkwebview-engine", + "clobbers": [ + "window.WkWebView" + ] } ], "plugin_metadata": { @@ -528,6 +578,8 @@ "cordova-plugin-device": "2.0.2", "cordova-plugin-themeablebrowser": "0.2.17", "cordova-plugin-jcore": "1.3.0", - "jpush-phonegap-plugin": "3.7.2" + "jpush-phonegap-plugin": "3.7.2", + "cordova-plugin-app-version": "0.1.9", + "cordova-plugin-wkwebview-engine": "1.2.1" } } diff --git a/platforms/ios/platform_www/cordova_plugins.js b/platforms/ios/platform_www/cordova_plugins.js index 2a5d5a5..99f7689 100644 --- a/platforms/ios/platform_www/cordova_plugins.js +++ b/platforms/ios/platform_www/cordova_plugins.js @@ -327,6 +327,30 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "clobbers": [ "JPush" ] + }, + { + "id": "cordova-plugin-app-version.AppVersionPlugin", + "file": "plugins/cordova-plugin-app-version/www/AppVersionPlugin.js", + "pluginId": "cordova-plugin-app-version", + "clobbers": [ + "cordova.getAppVersion" + ] + }, + { + "id": "cordova-plugin-wkwebview-engine.ios-wkwebview-exec", + "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js", + "pluginId": "cordova-plugin-wkwebview-engine", + "clobbers": [ + "cordova.exec" + ] + }, + { + "id": "cordova-plugin-wkwebview-engine.ios-wkwebview", + "file": "plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js", + "pluginId": "cordova-plugin-wkwebview-engine", + "clobbers": [ + "window.WkWebView" + ] } ]; module.exports.metadata = { @@ -344,6 +368,8 @@ cordova.define('cordova/plugin_list', function(require, exports, module) { "cordova-plugin-device": "2.0.2", "cordova-plugin-themeablebrowser": "0.2.17", "cordova-plugin-jcore": "1.3.0", - "jpush-phonegap-plugin": "3.7.2" + "jpush-phonegap-plugin": "3.7.2", + "cordova-plugin-app-version": "0.1.9", + "cordova-plugin-wkwebview-engine": "1.2.1" }; }); \ No newline at end of file diff --git a/platforms/ios/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js b/platforms/ios/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js new file mode 100644 index 0000000..430f50d --- /dev/null +++ b/platforms/ios/platform_www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js @@ -0,0 +1,68 @@ +cordova.define("cordova-plugin-app-version.AppVersionPlugin", function(require, exports, module) { +/*jslint indent: 2 */ +/*global window, jQuery, angular, cordova */ +"use strict"; + +// Returns a jQuery or AngularJS deferred object, or pass a success and fail callbacks if you don't want to use jQuery or AngularJS +var getPromisedCordovaExec = function (command, success, fail) { + var toReturn, deferred, injector, $q; + if (success === undefined) { + if (window.jQuery) { + deferred = jQuery.Deferred(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred; + } else if (window.angular) { + injector = angular.injector(["ng"]); + $q = injector.get("$q"); + deferred = $q.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.when && window.when.promise) { + deferred = when.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.Promise) { + toReturn = new Promise(function(c, e) { + success = c; + fail = e; + }); + } else if (window.WinJS && window.WinJS.Promise) { + toReturn = new WinJS.Promise(function(c, e) { + success = c; + fail = e; + }); + } else { + return console.error('AppVersion either needs a success callback, or jQuery/AngularJS/Promise/WinJS.Promise defined for using promises'); + } + } + // 5th param is NOT optional. must be at least empty array + cordova.exec(success, fail, "AppVersion", command, []); + return toReturn; +}; + +var getAppVersion = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getAppName = function (success, fail) { + return getPromisedCordovaExec('getAppName', success, fail); +}; + +getAppVersion.getPackageName = function (success, fail) { + return getPromisedCordovaExec('getPackageName', success, fail); +}; + +getAppVersion.getVersionNumber = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getVersionCode = function (success, fail) { + return getPromisedCordovaExec('getVersionCode', success, fail); +}; + +module.exports = getAppVersion; + +}); diff --git a/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js b/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js new file mode 100644 index 0000000..dc7595d --- /dev/null +++ b/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js @@ -0,0 +1,177 @@ +cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview-exec", function(require, exports, module) { +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +/** + * Creates the exec bridge used to notify the native code of + * commands. + */ +var cordova = require('cordova'); +var utils = require('cordova/utils'); +var base64 = require('cordova/base64'); + +function massageArgsJsToNative (args) { + if (!args || utils.typeName(args) !== 'Array') { + return args; + } + var ret = []; + args.forEach(function (arg, i) { + if (utils.typeName(arg) === 'ArrayBuffer') { + ret.push({ + 'CDVType': 'ArrayBuffer', + 'data': base64.fromArrayBuffer(arg) + }); + } else { + ret.push(arg); + } + }); + return ret; +} + +function massageMessageNativeToJs (message) { + if (message.CDVType === 'ArrayBuffer') { + var stringToArrayBuffer = function (str) { + var ret = new Uint8Array(str.length); + for (var i = 0; i < str.length; i++) { + ret[i] = str.charCodeAt(i); + } + return ret.buffer; + }; + var base64ToArrayBuffer = function (b64) { + return stringToArrayBuffer(atob(b64)); // eslint-disable-line no-undef + }; + message = base64ToArrayBuffer(message.data); + } + return message; +} + +function convertMessageToArgsNativeToJs (message) { + var args = []; + if (!message || !message.hasOwnProperty('CDVType')) { + args.push(message); + } else if (message.CDVType === 'MultiPart') { + message.messages.forEach(function (e) { + args.push(massageMessageNativeToJs(e)); + }); + } else { + args.push(massageMessageNativeToJs(message)); + } + return args; +} + +var iOSExec = function () { + // detect change in bridge, if there is a change, we forward to new bridge + + // if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) { + // bridgeMode = jsToNativeModes.WK_WEBVIEW_BINDING; + // } + + var successCallback, failCallback, service, action, actionArgs; + var callbackId = null; + if (typeof arguments[0] !== 'string') { + // FORMAT ONE + successCallback = arguments[0]; + failCallback = arguments[1]; + service = arguments[2]; + action = arguments[3]; + actionArgs = arguments[4]; + + // Since we need to maintain backwards compatibility, we have to pass + // an invalid callbackId even if no callback was provided since plugins + // will be expecting it. The Cordova.exec() implementation allocates + // an invalid callbackId and passes it even if no callbacks were given. + callbackId = 'INVALID'; + } else { + throw new Error('The old format of this exec call has been removed (deprecated since 2.1). Change to: ' + // eslint-disable-line + 'cordova.exec(null, null, \'Service\', \'action\', [ arg1, arg2 ]);'); + } + + // If actionArgs is not provided, default to an empty array + actionArgs = actionArgs || []; + + // Register the callbacks and add the callbackId to the positional + // arguments if given. + if (successCallback || failCallback) { + callbackId = service + cordova.callbackId++; + cordova.callbacks[callbackId] = + {success: successCallback, fail: failCallback}; + } + + actionArgs = massageArgsJsToNative(actionArgs); + + // CB-10133 DataClone DOM Exception 25 guard (fast function remover) + var command = [callbackId, service, action, JSON.parse(JSON.stringify(actionArgs))]; + window.webkit.messageHandlers.cordova.postMessage(command); +}; + +iOSExec.nativeCallback = function (callbackId, status, message, keepCallback, debug) { + var success = status === 0 || status === 1; + var args = convertMessageToArgsNativeToJs(message); + Promise.resolve().then(function () { + cordova.callbackFromNative(callbackId, success, status, args, keepCallback); // eslint-disable-line + }); +}; + +// for backwards compatibility +iOSExec.nativeEvalAndFetch = function (func) { + try { + func(); + } catch (e) { + console.log(e); + } +}; + +// Proxy the exec for bridge changes. See CB-10106 + +function cordovaExec () { + var cexec = require('cordova/exec'); + var cexec_valid = (typeof cexec.nativeFetchMessages === 'function') && (typeof cexec.nativeEvalAndFetch === 'function') && (typeof cexec.nativeCallback === 'function'); + return (cexec_valid && execProxy !== cexec) ? cexec : iOSExec; +} + +function execProxy () { + cordovaExec().apply(null, arguments); +} + +execProxy.nativeFetchMessages = function () { + return cordovaExec().nativeFetchMessages.apply(null, arguments); +}; + +execProxy.nativeEvalAndFetch = function () { + return cordovaExec().nativeEvalAndFetch.apply(null, arguments); +}; + +execProxy.nativeCallback = function () { + return cordovaExec().nativeCallback.apply(null, arguments); +}; + +module.exports = execProxy; + +if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) { + // unregister the old bridge + cordova.define.remove('cordova/exec'); + // redefine bridge to our new bridge + cordova.define('cordova/exec', function (require, exports, module) { + module.exports = execProxy; + }); +} + +}); diff --git a/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js b/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js new file mode 100644 index 0000000..0dac749 --- /dev/null +++ b/platforms/ios/platform_www/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js @@ -0,0 +1,33 @@ +cordova.define("cordova-plugin-wkwebview-engine.ios-wkwebview", function(require, exports, module) { +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +var exec = require('cordova/exec'); + +var WkWebKit = { + allowsBackForwardNavigationGestures: function (allow) { + exec(null, null, 'CDVWKWebViewEngine', 'allowsBackForwardNavigationGestures', [allow]); + } +}; + +module.exports = WkWebKit; + +}); diff --git a/plugins/android.json b/plugins/android.json index 7acd36f..3736fc4 100644 --- a/plugins/android.json +++ b/plugins/android.json @@ -42,9 +42,15 @@ "PACKAGE_NAME": "com.supwisdom.dlapp" }, "jpush-phonegap-plugin": { - "APP_KEY": "your_jpush_appkey", + "APP_KEY": "d644d997f2cab0551ff704a3", "CHANNEL": "developer-default", "PACKAGE_NAME": "com.supwisdom.dlapp" + }, + "cordova-plugin-app-version": { + "PACKAGE_NAME": "com.supwisdom.dlapp" + }, + "cordova-plugin-wkwebview-engine": { + "PACKAGE_NAME": "com.dalicitycard.app" } }, "dependent_plugins": { diff --git a/plugins/browser.json b/plugins/browser.json index a89cd8a..4315c7b 100644 --- a/plugins/browser.json +++ b/plugins/browser.json @@ -44,6 +44,12 @@ "APP_KEY": "your_jpush_appkey", "CHANNEL": "developer-default", "PACKAGE_NAME": "com.supwisdom.dlapp" + }, + "cordova-plugin-app-version": { + "PACKAGE_NAME": "com.supwisdom.dlapp" + }, + "cordova-plugin-wkwebview-engine": { + "PACKAGE_NAME": "com.supwisdom.dlapp" } }, "dependent_plugins": { diff --git a/plugins/cordova-plugin-app-version/LICENSE b/plugins/cordova-plugin-app-version/LICENSE new file mode 100644 index 0000000..484859f --- /dev/null +++ b/plugins/cordova-plugin-app-version/LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2013 White October + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/plugins/cordova-plugin-app-version/VERSION b/plugins/cordova-plugin-app-version/VERSION new file mode 100644 index 0000000..1a03094 --- /dev/null +++ b/plugins/cordova-plugin-app-version/VERSION @@ -0,0 +1 @@ +0.1.9 diff --git a/plugins/cordova-plugin-app-version/package.json b/plugins/cordova-plugin-app-version/package.json new file mode 100644 index 0000000..bcf4a9a --- /dev/null +++ b/plugins/cordova-plugin-app-version/package.json @@ -0,0 +1,54 @@ +{ + "_from": "cordova-plugin-app-version", + "_id": "cordova-plugin-app-version@0.1.9", + "_inBundle": false, + "_integrity": "sha1-nbBgeGMzenEEiTAuX1CpBPFEm9s=", + "_location": "/cordova-plugin-app-version", + "_phantomChildren": {}, + "_requested": { + "type": "tag", + "registry": true, + "raw": "cordova-plugin-app-version", + "name": "cordova-plugin-app-version", + "escapedName": "cordova-plugin-app-version", + "rawSpec": "", + "saveSpec": null, + "fetchSpec": "latest" + }, + "_requiredBy": [ + "#USER", + "/" + ], + "_resolved": "https://registry.npmjs.org/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.9.tgz", + "_shasum": "9db0607863337a710489302e5f50a904f1449bdb", + "_spec": "cordova-plugin-app-version", + "_where": "/Users/shuwei/works2/cordova/dlapp", + "author": { + "name": "whiteoctober" + }, + "bugs": { + "url": "https://github.com/whiteoctober/cordova-plugin-app-version/issues" + }, + "bundleDependencies": false, + "deprecated": false, + "description": "Cordova plugin to return the version number of the current app", + "homepage": "https://github.com/whiteoctober/cordova-plugin-app-version#readme", + "keywords": [ + "cordova", + "ecosystem:cordova", + "app", + "version", + "appversion", + "plugin" + ], + "license": "MIT", + "name": "cordova-plugin-app-version", + "repository": { + "type": "git", + "url": "git+https://github.com/whiteoctober/cordova-plugin-app-version.git" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "version": "0.1.9" +} diff --git a/plugins/cordova-plugin-app-version/plugin.xml b/plugins/cordova-plugin-app-version/plugin.xml new file mode 100644 index 0000000..97ff02c --- /dev/null +++ b/plugins/cordova-plugin-app-version/plugin.xml @@ -0,0 +1,79 @@ + + + + AppVersion + + This plugin will return the version of your App that you have set in + packaging it. I.e. it will always match the version in the app store. + + MIT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/cordova-plugin-app-version/src/android/AppVersion.java b/plugins/cordova-plugin-app-version/src/android/AppVersion.java new file mode 100644 index 0000000..204ed7e --- /dev/null +++ b/plugins/cordova-plugin-app-version/src/android/AppVersion.java @@ -0,0 +1,45 @@ +package uk.co.whiteoctober.cordova; + +import org.apache.cordova.CordovaPlugin; +import org.apache.cordova.CallbackContext; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PackageManager; + +public class AppVersion extends CordovaPlugin { + @Override + public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { + + try { + if (action.equals("getAppName")) { + PackageManager packageManager = this.cordova.getActivity().getPackageManager(); + ApplicationInfo app = packageManager.getApplicationInfo(this.cordova.getActivity().getPackageName(), 0); + callbackContext.success((String)packageManager.getApplicationLabel(app)); + return true; + } + if (action.equals("getPackageName")) { + callbackContext.success(this.cordova.getActivity().getPackageName()); + return true; + } + if (action.equals("getVersionNumber")) { + PackageManager packageManager = this.cordova.getActivity().getPackageManager(); + callbackContext.success(packageManager.getPackageInfo(this.cordova.getActivity().getPackageName(), 0).versionName); + return true; + } + if (action.equals("getVersionCode")) { + PackageManager packageManager = this.cordova.getActivity().getPackageManager(); + callbackContext.success(packageManager.getPackageInfo(this.cordova.getActivity().getPackageName(), 0).versionCode); + return true; + } + return false; + } catch (NameNotFoundException e) { + callbackContext.success("N/A"); + return true; + } + } + +} diff --git a/plugins/cordova-plugin-app-version/src/ios/AppVersion.h b/plugins/cordova-plugin-app-version/src/ios/AppVersion.h new file mode 100644 index 0000000..87c0330 --- /dev/null +++ b/plugins/cordova-plugin-app-version/src/ios/AppVersion.h @@ -0,0 +1,13 @@ +#import + +@interface AppVersion : CDVPlugin + +- (void)getAppName:(CDVInvokedUrlCommand*)command; + +- (void)getPackageName:(CDVInvokedUrlCommand*)command; + +- (void)getVersionNumber:(CDVInvokedUrlCommand*)command; + +- (void)getVersionCode:(CDVInvokedUrlCommand*)command; + +@end diff --git a/plugins/cordova-plugin-app-version/src/ios/AppVersion.m b/plugins/cordova-plugin-app-version/src/ios/AppVersion.m new file mode 100644 index 0000000..a73c78f --- /dev/null +++ b/plugins/cordova-plugin-app-version/src/ios/AppVersion.m @@ -0,0 +1,47 @@ +#import "AppVersion.h" +#import + +@implementation AppVersion + +- (void)getAppName : (CDVInvokedUrlCommand *)command +{ + NSString * callbackId = command.callbackId; + NSString * version =[[[NSBundle mainBundle]infoDictionary]objectForKey :@"CFBundleDisplayName"]; + CDVPluginResult * pluginResult =[CDVPluginResult resultWithStatus : CDVCommandStatus_OK messageAsString : version]; + [self.commandDelegate sendPluginResult : pluginResult callbackId : callbackId]; +} + +- (void)getPackageName:(CDVInvokedUrlCommand*)command +{ + NSString* callbackId = command.callbackId; + NSString* packageName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]; + CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:packageName]; + [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId]; +} + +- (void)getVersionNumber:(CDVInvokedUrlCommand*)command +{ + NSString* callbackId = command.callbackId; + NSString* version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; + if (version == nil) { + NSLog(@"CFBundleShortVersionString was nil, attempting CFBundleVersion"); + version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]; + if (version == nil) { + NSLog(@"CFBundleVersion was also nil, giving up"); + // not calling error callback here to maintain backward compatibility + } + } + + CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:version]; + [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId]; +} + +- (void)getVersionCode:(CDVInvokedUrlCommand*)command +{ + NSString* callbackId = command.callbackId; + NSString* version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]; + CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:version]; + [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId]; +} + +@end diff --git a/plugins/cordova-plugin-app-version/src/windows/AppVersionProxy.js b/plugins/cordova-plugin-app-version/src/windows/AppVersionProxy.js new file mode 100644 index 0000000..9c17927 --- /dev/null +++ b/plugins/cordova-plugin-app-version/src/windows/AppVersionProxy.js @@ -0,0 +1,33 @@ +AppVersionProxy = { + getVersionNumber: function (successCallback, failCallback, args) { + var version = Windows.ApplicationModel.Package.current.id.version; + successCallback([version.major, version.minor, version.build, version.revision].join('.')); + }, + getAppName: function (successCallback, failCallback, args) { + if(Windows.ApplicationModel.Package.current && Windows.ApplicationModel.Package.current.displayName){ + var name = Windows.ApplicationModel.Package.current.displayName; + successCallback(name); + } else { + Windows.ApplicationModel.Package.current.installedLocation.getFileAsync("AppxManifest.xml").then(function (file) { + Windows.Data.Xml.Dom.XmlDocument.loadFromFileAsync(file).then(function (xdoc) { + var displayName = xdoc.getElementsByTagName("DisplayName"); + if (displayName && displayName.length === 1) { + var name = displayName[0].innerText; + successCallback(name); + } else { + (failCallback || function(){})({ code: -1, message: "ERR_DISPLAY_NAME_NOT_FOUND" }); + } + }, (failCallback || function(){})); + }, (failCallback || function(){})); + } + }, + getPackageName: function (successCallback, failCallback, args) { + var name = Windows.ApplicationModel.Package.current.id.name; + successCallback(name); + }, + getVersionCode: function (successCallback, failCallback, args) { + var build = Windows.ApplicationModel.Package.current.id.version.build; + successCallback(build); + } +}; +cordova.commandProxy.add("AppVersion", AppVersionProxy); diff --git a/plugins/cordova-plugin-app-version/src/wp8/AppVersion.cs b/plugins/cordova-plugin-app-version/src/wp8/AppVersion.cs new file mode 100644 index 0000000..bb94ab0 --- /dev/null +++ b/plugins/cordova-plugin-app-version/src/wp8/AppVersion.cs @@ -0,0 +1,53 @@ +using System; +using System.Reflection; +using System.Xml.Linq; +using Windows.ApplicationModel; +using WPCordovaClassLib.Cordova; +using WPCordovaClassLib.Cordova.Commands; + +namespace Cordova.Extension.Commands +{ + public class AppVersion : BaseCommand + { + public void getVersionNumber(string empty) + { + string version; + if (Environment.OSVersion.Version.Major <= 8) + { + // Package.Current.Id is NOT working in Windows Phone 8 + // Workaround based on http://stackoverflow.com/questions/14371275/how-can-i-get-my-windows-store-apps-title-and-version-info + version = XDocument.Load("WMAppManifest.xml").Root.Element("App").Attribute("Version").Value; + } + else + { + version = Package.Current.Id.Version.ToString(); + } + + this.DispatchCommandResult(new PluginResult(PluginResult.Status.OK, version)); + } + + public void getAppName(string empty) + { + string name; + if (Environment.OSVersion.Version.Major <= 8) + { + //Windows.ApplicationModel.Package.Current.Id is NOT working in Windows Phone 8 + //Workaround based on http://stackoverflow.com/questions/14371275/how-can-i-get-my-windows-store-apps-title-and-version-info + name = XDocument.Load("WMAppManifest.xml").Root.Element("App").Attribute("Title").Value; + } + else + { + name = Package.Current.Id.Name; + } + + this.DispatchCommandResult(new PluginResult(PluginResult.Status.OK, name)); + } + + public void getPackageName(string empty) + { + string package = Assembly.GetExecutingAssembly().GetName().Name; + + this.DispatchCommandResult(new PluginResult(PluginResult.Status.OK, package)); + } + } +} \ No newline at end of file diff --git a/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js b/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js new file mode 100644 index 0000000..abb9381 --- /dev/null +++ b/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js @@ -0,0 +1,65 @@ +/*jslint indent: 2 */ +/*global window, jQuery, angular, cordova */ +"use strict"; + +// Returns a jQuery or AngularJS deferred object, or pass a success and fail callbacks if you don't want to use jQuery or AngularJS +var getPromisedCordovaExec = function (command, success, fail) { + var toReturn, deferred, injector, $q; + if (success === undefined) { + if (window.jQuery) { + deferred = jQuery.Deferred(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred; + } else if (window.angular) { + injector = angular.injector(["ng"]); + $q = injector.get("$q"); + deferred = $q.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.when && window.when.promise) { + deferred = when.defer(); + success = deferred.resolve; + fail = deferred.reject; + toReturn = deferred.promise; + } else if (window.Promise) { + toReturn = new Promise(function(c, e) { + success = c; + fail = e; + }); + } else if (window.WinJS && window.WinJS.Promise) { + toReturn = new WinJS.Promise(function(c, e) { + success = c; + fail = e; + }); + } else { + return console.error('AppVersion either needs a success callback, or jQuery/AngularJS/Promise/WinJS.Promise defined for using promises'); + } + } + // 5th param is NOT optional. must be at least empty array + cordova.exec(success, fail, "AppVersion", command, []); + return toReturn; +}; + +var getAppVersion = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getAppName = function (success, fail) { + return getPromisedCordovaExec('getAppName', success, fail); +}; + +getAppVersion.getPackageName = function (success, fail) { + return getPromisedCordovaExec('getPackageName', success, fail); +}; + +getAppVersion.getVersionNumber = function (success, fail) { + return getPromisedCordovaExec('getVersionNumber', success, fail); +}; + +getAppVersion.getVersionCode = function (success, fail) { + return getPromisedCordovaExec('getVersionCode', success, fail); +}; + +module.exports = getAppVersion; diff --git a/plugins/cordova-plugin-app-version/www/blackberry10/AppVersionProxy.js b/plugins/cordova-plugin-app-version/www/blackberry10/AppVersionProxy.js new file mode 100644 index 0000000..6a03074 --- /dev/null +++ b/plugins/cordova-plugin-app-version/www/blackberry10/AppVersionProxy.js @@ -0,0 +1,18 @@ +module.exports = { + getVersionNumber: function( success, fail ) { + if( !blackberry || !blackberry.app || !blackberry.app.version ) { + if( fail ) { + return fail(); + } else { + return ""; + } + } + + if( success ) { + return success( blackberry.app.version ); + } + return blackberry.app.version; + } +}; + +require("cordova/exec/proxy").add("AppVersion", module.exports); diff --git a/plugins/cordova-plugin-wkwebview-engine/LICENSE b/plugins/cordova-plugin-wkwebview-engine/LICENSE new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/plugins/cordova-plugin-wkwebview-engine/NOTICE b/plugins/cordova-plugin-wkwebview-engine/NOTICE new file mode 100644 index 0000000..666eab8 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/NOTICE @@ -0,0 +1,5 @@ +Apache Cordova +Copyright 2015 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/plugins/cordova-plugin-wkwebview-engine/package.json b/plugins/cordova-plugin-wkwebview-engine/package.json new file mode 100644 index 0000000..ade2dc7 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/package.json @@ -0,0 +1,72 @@ +{ + "_from": "cordova-plugin-wkwebview-engine", + "_id": "cordova-plugin-wkwebview-engine@1.2.1", + "_inBundle": false, + "_integrity": "sha512-usp6pu+tJ1y0btVAXOjE5+tMjbvTY6hsiLfHJPMdyzkgHvxoNSePZ/NavTGj4CBJJlUjnMsN3TUq25+SeTZCow==", + "_location": "/cordova-plugin-wkwebview-engine", + "_phantomChildren": {}, + "_requested": { + "type": "tag", + "registry": true, + "raw": "cordova-plugin-wkwebview-engine", + "name": "cordova-plugin-wkwebview-engine", + "escapedName": "cordova-plugin-wkwebview-engine", + "rawSpec": "", + "saveSpec": null, + "fetchSpec": "latest" + }, + "_requiredBy": [ + "#USER", + "/" + ], + "_resolved": "https://registry.npmjs.org/cordova-plugin-wkwebview-engine/-/cordova-plugin-wkwebview-engine-1.2.1.tgz", + "_shasum": "f8972282969355d2d2f3458b23f604210e45eaf3", + "_spec": "cordova-plugin-wkwebview-engine", + "_where": "/Users/shuwei/works2/cordova/dlapp", + "author": { + "name": "Apache Software Foundation" + }, + "bugs": { + "url": "https://github.com/apache/cordova-plugin-wkwebview-engine/issues" + }, + "bundleDependencies": false, + "deprecated": false, + "description": "The official Apache Cordova WKWebView Engine Plugin", + "devDependencies": { + "eslint": "^3.19.0", + "eslint-config-semistandard": "^11.0.0", + "eslint-config-standard": "^10.2.1", + "eslint-plugin-import": "^2.3.0", + "eslint-plugin-node": "^5.0.0", + "eslint-plugin-promise": "^3.5.0", + "eslint-plugin-standard": "^3.0.1" + }, + "engines": { + "cordovaDependencies": { + "2.0.0": { + "cordova": ">100" + } + } + }, + "homepage": "https://github.com/apache/cordova-plugin-wkwebview-engine#readme", + "keywords": [ + "cordova", + "wkwebview", + "cordova-ios", + "ecosystem:cordova" + ], + "license": "Apache-2.0", + "main": "index.js", + "name": "cordova-plugin-wkwebview-engine", + "repository": { + "type": "git", + "url": "git+https://github.com/apache/cordova-plugin-wkwebview-engine.git" + }, + "scripts": { + "eslint": "eslint src", + "objc-tests": "cd tests/ios && npm test", + "preobjc-tests": "cd tests/ios && npm install", + "test": "npm run eslint && npm run objc-tests" + }, + "version": "1.2.1" +} diff --git a/plugins/cordova-plugin-wkwebview-engine/plugin.xml b/plugins/cordova-plugin-wkwebview-engine/plugin.xml new file mode 100644 index 0000000..620d423 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/plugin.xml @@ -0,0 +1,63 @@ + + + + + + Cordova WKWebView Engine + Cordova WKWebView Engine Plugin + Apache 2.0 + cordova,wkwebview,webview + https://github.com/apache/cordova-plugin-wkwebview-engine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.h b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.h new file mode 100644 index 0000000..f4f8816 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.h @@ -0,0 +1,27 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import + +@interface CDVWKProcessPoolFactory : NSObject +@property (nonatomic, retain) WKProcessPool* sharedPool; + ++(instancetype) sharedFactory; +-(WKProcessPool*) sharedProcessPool; +@end diff --git a/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.m b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.m new file mode 100644 index 0000000..48ac09e --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKProcessPoolFactory.m @@ -0,0 +1,49 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import +#import +#import "CDVWKProcessPoolFactory.h" + +static CDVWKProcessPoolFactory *factory = nil; + +@implementation CDVWKProcessPoolFactory + ++ (instancetype)sharedFactory +{ + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + factory = [[CDVWKProcessPoolFactory alloc] init]; + }); + + return factory; +} + +- (instancetype)init +{ + if (self = [super init]) { + _sharedPool = [[WKProcessPool alloc] init]; + } + return self; +} + +- (WKProcessPool*) sharedProcessPool { + return _sharedPool; +} +@end diff --git a/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.h b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.h new file mode 100644 index 0000000..c71f4e2 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.h @@ -0,0 +1,29 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import +#import + +@interface CDVWKWebViewEngine : CDVPlugin + +@property (nonatomic, strong, readonly) id uiDelegate; + +- (void)allowsBackForwardNavigationGestures:(CDVInvokedUrlCommand*)command; + +@end diff --git a/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.m b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.m new file mode 100644 index 0000000..16a0cb7 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewEngine.m @@ -0,0 +1,494 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import "CDVWKWebViewEngine.h" +#import "CDVWKWebViewUIDelegate.h" +#import "CDVWKProcessPoolFactory.h" +#import + +#import + +#define CDV_BRIDGE_NAME @"cordova" +#define CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR @"loadFileURL:allowingReadAccessToURL:" + +@interface CDVWKWeakScriptMessageHandler : NSObject + +@property (nonatomic, weak, readonly) idscriptMessageHandler; + +- (instancetype)initWithScriptMessageHandler:(id)scriptMessageHandler; + +@end + + +@interface CDVWKWebViewEngine () + +@property (nonatomic, strong, readwrite) UIView* engineWebView; +@property (nonatomic, strong, readwrite) id uiDelegate; +@property (nonatomic, weak) id weakScriptMessageHandler; + +@end + +// see forwardingTargetForSelector: selector comment for the reason for this pragma +#pragma clang diagnostic ignored "-Wprotocol" + +@implementation CDVWKWebViewEngine + +@synthesize engineWebView = _engineWebView; + +- (instancetype)initWithFrame:(CGRect)frame +{ + self = [super init]; + if (self) { + if (NSClassFromString(@"WKWebView") == nil) { + return nil; + } + + self.engineWebView = [[WKWebView alloc] initWithFrame:frame]; + } + + return self; +} + +- (WKWebViewConfiguration*) createConfigurationFromSettings:(NSDictionary*)settings +{ + WKWebViewConfiguration* configuration = [[WKWebViewConfiguration alloc] init]; + configuration.processPool = [[CDVWKProcessPoolFactory sharedFactory] sharedProcessPool]; + if (settings == nil) { + return configuration; + } + + configuration.allowsInlineMediaPlayback = [settings cordovaBoolSettingForKey:@"AllowInlineMediaPlayback" defaultValue:NO]; + configuration.mediaPlaybackRequiresUserAction = [settings cordovaBoolSettingForKey:@"MediaPlaybackRequiresUserAction" defaultValue:YES]; + configuration.suppressesIncrementalRendering = [settings cordovaBoolSettingForKey:@"SuppressesIncrementalRendering" defaultValue:NO]; + configuration.mediaPlaybackAllowsAirPlay = [settings cordovaBoolSettingForKey:@"MediaPlaybackAllowsAirPlay" defaultValue:YES]; + return configuration; +} + +- (void)pluginInitialize +{ + // viewController would be available now. we attempt to set all possible delegates to it, by default + NSDictionary* settings = self.commandDelegate.settings; + + self.uiDelegate = [[CDVWKWebViewUIDelegate alloc] initWithTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]]; + + CDVWKWeakScriptMessageHandler *weakScriptMessageHandler = [[CDVWKWeakScriptMessageHandler alloc] initWithScriptMessageHandler:self]; + + WKUserContentController* userContentController = [[WKUserContentController alloc] init]; + [userContentController addScriptMessageHandler:weakScriptMessageHandler name:CDV_BRIDGE_NAME]; + + WKWebViewConfiguration* configuration = [self createConfigurationFromSettings:settings]; + configuration.userContentController = userContentController; + + // re-create WKWebView, since we need to update configuration + WKWebView* wkWebView = [[WKWebView alloc] initWithFrame:self.engineWebView.frame configuration:configuration]; + wkWebView.UIDelegate = self.uiDelegate; + self.engineWebView = wkWebView; + + if (IsAtLeastiOSVersion(@"9.0") && [self.viewController isKindOfClass:[CDVViewController class]]) { + wkWebView.customUserAgent = ((CDVViewController*) self.viewController).userAgent; + } + + if ([self.viewController conformsToProtocol:@protocol(WKUIDelegate)]) { + wkWebView.UIDelegate = (id )self.viewController; + } + + if ([self.viewController conformsToProtocol:@protocol(WKNavigationDelegate)]) { + wkWebView.navigationDelegate = (id )self.viewController; + } else { + wkWebView.navigationDelegate = (id )self; + } + + if ([self.viewController conformsToProtocol:@protocol(WKScriptMessageHandler)]) { + [wkWebView.configuration.userContentController addScriptMessageHandler:(id < WKScriptMessageHandler >)self.viewController name:CDV_BRIDGE_NAME]; + } + + [self updateSettings:settings]; + + // check if content thread has died on resume + NSLog(@"%@", @"CDVWKWebViewEngine will reload WKWebView if required on resume"); + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(onAppWillEnterForeground:) + name:UIApplicationWillEnterForegroundNotification object:nil]; + + NSLog(@"Using WKWebView"); + + [self addURLObserver]; +} + +- (void)onReset { + [self addURLObserver]; +} + +static void * KVOContext = &KVOContext; + +- (void)addURLObserver { + if(!IsAtLeastiOSVersion(@"9.0")){ + [self.webView addObserver:self forKeyPath:@"URL" options:0 context:KVOContext]; + } +} + +- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context +{ + if (context == KVOContext) { + if (object == [self webView] && [keyPath isEqualToString: @"URL"] && [object valueForKeyPath:keyPath] == nil){ + NSLog(@"URL is nil. Reloading WKWebView"); + [(WKWebView*)_engineWebView reload]; + } + } else { + [super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; + } +} + +- (void) onAppWillEnterForeground:(NSNotification*)notification { + if ([self shouldReloadWebView]) { + NSLog(@"%@", @"CDVWKWebViewEngine reloading!"); + [(WKWebView*)_engineWebView reload]; + } +} + +- (BOOL)shouldReloadWebView +{ + WKWebView* wkWebView = (WKWebView*)_engineWebView; + return [self shouldReloadWebView:wkWebView.URL title:wkWebView.title]; +} + +- (BOOL)shouldReloadWebView:(NSURL*)location title:(NSString*)title +{ + BOOL title_is_nil = (title == nil); + BOOL location_is_blank = [[location absoluteString] isEqualToString:@"about:blank"]; + + BOOL reload = (title_is_nil || location_is_blank); + +#ifdef DEBUG + NSLog(@"%@", @"CDVWKWebViewEngine shouldReloadWebView::"); + NSLog(@"CDVWKWebViewEngine shouldReloadWebView title: %@", title); + NSLog(@"CDVWKWebViewEngine shouldReloadWebView location: %@", [location absoluteString]); + NSLog(@"CDVWKWebViewEngine shouldReloadWebView reload: %u", reload); +#endif + + return reload; +} + + +- (id)loadRequest:(NSURLRequest*)request +{ + if ([self canLoadRequest:request]) { // can load, differentiate between file urls and other schemes + if (request.URL.fileURL) { + SEL wk_sel = NSSelectorFromString(CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR); + NSURL* readAccessUrl = [request.URL URLByDeletingLastPathComponent]; + return ((id (*)(id, SEL, id, id))objc_msgSend)(_engineWebView, wk_sel, request.URL, readAccessUrl); + } else { + return [(WKWebView*)_engineWebView loadRequest:request]; + } + } else { // can't load, print out error + NSString* errorHtml = [NSString stringWithFormat: + @"" + @"Error" + @"

" + @"

The WebView engine '%@' is unable to load the request: %@

" + @"

Most likely the cause of the error is that the loading of file urls is not supported in iOS %@.

" + @"

", + NSStringFromClass([self class]), + [request.URL description], + [[UIDevice currentDevice] systemVersion] + ]; + return [self loadHTMLString:errorHtml baseURL:nil]; + } +} + +- (id)loadHTMLString:(NSString*)string baseURL:(NSURL*)baseURL +{ + return [(WKWebView*)_engineWebView loadHTMLString:string baseURL:baseURL]; +} + +- (NSURL*) URL +{ + return [(WKWebView*)_engineWebView URL]; +} + +- (BOOL) canLoadRequest:(NSURLRequest*)request +{ + // See: https://issues.apache.org/jira/browse/CB-9636 + SEL wk_sel = NSSelectorFromString(CDV_WKWEBVIEW_FILE_URL_LOAD_SELECTOR); + + // if it's a file URL, check whether WKWebView has the selector (which is in iOS 9 and up only) + if (request.URL.fileURL) { + return [_engineWebView respondsToSelector:wk_sel]; + } else { + return YES; + } +} + +- (void)updateSettings:(NSDictionary*)settings +{ + WKWebView* wkWebView = (WKWebView*)_engineWebView; + + wkWebView.configuration.preferences.minimumFontSize = [settings cordovaFloatSettingForKey:@"MinimumFontSize" defaultValue:0.0]; + + /* + wkWebView.configuration.preferences.javaScriptEnabled = [settings cordovaBoolSettingForKey:@"JavaScriptEnabled" default:YES]; + wkWebView.configuration.preferences.javaScriptCanOpenWindowsAutomatically = [settings cordovaBoolSettingForKey:@"JavaScriptCanOpenWindowsAutomatically" default:NO]; + */ + + // By default, DisallowOverscroll is false (thus bounce is allowed) + BOOL bounceAllowed = !([settings cordovaBoolSettingForKey:@"DisallowOverscroll" defaultValue:NO]); + + // prevent webView from bouncing + if (!bounceAllowed) { + if ([wkWebView respondsToSelector:@selector(scrollView)]) { + ((UIScrollView*)[wkWebView scrollView]).bounces = NO; + } else { + for (id subview in wkWebView.subviews) { + if ([[subview class] isSubclassOfClass:[UIScrollView class]]) { + ((UIScrollView*)subview).bounces = NO; + } + } + } + } + + NSString* decelerationSetting = [settings cordovaSettingForKey:@"WKWebViewDecelerationSpeed"]; + if (!decelerationSetting) { + // Fallback to the UIWebView-named preference + decelerationSetting = [settings cordovaSettingForKey:@"UIWebViewDecelerationSpeed"]; + } + + if (![@"fast" isEqualToString:decelerationSetting]) { + [wkWebView.scrollView setDecelerationRate:UIScrollViewDecelerationRateNormal]; + } else { + [wkWebView.scrollView setDecelerationRate:UIScrollViewDecelerationRateFast]; + } + + wkWebView.allowsBackForwardNavigationGestures = [settings cordovaBoolSettingForKey:@"AllowBackForwardNavigationGestures" defaultValue:NO]; + wkWebView.allowsLinkPreview = [settings cordovaBoolSettingForKey:@"Allow3DTouchLinkPreview" defaultValue:YES]; +} + +- (void)updateWithInfo:(NSDictionary*)info +{ + NSDictionary* scriptMessageHandlers = [info objectForKey:kCDVWebViewEngineScriptMessageHandlers]; + NSDictionary* settings = [info objectForKey:kCDVWebViewEngineWebViewPreferences]; + id navigationDelegate = [info objectForKey:kCDVWebViewEngineWKNavigationDelegate]; + id uiDelegate = [info objectForKey:kCDVWebViewEngineWKUIDelegate]; + + WKWebView* wkWebView = (WKWebView*)_engineWebView; + + if (scriptMessageHandlers && [scriptMessageHandlers isKindOfClass:[NSDictionary class]]) { + NSArray* allKeys = [scriptMessageHandlers allKeys]; + + for (NSString* key in allKeys) { + id object = [scriptMessageHandlers objectForKey:key]; + if ([object conformsToProtocol:@protocol(WKScriptMessageHandler)]) { + [wkWebView.configuration.userContentController addScriptMessageHandler:object name:key]; + } + } + } + + if (navigationDelegate && [navigationDelegate conformsToProtocol:@protocol(WKNavigationDelegate)]) { + wkWebView.navigationDelegate = navigationDelegate; + } + + if (uiDelegate && [uiDelegate conformsToProtocol:@protocol(WKUIDelegate)]) { + wkWebView.UIDelegate = uiDelegate; + } + + if (settings && [settings isKindOfClass:[NSDictionary class]]) { + [self updateSettings:settings]; + } +} + +// This forwards the methods that are in the header that are not implemented here. +// Both WKWebView and UIWebView implement the below: +// loadHTMLString:baseURL: +// loadRequest: +- (id)forwardingTargetForSelector:(SEL)aSelector +{ + return _engineWebView; +} + +- (UIView*)webView +{ + return self.engineWebView; +} + +#pragma mark WKScriptMessageHandler implementation + +- (void)userContentController:(WKUserContentController*)userContentController didReceiveScriptMessage:(WKScriptMessage*)message +{ + if (![message.name isEqualToString:CDV_BRIDGE_NAME]) { + return; + } + + CDVViewController* vc = (CDVViewController*)self.viewController; + + NSArray* jsonEntry = message.body; // NSString:callbackId, NSString:service, NSString:action, NSArray:args + CDVInvokedUrlCommand* command = [CDVInvokedUrlCommand commandFromJson:jsonEntry]; + CDV_EXEC_LOG(@"Exec(%@): Calling %@.%@", command.callbackId, command.className, command.methodName); + + if (![vc.commandQueue execute:command]) { +#ifdef DEBUG + NSError* error = nil; + NSString* commandJson = nil; + NSData* jsonData = [NSJSONSerialization dataWithJSONObject:jsonEntry + options:0 + error:&error]; + + if (error == nil) { + commandJson = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + } + + static NSUInteger maxLogLength = 1024; + NSString* commandString = ([commandJson length] > maxLogLength) ? + [NSString stringWithFormat : @"%@[...]", [commandJson substringToIndex:maxLogLength]] : + commandJson; + + NSLog(@"FAILED pluginJSON = %@", commandString); +#endif + } +} + +#pragma mark WKNavigationDelegate implementation + +- (void)webView:(WKWebView*)webView didStartProvisionalNavigation:(WKNavigation*)navigation +{ + [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginResetNotification object:webView]]; +} + +- (void)webView:(WKWebView*)webView didFinishNavigation:(WKNavigation*)navigation +{ + CDVViewController* vc = (CDVViewController*)self.viewController; + [CDVUserAgentUtil releaseLock:vc.userAgentLockToken]; + + [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPageDidLoadNotification object:webView]]; +} + +- (void)webView:(WKWebView*)theWebView didFailProvisionalNavigation:(WKNavigation*)navigation withError:(NSError*)error +{ + [self webView:theWebView didFailNavigation:navigation withError:error]; +} + +- (void)webView:(WKWebView*)theWebView didFailNavigation:(WKNavigation*)navigation withError:(NSError*)error +{ + CDVViewController* vc = (CDVViewController*)self.viewController; + [CDVUserAgentUtil releaseLock:vc.userAgentLockToken]; + + NSString* message = [NSString stringWithFormat:@"Failed to load webpage with error: %@", [error localizedDescription]]; + NSLog(@"%@", message); + + NSURL* errorUrl = vc.errorURL; + if (errorUrl) { + errorUrl = [NSURL URLWithString:[NSString stringWithFormat:@"?error=%@", [message stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] relativeToURL:errorUrl]; + NSLog(@"%@", [errorUrl absoluteString]); + [theWebView loadRequest:[NSURLRequest requestWithURL:errorUrl]]; + } +} + +- (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView +{ + [webView reload]; +} + +- (BOOL)defaultResourcePolicyForURL:(NSURL*)url +{ + // all file:// urls are allowed + if ([url isFileURL]) { + return YES; + } + + return NO; +} + +- (void) webView: (WKWebView *) webView decidePolicyForNavigationAction: (WKNavigationAction*) navigationAction decisionHandler: (void (^)(WKNavigationActionPolicy)) decisionHandler +{ + NSURL* url = [navigationAction.request URL]; + CDVViewController* vc = (CDVViewController*)self.viewController; + + /* + * Give plugins the chance to handle the url + */ + BOOL anyPluginsResponded = NO; + BOOL shouldAllowRequest = NO; + + for (NSString* pluginName in vc.pluginObjects) { + CDVPlugin* plugin = [vc.pluginObjects objectForKey:pluginName]; + SEL selector = NSSelectorFromString(@"shouldOverrideLoadWithRequest:navigationType:"); + if ([plugin respondsToSelector:selector]) { + anyPluginsResponded = YES; + // https://issues.apache.org/jira/browse/CB-12497 + int navType = (int)navigationAction.navigationType; + if (WKNavigationTypeOther == navigationAction.navigationType) { + navType = (int)UIWebViewNavigationTypeOther; + } + shouldAllowRequest = (((BOOL (*)(id, SEL, id, int))objc_msgSend)(plugin, selector, navigationAction.request, navType)); + if (!shouldAllowRequest) { + break; + } + } + } + + if (anyPluginsResponded) { + return decisionHandler(shouldAllowRequest); + } + + /* + * Handle all other types of urls (tel:, sms:), and requests to load a url in the main webview. + */ + BOOL shouldAllowNavigation = [self defaultResourcePolicyForURL:url]; + if (shouldAllowNavigation) { + return decisionHandler(YES); + } else { + [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginHandleOpenURLNotification object:url]]; + } + + return decisionHandler(NO); +} + +#pragma mark - Plugin interface + +- (void)allowsBackForwardNavigationGestures:(CDVInvokedUrlCommand*)command; +{ + id value = [command argumentAtIndex:0]; + if (!([value isKindOfClass:[NSNumber class]])) { + value = [NSNumber numberWithBool:NO]; + } + + WKWebView* wkWebView = (WKWebView*)_engineWebView; + wkWebView.allowsBackForwardNavigationGestures = [value boolValue]; +} + +@end + +#pragma mark - CDVWKWeakScriptMessageHandler + +@implementation CDVWKWeakScriptMessageHandler + +- (instancetype)initWithScriptMessageHandler:(id)scriptMessageHandler +{ + self = [super init]; + if (self) { + _scriptMessageHandler = scriptMessageHandler; + } + return self; +} + +- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message +{ + [self.scriptMessageHandler userContentController:userContentController didReceiveScriptMessage:message]; +} + +@end diff --git a/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.h b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.h new file mode 100644 index 0000000..33a179b --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.h @@ -0,0 +1,28 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import + +@interface CDVWKWebViewUIDelegate : NSObject + +@property (nonatomic, copy) NSString* title; + +- (instancetype)initWithTitle:(NSString*)title; + +@end diff --git a/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.m b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.m new file mode 100644 index 0000000..a7a16f2 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/ios/CDVWKWebViewUIDelegate.m @@ -0,0 +1,123 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import "CDVWKWebViewUIDelegate.h" + +@implementation CDVWKWebViewUIDelegate + +- (instancetype)initWithTitle:(NSString*)title +{ + self = [super init]; + if (self) { + self.title = title; + } + + return self; +} + +- (void) webView:(WKWebView*)webView runJavaScriptAlertPanelWithMessage:(NSString*)message + initiatedByFrame:(WKFrameInfo*)frame completionHandler:(void (^)(void))completionHandler +{ + UIAlertController* alert = [UIAlertController alertControllerWithTitle:self.title + message:message + preferredStyle:UIAlertControllerStyleAlert]; + + UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction* action) + { + completionHandler(); + [alert dismissViewControllerAnimated:YES completion:nil]; + }]; + + [alert addAction:ok]; + + UIViewController* rootController = [UIApplication sharedApplication].delegate.window.rootViewController; + + [rootController presentViewController:alert animated:YES completion:nil]; +} + +- (void) webView:(WKWebView*)webView runJavaScriptConfirmPanelWithMessage:(NSString*)message + initiatedByFrame:(WKFrameInfo*)frame completionHandler:(void (^)(BOOL result))completionHandler +{ + UIAlertController* alert = [UIAlertController alertControllerWithTitle:self.title + message:message + preferredStyle:UIAlertControllerStyleAlert]; + + UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction* action) + { + completionHandler(YES); + [alert dismissViewControllerAnimated:YES completion:nil]; + }]; + + [alert addAction:ok]; + + UIAlertAction* cancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", @"Cancel") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction* action) + { + completionHandler(NO); + [alert dismissViewControllerAnimated:YES completion:nil]; + }]; + [alert addAction:cancel]; + + UIViewController* rootController = [UIApplication sharedApplication].delegate.window.rootViewController; + + [rootController presentViewController:alert animated:YES completion:nil]; +} + +- (void) webView:(WKWebView*)webView runJavaScriptTextInputPanelWithPrompt:(NSString*)prompt + defaultText:(NSString*)defaultText initiatedByFrame:(WKFrameInfo*)frame + completionHandler:(void (^)(NSString* result))completionHandler +{ + UIAlertController* alert = [UIAlertController alertControllerWithTitle:self.title + message:prompt + preferredStyle:UIAlertControllerStyleAlert]; + + UIAlertAction* ok = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"OK") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction* action) + { + completionHandler(((UITextField*)alert.textFields[0]).text); + [alert dismissViewControllerAnimated:YES completion:nil]; + }]; + + [alert addAction:ok]; + + UIAlertAction* cancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", @"Cancel") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction* action) + { + completionHandler(nil); + [alert dismissViewControllerAnimated:YES completion:nil]; + }]; + [alert addAction:cancel]; + + [alert addTextFieldWithConfigurationHandler:^(UITextField* textField) { + textField.text = defaultText; + }]; + + UIViewController* rootController = [UIApplication sharedApplication].delegate.window.rootViewController; + + [rootController presentViewController:alert animated:YES completion:nil]; +} + +@end diff --git a/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js b/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js new file mode 100644 index 0000000..331fe93 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview-exec.js @@ -0,0 +1,174 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +/** + * Creates the exec bridge used to notify the native code of + * commands. + */ +var cordova = require('cordova'); +var utils = require('cordova/utils'); +var base64 = require('cordova/base64'); + +function massageArgsJsToNative (args) { + if (!args || utils.typeName(args) !== 'Array') { + return args; + } + var ret = []; + args.forEach(function (arg, i) { + if (utils.typeName(arg) === 'ArrayBuffer') { + ret.push({ + 'CDVType': 'ArrayBuffer', + 'data': base64.fromArrayBuffer(arg) + }); + } else { + ret.push(arg); + } + }); + return ret; +} + +function massageMessageNativeToJs (message) { + if (message.CDVType === 'ArrayBuffer') { + var stringToArrayBuffer = function (str) { + var ret = new Uint8Array(str.length); + for (var i = 0; i < str.length; i++) { + ret[i] = str.charCodeAt(i); + } + return ret.buffer; + }; + var base64ToArrayBuffer = function (b64) { + return stringToArrayBuffer(atob(b64)); // eslint-disable-line no-undef + }; + message = base64ToArrayBuffer(message.data); + } + return message; +} + +function convertMessageToArgsNativeToJs (message) { + var args = []; + if (!message || !message.hasOwnProperty('CDVType')) { + args.push(message); + } else if (message.CDVType === 'MultiPart') { + message.messages.forEach(function (e) { + args.push(massageMessageNativeToJs(e)); + }); + } else { + args.push(massageMessageNativeToJs(message)); + } + return args; +} + +var iOSExec = function () { + // detect change in bridge, if there is a change, we forward to new bridge + + // if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) { + // bridgeMode = jsToNativeModes.WK_WEBVIEW_BINDING; + // } + + var successCallback, failCallback, service, action, actionArgs; + var callbackId = null; + if (typeof arguments[0] !== 'string') { + // FORMAT ONE + successCallback = arguments[0]; + failCallback = arguments[1]; + service = arguments[2]; + action = arguments[3]; + actionArgs = arguments[4]; + + // Since we need to maintain backwards compatibility, we have to pass + // an invalid callbackId even if no callback was provided since plugins + // will be expecting it. The Cordova.exec() implementation allocates + // an invalid callbackId and passes it even if no callbacks were given. + callbackId = 'INVALID'; + } else { + throw new Error('The old format of this exec call has been removed (deprecated since 2.1). Change to: ' + // eslint-disable-line + 'cordova.exec(null, null, \'Service\', \'action\', [ arg1, arg2 ]);'); + } + + // If actionArgs is not provided, default to an empty array + actionArgs = actionArgs || []; + + // Register the callbacks and add the callbackId to the positional + // arguments if given. + if (successCallback || failCallback) { + callbackId = service + cordova.callbackId++; + cordova.callbacks[callbackId] = + {success: successCallback, fail: failCallback}; + } + + actionArgs = massageArgsJsToNative(actionArgs); + + // CB-10133 DataClone DOM Exception 25 guard (fast function remover) + var command = [callbackId, service, action, JSON.parse(JSON.stringify(actionArgs))]; + window.webkit.messageHandlers.cordova.postMessage(command); +}; + +iOSExec.nativeCallback = function (callbackId, status, message, keepCallback, debug) { + var success = status === 0 || status === 1; + var args = convertMessageToArgsNativeToJs(message); + Promise.resolve().then(function () { + cordova.callbackFromNative(callbackId, success, status, args, keepCallback); // eslint-disable-line + }); +}; + +// for backwards compatibility +iOSExec.nativeEvalAndFetch = function (func) { + try { + func(); + } catch (e) { + console.log(e); + } +}; + +// Proxy the exec for bridge changes. See CB-10106 + +function cordovaExec () { + var cexec = require('cordova/exec'); + var cexec_valid = (typeof cexec.nativeFetchMessages === 'function') && (typeof cexec.nativeEvalAndFetch === 'function') && (typeof cexec.nativeCallback === 'function'); + return (cexec_valid && execProxy !== cexec) ? cexec : iOSExec; +} + +function execProxy () { + cordovaExec().apply(null, arguments); +} + +execProxy.nativeFetchMessages = function () { + return cordovaExec().nativeFetchMessages.apply(null, arguments); +}; + +execProxy.nativeEvalAndFetch = function () { + return cordovaExec().nativeEvalAndFetch.apply(null, arguments); +}; + +execProxy.nativeCallback = function () { + return cordovaExec().nativeCallback.apply(null, arguments); +}; + +module.exports = execProxy; + +if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) { + // unregister the old bridge + cordova.define.remove('cordova/exec'); + // redefine bridge to our new bridge + cordova.define('cordova/exec', function (require, exports, module) { + module.exports = execProxy; + }); +} diff --git a/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js b/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js new file mode 100644 index 0000000..71e503c --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/src/www/ios/ios-wkwebview.js @@ -0,0 +1,30 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +var exec = require('cordova/exec'); + +var WkWebKit = { + allowsBackForwardNavigationGestures: function (allow) { + exec(null, null, 'CDVWKWebViewEngine', 'allowsBackForwardNavigationGestures', [allow]); + } +}; + +module.exports = WkWebKit; diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/contents.xcworkspacedata b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..e4f97fa --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout new file mode 100644 index 0000000..fd8d16a --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 6BE9AD73-1B9F-4362-98D7-DC631BEC6185 + IDESourceControlProjectName + CDVWKWebViewEngineTest + IDESourceControlProjectOriginsDictionary + + BEF5A5D0FF64801E558286389440357A9233D7DB + https://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine.git + + IDESourceControlProjectPath + tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + BEF5A5D0FF64801E558286389440357A9233D7DB + ../../../../.. + + IDESourceControlProjectURL + https://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + BEF5A5D0FF64801E558286389440357A9233D7DB + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + BEF5A5D0FF64801E558286389440357A9233D7DB + IDESourceControlWCCName + cordova-plugin-wkwebview-engine + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme new file mode 100644 index 0000000..8029dc0 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest.xcworkspace/xcshareddata/xcschemes/CordovaLib.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/CDVWKWebViewEngineTest.m b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/CDVWKWebViewEngineTest.m new file mode 100644 index 0000000..12d9598 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/CDVWKWebViewEngineTest.m @@ -0,0 +1,240 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ + +#import +#import +#import "CDVWKWebViewEngine.h" +#import "CDVWKProcessPoolFactory.h" +#import +#import + +@interface CDVWKWebViewEngineTest : XCTestCase + +@property (nonatomic, strong) CDVWKWebViewEngine* plugin; +@property (nonatomic, strong) CDVViewController* viewController; + +@end + +@interface CDVWKWebViewEngine () + +// TODO: expose private interface, if needed +- (BOOL)shouldReloadWebView; +- (BOOL)shouldReloadWebView:(NSURL*)location title:(NSString*)title; + +@end + +@interface CDVViewController () + +// expose property as readwrite, for test purposes +@property (nonatomic, readwrite, strong) NSMutableDictionary* settings; + +@end + +@implementation CDVWKWebViewEngineTest + +- (void)setUp { + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. + + // NOTE: no app settings are set, so it will rely on default WKWebViewConfiguration settings + self.plugin = [[CDVWKWebViewEngine alloc] initWithFrame:CGRectMake(0, 0, 100, 100)]; + self.viewController = [[CDVViewController alloc] init]; + [self.viewController registerPlugin:self.plugin withClassName:NSStringFromClass([self.plugin class])]; + + XCTAssert([self.plugin conformsToProtocol:@protocol(CDVWebViewEngineProtocol)], @"Plugin does not conform to CDVWebViewEngineProtocol"); +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void) testCanLoadRequest { + NSURLRequest* fileUrlRequest = [NSURLRequest requestWithURL:[NSURL fileURLWithPath:@"path/to/file.html"]]; + NSURLRequest* httpUrlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://apache.org"]]; + NSURLRequest* miscUrlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"foo://bar"]]; + id webViewEngineProtocol = self.plugin; + + SEL wk_sel = NSSelectorFromString(@"loadFileURL:allowingReadAccessToURL:"); + if ([self.plugin.engineWebView respondsToSelector:wk_sel]) { + XCTAssertTrue([webViewEngineProtocol canLoadRequest:fileUrlRequest]); + } else { + XCTAssertFalse([webViewEngineProtocol canLoadRequest:fileUrlRequest]); + } + + XCTAssertTrue([webViewEngineProtocol canLoadRequest:httpUrlRequest]); + XCTAssertTrue([webViewEngineProtocol canLoadRequest:miscUrlRequest]); +} + +- (void) testUpdateInfo { + // Add -ObjC to Other Linker Flags to test project, to load Categories + // Update objc test template generator as well + + id webViewEngineProtocol = self.plugin; + WKWebView* wkWebView = (WKWebView*)self.plugin.engineWebView; + + // iOS >=10 defaults to NO, < 10 defaults to YES. + BOOL mediaPlaybackRequiresUserActionDefault = IsAtLeastiOSVersion(@"10.0")? NO : YES; + + NSDictionary* preferences = @{ + [@"MinimumFontSize" lowercaseString] : @1.1, // default is 0.0 + [@"AllowInlineMediaPlayback" lowercaseString] : @YES, // default is NO + [@"MediaPlaybackRequiresUserAction" lowercaseString] : @(!mediaPlaybackRequiresUserActionDefault), // default is NO on iOS >= 10, YES for < 10 + [@"SuppressesIncrementalRendering" lowercaseString] : @YES, // default is NO + [@"MediaPlaybackAllowsAirPlay" lowercaseString] : @NO, // default is YES + [@"DisallowOverscroll" lowercaseString] : @YES, // so bounces is to be NO. defaults to NO + [@"WKWebViewDecelerationSpeed" lowercaseString] : @"fast" // default is 'normal' + }; + NSDictionary* info = @{ + kCDVWebViewEngineWebViewPreferences : preferences + }; + [webViewEngineProtocol updateWithInfo:info]; + + // the only preference we can set, we **can** change this during runtime + XCTAssertEqualWithAccuracy(wkWebView.configuration.preferences.minimumFontSize, 1.1, 0.0001); + + // the WKWebViewConfiguration properties, we **cannot** change outside of initialization + if (IsAtLeastiOSVersion(@"10.0")) { + XCTAssertFalse(wkWebView.configuration.mediaPlaybackRequiresUserAction); + } else { + XCTAssertTrue(wkWebView.configuration.mediaPlaybackRequiresUserAction); + } + XCTAssertFalse(wkWebView.configuration.allowsInlineMediaPlayback); + XCTAssertFalse(wkWebView.configuration.suppressesIncrementalRendering); + XCTAssertTrue(wkWebView.configuration.mediaPlaybackAllowsAirPlay); + + // in the test above, DisallowOverscroll is YES, so no bounce + if ([wkWebView respondsToSelector:@selector(scrollView)]) { + XCTAssertFalse(((UIScrollView*)[wkWebView scrollView]).bounces); + } else { + for (id subview in wkWebView.subviews) { + if ([[subview class] isSubclassOfClass:[UIScrollView class]]) { + XCTAssertFalse(((UIScrollView*)subview).bounces = NO); + } + } + } + + XCTAssertTrue(wkWebView.scrollView.decelerationRate == UIScrollViewDecelerationRateFast); +} + +- (void) testConfigurationFromSettings { + // we need to re-set the plugin from the "setup" to take in the app settings we need + self.plugin = [[CDVWKWebViewEngine alloc] initWithFrame:CGRectMake(0, 0, 100, 100)]; + self.viewController = [[CDVViewController alloc] init]; + + // generate the app settings + // iOS >=10 defaults to NO, < 10 defaults to YES. + BOOL mediaPlaybackRequiresUserActionDefault = IsAtLeastiOSVersion(@"10.0")? NO : YES; + + NSDictionary* settings = @{ + [@"MinimumFontSize" lowercaseString] : @1.1, // default is 0.0 + [@"AllowInlineMediaPlayback" lowercaseString] : @YES, // default is NO + [@"MediaPlaybackRequiresUserAction" lowercaseString] : @(!mediaPlaybackRequiresUserActionDefault), // default is NO on iOS >= 10, YES for < 10 + [@"SuppressesIncrementalRendering" lowercaseString] : @YES, // default is NO + [@"MediaPlaybackAllowsAirPlay" lowercaseString] : @NO, // default is YES + [@"DisallowOverscroll" lowercaseString] : @YES, // so bounces is to be NO. defaults to NO + [@"WKWebViewDecelerationSpeed" lowercaseString] : @"fast" // default is 'normal' + }; + // this can be set because of the Category at the top of the file + self.viewController.settings = [settings mutableCopy]; + + // app settings are read after you register the plugin + [self.viewController registerPlugin:self.plugin withClassName:NSStringFromClass([self.plugin class])]; + XCTAssert([self.plugin conformsToProtocol:@protocol(CDVWebViewEngineProtocol)], @"Plugin does not conform to CDVWebViewEngineProtocol"); + + // after registering (thus plugin initialization), we can grab the webview configuration + WKWebView* wkWebView = (WKWebView*)self.plugin.engineWebView; + + // the only preference we can set, we **can** change this during runtime + XCTAssertEqualWithAccuracy(wkWebView.configuration.preferences.minimumFontSize, 1.1, 0.0001); + + // the WKWebViewConfiguration properties, we **cannot** change outside of initialization + if (IsAtLeastiOSVersion(@"10.0")) { + XCTAssertTrue(wkWebView.configuration.mediaPlaybackRequiresUserAction); + } else { + XCTAssertFalse(wkWebView.configuration.mediaPlaybackRequiresUserAction); + } + XCTAssertTrue(wkWebView.configuration.allowsInlineMediaPlayback); + XCTAssertTrue(wkWebView.configuration.suppressesIncrementalRendering); + // The test case below is in a separate test "testConfigurationWithMediaPlaybackAllowsAirPlay" (Apple bug) + // XCTAssertFalse(wkWebView.configuration.mediaPlaybackAllowsAirPlay); + + // in the test above, DisallowOverscroll is YES, so no bounce + if ([wkWebView respondsToSelector:@selector(scrollView)]) { + XCTAssertFalse(((UIScrollView*)[wkWebView scrollView]).bounces); + } else { + for (id subview in wkWebView.subviews) { + if ([[subview class] isSubclassOfClass:[UIScrollView class]]) { + XCTAssertFalse(((UIScrollView*)subview).bounces = NO); + } + } + } + + XCTAssertTrue(wkWebView.scrollView.decelerationRate == UIScrollViewDecelerationRateFast); +} + +- (void) testShouldReloadWebView { + WKWebView* wkWebView = (WKWebView*)self.plugin.engineWebView; + + NSURL* about_blank = [NSURL URLWithString:@"about:blank"]; + NSURL* real_site = [NSURL URLWithString:@"https://cordova.apache.org"]; + NSString* empty_title_document = @""; + + // about:blank should reload + [wkWebView loadRequest:[NSURLRequest requestWithURL:about_blank]]; + XCTAssertTrue([self.plugin shouldReloadWebView]); + + // a network location should *not* reload + [wkWebView loadRequest:[NSURLRequest requestWithURL:real_site]]; + XCTAssertFalse([self.plugin shouldReloadWebView]); + + // document with empty title should *not* reload + // baseURL:nil results in about:blank, so we use a dummy here + [wkWebView loadHTMLString:empty_title_document baseURL:[NSURL URLWithString:@"about:"]]; + XCTAssertFalse([self.plugin shouldReloadWebView]); + + // Anecdotal assertion that when the WKWebView process has died, + // the title is nil, should always reload + XCTAssertTrue([self.plugin shouldReloadWebView:about_blank title:nil]); + XCTAssertTrue([self.plugin shouldReloadWebView:real_site title:nil]); + + // about:blank should always reload + XCTAssertTrue([self.plugin shouldReloadWebView:about_blank title:@"some title"]); + + // non about:blank with a non-nil title should **not** reload + XCTAssertFalse([self.plugin shouldReloadWebView:real_site title:@""]); +} + +- (void) testConfigurationWithMediaPlaybackAllowsAirPlay { + WKWebViewConfiguration* configuration = [WKWebViewConfiguration new]; + configuration.allowsAirPlayForMediaPlayback = NO; + + WKWebView* wkWebView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) configuration:configuration]; + + XCTAssertFalse(configuration.allowsAirPlayForMediaPlayback); + // Uh-oh, bug in WKWebView below. Tested on iOS 9, iOS 10 beta 3 + XCTAssertFalse(wkWebView.configuration.allowsAirPlayForMediaPlayback); +} + +- (void) testWKProcessPoolFactory { + WKProcessPool* shared = [[CDVWKProcessPoolFactory sharedFactory] sharedProcessPool]; + XCTAssertTrue(shared != nil); +} + +@end diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/Info.plist b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/Info.plist new file mode 100644 index 0000000..ba72822 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineLibTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj new file mode 100644 index 0000000..8c41550 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.pbxproj @@ -0,0 +1,559 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 7E9F51AB19DA10AE00DA31AC /* CDVWKWebViewEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E9F51A919DA10AE00DA31AC /* CDVWKWebViewEngine.m */; }; + 7E9F51B119DA114400DA31AC /* CDVWKWebViewEngineTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E9F51B019DA114400DA31AC /* CDVWKWebViewEngineTest.m */; }; + 7E9F51B319DA116500DA31AC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9F51B219DA116500DA31AC /* Foundation.framework */; }; + 7E9F51B519DA127E00DA31AC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9F51B419DA127E00DA31AC /* UIKit.framework */; }; + 7E9F51B919DA1B1600DA31AC /* libCDVWKWebViewEngineLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9F519519DA102000DA31AC /* libCDVWKWebViewEngineLib.a */; }; + 7E9F51BA19DA1B2000DA31AC /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E9F519019DA0F8300DA31AC /* libCordova.a */; }; + 7EACDCE71D234E2A00494C9E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EACDCE61D234E2A00494C9E /* WebKit.framework */; }; + 7EACDCEB1D234FB300494C9E /* CDVWKWebViewUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EACDCEA1D234FB300494C9E /* CDVWKWebViewUIDelegate.m */; }; + A9CC1CED1E0D42F50083E165 /* CDVWKProcessPoolFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = A9CC1CEC1E0D42F50083E165 /* CDVWKProcessPoolFactory.m */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 3050280F1E2973F700CF9F12 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7E9F518B19DA0F8300DA31AC /* CordovaLib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = D2AAC07D0554694100DB518D; + remoteInfo = CordovaLib; + }; + 7E9F518F19DA0F8300DA31AC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7E9F518B19DA0F8300DA31AC /* CordovaLib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 68A32D7114102E1C006B237C; + remoteInfo = CordovaLib; + }; + 7E9F51AC19DA10DE00DA31AC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7E9F517219DA09CE00DA31AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7E9F519419DA102000DA31AC; + remoteInfo = CDVWKWebViewEngineLib; + }; + 7E9F51AE19DA10E100DA31AC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7E9F518B19DA0F8300DA31AC /* CordovaLib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = D2AAC07D0554694100DB518D; + remoteInfo = CordovaLib; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 7E9F519319DA102000DA31AC /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 7E9F518B19DA0F8300DA31AC /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CordovaLib.xcodeproj; path = "../node_modules/cordova-ios/CordovaLib/CordovaLib.xcodeproj"; sourceTree = ""; }; + 7E9F519519DA102000DA31AC /* libCDVWKWebViewEngineLib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCDVWKWebViewEngineLib.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 7E9F519F19DA102000DA31AC /* CDVWKWebViewEngineLibTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CDVWKWebViewEngineLibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 7E9F51A219DA102000DA31AC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 7E9F51A919DA10AE00DA31AC /* CDVWKWebViewEngine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVWKWebViewEngine.m; path = ../../../src/ios/CDVWKWebViewEngine.m; sourceTree = SOURCE_ROOT; }; + 7E9F51AA19DA10AE00DA31AC /* CDVWKWebViewEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVWKWebViewEngine.h; path = ../../../src/ios/CDVWKWebViewEngine.h; sourceTree = SOURCE_ROOT; }; + 7E9F51B019DA114400DA31AC /* CDVWKWebViewEngineTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVWKWebViewEngineTest.m; sourceTree = ""; }; + 7E9F51B219DA116500DA31AC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 7E9F51B419DA127E00DA31AC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 7EACDCE61D234E2A00494C9E /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; }; + 7EACDCE91D234FB300494C9E /* CDVWKWebViewUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVWKWebViewUIDelegate.h; path = ../../../src/ios/CDVWKWebViewUIDelegate.h; sourceTree = SOURCE_ROOT; }; + 7EACDCEA1D234FB300494C9E /* CDVWKWebViewUIDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVWKWebViewUIDelegate.m; path = ../../../src/ios/CDVWKWebViewUIDelegate.m; sourceTree = SOURCE_ROOT; }; + A9CC1CEB1E0D42F50083E165 /* CDVWKProcessPoolFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVWKProcessPoolFactory.h; path = ../../../src/ios/CDVWKProcessPoolFactory.h; sourceTree = SOURCE_ROOT; }; + A9CC1CEC1E0D42F50083E165 /* CDVWKProcessPoolFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVWKProcessPoolFactory.m; path = ../../../src/ios/CDVWKProcessPoolFactory.m; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 7E9F519219DA102000DA31AC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7EACDCE71D234E2A00494C9E /* WebKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7E9F519C19DA102000DA31AC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7E9F51BA19DA1B2000DA31AC /* libCordova.a in Frameworks */, + 7E9F51B919DA1B1600DA31AC /* libCDVWKWebViewEngineLib.a in Frameworks */, + 7E9F51B519DA127E00DA31AC /* UIKit.framework in Frameworks */, + 7E9F51B319DA116500DA31AC /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 7E9F517119DA09CE00DA31AC = { + isa = PBXGroup; + children = ( + 7EACDCE61D234E2A00494C9E /* WebKit.framework */, + 7E9F51B419DA127E00DA31AC /* UIKit.framework */, + 7E9F51B219DA116500DA31AC /* Foundation.framework */, + 7E9F518B19DA0F8300DA31AC /* CordovaLib.xcodeproj */, + 7E9F519619DA102000DA31AC /* CDVWKWebViewEngineLib */, + 7E9F51A019DA102000DA31AC /* CDVWKWebViewEngineLibTests */, + 7E9F517D19DA0A0A00DA31AC /* Products */, + ); + sourceTree = ""; + }; + 7E9F517D19DA0A0A00DA31AC /* Products */ = { + isa = PBXGroup; + children = ( + 7E9F519519DA102000DA31AC /* libCDVWKWebViewEngineLib.a */, + 7E9F519F19DA102000DA31AC /* CDVWKWebViewEngineLibTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 7E9F518C19DA0F8300DA31AC /* Products */ = { + isa = PBXGroup; + children = ( + 7E9F519019DA0F8300DA31AC /* libCordova.a */, + ); + name = Products; + sourceTree = ""; + }; + 7E9F519619DA102000DA31AC /* CDVWKWebViewEngineLib */ = { + isa = PBXGroup; + children = ( + A9CC1CEB1E0D42F50083E165 /* CDVWKProcessPoolFactory.h */, + A9CC1CEC1E0D42F50083E165 /* CDVWKProcessPoolFactory.m */, + 7EACDCE91D234FB300494C9E /* CDVWKWebViewUIDelegate.h */, + 7EACDCEA1D234FB300494C9E /* CDVWKWebViewUIDelegate.m */, + 7E9F51A919DA10AE00DA31AC /* CDVWKWebViewEngine.m */, + 7E9F51AA19DA10AE00DA31AC /* CDVWKWebViewEngine.h */, + ); + path = CDVWKWebViewEngineLib; + sourceTree = SOURCE_ROOT; + }; + 7E9F51A019DA102000DA31AC /* CDVWKWebViewEngineLibTests */ = { + isa = PBXGroup; + children = ( + 7E9F51A119DA102000DA31AC /* Supporting Files */, + 7E9F51B019DA114400DA31AC /* CDVWKWebViewEngineTest.m */, + ); + path = CDVWKWebViewEngineLibTests; + sourceTree = ""; + }; + 7E9F51A119DA102000DA31AC /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 7E9F51A219DA102000DA31AC /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 7E9F519419DA102000DA31AC /* CDVWKWebViewEngineLib */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7E9F51A319DA102000DA31AC /* Build configuration list for PBXNativeTarget "CDVWKWebViewEngineLib" */; + buildPhases = ( + 7E9F519119DA102000DA31AC /* Sources */, + 7E9F519219DA102000DA31AC /* Frameworks */, + 7E9F519319DA102000DA31AC /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 305028101E2973F700CF9F12 /* PBXTargetDependency */, + ); + name = CDVWKWebViewEngineLib; + productName = CDVWKWebViewEngineLib; + productReference = 7E9F519519DA102000DA31AC /* libCDVWKWebViewEngineLib.a */; + productType = "com.apple.product-type.library.static"; + }; + 7E9F519E19DA102000DA31AC /* CDVWKWebViewEngineLibTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7E9F51A619DA102000DA31AC /* Build configuration list for PBXNativeTarget "CDVWKWebViewEngineLibTests" */; + buildPhases = ( + 7E9F519B19DA102000DA31AC /* Sources */, + 7E9F519C19DA102000DA31AC /* Frameworks */, + 7E9F519D19DA102000DA31AC /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 7E9F51AF19DA10E100DA31AC /* PBXTargetDependency */, + 7E9F51AD19DA10DE00DA31AC /* PBXTargetDependency */, + ); + name = CDVWKWebViewEngineLibTests; + productName = CDVWKWebViewEngineLibTests; + productReference = 7E9F519F19DA102000DA31AC /* CDVWKWebViewEngineLibTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 7E9F517219DA09CE00DA31AC /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0830; + TargetAttributes = { + 7E9F519419DA102000DA31AC = { + CreatedOnToolsVersion = 6.0; + }; + 7E9F519E19DA102000DA31AC = { + CreatedOnToolsVersion = 6.0; + }; + }; + }; + buildConfigurationList = 7E9F517519DA09CE00DA31AC /* Build configuration list for PBXProject "CDVWKWebViewEngineTest" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 7E9F517119DA09CE00DA31AC; + productRefGroup = 7E9F517D19DA0A0A00DA31AC /* Products */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 7E9F518C19DA0F8300DA31AC /* Products */; + ProjectRef = 7E9F518B19DA0F8300DA31AC /* CordovaLib.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + 7E9F519419DA102000DA31AC /* CDVWKWebViewEngineLib */, + 7E9F519E19DA102000DA31AC /* CDVWKWebViewEngineLibTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 7E9F519019DA0F8300DA31AC /* libCordova.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libCordova.a; + remoteRef = 7E9F518F19DA0F8300DA31AC /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + 7E9F519D19DA102000DA31AC /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 7E9F519119DA102000DA31AC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A9CC1CED1E0D42F50083E165 /* CDVWKProcessPoolFactory.m in Sources */, + 7EACDCEB1D234FB300494C9E /* CDVWKWebViewUIDelegate.m in Sources */, + 7E9F51AB19DA10AE00DA31AC /* CDVWKWebViewEngine.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7E9F519B19DA102000DA31AC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7E9F51B119DA114400DA31AC /* CDVWKWebViewEngineTest.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 305028101E2973F700CF9F12 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = CordovaLib; + targetProxy = 3050280F1E2973F700CF9F12 /* PBXContainerItemProxy */; + }; + 7E9F51AD19DA10DE00DA31AC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 7E9F519419DA102000DA31AC /* CDVWKWebViewEngineLib */; + targetProxy = 7E9F51AC19DA10DE00DA31AC /* PBXContainerItemProxy */; + }; + 7E9F51AF19DA10E100DA31AC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = CordovaLib; + targetProxy = 7E9F51AE19DA10E100DA31AC /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 7E9F517619DA09CE00DA31AC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = "-ObjC"; + }; + name = Debug; + }; + 7E9F517719DA09CE00DA31AC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_LDFLAGS = "-ObjC"; + }; + name = Release; + }; + 7E9F51A419DA102000DA31AC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "$(inherited)"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 7E9F51A519DA102000DA31AC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "$(inherited)"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 7E9F51A719DA102000DA31AC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = CDVWKWebViewEngineLibTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 7E9F51A819DA102000DA31AC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = CDVWKWebViewEngineLibTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.apache.cordova.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 7E9F517519DA09CE00DA31AC /* Build configuration list for PBXProject "CDVWKWebViewEngineTest" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7E9F517619DA09CE00DA31AC /* Debug */, + 7E9F517719DA09CE00DA31AC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 7E9F51A319DA102000DA31AC /* Build configuration list for PBXNativeTarget "CDVWKWebViewEngineLib" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7E9F51A419DA102000DA31AC /* Debug */, + 7E9F51A519DA102000DA31AC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 7E9F51A619DA102000DA31AC /* Build configuration list for PBXNativeTarget "CDVWKWebViewEngineLibTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7E9F51A719DA102000DA31AC /* Debug */, + 7E9F51A819DA102000DA31AC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 7E9F517219DA09CE00DA31AC /* Project object */; +} diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..bd6cf4a --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout new file mode 100644 index 0000000..fd8d16a --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/project.xcworkspace/xcshareddata/CDVWKWebViewEngineTest.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 6BE9AD73-1B9F-4362-98D7-DC631BEC6185 + IDESourceControlProjectName + CDVWKWebViewEngineTest + IDESourceControlProjectOriginsDictionary + + BEF5A5D0FF64801E558286389440357A9233D7DB + https://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine.git + + IDESourceControlProjectPath + tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + BEF5A5D0FF64801E558286389440357A9233D7DB + ../../../../.. + + IDESourceControlProjectURL + https://git-wip-us.apache.org/repos/asf/cordova-plugin-wkwebview-engine.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + BEF5A5D0FF64801E558286389440357A9233D7DB + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + BEF5A5D0FF64801E558286389440357A9233D7DB + IDESourceControlWCCName + cordova-plugin-wkwebview-engine + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLib.xcscheme b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLib.xcscheme new file mode 100644 index 0000000..835532c --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLib.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLibTests.xcscheme b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLibTests.xcscheme new file mode 100644 index 0000000..dd99117 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/CDVWKWebViewEngineTest/CDVWKWebViewEngineTest.xcodeproj/xcshareddata/xcschemes/CDVWKWebViewEngineLibTests.xcscheme @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/package.json b/plugins/cordova-plugin-wkwebview-engine/tests/ios/package.json new file mode 100644 index 0000000..1292141 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/package.json @@ -0,0 +1,13 @@ +{ + "name": "cordova-plugin-wkwebview-engine-test-ios", + "version": "1.0.0", + "description": "iOS Unit Tests for cordova-plugin-wkwebview-engine Plugin", + "author": "Apache Software Foundation", + "license": "Apache-2.0", + "dependencies": { + "cordova-ios": "*" + }, + "scripts": { + "test": "xcodebuild test -workspace CDVWKWebViewEngineTest.xcworkspace -scheme CDVWKWebViewEngineLibTests -destination 'platform=iOS Simulator,name=iPhone 5' -xcconfig test.xcconfig" + } +} diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/ios/test.xcconfig b/plugins/cordova-plugin-wkwebview-engine/tests/ios/test.xcconfig new file mode 100644 index 0000000..072159d --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/ios/test.xcconfig @@ -0,0 +1,20 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +HEADER_SEARCH_PATHS = $(TARGET_BUILD_DIR)/include diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/package.json b/plugins/cordova-plugin-wkwebview-engine/tests/package.json new file mode 100644 index 0000000..0c993ce --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/package.json @@ -0,0 +1,14 @@ +{ + "name": "cordova-plugin-wkwebview-engine-tests", + "version": "1.2.1", + "description": "", + "cordova": { + "id": "cordova-plugin-wkwebview-engine-tests", + "platforms": [] + }, + "keywords": [ + "ecosystem:cordova" + ], + "author": "Apache Software Foundation", + "license": "Apache-2.0" +} diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/plugin.xml b/plugins/cordova-plugin-wkwebview-engine/tests/plugin.xml new file mode 100644 index 0000000..01d7a4f --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/plugin.xml @@ -0,0 +1,29 @@ + + + + + cordova-plugin-wkwebview-engine Tests + Apache 2.0 + + + + diff --git a/plugins/cordova-plugin-wkwebview-engine/tests/tests.js b/plugins/cordova-plugin-wkwebview-engine/tests/tests.js new file mode 100644 index 0000000..879b6a0 --- /dev/null +++ b/plugins/cordova-plugin-wkwebview-engine/tests/tests.js @@ -0,0 +1,44 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +/* jshint jasmine: true */ + +exports.defineAutoTests = function () { + describe('cordova-plugin-wkwebview-engine (cordova)', function () { + it("cordova-plugin-wkwebview-engine.spec.1 should exist", function () { + //expect(window).toBeDefined(); + }); + }); +}; + +exports.defineManualTests = function (contentEl, createActionButton) { + + contentEl.innerHTML = 'Your HTML instructions here'; + + createActionButton('Do something 1', function () { + // do something 1; + }, 'do-something-1'); + + createActionButton('Do something 2', function () { + // do something 2; + }, 'do-something-2'); + +}; diff --git a/plugins/fetch.json b/plugins/fetch.json index e566969..c8f43cc 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -116,7 +116,7 @@ }, "is_top_level": true, "variables": { - "APP_KEY": "your_jpush_appkey", + "APP_KEY": "d644d997f2cab0551ff704a3", "CHANNEL": "developer-default" } }, @@ -127,5 +127,21 @@ }, "is_top_level": false, "variables": {} + }, + "cordova-plugin-app-version": { + "source": { + "type": "registry", + "id": "cordova-plugin-app-version" + }, + "is_top_level": true, + "variables": {} + }, + "cordova-plugin-wkwebview-engine": { + "source": { + "type": "registry", + "id": "cordova-plugin-wkwebview-engine" + }, + "is_top_level": true, + "variables": {} } } \ No newline at end of file diff --git a/plugins/ios.json b/plugins/ios.json index 103eff8..26cc800 100644 --- a/plugins/ios.json +++ b/plugins/ios.json @@ -43,9 +43,15 @@ "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" }, "jpush-phonegap-plugin": { - "APP_KEY": "your_jpush_appkey", + "APP_KEY": "d644d997f2cab0551ff704a3", "CHANNEL": "developer-default", "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" + }, + "cordova-plugin-app-version": { + "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" + }, + "cordova-plugin-wkwebview-engine": { + "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)" } }, "dependent_plugins": { diff --git a/www/billdetail.html b/www/billdetail.html index e419a98..8289dbf 100644 --- a/www/billdetail.html +++ b/www/billdetail.html @@ -16,7 +16,7 @@

- +

è´¦åè¯¦æ

diff --git a/www/js/billdetail.js b/www/js/billdetail.js index 3615234..51579aa 100644 --- a/www/js/billdetail.js +++ b/www/js/billdetail.js @@ -9,7 +9,8 @@ var app = { this.loadBill() }, toBack: function (){ - window.history.back(); + //window.history.back(); + window.history.go(-1) }, loadBill: function() { var refno = window.localStorage.getItem("currentrefno"); diff --git a/www/js/index.js b/www/js/index.js index fe23a8d..db3d7ce 100644 --- a/www/js/index.js +++ b/www/js/index.js @@ -22,9 +22,6 @@ var app = { // Application Constructor initialize: function() { document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); - document.addEventListener('jpush.receiveRegistrationId', function (event) { - console.log(event.registrationId) - }, false) }, onDeviceReady: function() { @@ -37,15 +34,10 @@ var app = { console.log(ret) if (ok) { if(ret.code==200){ - var exp = window.localStorage.getItem("tokenexpire"); - var t = parseInt(exp); - //token å°äº10åéäºï¼éè¦å·æ° - console.log((ret.now-t)) - if(ret.now-t>1000*60*10){ - window.location = "login.html"; - }else{ - window.location = "main.html"; + if(!isEmpty(ret.token)){ + window.localStorage.setItem("token",ret.token); } + window.location = "main.html"; }else{ window.location = "login.html"; } diff --git a/www/js/login.js b/www/js/login.js index 77b8b2a..7931a48 100644 --- a/www/js/login.js +++ b/www/js/login.js @@ -33,7 +33,8 @@ var app = { $.showLoading("ç»å½ä¸"); var param={ "username":phone, - "password":pwd + "password":pwd, + "platform":device.platform } Login(param,function(ok,ret){ console.log(ret) @@ -47,6 +48,7 @@ var app = { window.localStorage.setItem("phone",phone); window.localStorage.setItem("phoneX",ret.phone); window.localStorage.setItem("token",ret.token); + window.localStorage.setItem("uid",ret.uid); window.localStorage.setItem("tenantid",ret.tenantid); window.localStorage.setItem("tokenexpire",ret.expire); window.localStorage.setItem("tokentime",ret.now); diff --git a/www/js/main.js b/www/js/main.js index 3b01a2a..90977da 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -4,11 +4,61 @@ var app = { initialize: function() { this.initTab(); document.addEventListener('deviceready', this.onDeviceReady.bind(this), false); + document.addEventListener('jpush.receiveRegistrationId', function(event) { + console.log(event.registrationId) + }, false) + document.addEventListener("jpush.openNotification", function (event) { + var refno + console.log("openNotify:"+event); + if(device.platform == "Android") { + refno = event.extras.refno + } else { + refno = event.refno + window.JPush.setApplicationIconBadgeNumber(0); + } + app.openBill(refno); + console.log("openNotify:"+refno); + }, false) + }, + openBill:function(billno){ + window.localStorage.setItem("currentrefno",billno); + window.location='billdetail.html'; + }, + initJpush: function() { + if(device.platform == "Android") { + } else { + window.JPush.setApplicationIconBadgeNumber(0); + } + window.JPush.init(); + window.JPush.setDebugMode(true); + window.JPush.isPushStopped(function(result) { + if (result == 0) { + //window.JPush.resumePush(); + } else { + window.JPush.resumePush(); + } + }); + window.JPush.getUserNotificationSettings(function(result) { + if(result == 0) { + } else if(result > 0) { + } + }); + var uid = window.localStorage.getItem("uid"); + window.JPush.setAlias({ sequence: 1, alias: uid }, + (result) => { + var sequence = result.sequence + var alias = result.alias + //alert(JSON.stringify(result)) + }, (error) => { + var sequence = error.sequence + var errorCode = error.code + //alert(JSON.stringify(error)) + }) }, onDeviceReady: function() { var uid = window.localStorage.getItem("token"); - console.log(CURRENT_INDEX); + this.initJpush(); $('#scanBtn').click(function() { //window.location = "scan.html"; app.checkBefore(function() { @@ -42,11 +92,12 @@ var app = { }) }); $('#secBtn').click(function() { - app.checkBefore(function() { + window.location = "security.html"; + /*app.checkBefore(function() { app.checkOther(function() { window.location = "security.html"; }) - }) + })*/ }); $('#usersec').click(function() { app.checkBefore(function() { @@ -57,22 +108,23 @@ var app = { }); this.initData(); }, - initTab:function(){ + initTab: function() { $("#maincontent").css("top", $("#maintop").height()) var tab = new auiTab({ element: document.getElementById("footer"), }, function(ret) { - window.localStorage.setItem("tabindex",ret.index); - + window.localStorage.setItem("tabindex", ret.index); + changeTab(ret.index); }); - var tabindex = window.localStorage.getItem("tabindex"); - if(!tabindex||tabindex==0){ + var tabindex = window.localStorage.getItem("tabindex"); + if (!tabindex || tabindex == 0) { tabindex = 1 } changeTab(tabindex); tab.setActive(tabindex) - function changeTab(index){ + + function changeTab(index) { if (index == 1) { $("#main1").show(); $("#main2").hide(); @@ -93,8 +145,9 @@ var app = { } V1Bills(param, function(ok, ret) { if (ok) { - console.log(ret) + //console.log(ret) if (ret.code == 200) { + app.checkVersion(ret.version,ret.minversion,ret.versionmsg); $("#maingt").text(ret.t + "ï¼") $("#user-amount").text(ret.amount) $("#user-point").text(ret.point) @@ -131,7 +184,17 @@ var app = { } }) }, - + checkVersion:function(ver,minver,msg){ + cordova.getAppVersion.getVersionNumber(function (version) { + //alert(version); + if(versionversion){ + alert("ææ°ççæ¬"); + } + }); + }, initBillView: function(page) { var html = ''; for (var i = 0; i < page.data.length; i++) { @@ -255,4 +318,4 @@ var app = { } } }; -app.initialize(); \ No newline at end of file +app.initialize(); diff --git a/www/js/register.js b/www/js/register.js index e0214ab..d10558e 100644 --- a/www/js/register.js +++ b/www/js/register.js @@ -33,7 +33,6 @@ var app = { $.hideLoading(); console.log(ret) if(ret.code==200){ - window.localStorage.setItem("phone",phone); window.localStorage.setItem("uid",ret.uid); window.localStorage.setItem("code",ret.randcode); diff --git a/www/js/scan.js b/www/js/scan.js index e75eba8..bb0a001 100644 --- a/www/js/scan.js +++ b/www/js/scan.js @@ -32,9 +32,9 @@ var app = { $.alert('æ«æåºéï¼è¯·ç¨ååè¯ï¼' + JSON.stringify(err), 'æç¤º'); } else { // The scan completed, display the contents of the QR code: - //$.alert(text, 'æç¤º'); - showRet(text); QRScanner.destroy(); + $.alert(text, 'æç¤º'); + showRet(text); } } //å¼å§æ«æï¼éè¦å°é¡µé¢çèæ¯è®¾ç½®æéæ @@ -78,10 +78,11 @@ function showRet(url) { } var userid = window.localStorage.getItem("userid"); if(url.indexOf("?")>0){ - url=url+'&uid='+userid; + url=url+'&userid='+userid; }else{ - url=url+'?uid='+userid; + url=url+'?userid='+userid; } + console.log(url) inAppBrowserRef = cordova.ThemeableBrowser.open(url, '_blank', { statusbar: { color: '#03a9f4ff' diff --git a/www/js/server.js b/www/js/server.js index 2bd6a73..c8eb688 100644 --- a/www/js/server.js +++ b/www/js/server.js @@ -1,11 +1,12 @@ -var dev = true; -var SERVER = "http://ykt.supwisdom.com:10010/payapi/mobileapi"; +var dev = false; +var SERVER = "https://yy.dlsmk.cn/payapi/mobileapi"; var GLOBAL_TODAY=""; var GLOBAL_YESTERDAY=""; var CURRENT_INDEX=1; if (dev) { - SERVER = "http://172.28.43.3:8099/payapi/mobileapi"; + SERVER = "http://172.28.201.70:10010/payapi/mobileapi"; } + function V1Qrcode(callback) { ajaxPost("/v1/qrcode", {}, callback) } diff --git a/www/register.html b/www/register.html index 640b3ee..34e5998 100644 --- a/www/register.html +++ b/www/register.html @@ -15,7 +15,7 @@

- +

æ³¨å

diff --git a/www/security.html b/www/security.html index 049a988..39a40ca 100644 --- a/www/security.html +++ b/www/security.html @@ -50,7 +50,7 @@