From 19fc5035cdc4f849eb0c746fe22c47c53143fb56 Mon Sep 17 00:00:00 2001 From: YorkShen Date: Mon, 23 Sep 2019 17:11:14 +0800 Subject: [PATCH] * [Android] Rename Android package name from 'com.taobao.weex' to 'org.apache.weex' --- android/build.gradle | 2 +- android/sdk/.gitignore | 1 + android/sdk/build.gradle | 6 +- android/sdk/buildSrc/packageName.gradle | 42 +++-- android/sdk/proguard-rules.pro | 10 +- android/sdk/src/main/AndroidManifest.xml | 2 +- .../apache}/weex/ComponentObserver.java | 4 +- .../weex/IWXActivityStateListener.java | 2 +- .../apache}/weex/IWXRenderListener.java | 7 +- .../apache}/weex/IWXStatisticsListener.java | 2 +- .../apache}/weex/InitConfig.java | 28 ++-- .../apache}/weex/RenderContainer.java | 4 +- .../taobao => org/apache}/weex/Script.java | 2 +- .../apache}/weex/WXEnvironment.java | 21 +-- .../apache}/weex/WXGlobalEventModule.java | 6 +- .../apache}/weex/WXGlobalEventReceiver.java | 4 +- .../apache}/weex/WXHttpListener.java | 24 +-- .../apache}/weex/WXSDKEngine.java | 152 +++++++++--------- .../apache}/weex/WXSDKInstance.java | 118 +++++++------- .../apache}/weex/WXSDKManager.java | 72 ++++----- .../apache}/weex/WeexFrameRateControl.java | 4 +- .../weex/adapter/ClassLoaderAdapter.java | 8 +- .../weex/adapter/DefaultUriAdapter.java | 6 +- .../weex/adapter/DefaultWXHttpAdapter.java | 10 +- .../weex/adapter/DrawableStrategy.java | 2 +- .../weex/adapter/ICrashInfoReporter.java | 2 +- .../apache}/weex/adapter/IDrawableLoader.java | 2 +- .../apache}/weex/adapter/ITracingAdapter.java | 4 +- .../adapter/IWXAccessibilityRoleAdapter.java | 2 +- .../weex/adapter/IWXConfigAdapter.java | 2 +- .../apache}/weex/adapter/IWXHttpAdapter.java | 6 +- .../weex/adapter/IWXImgLoaderAdapter.java | 6 +- .../weex/adapter/IWXJSExceptionAdapter.java | 4 +- .../weex/adapter/IWXJsFileLoaderAdapter.java | 2 +- .../weex/adapter/IWXJscProcessManager.java | 4 +- .../weex/adapter/IWXSoLoaderAdapter.java | 2 +- .../weex/adapter/IWXUserTrackAdapter.java | 4 +- .../apache}/weex/adapter/URIAdapter.java | 4 +- .../apache}/weex/annotation/Component.java | 2 +- .../apache}/weex/annotation/JSMethod.java | 2 +- .../weex/appfram/clipboard/IWXClipboard.java | 4 +- .../appfram/clipboard/WXClipboardModule.java | 10 +- .../navigator/IActivityNavBarSetter.java | 2 +- .../weex/appfram/navigator/INavigator.java | 2 +- .../appfram/navigator/WXNavigatorModule.java | 16 +- .../weex/appfram/pickers/DatePickerImpl.java | 6 +- .../weex/appfram/pickers/WXPickersModule.java | 14 +- .../appfram/storage/DefaultWXStorage.java | 6 +- .../weex/appfram/storage/IWXStorage.java | 4 +- .../appfram/storage/IWXStorageAdapter.java | 5 +- .../appfram/storage/StorageResultHandler.java | 4 +- .../appfram/storage/WXSQLiteOpenHelper.java | 4 +- .../weex/appfram/storage/WXStorageModule.java | 8 +- .../appfram/websocket/IWebSocketAdapter.java | 2 +- .../websocket/IWebSocketAdapterFactory.java | 2 +- .../websocket/WebSocketCloseCodes.java | 2 +- .../appfram/websocket/WebSocketModule.java | 12 +- .../apache}/weex/base/CalledByNative.java | 2 +- .../apache}/weex/base/FloatUtil.java | 2 +- .../weex/base/SystemMessageHandler.java | 3 +- .../apache}/weex/bridge/EventResult.java | 2 +- .../apache}/weex/bridge/Invoker.java | 2 +- .../apache}/weex/bridge/JSCallback.java | 2 +- .../weex/bridge/JavascriptInvokable.java | 2 +- .../apache}/weex/bridge/MethodInvoker.java | 2 +- .../apache}/weex/bridge/ModuleFactory.java | 7 +- .../weex/bridge/ModuleFactoryImpl.java | 2 +- .../weex/bridge/NativeInvokeHelper.java | 13 +- .../apache}/weex/bridge/RequestHandler.java | 32 ++-- .../apache}/weex/bridge/ResultCallback.java | 2 +- .../weex/bridge/ResultCallbackManager.java | 2 +- .../apache}/weex/bridge/SimpleJSCallback.java | 2 +- .../apache}/weex/bridge/WXBridge.java | 41 ++--- .../apache}/weex/bridge/WXBridgeManager.java | 124 +++++++------- .../apache}/weex/bridge/WXDebugJsBridge.java | 6 +- .../apache}/weex/bridge/WXHashMap.java | 2 +- .../apache}/weex/bridge/WXJSObject.java | 4 +- .../apache}/weex/bridge/WXModuleManager.java | 38 ++--- .../apache}/weex/bridge/WXParams.java | 8 +- .../apache}/weex/bridge/WXServiceManager.java | 7 +- .../apache}/weex/bridge/WXTask.java | 4 +- .../weex/bridge/WXValidateProcessor.java | 6 +- .../apache}/weex/common/Constants.java | 2 +- .../apache}/weex/common/Destroyable.java | 2 +- .../weex/common/ICheckBindingScroller.java | 2 +- .../apache}/weex/common/IWXBridge.java | 12 +- .../apache}/weex/common/IWXDebugConfig.java | 6 +- .../apache}/weex/common/IWXObject.java | 2 +- .../weex/common/OnWXScrollListener.java | 2 +- .../apache}/weex/common/RenderTypes.java | 2 +- .../weex/common/TypeModuleFactory.java | 14 +- .../apache}/weex/common/WXCompatModule.java | 4 +- .../apache}/weex/common/WXConfig.java | 2 +- .../apache}/weex/common/WXErrorCode.java | 2 +- .../apache}/weex/common/WXException.java | 2 +- .../apache}/weex/common/WXImageSharpen.java | 2 +- .../apache}/weex/common/WXImageStrategy.java | 4 +- .../apache}/weex/common/WXInstanceWrap.java | 6 +- .../weex/common/WXJSBridgeMsgType.java | 2 +- .../weex/common/WXJSEngineListener.java | 2 +- .../weex/common/WXJSExceptionInfo.java | 4 +- .../apache}/weex/common/WXJSService.java | 2 +- .../apache}/weex/common/WXModule.java | 12 +- .../apache}/weex/common/WXModuleAnno.java | 4 +- .../apache}/weex/common/WXPerformance.java | 17 +- .../apache}/weex/common/WXRefreshData.java | 2 +- .../apache}/weex/common/WXRenderStrategy.java | 2 +- .../apache}/weex/common/WXRequest.java | 4 +- .../weex/common/WXRequestListener.java | 2 +- .../apache}/weex/common/WXResponse.java | 2 +- .../weex/common/WXRuntimeException.java | 2 +- .../apache}/weex/common/WXThread.java | 15 +- .../weex/common/WXWorkThreadManager.java | 2 +- .../apache}/weex/dom/CSSConstants.java | 2 +- .../apache}/weex/dom/CSSShorthand.java | 4 +- .../apache}/weex/dom/RenderContext.java | 6 +- .../apache}/weex/dom/TextDecorationSpan.java | 4 +- .../apache}/weex/dom/WXAttr.java | 28 ++-- .../apache}/weex/dom/WXCustomStyleSpan.java | 4 +- .../apache}/weex/dom/WXEvent.java | 7 +- .../apache}/weex/dom/WXImageQuality.java | 2 +- .../apache}/weex/dom/WXLineHeightSpan.java | 6 +- .../apache}/weex/dom/WXStyle.java | 14 +- .../apache}/weex/dom/binding/ELUtils.java | 10 +- .../apache}/weex/dom/binding/JSONUtils.java | 2 +- .../apache}/weex/dom/binding/WXStatement.java | 2 +- .../weex/dom/transition/WXTransition.java | 54 +++---- .../apache}/weex/el/parse/ArrayStack.java | 2 +- .../apache}/weex/el/parse/Block.java | 2 +- .../apache}/weex/el/parse/Operator.java | 2 +- .../apache}/weex/el/parse/Operators.java | 2 +- .../apache}/weex/el/parse/Parser.java | 6 +- .../apache}/weex/el/parse/Symbol.java | 2 +- .../apache}/weex/el/parse/Token.java | 2 +- .../apache}/weex/font/FontAdapter.java | 2 +- .../apache}/weex/font/FontListener.java | 2 +- .../apache}/weex/http/Options.java | 3 +- .../apache}/weex/http/Status.java | 2 +- .../apache}/weex/http/WXHttpUtil.java | 6 +- .../apache}/weex/http/WXStreamModule.java | 33 ++-- .../InstanceOnFireEventInterceptor.java | 6 +- .../weex/layout/ContentBoxMeasurement.java | 11 +- .../apache}/weex/layout/MeasureMode.java | 2 +- .../apache}/weex/layout/MeasureSize.java | 2 +- .../TextContentBoxMeasurement.java | 45 +++--- .../weex/performance/IApmGenerator.java | 2 +- .../apache}/weex/performance/IWXAnalyzer.java | 2 +- .../performance/IWXApmMonitorAdapter.java | 2 +- .../performance/WXAnalyzerDataTransfer.java | 19 ++- .../weex/performance/WXInstanceApm.java | 26 +-- .../weex/performance/WXStateRecord.java | 12 +- .../weex/performance/WhiteScreenUtils.java | 13 +- .../render/WXAbstractRenderContainer.java | 4 +- .../apache}/weex/tracing/Stopwatch.java | 4 +- .../apache}/weex/tracing/WXTracing.java | 10 +- .../apache}/weex/ui/ComponentCreator.java | 10 +- .../ui/ExternalLoaderComponentHolder.java | 12 +- .../weex/ui/IExternalComponentGetter.java | 6 +- .../weex/ui/IExternalModuleGetter.java | 4 +- .../apache}/weex/ui/IFComponentHolder.java | 8 +- .../apache}/weex/ui/RenderContextImpl.java | 13 +- .../weex/ui/SimpleComponentHolder.java | 35 ++-- .../apache}/weex/ui/WXComponentRegistry.java | 24 ++- .../apache}/weex/ui/WXRenderHandler.java | 2 +- .../apache}/weex/ui/WXRenderManager.java | 27 ++-- .../apache}/weex/ui/action/ActionAddRule.java | 14 +- .../ui/action/ActionGetComponentRect.java | 17 +- .../ui/action/ActionGetLayoutDirection.java | 19 +-- .../weex/ui/action/ActionInvokeMethod.java | 11 +- .../weex/ui/action/ActionReloadPage.java | 6 +- .../weex/ui/action/BasicComponentData.java | 16 +- .../weex/ui/action/BasicGraphicAction.java | 13 +- .../GraphicActionAbstractAddElement.java | 19 +-- .../GraphicActionAddChildToRichtext.java | 9 +- .../ui/action/GraphicActionAddElement.java | 24 +-- .../weex/ui/action/GraphicActionAddEvent.java | 15 +- .../ui/action/GraphicActionAnimation.java | 37 ++--- .../GraphicActionAppendTreeCreateFinish.java | 11 +- .../ui/action/GraphicActionBatchAction.java | 4 +- .../ui/action/GraphicActionBatchBegin.java | 4 +- .../weex/ui/action/GraphicActionBatchEnd.java | 4 +- .../ui/action/GraphicActionCreateBody.java | 15 +- .../ui/action/GraphicActionCreateFinish.java | 12 +- .../weex/ui/action/GraphicActionLayout.java | 11 +- .../ui/action/GraphicActionMoveElement.java | 13 +- .../ui/action/GraphicActionRefreshFinish.java | 7 +- .../GraphicActionRemoveChildFromRichtext.java | 9 +- .../ui/action/GraphicActionRemoveElement.java | 13 +- .../ui/action/GraphicActionRemoveEvent.java | 15 +- .../ui/action/GraphicActionRenderSuccess.java | 6 +- .../action/GraphicActionScrollToElement.java | 13 +- .../ui/action/GraphicActionUpdateAttr.java | 8 +- .../GraphicActionUpdateRichtextAttr.java | 8 +- .../GraphicActionUpdateRichtextStyle.java | 9 +- .../ui/action/GraphicActionUpdateStyle.java | 16 +- .../weex/ui/action/GraphicPosition.java | 2 +- .../apache}/weex/ui/action/GraphicSize.java | 2 +- .../apache}/weex/ui/action/IExecutable.java | 2 +- .../ui/action/UpdateComponentDataAction.java | 19 +-- .../ui/animation/BackgroundColorProperty.java | 8 +- .../ui/animation/CameraDistanceProperty.java | 2 +- .../weex/ui/animation/HeightProperty.java | 2 +- .../ui/animation/LayoutParamsProperty.java | 6 +- .../weex/ui/animation/TransformParser.java | 20 +-- .../weex/ui/animation/WXAnimationBean.java | 17 +- .../weex/ui/animation/WXAnimationModule.java | 15 +- .../weex/ui/animation/WidthProperty.java | 2 +- .../ui/component/AbstractEditComponent.java | 44 +++-- .../weex/ui/component/AppearanceHelper.java | 3 +- .../weex/ui/component/NestedContainer.java | 4 +- .../apache}/weex/ui/component/Scrollable.java | 5 +- .../apache}/weex/ui/component/Textarea.java | 15 +- .../apache}/weex/ui/component/WXA.java | 16 +- .../weex/ui/component/WXBaseRefresh.java | 13 +- .../ui/component/WXBasicComponentType.java | 2 +- .../weex/ui/component/WXComponent.java | 131 +++++++-------- .../weex/ui/component/WXComponentFactory.java | 24 ++- .../weex/ui/component/WXComponentProp.java | 2 +- .../apache}/weex/ui/component/WXDiv.java | 22 ++- .../apache}/weex/ui/component/WXEmbed.java | 36 +++-- .../apache}/weex/ui/component/WXHeader.java | 12 +- .../apache}/weex/ui/component/WXImage.java | 54 +++---- .../weex/ui/component/WXIndicator.java | 22 +-- .../apache}/weex/ui/component/WXInput.java | 10 +- .../apache}/weex/ui/component/WXLoading.java | 27 ++-- .../weex/ui/component/WXLoadingIndicator.java | 16 +- .../apache}/weex/ui/component/WXRefresh.java | 24 +-- .../apache}/weex/ui/component/WXScroller.java | 48 +++--- .../apache}/weex/ui/component/WXSlider.java | 34 ++-- .../weex/ui/component/WXSliderNeighbor.java | 25 +-- .../apache}/weex/ui/component/WXSwitch.java | 19 ++- .../apache}/weex/ui/component/WXText.java | 30 ++-- .../weex/ui/component/WXTextDecoration.java | 2 +- .../weex/ui/component/WXVContainer.java | 20 +-- .../apache}/weex/ui/component/WXVideo.java | 28 ++-- .../apache}/weex/ui/component/WXWeb.java | 23 +-- .../ui/component/basic/WXBasicComponent.java | 19 ++- .../ui/component/binding/AsynLayoutTask.java | 11 +- .../weex/ui/component/binding/Layouts.java | 28 ++-- .../weex/ui/component/binding/Statements.java | 63 ++++---- .../helper/ScrollStartEndHelper.java | 18 +-- .../helper/SoftKeyboardDetector.java | 6 +- .../ui/component/helper/WXStickyHelper.java | 7 +- .../component/helper/WXTimeInputHelper.java | 6 +- .../ui/component/list/BasicListComponent.java | 70 ++++---- .../ui/component/list/DefaultDragHelper.java | 8 +- .../weex/ui/component/list/DragHelper.java | 4 +- .../component/list/DragSupportCallback.java | 6 +- .../weex/ui/component/list/EventTrigger.java | 2 +- .../ui/component/list/GapItemDecoration.java | 6 +- .../list/HorizontalListComponent.java | 12 +- .../ui/component/list/ListComponentView.java | 6 +- .../ui/component/list/RecyclerTransform.java | 8 +- .../component/list/SimpleListComponent.java | 13 +- .../ui/component/list/SimpleRecyclerView.java | 12 +- .../ui/component/list/StickyHeaderHelper.java | 9 +- .../weex/ui/component/list/WXCell.java | 40 +++-- .../ui/component/list/WXListComponent.java | 46 +++--- .../ui/component/list/WXPagerSnapHelper.java | 2 +- .../list/template/AsyncCellLoadTask.java | 8 +- .../list/template/CellDataManager.java | 8 +- .../list/template/CellRenderContext.java | 4 +- .../list/template/CellRenderState.java | 6 +- .../component/list/template/PositionRef.java | 3 +- .../ui/component/list/template/Selector.java | 11 +- .../list/template/TemplateCache.java | 4 +- .../component/list/template/TemplateDom.java | 17 +- .../list/template/TemplateStickyHelper.java | 6 +- .../list/template/TemplateViewHolder.java | 6 +- .../template/VirtualComponentLifecycle.java | 2 +- .../list/template/WXRecyclerTemplateList.java | 98 +++++------ .../jni/NativeRenderLayoutDirection.java | 2 +- .../template/jni/NativeRenderObjectUtils.java | 8 +- .../pesudo/OnActivePseudoListner.java | 2 +- .../ui/component/pesudo/PesudoStatus.java | 9 +- .../pesudo/TouchActivePseudoListener.java | 2 +- .../ui/component/richtext/WXRichText.java | 20 +-- .../ui/component/richtext/WXRichTextView.java | 6 +- .../ui/component/richtext/node/ANode.java | 13 +- .../ui/component/richtext/node/ImgNode.java | 30 ++-- .../component/richtext/node/RichTextNode.java | 18 +-- .../richtext/node/RichTextNodeCreator.java | 2 +- .../richtext/node/RichTextNodeManager.java | 4 +- .../ui/component/richtext/node/SpanNode.java | 10 +- .../ui/component/richtext/span/ASpan.java | 4 +- .../ui/component/richtext/span/ImgSpan.java | 6 +- .../richtext/span/ItemClickSpan.java | 10 +- .../ui/config/AutoScanConfigRegister.java | 14 +- .../weex/ui/config/ConfigComponentHolder.java | 27 ++-- .../weex/ui/config/ConfigModuleFactory.java | 26 +-- .../apache}/weex/ui/flat/FlatComponent.java | 4 +- .../apache}/weex/ui/flat/FlatGUIContext.java | 16 +- .../apache}/weex/ui/flat/WidgetContainer.java | 14 +- .../ui/flat/widget/AndroidViewWidget.java | 6 +- .../weex/ui/flat/widget/BaseWidget.java | 8 +- .../weex/ui/flat/widget/TextWidget.java | 4 +- .../apache}/weex/ui/flat/widget/Widget.java | 4 +- .../weex/ui/flat/widget/WidgetGroup.java | 4 +- .../weex/ui/module/ConsoleLogModule.java | 15 +- .../weex/ui/module/WXDeviceInfoModule.java | 12 +- .../apache}/weex/ui/module/WXDomModule.java | 28 ++-- .../weex/ui/module/WXLocaleModule.java | 10 +- .../apache}/weex/ui/module/WXMetaModule.java | 20 +-- .../weex/ui/module/WXModalUIModule.java | 12 +- .../apache}/weex/ui/module/WXTimerModule.java | 60 ++++--- .../weex/ui/module/WXWebViewModule.java | 14 +- .../apache}/weex/ui/view/BaseFrameLayout.java | 8 +- .../apache}/weex/ui/view/IRenderResult.java | 4 +- .../apache}/weex/ui/view/IRenderStatus.java | 4 +- .../apache}/weex/ui/view/IWXScroller.java | 2 +- .../apache}/weex/ui/view/IWXTextView.java | 2 +- .../apache}/weex/ui/view/IWebView.java | 2 +- .../weex/ui/view/WXBaseCircleIndicator.java | 8 +- .../weex/ui/view/WXBaseRefreshLayout.java | 2 +- .../weex/ui/view/WXCircleIndicator.java | 2 +- .../weex/ui/view/WXCirclePageAdapter.java | 6 +- .../weex/ui/view/WXCircleViewPager.java | 8 +- .../apache}/weex/ui/view/WXEditText.java | 6 +- .../apache}/weex/ui/view/WXFrameLayout.java | 22 +-- .../weex/ui/view/WXHorizontalScrollView.java | 6 +- .../apache}/weex/ui/view/WXImageView.java | 12 +- .../apache}/weex/ui/view/WXLoadingLayout.java | 2 +- .../apache}/weex/ui/view/WXRefreshLayout.java | 2 +- .../apache}/weex/ui/view/WXScrollView.java | 16 +- .../weex/ui/view/WXSmoothScroller.java | 2 +- .../apache}/weex/ui/view/WXSwitchView.java | 6 +- .../apache}/weex/ui/view/WXTextView.java | 8 +- .../apache}/weex/ui/view/WXVideoView.java | 8 +- .../apache}/weex/ui/view/WXWebView.java | 4 +- .../weex/ui/view/border/BorderCorner.java | 5 +- .../weex/ui/view/border/BorderDrawable.java | 28 ++-- .../weex/ui/view/border/BorderEdge.java | 5 +- .../weex/ui/view/border/BorderRadiusType.java | 2 +- .../weex/ui/view/border/BorderStyle.java | 4 +- .../weex/ui/view/border/BorderUtil.java | 5 +- .../weex/ui/view/border/BottomLeftCorner.java | 2 +- .../ui/view/border/BottomRightCorner.java | 2 +- .../weex/ui/view/border/TopLeftCorner.java | 2 +- .../weex/ui/view/border/TopRightCorner.java | 2 +- .../weex/ui/view/gesture/WXGesture.java | 42 ++--- .../ui/view/gesture/WXGestureObservable.java | 4 +- .../weex/ui/view/gesture/WXGestureType.java | 2 +- .../listview/ExtendedLinearLayoutManager.java | 2 +- .../ExtendedStaggeredGridLayoutManager.java | 6 +- .../weex/ui/view/listview/WXRecyclerView.java | 10 +- .../listview/adapter/IOnLoadMoreListener.java | 2 +- .../adapter/IRecyclerAdapterListener.java | 2 +- .../listview/adapter/ListBaseViewHolder.java | 6 +- .../adapter/RecyclerViewBaseAdapter.java | 2 +- .../adapter/TransformItemDecoration.java | 2 +- .../WXRecyclerViewOnScrollListener.java | 4 +- .../refresh/circlebar/CircleProgressBar.java | 2 +- .../circlebar/MaterialProgressDrawable.java | 2 +- .../ui/view/refresh/core/WXRefreshView.java | 6 +- .../ui/view/refresh/core/WXSwipeLayout.java | 2 +- .../view/refresh/wrapper/BaseBounceView.java | 18 +-- .../refresh/wrapper/BounceRecyclerView.java | 16 +- .../refresh/wrapper/BounceScrollerView.java | 6 +- .../apache}/weex/utils/ATagUtil.java | 8 +- .../apache}/weex/utils/BoxShadowUtil.java | 6 +- .../apache}/weex/utils/FontDO.java | 12 +- .../apache}/weex/utils/FunctionParser.java | 4 +- .../apache}/weex/utils/ImageDrawable.java | 2 +- .../apache}/weex/utils/ImgURIUtil.java | 2 +- .../apache}/weex/utils/LogLevel.java | 2 +- .../apache}/weex/utils/OsVersion.java | 2 +- .../weex/utils/SingleFunctionParser.java | 2 +- .../apache}/weex/utils/StaticLayoutProxy.java | 2 +- .../apache}/weex/utils/Trace.java | 2 +- .../apache}/weex/utils/TypefaceUtil.java | 17 +- .../weex/utils/WXDataStructureUtil.java | 2 +- .../apache}/weex/utils/WXDeviceUtils.java | 2 +- .../apache}/weex/utils/WXDomUtils.java | 11 +- .../apache}/weex/utils/WXExceptionUtils.java | 28 ++-- .../apache}/weex/utils/WXFileUtils.java | 2 +- .../apache}/weex/utils/WXInterception.java | 2 +- .../apache}/weex/utils/WXJsonUtils.java | 6 +- .../apache}/weex/utils/WXLogUtils.java | 12 +- .../apache}/weex/utils/WXMap.java | 2 +- .../apache}/weex/utils/WXReflectionUtils.java | 2 +- .../apache}/weex/utils/WXResourceUtils.java | 2 +- .../apache}/weex/utils/WXSoInstallMgrSdk.java | 12 +- .../apache}/weex/utils/WXUtils.java | 10 +- .../apache}/weex/utils/WXViewToImageUtil.java | 4 +- .../apache}/weex/utils/WXViewUtils.java | 22 +-- .../apache}/weex/utils/WXWsonJSONSwitch.java | 8 +- .../weex/utils/batch/BactchExecutor.java | 2 +- .../utils/batch/BatchOperationHelper.java | 6 +- .../apache}/weex/utils/batch/Interceptor.java | 2 +- .../weex/utils/cache/RegisterCache.java | 16 +- .../apache}/weex/utils/tools/Info.java | 2 +- .../apache}/weex/utils/tools/LogDetail.java | 4 +- .../apache}/weex/utils/tools/LogSwitch.java | 2 +- .../apache}/weex/utils/tools/TaskInfo.java | 2 +- .../apache}/weex/utils/tools/Time.java | 2 +- .../weex/utils/tools/TimeCalculator.java | 6 +- .../taobao => org/apache}/weex/wson/Wson.java | 4 +- .../apache}/weex/wson/WsonUtils.java | 4 +- weex_core/Source/WXBridge_jni.h | 22 +-- weex_core/Source/android/wrap/log_utils.cpp | 2 +- weex_core/Source/android/wrap/wml_bridge.cpp | 4 +- .../Source/android/wrap/wx_js_object.cpp | 2 +- weex_core/Source/android/wrap/wx_map.cpp | 2 +- .../Source/base/android/jniprebuild/jni_files | 2 +- .../jniheader/ContentBoxMeasurement_jni.h | 4 +- .../jniheader/NativeRenderObjectUtils_jni.h | 8 +- .../jniheader/RequestHandler_jni.h | 6 +- .../jniheader/SystemMessageHandler_jni.h | 6 +- .../jniprebuild/jniheader/WXBridge_jni.h | 20 +-- .../jniheader/WXDebugJsBridge_jni.h | 4 +- .../jniprebuild/jniheader/WXJsFunctions_jni.h | 4 +- .../jniprebuild/jniheader/WXParams_jni.h | 4 +- 412 files changed, 2238 insertions(+), 2291 deletions(-) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ComponentObserver.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/IWXActivityStateListener.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/IWXRenderListener.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/IWXStatisticsListener.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/InitConfig.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/RenderContainer.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/Script.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WXEnvironment.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WXGlobalEventModule.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WXGlobalEventReceiver.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WXHttpListener.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WXSDKEngine.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WXSDKInstance.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WXSDKManager.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/WeexFrameRateControl.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/ClassLoaderAdapter.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/DefaultUriAdapter.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/DefaultWXHttpAdapter.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/DrawableStrategy.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/ICrashInfoReporter.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IDrawableLoader.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/ITracingAdapter.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXAccessibilityRoleAdapter.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXConfigAdapter.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXHttpAdapter.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXImgLoaderAdapter.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXJSExceptionAdapter.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXJsFileLoaderAdapter.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXJscProcessManager.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXSoLoaderAdapter.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/IWXUserTrackAdapter.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/adapter/URIAdapter.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/annotation/Component.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/annotation/JSMethod.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/clipboard/IWXClipboard.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/clipboard/WXClipboardModule.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/navigator/IActivityNavBarSetter.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/navigator/INavigator.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/navigator/WXNavigatorModule.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/pickers/DatePickerImpl.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/pickers/WXPickersModule.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/storage/DefaultWXStorage.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/storage/IWXStorage.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/storage/IWXStorageAdapter.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/storage/StorageResultHandler.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/storage/WXSQLiteOpenHelper.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/storage/WXStorageModule.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/websocket/IWebSocketAdapter.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/websocket/IWebSocketAdapterFactory.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/websocket/WebSocketCloseCodes.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/appfram/websocket/WebSocketModule.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/base/CalledByNative.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/base/FloatUtil.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/base/SystemMessageHandler.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/EventResult.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/Invoker.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/JSCallback.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/JavascriptInvokable.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/MethodInvoker.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/ModuleFactory.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/ModuleFactoryImpl.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/NativeInvokeHelper.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/RequestHandler.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/ResultCallback.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/ResultCallbackManager.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/SimpleJSCallback.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXBridge.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXBridgeManager.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXDebugJsBridge.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXHashMap.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXJSObject.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXModuleManager.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXParams.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXServiceManager.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXTask.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/bridge/WXValidateProcessor.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/Constants.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/Destroyable.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/ICheckBindingScroller.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/IWXBridge.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/IWXDebugConfig.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/IWXObject.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/OnWXScrollListener.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/RenderTypes.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/TypeModuleFactory.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXCompatModule.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXConfig.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXErrorCode.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXException.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXImageSharpen.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXImageStrategy.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXInstanceWrap.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXJSBridgeMsgType.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXJSEngineListener.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXJSExceptionInfo.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXJSService.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXModule.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXModuleAnno.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXPerformance.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXRefreshData.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXRenderStrategy.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXRequest.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXRequestListener.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXResponse.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXRuntimeException.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXThread.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/common/WXWorkThreadManager.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/CSSConstants.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/CSSShorthand.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/RenderContext.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/TextDecorationSpan.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/WXAttr.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/WXCustomStyleSpan.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/WXEvent.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/WXImageQuality.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/WXLineHeightSpan.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/WXStyle.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/binding/ELUtils.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/binding/JSONUtils.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/binding/WXStatement.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/dom/transition/WXTransition.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/el/parse/ArrayStack.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/el/parse/Block.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/el/parse/Operator.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/el/parse/Operators.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/el/parse/Parser.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/el/parse/Symbol.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/el/parse/Token.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/font/FontAdapter.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/font/FontListener.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/http/Options.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/http/Status.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/http/WXHttpUtil.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/http/WXStreamModule.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/instance/InstanceOnFireEventInterceptor.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/layout/ContentBoxMeasurement.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/layout/MeasureMode.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/layout/MeasureSize.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/layout/measurefunc/TextContentBoxMeasurement.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/performance/IApmGenerator.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/performance/IWXAnalyzer.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/performance/IWXApmMonitorAdapter.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/performance/WXAnalyzerDataTransfer.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/performance/WXInstanceApm.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/performance/WXStateRecord.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/performance/WhiteScreenUtils.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/render/WXAbstractRenderContainer.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/tracing/Stopwatch.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/tracing/WXTracing.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/ComponentCreator.java (83%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/ExternalLoaderComponentHolder.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/IExternalComponentGetter.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/IExternalModuleGetter.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/IFComponentHolder.java (83%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/RenderContextImpl.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/SimpleComponentHolder.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/WXComponentRegistry.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/WXRenderHandler.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/WXRenderManager.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/ActionAddRule.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/ActionGetComponentRect.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/ActionGetLayoutDirection.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/ActionInvokeMethod.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/ActionReloadPage.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/BasicComponentData.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/BasicGraphicAction.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionAbstractAddElement.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionAddChildToRichtext.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionAddElement.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionAddEvent.java (79%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionAnimation.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionAppendTreeCreateFinish.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionBatchAction.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionBatchBegin.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionBatchEnd.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionCreateBody.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionCreateFinish.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionLayout.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionMoveElement.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionRefreshFinish.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionRemoveChildFromRichtext.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionRemoveElement.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionRemoveEvent.java (78%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionRenderSuccess.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionScrollToElement.java (80%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionUpdateAttr.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionUpdateRichtextAttr.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionUpdateRichtextStyle.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicActionUpdateStyle.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicPosition.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/GraphicSize.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/IExecutable.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/action/UpdateComponentDataAction.java (81%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/BackgroundColorProperty.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/CameraDistanceProperty.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/HeightProperty.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/LayoutParamsProperty.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/TransformParser.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/WXAnimationBean.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/WXAnimationModule.java (85%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/animation/WidthProperty.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/AbstractEditComponent.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/AppearanceHelper.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/NestedContainer.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/Scrollable.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/Textarea.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXA.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXBaseRefresh.java (82%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXBasicComponentType.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXComponent.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXComponentFactory.java (80%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXComponentProp.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXDiv.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXEmbed.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXHeader.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXImage.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXIndicator.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXInput.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXLoading.java (81%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXLoadingIndicator.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXRefresh.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXScroller.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXSlider.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXSliderNeighbor.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXSwitch.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXText.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXTextDecoration.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXVContainer.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXVideo.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/WXWeb.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/basic/WXBasicComponent.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/binding/AsynLayoutTask.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/binding/Layouts.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/binding/Statements.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/helper/ScrollStartEndHelper.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/helper/SoftKeyboardDetector.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/helper/WXStickyHelper.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/helper/WXTimeInputHelper.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/BasicListComponent.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/DefaultDragHelper.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/DragHelper.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/DragSupportCallback.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/EventTrigger.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/GapItemDecoration.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/HorizontalListComponent.java (82%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/ListComponentView.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/RecyclerTransform.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/SimpleListComponent.java (79%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/SimpleRecyclerView.java (85%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/StickyHeaderHelper.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/WXCell.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/WXListComponent.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/WXPagerSnapHelper.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/AsyncCellLoadTask.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/CellDataManager.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/CellRenderContext.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/CellRenderState.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/PositionRef.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/Selector.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/TemplateCache.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/TemplateDom.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/TemplateStickyHelper.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/TemplateViewHolder.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/VirtualComponentLifecycle.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/WXRecyclerTemplateList.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/jni/NativeRenderLayoutDirection.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/list/template/jni/NativeRenderObjectUtils.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/pesudo/OnActivePseudoListner.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/pesudo/PesudoStatus.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/pesudo/TouchActivePseudoListener.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/WXRichText.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/WXRichTextView.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/node/ANode.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/node/ImgNode.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/node/RichTextNode.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/node/RichTextNodeCreator.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/node/RichTextNodeManager.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/node/SpanNode.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/span/ASpan.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/span/ImgSpan.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/component/richtext/span/ItemClickSpan.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/config/AutoScanConfigRegister.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/config/ConfigComponentHolder.java (87%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/config/ConfigModuleFactory.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/FlatComponent.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/FlatGUIContext.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/WidgetContainer.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/widget/AndroidViewWidget.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/widget/BaseWidget.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/widget/TextWidget.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/widget/Widget.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/flat/widget/WidgetGroup.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/ConsoleLogModule.java (88%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/WXDeviceInfoModule.java (84%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/WXDomModule.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/WXLocaleModule.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/WXMetaModule.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/WXModalUIModule.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/WXTimerModule.java (78%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/module/WXWebViewModule.java (86%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/BaseFrameLayout.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/IRenderResult.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/IRenderStatus.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/IWXScroller.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/IWXTextView.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/IWebView.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXBaseCircleIndicator.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXBaseRefreshLayout.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXCircleIndicator.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXCirclePageAdapter.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXCircleViewPager.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXEditText.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXFrameLayout.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXHorizontalScrollView.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXImageView.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXLoadingLayout.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXRefreshLayout.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXScrollView.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXSmoothScroller.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXSwitchView.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXTextView.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXVideoView.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/WXWebView.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BorderCorner.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BorderDrawable.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BorderEdge.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BorderRadiusType.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BorderStyle.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BorderUtil.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BottomLeftCorner.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/BottomRightCorner.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/TopLeftCorner.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/border/TopRightCorner.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/gesture/WXGesture.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/gesture/WXGestureObservable.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/gesture/WXGestureType.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/ExtendedLinearLayoutManager.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/WXRecyclerView.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/adapter/IOnLoadMoreListener.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/adapter/IRecyclerAdapterListener.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/adapter/ListBaseViewHolder.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/adapter/TransformItemDecoration.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/refresh/circlebar/CircleProgressBar.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/refresh/circlebar/MaterialProgressDrawable.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/refresh/core/WXRefreshView.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/refresh/core/WXSwipeLayout.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/refresh/wrapper/BaseBounceView.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/refresh/wrapper/BounceRecyclerView.java (89%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/ui/view/refresh/wrapper/BounceScrollerView.java (91%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/ATagUtil.java (90%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/BoxShadowUtil.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/FontDO.java (95%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/FunctionParser.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/ImageDrawable.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/ImgURIUtil.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/LogLevel.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/OsVersion.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/SingleFunctionParser.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/StaticLayoutProxy.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/Trace.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/TypefaceUtil.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXDataStructureUtil.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXDeviceUtils.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXDomUtils.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXExceptionUtils.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXFileUtils.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXInterception.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXJsonUtils.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXLogUtils.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXMap.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXReflectionUtils.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXResourceUtils.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXSoInstallMgrSdk.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXUtils.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXViewToImageUtil.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXViewUtils.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/WXWsonJSONSwitch.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/batch/BactchExecutor.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/batch/BatchOperationHelper.java (92%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/batch/Interceptor.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/cache/RegisterCache.java (93%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/tools/Info.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/tools/LogDetail.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/tools/LogSwitch.java (97%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/tools/TaskInfo.java (96%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/tools/Time.java (98%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/utils/tools/TimeCalculator.java (94%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/wson/Wson.java (99%) rename android/sdk/src/main/java/{com/taobao => org/apache}/weex/wson/WsonUtils.java (95%) diff --git a/android/build.gradle b/android/build.gradle index 6a3c4dbcb7..642d523d8d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -58,7 +58,7 @@ ext { fastjsonLibVersion="1.1.70.android" //Default value for disableCov is false disableCov = project.hasProperty("disableCov") && disableCov.equals("true") - useApachePackageName = project.hasProperty('apachePackageName') ? project.property('apachePackageName').toBoolean() : true + useApachePackageName = project.hasProperty('apachePackageName') ? project.property('apachePackageName').toBoolean() : false implementFromWeex = true } diff --git a/android/sdk/.gitignore b/android/sdk/.gitignore index b4cd062633..f29323dc68 100755 --- a/android/sdk/.gitignore +++ b/android/sdk/.gitignore @@ -19,3 +19,4 @@ assets/weex-rax-api.js /libs/armeabi /src/legacyRelease/ +proguard-rules-legacy.pro \ No newline at end of file diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index 6b7559ae63..76be349756 100755 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -146,9 +146,9 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), useApachePackageName ? 'proguard-rules.pro' : 'proguard-rules-legacy.pro' buildConfigField "boolean", "ENABLE_TRACE", "false" - consumerProguardFiles 'proguard-rules.pro' + consumerProguardFiles useApachePackageName ? 'proguard-rules.pro' : 'proguard-rules-legacy.pro' } debug { @@ -265,4 +265,4 @@ task weex_core_license(type: com.hierynomus.gradle.license.tasks.LicenseFormat) 'Source/include/JavaScriptCore/**/*.cpp']) } -preBuild.dependsOn copyAndRenameCppSourceFile, copyAndRenamePackage, copyManifest, copyASanLib, checkNdkVersion, licenseFormat \ No newline at end of file +preBuild.dependsOn copyAndRenameCppSourceFile, copyAndRenamePackage, copyManifest, copyProguard, copyASanLib, checkNdkVersion, licenseFormat \ No newline at end of file diff --git a/android/sdk/buildSrc/packageName.gradle b/android/sdk/buildSrc/packageName.gradle index 94b2ddc0ab..2855743ff6 100644 --- a/android/sdk/buildSrc/packageName.gradle +++ b/android/sdk/buildSrc/packageName.gradle @@ -3,15 +3,15 @@ task copyAndRenamePackage(type: Copy) { doFirst { delete new File('src/legacyRelease/java') } - from new File('src/main/java/com/taobao/weex') - into new File('src/legacyRelease/java/org/apache/weex') + from new File('src/main/java/org/apache/weex') + into new File('src/legacyRelease/java/com/taobao/weex') filter { String line -> - line.replaceAll(/^(package com\.taobao)(\.weex.*)$/, { _, packageName, suffix -> - "package org.apache${suffix}" - }).replaceAll(/^(import com\.taobao)(\.weex.*)$/, { _, packageName, suffix -> - "import org.apache${suffix}" - }).replaceAll(/^(import static com\.taobao)(\.weex.*)$/, { _, packageName, suffix -> - "import static org.apache${suffix}" + line.replaceAll(/^(package org\.apache)(\.weex.*)$/, { _, packageName, suffix -> + "package com.taobao${suffix}" + }).replaceAll(/^(import org\.apache)(\.weex.*)$/, { _, packageName, suffix -> + "import com.taobao${suffix}" + }).replaceAll(/^(import static org\.apache)(\.weex.*)$/, { _, packageName, suffix -> + "import static com.taobao${suffix}" }) } } @@ -25,8 +25,24 @@ task copyManifest(type: Copy){ from new File('src/main/AndroidManifest.xml') into new File('src/legacyRelease') filter { String line -> - line.replaceAll(/(com\.taobao)(\.weex.*)/, { _, packageName, suffix -> - "org.apache${suffix}" + line.replaceAll(/(org\.apache)(\.weex.*)/, { _, packageName, suffix -> + "com.taobao${suffix}" + }) + } + } +} + +task copyProguard(type: Copy){ + if(!project.useApachePackageName){ + doFirst { + delete new File('proguard-rules-legacy.pro') + } + from new File('proguard-rules.pro') + into new File('.') + rename 'proguard-rules.pro', 'proguard-rules-legacy.pro' + filter { String line -> + line.replaceAll(/(org\.apache)(\.weex.*)/, { _, packageName, suffix -> + "com.taobao${suffix}" }) } } @@ -49,9 +65,9 @@ task copyAndRenameCppSourceFile(type: Copy, dependsOn: copyOtherCppFile){ into new File('src/legacyRelease/cpp') include '**/*.cpp', '**/*.cc', '**/*.c', '**/*.h', '**/*.hpp' filter { String line -> - line.replaceAll('(.*".*)(com/taobao/weex)(.*".*)', { _, prefix, packageName, suffix -> - logger.info("Content substation in .cpp/.h files happpened, \n Input: ${line}, \n Output: ${prefix}org/apache/weex${suffix}") - "${prefix}org/apache/weex${suffix}" + line.replaceAll('(.*".*)(org/apache/weex)(.*".*)', { _, prefix, packageName, suffix -> + logger.info("Content substation in .cpp/.h files happpened, \n Input: ${line}, \n Output: ${prefix}com/taobao/weex${suffix}") + "${prefix}com/taobao/weex${suffix}" }) } } diff --git a/android/sdk/proguard-rules.pro b/android/sdk/proguard-rules.pro index 957227f8c9..19b57c0175 100755 --- a/android/sdk/proguard-rules.pro +++ b/android/sdk/proguard-rules.pro @@ -34,8 +34,8 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} --keep class com.taobao.weex.bridge.** { *; } --keep class com.taobao.weex.layout.** { *; } --keep class com.taobao.weex.WXSDKEngine { *; } --keep class com.taobao.weex.base.SystemMessageHandler { *; } --dontwarn com.taobao.weex.bridge.** +-keep class org.apache.weex.bridge.** { *; } +-keep class org.apache.weex.layout.** { *; } +-keep class org.apache.weex.WXSDKEngine { *; } +-keep class org.apache.weex.base.SystemMessageHandler { *; } +-dontwarn org.apache.weex.bridge.** diff --git a/android/sdk/src/main/AndroidManifest.xml b/android/sdk/src/main/AndroidManifest.xml index 5360c0c9f2..3c06bb4f06 100755 --- a/android/sdk/src/main/AndroidManifest.xml +++ b/android/sdk/src/main/AndroidManifest.xml @@ -18,6 +18,6 @@ specific language governing permissions and limitations under the License. --> + package="org.apache.weex"> \ No newline at end of file diff --git a/android/sdk/src/main/java/com/taobao/weex/ComponentObserver.java b/android/sdk/src/main/java/org/apache/weex/ComponentObserver.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ComponentObserver.java rename to android/sdk/src/main/java/org/apache/weex/ComponentObserver.java index a2bcd0942d..f77eb7eaed 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ComponentObserver.java +++ b/android/sdk/src/main/java/org/apache/weex/ComponentObserver.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.view.View; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponent; /** * Created by sospartan on 14/06/2017. diff --git a/android/sdk/src/main/java/com/taobao/weex/IWXActivityStateListener.java b/android/sdk/src/main/java/org/apache/weex/IWXActivityStateListener.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/IWXActivityStateListener.java rename to android/sdk/src/main/java/org/apache/weex/IWXActivityStateListener.java index cc2d413495..0398aec7c3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/IWXActivityStateListener.java +++ b/android/sdk/src/main/java/org/apache/weex/IWXActivityStateListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; /** * Listener class for activity lifecycle diff --git a/android/sdk/src/main/java/com/taobao/weex/IWXRenderListener.java b/android/sdk/src/main/java/org/apache/weex/IWXRenderListener.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/IWXRenderListener.java rename to android/sdk/src/main/java/org/apache/weex/IWXRenderListener.java index fd78d60906..82f70fa094 100644 --- a/android/sdk/src/main/java/com/taobao/weex/IWXRenderListener.java +++ b/android/sdk/src/main/java/org/apache/weex/IWXRenderListener.java @@ -16,16 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.view.View; +import org.apache.weex.common.WXRenderStrategy; public interface IWXRenderListener { /** - * If {@link com.taobao.weex.common.WXRenderStrategy#APPEND_ASYNC} is applied, this method + * If {@link WXRenderStrategy#APPEND_ASYNC} is applied, this method * will be invoked when the rendering of first view is finish. - * If {@link com.taobao.weex.common.WXRenderStrategy#APPEND_ONCE} is applied, this method will + * If {@link WXRenderStrategy#APPEND_ONCE} is applied, this method will * be invoked when the rendering of the view tree is finished. */ void onViewCreated(WXSDKInstance instance, View view); diff --git a/android/sdk/src/main/java/com/taobao/weex/IWXStatisticsListener.java b/android/sdk/src/main/java/org/apache/weex/IWXStatisticsListener.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/IWXStatisticsListener.java rename to android/sdk/src/main/java/org/apache/weex/IWXStatisticsListener.java index 814edaec6c..580b02ac1c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/IWXStatisticsListener.java +++ b/android/sdk/src/main/java/org/apache/weex/IWXStatisticsListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; public interface IWXStatisticsListener { /** diff --git a/android/sdk/src/main/java/com/taobao/weex/InitConfig.java b/android/sdk/src/main/java/org/apache/weex/InitConfig.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/InitConfig.java rename to android/sdk/src/main/java/org/apache/weex/InitConfig.java index 053fb826fa..911271b46a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/InitConfig.java +++ b/android/sdk/src/main/java/org/apache/weex/InitConfig.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.support.annotation.NonNull; -import com.taobao.weex.adapter.ClassLoaderAdapter; -import com.taobao.weex.adapter.IDrawableLoader; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.adapter.IWXImgLoaderAdapter; -import com.taobao.weex.adapter.IWXJSExceptionAdapter; -import com.taobao.weex.adapter.IWXJsFileLoaderAdapter; -import com.taobao.weex.adapter.IWXJscProcessManager; -import com.taobao.weex.adapter.IWXSoLoaderAdapter; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.appfram.storage.IWXStorageAdapter; -import com.taobao.weex.appfram.websocket.IWebSocketAdapterFactory; -import com.taobao.weex.performance.IApmGenerator; +import org.apache.weex.adapter.ClassLoaderAdapter; +import org.apache.weex.adapter.IDrawableLoader; +import org.apache.weex.adapter.IWXHttpAdapter; +import org.apache.weex.adapter.IWXImgLoaderAdapter; +import org.apache.weex.adapter.IWXJSExceptionAdapter; +import org.apache.weex.adapter.IWXJsFileLoaderAdapter; +import org.apache.weex.adapter.IWXJscProcessManager; +import org.apache.weex.adapter.IWXSoLoaderAdapter; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.appfram.storage.IWXStorageAdapter; +import org.apache.weex.appfram.websocket.IWebSocketAdapterFactory; +import org.apache.weex.performance.IApmGenerator; import java.util.LinkedList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/RenderContainer.java b/android/sdk/src/main/java/org/apache/weex/RenderContainer.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/RenderContainer.java rename to android/sdk/src/main/java/org/apache/weex/RenderContainer.java index cec6eaf117..29af1b6fe7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/RenderContainer.java +++ b/android/sdk/src/main/java/org/apache/weex/RenderContainer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.annotation.TargetApi; import android.content.Context; @@ -25,7 +25,7 @@ import android.view.View; -import com.taobao.weex.render.WXAbstractRenderContainer; +import org.apache.weex.render.WXAbstractRenderContainer; /** * Created by sospartan on 08/10/2016. diff --git a/android/sdk/src/main/java/com/taobao/weex/Script.java b/android/sdk/src/main/java/org/apache/weex/Script.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/Script.java rename to android/sdk/src/main/java/org/apache/weex/Script.java index e18bb7674d..6688fc33d5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/Script.java +++ b/android/sdk/src/main/java/org/apache/weex/Script.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.text.TextUtils; diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java b/android/sdk/src/main/java/org/apache/weex/WXEnvironment.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java rename to android/sdk/src/main/java/org/apache/weex/WXEnvironment.java index 0df610514b..44cd4b4c58 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java +++ b/android/sdk/src/main/java/org/apache/weex/WXEnvironment.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import static android.content.Context.MODE_PRIVATE; @@ -31,15 +31,16 @@ import android.os.Environment; import android.telephony.TelephonyManager; import android.text.TextUtils; -import com.taobao.weex.common.WXConfig; -import com.taobao.weex.utils.FontDO; -import com.taobao.weex.utils.LogLevel; -import com.taobao.weex.utils.TypefaceUtil; -import com.taobao.weex.utils.WXFileUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXSoInstallMgrSdk; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import com.taobao.weex.R; +import org.apache.weex.common.WXConfig; +import org.apache.weex.utils.FontDO; +import org.apache.weex.utils.LogLevel; +import org.apache.weex.utils.TypefaceUtil; +import org.apache.weex.utils.WXFileUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXSoInstallMgrSdk; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import dalvik.system.PathClassLoader; import java.io.BufferedReader; import java.io.File; diff --git a/android/sdk/src/main/java/com/taobao/weex/WXGlobalEventModule.java b/android/sdk/src/main/java/org/apache/weex/WXGlobalEventModule.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/WXGlobalEventModule.java rename to android/sdk/src/main/java/org/apache/weex/WXGlobalEventModule.java index b487ba22c6..9ad32e1b4f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXGlobalEventModule.java +++ b/android/sdk/src/main/java/org/apache/weex/WXGlobalEventModule.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.WXModule; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.WXModule; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/WXGlobalEventReceiver.java b/android/sdk/src/main/java/org/apache/weex/WXGlobalEventReceiver.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/WXGlobalEventReceiver.java rename to android/sdk/src/main/java/org/apache/weex/WXGlobalEventReceiver.java index 82e8363277..75c1f85514 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXGlobalEventReceiver.java +++ b/android/sdk/src/main/java/org/apache/weex/WXGlobalEventReceiver.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/WXHttpListener.java b/android/sdk/src/main/java/org/apache/weex/WXHttpListener.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/WXHttpListener.java rename to android/sdk/src/main/java/org/apache/weex/WXHttpListener.java index 15d9cf2f7d..234c3c4f5d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXHttpListener.java +++ b/android/sdk/src/main/java/org/apache/weex/WXHttpListener.java @@ -16,30 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.net.Uri; import android.text.TextUtils; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXPerformance; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.common.WXResponse; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.tracing.WXTracing; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.tools.LogDetail; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXPerformance; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.common.WXResponse; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.tracing.WXTracing; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.tools.LogDetail; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.weex.adapter.IWXHttpAdapter.OnHttpListener; /** * load bundle js listener */ -public class WXHttpListener implements IWXHttpAdapter.OnHttpListener { +public class WXHttpListener implements OnHttpListener { private String pageName; private Map options; diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/org/apache/weex/WXSDKEngine.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java rename to android/sdk/src/main/java/org/apache/weex/WXSDKEngine.java index d9ef52265f..ed1cda6290 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java +++ b/android/sdk/src/main/java/org/apache/weex/WXSDKEngine.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; - -import static com.taobao.weex.WXEnvironment.CORE_SO_NAME; +package org.apache.weex; import android.app.Application; import android.content.Context; @@ -26,79 +24,79 @@ import android.content.res.Resources; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; -import com.taobao.weex.adapter.IDrawableLoader; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.adapter.IWXImgLoaderAdapter; -import com.taobao.weex.adapter.IWXJSExceptionAdapter; -import com.taobao.weex.adapter.IWXJsFileLoaderAdapter; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.appfram.clipboard.WXClipboardModule; -import com.taobao.weex.appfram.navigator.IActivityNavBarSetter; -import com.taobao.weex.appfram.navigator.INavigator; -import com.taobao.weex.appfram.navigator.WXNavigatorModule; -import com.taobao.weex.appfram.pickers.WXPickersModule; -import com.taobao.weex.appfram.storage.IWXStorageAdapter; -import com.taobao.weex.appfram.storage.WXStorageModule; -import com.taobao.weex.appfram.websocket.WebSocketModule; -import com.taobao.weex.bridge.ModuleFactory; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.bridge.WXModuleManager; -import com.taobao.weex.bridge.WXServiceManager; -import com.taobao.weex.common.Destroyable; -import com.taobao.weex.common.TypeModuleFactory; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXException; -import com.taobao.weex.common.WXInstanceWrap; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.http.WXStreamModule; -import com.taobao.weex.performance.WXStateRecord; -import com.taobao.weex.ui.ExternalLoaderComponentHolder; -import com.taobao.weex.ui.IExternalComponentGetter; -import com.taobao.weex.ui.IExternalModuleGetter; -import com.taobao.weex.ui.IFComponentHolder; -import com.taobao.weex.ui.SimpleComponentHolder; -import com.taobao.weex.ui.WXComponentRegistry; -import com.taobao.weex.ui.animation.WXAnimationModule; -import com.taobao.weex.ui.component.Textarea; -import com.taobao.weex.ui.component.WXA; -import com.taobao.weex.ui.component.WXBasicComponentType; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXDiv; -import com.taobao.weex.ui.component.WXEmbed; -import com.taobao.weex.ui.component.WXHeader; -import com.taobao.weex.ui.component.WXImage; -import com.taobao.weex.ui.component.WXIndicator; -import com.taobao.weex.ui.component.WXInput; -import com.taobao.weex.ui.component.WXLoading; -import com.taobao.weex.ui.component.WXLoadingIndicator; -import com.taobao.weex.ui.component.WXRefresh; -import com.taobao.weex.ui.component.WXScroller; -import com.taobao.weex.ui.component.WXSlider; -import com.taobao.weex.ui.component.WXSliderNeighbor; -import com.taobao.weex.ui.component.WXSwitch; -import com.taobao.weex.ui.component.WXText; -import com.taobao.weex.ui.component.WXVideo; -import com.taobao.weex.ui.component.WXWeb; -import com.taobao.weex.ui.component.list.HorizontalListComponent; -import com.taobao.weex.ui.component.list.SimpleListComponent; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.component.list.WXListComponent; -import com.taobao.weex.ui.component.list.template.WXRecyclerTemplateList; -import com.taobao.weex.ui.component.richtext.WXRichText; -import com.taobao.weex.ui.config.AutoScanConfigRegister; -import com.taobao.weex.ui.module.WXDeviceInfoModule; -import com.taobao.weex.ui.module.ConsoleLogModule; -import com.taobao.weex.ui.module.WXLocaleModule; -import com.taobao.weex.ui.module.WXMetaModule; -import com.taobao.weex.ui.module.WXModalUIModule; -import com.taobao.weex.ui.module.WXTimerModule; -import com.taobao.weex.ui.module.WXWebViewModule; -import com.taobao.weex.utils.LogLevel; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXSoInstallMgrSdk; -import com.taobao.weex.utils.batch.BatchOperationHelper; -import com.taobao.weex.utils.cache.RegisterCache; +import org.apache.weex.adapter.IDrawableLoader; +import org.apache.weex.adapter.IWXHttpAdapter; +import org.apache.weex.adapter.IWXImgLoaderAdapter; +import org.apache.weex.adapter.IWXJSExceptionAdapter; +import org.apache.weex.adapter.IWXJsFileLoaderAdapter; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.appfram.clipboard.WXClipboardModule; +import org.apache.weex.appfram.navigator.IActivityNavBarSetter; +import org.apache.weex.appfram.navigator.INavigator; +import org.apache.weex.appfram.navigator.WXNavigatorModule; +import org.apache.weex.appfram.pickers.WXPickersModule; +import org.apache.weex.appfram.storage.IWXStorageAdapter; +import org.apache.weex.appfram.storage.WXStorageModule; +import org.apache.weex.appfram.websocket.WebSocketModule; +import org.apache.weex.bridge.ModuleFactory; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.bridge.WXModuleManager; +import org.apache.weex.bridge.WXServiceManager; +import org.apache.weex.common.Destroyable; +import org.apache.weex.common.TypeModuleFactory; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXException; +import org.apache.weex.common.WXInstanceWrap; +import org.apache.weex.common.WXModule; +import org.apache.weex.http.WXStreamModule; +import org.apache.weex.performance.WXStateRecord; +import org.apache.weex.ui.ExternalLoaderComponentHolder; +import org.apache.weex.ui.IExternalComponentGetter; +import org.apache.weex.ui.IExternalModuleGetter; +import org.apache.weex.ui.IFComponentHolder; +import org.apache.weex.ui.SimpleComponentHolder; +import org.apache.weex.ui.WXComponentRegistry; +import org.apache.weex.ui.animation.WXAnimationModule; +import org.apache.weex.ui.component.Textarea; +import org.apache.weex.ui.component.WXA; +import org.apache.weex.ui.component.WXBasicComponentType; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXDiv; +import org.apache.weex.ui.component.WXEmbed; +import org.apache.weex.ui.component.WXHeader; +import org.apache.weex.ui.component.WXImage; +import org.apache.weex.ui.component.WXIndicator; +import org.apache.weex.ui.component.WXInput; +import org.apache.weex.ui.component.WXLoading; +import org.apache.weex.ui.component.WXLoadingIndicator; +import org.apache.weex.ui.component.WXRefresh; +import org.apache.weex.ui.component.WXScroller; +import org.apache.weex.ui.component.WXSlider; +import org.apache.weex.ui.component.WXSliderNeighbor; +import org.apache.weex.ui.component.WXSwitch; +import org.apache.weex.ui.component.WXText; +import org.apache.weex.ui.component.WXVideo; +import org.apache.weex.ui.component.WXWeb; +import org.apache.weex.ui.component.list.HorizontalListComponent; +import org.apache.weex.ui.component.list.SimpleListComponent; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.component.list.WXListComponent; +import org.apache.weex.ui.component.list.template.WXRecyclerTemplateList; +import org.apache.weex.ui.component.richtext.WXRichText; +import org.apache.weex.ui.config.AutoScanConfigRegister; +import org.apache.weex.ui.module.WXDeviceInfoModule; +import org.apache.weex.ui.module.ConsoleLogModule; +import org.apache.weex.ui.module.WXLocaleModule; +import org.apache.weex.ui.module.WXMetaModule; +import org.apache.weex.ui.module.WXModalUIModule; +import org.apache.weex.ui.module.WXTimerModule; +import org.apache.weex.ui.module.WXWebViewModule; +import org.apache.weex.utils.LogLevel; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXSoInstallMgrSdk; +import org.apache.weex.utils.batch.BatchOperationHelper; +import org.apache.weex.utils.cache.RegisterCache; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -106,7 +104,7 @@ public class WXSDKEngine implements Serializable { public static final String JS_FRAMEWORK_RELOAD="js_framework_reload"; - private static final String V8_SO_NAME = CORE_SO_NAME; + private static final String V8_SO_NAME = WXEnvironment.CORE_SO_NAME; private volatile static boolean mIsInit = false; private volatile static boolean mIsSoInit = false; private static final Object mLock = new Object(); diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/org/apache/weex/WXSDKInstance.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java rename to android/sdk/src/main/java/org/apache/weex/WXSDKInstance.java index 96ce2ec1b8..ad6efe1097 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/org/apache/weex/WXSDKInstance.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; -import static com.taobao.weex.common.WXErrorCode.WX_ERR_RELOAD_PAGE; -import static com.taobao.weex.http.WXHttpUtil.KEY_USER_AGENT; +import static org.apache.weex.http.WXHttpUtil.KEY_USER_AGENT; import android.app.Activity; import android.app.AlertDialog; @@ -41,58 +40,58 @@ import android.view.ViewGroup; import android.widget.ScrollView; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.adapter.IDrawableLoader; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.adapter.IWXImgLoaderAdapter; -import com.taobao.weex.adapter.IWXJscProcessManager; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.appfram.websocket.IWebSocketAdapter; -import com.taobao.weex.bridge.EventResult; -import com.taobao.weex.bridge.NativeInvokeHelper; -import com.taobao.weex.bridge.SimpleJSCallback; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.bridge.WXModuleManager; -import com.taobao.weex.bridge.WXParams; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.Destroyable; -import com.taobao.weex.common.OnWXScrollListener; -import com.taobao.weex.common.RenderTypes; -import com.taobao.weex.common.WXConfig; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.common.WXPerformance; -import com.taobao.weex.common.WXRefreshData; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.common.WXRequest; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.http.WXHttpUtil; -import com.taobao.weex.instance.InstanceOnFireEventInterceptor; -import com.taobao.weex.layout.ContentBoxMeasurement; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.performance.WXStateRecord; -import com.taobao.weex.performance.WhiteScreenUtils; -import com.taobao.weex.render.WXAbstractRenderContainer; -import com.taobao.weex.tracing.WXTracing; -import com.taobao.weex.ui.action.GraphicActionAddElement; -import com.taobao.weex.ui.component.NestedContainer; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXEmbed; -import com.taobao.weex.ui.flat.FlatGUIContext; -import com.taobao.weex.ui.view.WXScrollView; -import com.taobao.weex.utils.Trace; -import com.taobao.weex.utils.WXDeviceUtils; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXFileUtils; -import com.taobao.weex.utils.WXJsonUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXReflectionUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; -import com.taobao.weex.utils.cache.RegisterCache; -import com.taobao.weex.utils.tools.LogDetail; -import com.taobao.weex.utils.tools.TimeCalculator; +import org.apache.weex.adapter.IDrawableLoader; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.adapter.IWXHttpAdapter; +import org.apache.weex.adapter.IWXImgLoaderAdapter; +import org.apache.weex.adapter.IWXJscProcessManager; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.appfram.websocket.IWebSocketAdapter; +import org.apache.weex.bridge.EventResult; +import org.apache.weex.bridge.NativeInvokeHelper; +import org.apache.weex.bridge.SimpleJSCallback; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.bridge.WXModuleManager; +import org.apache.weex.bridge.WXParams; +import org.apache.weex.common.Constants; +import org.apache.weex.common.Destroyable; +import org.apache.weex.common.OnWXScrollListener; +import org.apache.weex.common.RenderTypes; +import org.apache.weex.common.WXConfig; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXModule; +import org.apache.weex.common.WXPerformance; +import org.apache.weex.common.WXRefreshData; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.common.WXRequest; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.http.WXHttpUtil; +import org.apache.weex.instance.InstanceOnFireEventInterceptor; +import org.apache.weex.layout.ContentBoxMeasurement; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.performance.WXStateRecord; +import org.apache.weex.performance.WhiteScreenUtils; +import org.apache.weex.render.WXAbstractRenderContainer; +import org.apache.weex.tracing.WXTracing; +import org.apache.weex.ui.action.GraphicActionAddElement; +import org.apache.weex.ui.component.NestedContainer; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXEmbed; +import org.apache.weex.ui.flat.FlatGUIContext; +import org.apache.weex.ui.view.WXScrollView; +import org.apache.weex.utils.Trace; +import org.apache.weex.utils.WXDeviceUtils; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXFileUtils; +import org.apache.weex.utils.WXJsonUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXReflectionUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; +import org.apache.weex.utils.cache.RegisterCache; +import org.apache.weex.utils.tools.LogDetail; +import org.apache.weex.utils.tools.TimeCalculator; import java.io.Serializable; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -102,6 +101,7 @@ import java.util.Map; import java.util.PriorityQueue; import java.util.concurrent.ConcurrentHashMap; +import org.apache.weex.bridge.WXBridgeManager.BundType; /** @@ -161,7 +161,7 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan /** * bundle type */ - public WXBridgeManager.BundType bundleType; + public BundType bundleType; public long mRenderStartNanos; public int mExecJSTraceId = WXTracing.nextId(); @@ -945,7 +945,7 @@ public void run() { if(containerView instanceof ViewGroup) { if(0 == ((ViewGroup) containerView).getChildCount()) { if(wxJscProcessManager.withException(WXSDKInstance.this)) { - onJSException(String.valueOf(WX_ERR_RELOAD_PAGE),"jsc reboot","jsc reboot"); + onJSException(String.valueOf(WXErrorCode.WX_ERR_RELOAD_PAGE),"jsc reboot","jsc reboot"); } if(!createInstanceHeartBeat) { WXBridgeManager.getInstance().callReportCrashReloadPage(mInstanceId, null); @@ -1041,7 +1041,7 @@ private void renderByUrlInternal(String pageName, IWXHttpAdapter adapter = WXSDKManager.getInstance().getIWXHttpAdapter(); WXRequest wxRequest = new WXRequest(); - wxRequest.url = rewriteUri(Uri.parse(url),URIAdapter.BUNDLE).toString(); + wxRequest.url = rewriteUri(Uri.parse(url), URIAdapter.BUNDLE).toString(); if(wxRequest != null && !TextUtils.isEmpty(wxRequest.url)){ requestUrl = wxRequest.url; }else { @@ -1167,7 +1167,7 @@ public void reloadPage(boolean reloadThis) { "true")); WXLogUtils.e("degrade : " + degrade); if(degrade) { - onJSException(String.valueOf(WX_ERR_RELOAD_PAGE.getErrorCode()),"Do not reloadPage", "Do not reloadPage degradeToH5"); + onJSException(String.valueOf(WXErrorCode.WX_ERR_RELOAD_PAGE.getErrorCode()),"Do not reloadPage", "Do not reloadPage degradeToH5"); WXLogUtils.e("Do not reloadPage degradeToH5"); } } diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/org/apache/weex/WXSDKManager.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java rename to android/sdk/src/main/java/org/apache/weex/WXSDKManager.java index c6c49d9a3d..628e4ccab2 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java +++ b/android/sdk/src/main/java/org/apache/weex/WXSDKManager.java @@ -16,48 +16,48 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; import android.os.Looper; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import com.taobao.weex.adapter.ClassLoaderAdapter; -import com.taobao.weex.adapter.DefaultUriAdapter; -import com.taobao.weex.adapter.DefaultWXHttpAdapter; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.adapter.ICrashInfoReporter; -import com.taobao.weex.adapter.IDrawableLoader; -import com.taobao.weex.adapter.IWXJscProcessManager; -import com.taobao.weex.adapter.ITracingAdapter; -import com.taobao.weex.adapter.IWXAccessibilityRoleAdapter; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.adapter.IWXImgLoaderAdapter; -import com.taobao.weex.adapter.IWXJSExceptionAdapter; -import com.taobao.weex.adapter.IWXJsFileLoaderAdapter; -import com.taobao.weex.adapter.IWXSoLoaderAdapter; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.appfram.navigator.IActivityNavBarSetter; -import com.taobao.weex.appfram.navigator.INavigator; -import com.taobao.weex.appfram.storage.DefaultWXStorage; -import com.taobao.weex.appfram.storage.IWXStorageAdapter; -import com.taobao.weex.appfram.websocket.IWebSocketAdapter; -import com.taobao.weex.appfram.websocket.IWebSocketAdapterFactory; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.bridge.WXModuleManager; -import com.taobao.weex.bridge.WXValidateProcessor; -import com.taobao.weex.common.WXRefreshData; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.common.WXWorkThreadManager; -import com.taobao.weex.font.FontAdapter; -import com.taobao.weex.performance.IApmGenerator; -import com.taobao.weex.performance.IWXAnalyzer; -import com.taobao.weex.ui.WXRenderManager; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.adapter.ClassLoaderAdapter; +import org.apache.weex.adapter.DefaultUriAdapter; +import org.apache.weex.adapter.DefaultWXHttpAdapter; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.adapter.ICrashInfoReporter; +import org.apache.weex.adapter.IDrawableLoader; +import org.apache.weex.adapter.IWXJscProcessManager; +import org.apache.weex.adapter.ITracingAdapter; +import org.apache.weex.adapter.IWXAccessibilityRoleAdapter; +import org.apache.weex.adapter.IWXHttpAdapter; +import org.apache.weex.adapter.IWXImgLoaderAdapter; +import org.apache.weex.adapter.IWXJSExceptionAdapter; +import org.apache.weex.adapter.IWXJsFileLoaderAdapter; +import org.apache.weex.adapter.IWXSoLoaderAdapter; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.appfram.navigator.IActivityNavBarSetter; +import org.apache.weex.appfram.navigator.INavigator; +import org.apache.weex.appfram.storage.DefaultWXStorage; +import org.apache.weex.appfram.storage.IWXStorageAdapter; +import org.apache.weex.appfram.websocket.IWebSocketAdapter; +import org.apache.weex.appfram.websocket.IWebSocketAdapterFactory; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.bridge.WXModuleManager; +import org.apache.weex.bridge.WXValidateProcessor; +import org.apache.weex.common.WXRefreshData; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.common.WXThread; +import org.apache.weex.common.WXWorkThreadManager; +import org.apache.weex.font.FontAdapter; +import org.apache.weex.performance.IApmGenerator; +import org.apache.weex.performance.IWXAnalyzer; +import org.apache.weex.ui.WXRenderManager; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; import java.io.File; import java.util.ArrayList; diff --git a/android/sdk/src/main/java/com/taobao/weex/WeexFrameRateControl.java b/android/sdk/src/main/java/org/apache/weex/WeexFrameRateControl.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/WeexFrameRateControl.java rename to android/sdk/src/main/java/org/apache/weex/WeexFrameRateControl.java index eef4d5cb0a..2d98862b62 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WeexFrameRateControl.java +++ b/android/sdk/src/main/java/org/apache/weex/WeexFrameRateControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex; +package org.apache.weex; /** * Created by shiwentao on 2017/8/24. @@ -26,7 +26,7 @@ import android.os.Build; import android.util.Log; import android.view.Choreographer; -import com.taobao.weex.common.WXErrorCode; +import org.apache.weex.common.WXErrorCode; import java.lang.ref.WeakReference; public class WeexFrameRateControl { diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/ClassLoaderAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/ClassLoaderAdapter.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/adapter/ClassLoaderAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/ClassLoaderAdapter.java index 7d6a85446e..e1410251fa 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/ClassLoaderAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/ClassLoaderAdapter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; import android.content.Context; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.WXModule; +import org.apache.weex.ui.component.WXComponent; /** * Created by furture on 2018/2/7. diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/DefaultUriAdapter.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/DefaultUriAdapter.java index de77e87e32..70f24a2210 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/DefaultUriAdapter.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; import android.net.Uri; import android.support.annotation.NonNull; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; import java.util.List; @@ -53,7 +53,7 @@ public Uri rewrite(String bundleURL, String type, Uri uri) { if (uri.isRelative()) { //When uri is empty, means use the base url instead. Web broswer behave this way. if(uri.getEncodedPath().length() == 0){ - if(URIAdapter.IMAGE.equals(type)){ + if(IMAGE.equals(type)){ if(TextUtils.isEmpty(uri.toString())){ return uri; } diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultWXHttpAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/DefaultWXHttpAdapter.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/adapter/DefaultWXHttpAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/DefaultWXHttpAdapter.java index 2d267651f0..7f5fe12a4b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultWXHttpAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/DefaultWXHttpAdapter.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.WXRequest; -import com.taobao.weex.common.WXResponse; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.WXRequest; +import org.apache.weex.common.WXResponse; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/DrawableStrategy.java b/android/sdk/src/main/java/org/apache/weex/adapter/DrawableStrategy.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/adapter/DrawableStrategy.java rename to android/sdk/src/main/java/org/apache/weex/adapter/DrawableStrategy.java index c6daa5a3e2..60fca0deb6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/DrawableStrategy.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/DrawableStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; public class DrawableStrategy { diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/ICrashInfoReporter.java b/android/sdk/src/main/java/org/apache/weex/adapter/ICrashInfoReporter.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/adapter/ICrashInfoReporter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/ICrashInfoReporter.java index 54c15cc3b2..254fa45bf2 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/ICrashInfoReporter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/ICrashInfoReporter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; /** * Created by zhengshihan on 2017/5/23. diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IDrawableLoader.java b/android/sdk/src/main/java/org/apache/weex/adapter/IDrawableLoader.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IDrawableLoader.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IDrawableLoader.java index 080d3b58f6..c71351d442 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IDrawableLoader.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IDrawableLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; import android.graphics.drawable.Drawable; import android.support.annotation.Nullable; diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/ITracingAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/ITracingAdapter.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/adapter/ITracingAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/ITracingAdapter.java index 4acb23d6e0..e0ce304e70 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/ITracingAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/ITracingAdapter.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; -import com.taobao.weex.tracing.WXTracing; +import org.apache.weex.tracing.WXTracing; /** * Created by moxun on 2017/7/6. diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXAccessibilityRoleAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXAccessibilityRoleAdapter.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXAccessibilityRoleAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXAccessibilityRoleAdapter.java index 46ca77f049..7682339669 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXAccessibilityRoleAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXAccessibilityRoleAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; /** * Created by moxun on 2017/11/13. diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXConfigAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXConfigAdapter.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXConfigAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXConfigAdapter.java index 953bf2c865..17791e3c1b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXConfigAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXConfigAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; /** * @author zhongcang diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXHttpAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXHttpAdapter.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXHttpAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXHttpAdapter.java index 3d6ea1f3d8..0da8e24870 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXHttpAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXHttpAdapter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; -import com.taobao.weex.common.WXRequest; -import com.taobao.weex.common.WXResponse; +import org.apache.weex.common.WXRequest; +import org.apache.weex.common.WXResponse; import java.util.List; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXImgLoaderAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXImgLoaderAdapter.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXImgLoaderAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXImgLoaderAdapter.java index 4b03ba850e..ffbad5251e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXImgLoaderAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXImgLoaderAdapter.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; import android.widget.ImageView; -import com.taobao.weex.common.WXImageStrategy; -import com.taobao.weex.dom.WXImageQuality; +import org.apache.weex.common.WXImageStrategy; +import org.apache.weex.dom.WXImageQuality; /** * Interface for ImageLoader. This interface works as an adapter for various image library. diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXJSExceptionAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXJSExceptionAdapter.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXJSExceptionAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXJSExceptionAdapter.java index 12ea4d86ea..0bedb93057 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXJSExceptionAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXJSExceptionAdapter.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; -import com.taobao.weex.common.WXJSExceptionInfo; +import org.apache.weex.common.WXJSExceptionInfo; public interface IWXJSExceptionAdapter { diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXJsFileLoaderAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXJsFileLoaderAdapter.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXJsFileLoaderAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXJsFileLoaderAdapter.java index 37bbf7f371..4af06236d9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXJsFileLoaderAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXJsFileLoaderAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; public interface IWXJsFileLoaderAdapter { String loadRaxApi(); diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXJscProcessManager.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXJscProcessManager.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXJscProcessManager.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXJscProcessManager.java index 4c8d22a757..1bce4a8581 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXJscProcessManager.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXJscProcessManager.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; public interface IWXJscProcessManager { boolean enableBackupThread(); diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXSoLoaderAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXSoLoaderAdapter.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXSoLoaderAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXSoLoaderAdapter.java index fb9614abb9..c6525662ee 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXSoLoaderAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXSoLoaderAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; /** * Interface for loading library. diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/IWXUserTrackAdapter.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/IWXUserTrackAdapter.java index 915399ef0a..fcdd71112c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXUserTrackAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/IWXUserTrackAdapter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; import android.content.Context; -import com.taobao.weex.common.WXPerformance; +import org.apache.weex.common.WXPerformance; import java.io.Serializable; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/URIAdapter.java b/android/sdk/src/main/java/org/apache/weex/adapter/URIAdapter.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/adapter/URIAdapter.java rename to android/sdk/src/main/java/org/apache/weex/adapter/URIAdapter.java index cdac2fdd8c..264dc178de 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/URIAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/adapter/URIAdapter.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.adapter; +package org.apache.weex.adapter; import android.net.Uri; import android.support.annotation.NonNull; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; /** * Created by sospartan on 15/11/2016. diff --git a/android/sdk/src/main/java/com/taobao/weex/annotation/Component.java b/android/sdk/src/main/java/org/apache/weex/annotation/Component.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/annotation/Component.java rename to android/sdk/src/main/java/org/apache/weex/annotation/Component.java index 3f3414c089..7174925a96 100644 --- a/android/sdk/src/main/java/com/taobao/weex/annotation/Component.java +++ b/android/sdk/src/main/java/org/apache/weex/annotation/Component.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.annotation; +package org.apache.weex.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/android/sdk/src/main/java/com/taobao/weex/annotation/JSMethod.java b/android/sdk/src/main/java/org/apache/weex/annotation/JSMethod.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/annotation/JSMethod.java rename to android/sdk/src/main/java/org/apache/weex/annotation/JSMethod.java index 443dc37b41..7f8ce5b450 100644 --- a/android/sdk/src/main/java/com/taobao/weex/annotation/JSMethod.java +++ b/android/sdk/src/main/java/org/apache/weex/annotation/JSMethod.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.annotation; +package org.apache.weex.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/clipboard/IWXClipboard.java b/android/sdk/src/main/java/org/apache/weex/appfram/clipboard/IWXClipboard.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/appfram/clipboard/IWXClipboard.java rename to android/sdk/src/main/java/org/apache/weex/appfram/clipboard/IWXClipboard.java index ccccd310dc..1c09643da3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/clipboard/IWXClipboard.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/clipboard/IWXClipboard.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.clipboard; +package org.apache.weex.appfram.clipboard; import android.support.annotation.Nullable; -import com.taobao.weex.bridge.JSCallback; +import org.apache.weex.bridge.JSCallback; /** * Created by yiyuan.zhangyy(xingjiu)
diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/clipboard/WXClipboardModule.java b/android/sdk/src/main/java/org/apache/weex/appfram/clipboard/WXClipboardModule.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/appfram/clipboard/WXClipboardModule.java rename to android/sdk/src/main/java/org/apache/weex/appfram/clipboard/WXClipboardModule.java index 7ded68a484..b38f9f0b6f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/clipboard/WXClipboardModule.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/clipboard/WXClipboardModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.clipboard; +package org.apache.weex.appfram.clipboard; import android.content.ClipData; import android.content.ClipboardManager; @@ -26,10 +26,10 @@ import android.net.Uri; import android.support.annotation.Nullable; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.WXModule; +import org.apache.weex.utils.WXLogUtils; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/navigator/IActivityNavBarSetter.java b/android/sdk/src/main/java/org/apache/weex/appfram/navigator/IActivityNavBarSetter.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/appfram/navigator/IActivityNavBarSetter.java rename to android/sdk/src/main/java/org/apache/weex/appfram/navigator/IActivityNavBarSetter.java index 321991d529..6f97e84189 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/navigator/IActivityNavBarSetter.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/navigator/IActivityNavBarSetter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.navigator; +package org.apache.weex.appfram.navigator; /** * Define the NavBarSetter api of the Activity diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/navigator/INavigator.java b/android/sdk/src/main/java/org/apache/weex/appfram/navigator/INavigator.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/appfram/navigator/INavigator.java rename to android/sdk/src/main/java/org/apache/weex/appfram/navigator/INavigator.java index 65c7193430..60ddbb4e43 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/navigator/INavigator.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/navigator/INavigator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.navigator; +package org.apache.weex.appfram.navigator; import android.app.Activity; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/navigator/WXNavigatorModule.java b/android/sdk/src/main/java/org/apache/weex/appfram/navigator/WXNavigatorModule.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/appfram/navigator/WXNavigatorModule.java rename to android/sdk/src/main/java/org/apache/weex/appfram/navigator/WXNavigatorModule.java index 69c253b1a6..674c89d64d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/navigator/WXNavigatorModule.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/navigator/WXNavigatorModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.navigator; +package org.apache.weex.appfram.navigator; import android.app.Activity; import android.content.Context; @@ -28,13 +28,13 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKEngine; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXSDKEngine; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXModule; +import org.apache.weex.utils.WXLogUtils; public class WXNavigatorModule extends WXModule { diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java b/android/sdk/src/main/java/org/apache/weex/appfram/pickers/DatePickerImpl.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java rename to android/sdk/src/main/java/org/apache/weex/appfram/pickers/DatePickerImpl.java index 7aca328c12..9739bd66e4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/pickers/DatePickerImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.pickers; +package org.apache.weex.appfram.pickers; import android.app.AlertDialog; import android.app.DatePickerDialog; @@ -30,8 +30,8 @@ import android.widget.DatePicker; import android.widget.TimePicker; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.common.WXThread; +import org.apache.weex.utils.WXLogUtils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/WXPickersModule.java b/android/sdk/src/main/java/org/apache/weex/appfram/pickers/WXPickersModule.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/appfram/pickers/WXPickersModule.java rename to android/sdk/src/main/java/org/apache/weex/appfram/pickers/WXPickersModule.java index ef46f8fb93..5b312af146 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/WXPickersModule.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/pickers/WXPickersModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.pickers; +package org.apache.weex.appfram.pickers; import android.content.Context; import android.content.DialogInterface; @@ -35,12 +35,12 @@ import android.widget.ListView; import android.widget.TextView; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.common.WXModule; +import org.apache.weex.common.WXThread; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/DefaultWXStorage.java b/android/sdk/src/main/java/org/apache/weex/appfram/storage/DefaultWXStorage.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/appfram/storage/DefaultWXStorage.java rename to android/sdk/src/main/java/org/apache/weex/appfram/storage/DefaultWXStorage.java index 9bcc75ec69..2a0a6bb1b1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/DefaultWXStorage.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/storage/DefaultWXStorage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.storage; +package org.apache.weex.appfram.storage; import android.content.ContentValues; import android.content.Context; @@ -26,8 +26,8 @@ import android.database.sqlite.SQLiteStatement; import android.support.annotation.Nullable; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.common.WXThread; +import org.apache.weex.utils.WXLogUtils; import java.util.ArrayList; import java.util.Date; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/IWXStorage.java b/android/sdk/src/main/java/org/apache/weex/appfram/storage/IWXStorage.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/appfram/storage/IWXStorage.java rename to android/sdk/src/main/java/org/apache/weex/appfram/storage/IWXStorage.java index c869d53562..ea6dc0624b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/IWXStorage.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/storage/IWXStorage.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.storage; +package org.apache.weex.appfram.storage; import android.support.annotation.Nullable; -import com.taobao.weex.bridge.JSCallback; +import org.apache.weex.bridge.JSCallback; interface IWXStorage { public void setItem(String key, String value,@Nullable JSCallback callback); diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/IWXStorageAdapter.java b/android/sdk/src/main/java/org/apache/weex/appfram/storage/IWXStorageAdapter.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/appfram/storage/IWXStorageAdapter.java rename to android/sdk/src/main/java/org/apache/weex/appfram/storage/IWXStorageAdapter.java index c04512c06d..543e4c311e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/IWXStorageAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/storage/IWXStorageAdapter.java @@ -16,15 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.storage; +package org.apache.weex.appfram.storage; import java.util.Map; +import org.apache.weex.InitConfig; /** * interface for {@link WXStorageModule} class. * this interface works as an adapter for different storage strategy. * the default is use {@link android.database.sqlite.SQLiteDatabase} to store k-v pairs. - * You can call {@link com.taobao.weex.InitConfig.Builder#setStorageAdapter(IWXStorageAdapter)} to inject your own + * You can call {@link InitConfig.Builder#setStorageAdapter(IWXStorageAdapter)} to inject your own * storage implementation. * */ public interface IWXStorageAdapter { diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/StorageResultHandler.java b/android/sdk/src/main/java/org/apache/weex/appfram/storage/StorageResultHandler.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/appfram/storage/StorageResultHandler.java rename to android/sdk/src/main/java/org/apache/weex/appfram/storage/StorageResultHandler.java index f8be20746b..4225e66e3c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/StorageResultHandler.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/storage/StorageResultHandler.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.storage; +package org.apache.weex.appfram.storage; import android.support.annotation.Nullable; -import com.taobao.weex.bridge.JSCallback; +import org.apache.weex.bridge.JSCallback; import java.util.ArrayList; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXSQLiteOpenHelper.java b/android/sdk/src/main/java/org/apache/weex/appfram/storage/WXSQLiteOpenHelper.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXSQLiteOpenHelper.java rename to android/sdk/src/main/java/org/apache/weex/appfram/storage/WXSQLiteOpenHelper.java index 447703084f..1ae25f2506 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXSQLiteOpenHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/storage/WXSQLiteOpenHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.storage; +package org.apache.weex.appfram.storage; import android.content.Context; import android.database.Cursor; @@ -26,7 +26,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXStorageModule.java b/android/sdk/src/main/java/org/apache/weex/appfram/storage/WXStorageModule.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXStorageModule.java rename to android/sdk/src/main/java/org/apache/weex/appfram/storage/WXStorageModule.java index b6d9534899..cb4b6de656 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/storage/WXStorageModule.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/storage/WXStorageModule.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.storage; +package org.apache.weex.appfram.storage; import android.support.annotation.Nullable; import android.text.TextUtils; -import com.taobao.weex.WXSDKEngine; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.annotation.JSMethod; +import org.apache.weex.WXSDKEngine; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.annotation.JSMethod; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/IWebSocketAdapter.java b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/IWebSocketAdapter.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/appfram/websocket/IWebSocketAdapter.java rename to android/sdk/src/main/java/org/apache/weex/appfram/websocket/IWebSocketAdapter.java index aebd1b8caf..1386620436 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/IWebSocketAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/IWebSocketAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.websocket; +package org.apache.weex.appfram.websocket; import android.support.annotation.Nullable; diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/IWebSocketAdapterFactory.java b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/IWebSocketAdapterFactory.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/appfram/websocket/IWebSocketAdapterFactory.java rename to android/sdk/src/main/java/org/apache/weex/appfram/websocket/IWebSocketAdapterFactory.java index e2e21dd08f..9ae2e4f9c4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/IWebSocketAdapterFactory.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/IWebSocketAdapterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.websocket; +package org.apache.weex.appfram.websocket; /** * Created by moxun on 16/12/28. diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/WebSocketCloseCodes.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java rename to android/sdk/src/main/java/org/apache/weex/appfram/websocket/WebSocketCloseCodes.java index 62513998d4..82c7fa9f11 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketCloseCodes.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/WebSocketCloseCodes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.websocket; +package org.apache.weex.appfram.websocket; /** * Created by moxun on 17/1/3. diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketModule.java b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/WebSocketModule.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketModule.java rename to android/sdk/src/main/java/org/apache/weex/appfram/websocket/WebSocketModule.java index f05f560e85..7b7ccf1f36 100644 --- a/android/sdk/src/main/java/com/taobao/weex/appfram/websocket/WebSocketModule.java +++ b/android/sdk/src/main/java/org/apache/weex/appfram/websocket/WebSocketModule.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.appfram.websocket; +package org.apache.weex.appfram.websocket; import android.os.Looper; -import com.taobao.weex.WXSDKEngine; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXSDKEngine; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.utils.WXLogUtils; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/base/CalledByNative.java b/android/sdk/src/main/java/org/apache/weex/base/CalledByNative.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/base/CalledByNative.java rename to android/sdk/src/main/java/org/apache/weex/base/CalledByNative.java index 15fa920690..a9c6fd948c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/base/CalledByNative.java +++ b/android/sdk/src/main/java/org/apache/weex/base/CalledByNative.java @@ -17,6 +17,6 @@ * under the License. */ -package com.taobao.weex.base; +package org.apache.weex.base; public @interface CalledByNative { } diff --git a/android/sdk/src/main/java/com/taobao/weex/base/FloatUtil.java b/android/sdk/src/main/java/org/apache/weex/base/FloatUtil.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/base/FloatUtil.java rename to android/sdk/src/main/java/org/apache/weex/base/FloatUtil.java index ecbeeb4744..d2ad9c3dd0 100755 --- a/android/sdk/src/main/java/com/taobao/weex/base/FloatUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/base/FloatUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.base; +package org.apache.weex.base; public class FloatUtil { diff --git a/android/sdk/src/main/java/com/taobao/weex/base/SystemMessageHandler.java b/android/sdk/src/main/java/org/apache/weex/base/SystemMessageHandler.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/base/SystemMessageHandler.java rename to android/sdk/src/main/java/org/apache/weex/base/SystemMessageHandler.java index 50ecfa72f2..5663b49dd1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/base/SystemMessageHandler.java +++ b/android/sdk/src/main/java/org/apache/weex/base/SystemMessageHandler.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.base; +package org.apache.weex.base; import android.os.Handler; import android.os.Message; import android.util.Log; import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/EventResult.java b/android/sdk/src/main/java/org/apache/weex/bridge/EventResult.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/EventResult.java rename to android/sdk/src/main/java/org/apache/weex/bridge/EventResult.java index 5d0e82d7fd..63b315b47f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/EventResult.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/EventResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; /** * Created by furture on 2017/10/17. diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/Invoker.java b/android/sdk/src/main/java/org/apache/weex/bridge/Invoker.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/Invoker.java rename to android/sdk/src/main/java/org/apache/weex/bridge/Invoker.java index 43eab766e3..0b5232a573 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/Invoker.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/Invoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/JSCallback.java b/android/sdk/src/main/java/org/apache/weex/bridge/JSCallback.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/JSCallback.java rename to android/sdk/src/main/java/org/apache/weex/bridge/JSCallback.java index d0ccb69b21..815f19f19d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/JSCallback.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/JSCallback.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; /** * Created by sospartan on 5/24/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/JavascriptInvokable.java b/android/sdk/src/main/java/org/apache/weex/bridge/JavascriptInvokable.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/bridge/JavascriptInvokable.java rename to android/sdk/src/main/java/org/apache/weex/bridge/JavascriptInvokable.java index 32afe62865..a2f0c30e27 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/JavascriptInvokable.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/JavascriptInvokable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; /** * Created by sospartan on 11/11/2016. diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/MethodInvoker.java b/android/sdk/src/main/java/org/apache/weex/bridge/MethodInvoker.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/bridge/MethodInvoker.java rename to android/sdk/src/main/java/org/apache/weex/bridge/MethodInvoker.java index 740e081cb4..812421afb8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/MethodInvoker.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/MethodInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/ModuleFactory.java b/android/sdk/src/main/java/org/apache/weex/bridge/ModuleFactory.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/bridge/ModuleFactory.java rename to android/sdk/src/main/java/org/apache/weex/bridge/ModuleFactory.java index a5b41db6bf..0248766f44 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/ModuleFactory.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/ModuleFactory.java @@ -16,12 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; -import com.taobao.weex.common.WXModule; - -import java.util.ArrayList; -import java.util.Map; +import org.apache.weex.common.WXModule; /** * Created by sospartan on 6/17/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/ModuleFactoryImpl.java b/android/sdk/src/main/java/org/apache/weex/bridge/ModuleFactoryImpl.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/ModuleFactoryImpl.java rename to android/sdk/src/main/java/org/apache/weex/bridge/ModuleFactoryImpl.java index da26f14c2e..3166e0bb17 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/ModuleFactoryImpl.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/ModuleFactoryImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; /** * Created by shiwentao on 2018/3/13. diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java b/android/sdk/src/main/java/org/apache/weex/bridge/NativeInvokeHelper.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java rename to android/sdk/src/main/java/org/apache/weex/bridge/NativeInvokeHelper.java index a84a2401c4..ebf17adbfa 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/NativeInvokeHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/NativeInvokeHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import android.util.Log; @@ -24,12 +24,11 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.performance.WXAnalyzerDataTransfer; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXReflectionUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.performance.WXAnalyzerDataTransfer; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXReflectionUtils; import java.lang.reflect.Type; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/RequestHandler.java b/android/sdk/src/main/java/org/apache/weex/bridge/RequestHandler.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/bridge/RequestHandler.java rename to android/sdk/src/main/java/org/apache/weex/bridge/RequestHandler.java index f49ba9cb58..fc87a6797c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/RequestHandler.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/RequestHandler.java @@ -16,28 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; -import static com.taobao.weex.http.WXHttpUtil.KEY_USER_AGENT; +import static org.apache.weex.http.WXHttpUtil.KEY_USER_AGENT; import android.net.Uri; import android.support.annotation.Keep; import android.text.TextUtils; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXHttpListener; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.base.CalledByNative; -import com.taobao.weex.bridge.WXBridgeManager.BundType; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXRequest; -import com.taobao.weex.common.WXResponse; -import com.taobao.weex.http.WXHttpUtil; -import com.taobao.weex.utils.WXExceptionUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXHttpListener; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXHttpAdapter; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.base.CalledByNative; +import org.apache.weex.bridge.WXBridgeManager.BundType; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXRequest; +import org.apache.weex.common.WXResponse; +import org.apache.weex.http.WXHttpUtil; +import org.apache.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.util.HashMap; import java.util.Locale; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/ResultCallback.java b/android/sdk/src/main/java/org/apache/weex/bridge/ResultCallback.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/bridge/ResultCallback.java rename to android/sdk/src/main/java/org/apache/weex/bridge/ResultCallback.java index 368a5b1bef..203b3d8fa1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/ResultCallback.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/ResultCallback.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; public interface ResultCallback { void onReceiveResult(T result); diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/ResultCallbackManager.java b/android/sdk/src/main/java/org/apache/weex/bridge/ResultCallbackManager.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/bridge/ResultCallbackManager.java rename to android/sdk/src/main/java/org/apache/weex/bridge/ResultCallbackManager.java index 59475be914..d945a0fed5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/ResultCallbackManager.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/ResultCallbackManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import android.util.SparseArray; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/SimpleJSCallback.java b/android/sdk/src/main/java/org/apache/weex/bridge/SimpleJSCallback.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/bridge/SimpleJSCallback.java rename to android/sdk/src/main/java/org/apache/weex/bridge/SimpleJSCallback.java index 8b9411ed35..ef869875d8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/SimpleJSCallback.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/SimpleJSCallback.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; /** * Created by sospartan on 27/10/2016. diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXBridge.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXBridge.java index 14181c18e2..ac02b42dd1 100755 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXBridge.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import android.text.TextUtils; import android.util.Log; @@ -24,24 +24,25 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.base.CalledByNative; -import com.taobao.weex.common.IWXBridge; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.layout.ContentBoxMeasurement; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.performance.WXStateRecord; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXJsonUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXWsonJSONSwitch; -import com.taobao.weex.utils.tools.TimeCalculator; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.base.CalledByNative; +import org.apache.weex.common.IWXBridge; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.layout.ContentBoxMeasurement; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.performance.WXStateRecord; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXJsonUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXWsonJSONSwitch; +import org.apache.weex.utils.tools.TimeCalculator; import java.io.Serializable; import java.util.HashMap; @@ -313,7 +314,7 @@ public void reportJSException(String instanceId, String func, String exception) /** * Bridge module Js Method - * support Sync or Async through setting Annotation as {@link com.taobao.weex.annotation.JSMethod } + * support Sync or Async through setting Annotation as {@link JSMethod } * * @param instanceId Instance ID * @param module the name of module diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXBridgeManager.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXBridgeManager.java index 1c81edead8..ad41e19063 100755 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXBridgeManager.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; -import static com.taobao.weex.bridge.WXModuleManager.createDomModule; +import static org.apache.weex.bridge.WXModuleManager.createDomModule; import android.content.Context; import android.net.Uri; @@ -39,66 +39,66 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.Script; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKEngine; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.adapter.IWXJSExceptionAdapter; -import com.taobao.weex.adapter.IWXJsFileLoaderAdapter; -import com.taobao.weex.adapter.IWXJscProcessManager; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.common.IWXBridge; -import com.taobao.weex.common.IWXDebugConfig; -import com.taobao.weex.common.WXConfig; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXException; -import com.taobao.weex.common.WXJSBridgeMsgType; -import com.taobao.weex.common.WXJSExceptionInfo; -import com.taobao.weex.common.WXRefreshData; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.layout.ContentBoxMeasurement; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.performance.WXStateRecord; -import com.taobao.weex.ui.WXComponentRegistry; -import com.taobao.weex.ui.WXRenderManager; -import com.taobao.weex.ui.action.ActionReloadPage; -import com.taobao.weex.ui.action.BasicGraphicAction; -import com.taobao.weex.ui.action.GraphicActionAddChildToRichtext; -import com.taobao.weex.ui.action.GraphicActionAddElement; -import com.taobao.weex.ui.action.GraphicActionAddEvent; -import com.taobao.weex.ui.action.GraphicActionAppendTreeCreateFinish; -import com.taobao.weex.ui.action.GraphicActionCreateBody; -import com.taobao.weex.ui.action.GraphicActionCreateFinish; -import com.taobao.weex.ui.action.GraphicActionLayout; -import com.taobao.weex.ui.action.GraphicActionMoveElement; -import com.taobao.weex.ui.action.GraphicActionRefreshFinish; -import com.taobao.weex.ui.action.GraphicActionRemoveChildFromRichtext; -import com.taobao.weex.ui.action.GraphicActionRemoveElement; -import com.taobao.weex.ui.action.GraphicActionRemoveEvent; -import com.taobao.weex.ui.action.GraphicActionRenderSuccess; -import com.taobao.weex.ui.action.GraphicActionUpdateAttr; -import com.taobao.weex.ui.action.GraphicActionUpdateRichtextAttr; -import com.taobao.weex.ui.action.GraphicActionUpdateRichtextStyle; -import com.taobao.weex.ui.action.GraphicActionUpdateStyle; -import com.taobao.weex.ui.action.GraphicPosition; -import com.taobao.weex.ui.action.GraphicSize; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.module.WXDomModule; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXFileUtils; -import com.taobao.weex.utils.WXJsonUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; -import com.taobao.weex.utils.WXWsonJSONSwitch; -import com.taobao.weex.utils.batch.BactchExecutor; -import com.taobao.weex.utils.batch.Interceptor; -import com.taobao.weex.utils.tools.LogDetail; +import org.apache.weex.Script; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKEngine; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.adapter.IWXJSExceptionAdapter; +import org.apache.weex.adapter.IWXJsFileLoaderAdapter; +import org.apache.weex.adapter.IWXJscProcessManager; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.common.IWXBridge; +import org.apache.weex.common.IWXDebugConfig; +import org.apache.weex.common.WXConfig; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXException; +import org.apache.weex.common.WXJSBridgeMsgType; +import org.apache.weex.common.WXJSExceptionInfo; +import org.apache.weex.common.WXRefreshData; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.common.WXThread; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.layout.ContentBoxMeasurement; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.performance.WXStateRecord; +import org.apache.weex.ui.WXComponentRegistry; +import org.apache.weex.ui.WXRenderManager; +import org.apache.weex.ui.action.ActionReloadPage; +import org.apache.weex.ui.action.BasicGraphicAction; +import org.apache.weex.ui.action.GraphicActionAddChildToRichtext; +import org.apache.weex.ui.action.GraphicActionAddElement; +import org.apache.weex.ui.action.GraphicActionAddEvent; +import org.apache.weex.ui.action.GraphicActionAppendTreeCreateFinish; +import org.apache.weex.ui.action.GraphicActionCreateBody; +import org.apache.weex.ui.action.GraphicActionCreateFinish; +import org.apache.weex.ui.action.GraphicActionLayout; +import org.apache.weex.ui.action.GraphicActionMoveElement; +import org.apache.weex.ui.action.GraphicActionRefreshFinish; +import org.apache.weex.ui.action.GraphicActionRemoveChildFromRichtext; +import org.apache.weex.ui.action.GraphicActionRemoveElement; +import org.apache.weex.ui.action.GraphicActionRemoveEvent; +import org.apache.weex.ui.action.GraphicActionRenderSuccess; +import org.apache.weex.ui.action.GraphicActionUpdateAttr; +import org.apache.weex.ui.action.GraphicActionUpdateRichtextAttr; +import org.apache.weex.ui.action.GraphicActionUpdateRichtextStyle; +import org.apache.weex.ui.action.GraphicActionUpdateStyle; +import org.apache.weex.ui.action.GraphicPosition; +import org.apache.weex.ui.action.GraphicSize; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.module.WXDomModule; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXFileUtils; +import org.apache.weex.utils.WXJsonUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; +import org.apache.weex.utils.WXWsonJSONSwitch; +import org.apache.weex.utils.batch.BactchExecutor; +import org.apache.weex.utils.batch.Interceptor; +import org.apache.weex.utils.tools.LogDetail; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXDebugJsBridge.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXDebugJsBridge.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXDebugJsBridge.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXDebugJsBridge.java index 7b584168e3..bed2a43959 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXDebugJsBridge.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXDebugJsBridge.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import com.alibaba.fastjson.JSON; -import com.taobao.weex.utils.WXWsonJSONSwitch; -import com.taobao.weex.wson.WsonUtils; +import org.apache.weex.utils.WXWsonJSONSwitch; +import org.apache.weex.wson.WsonUtils; /** * Created by darin on 27/03/2018. diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXHashMap.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXHashMap.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXHashMap.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXHashMap.java index 1296af0aca..68ca5e2d82 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXHashMap.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXHashMap.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import android.text.TextUtils; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXJSObject.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXJSObject.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXJSObject.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXJSObject.java index 56ce5016ed..7642cad4dc 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXJSObject.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXJSObject.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; -import com.taobao.weex.utils.WXJsonUtils; +import org.apache.weex.utils.WXJsonUtils; public class WXJSObject { diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXModuleManager.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXModuleManager.java index f5441230ac..25fdbe6d2e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXModuleManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import android.content.Intent; import android.support.annotation.NonNull; @@ -24,19 +24,18 @@ import android.view.Menu; import com.alibaba.fastjson.JSONArray; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.common.Destroyable; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXException; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.ui.config.ConfigModuleFactory; -import com.taobao.weex.ui.module.WXDomModule; -import com.taobao.weex.ui.module.WXTimerModule; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.cache.RegisterCache; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.WXSDKEngine; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.common.Destroyable; +import org.apache.weex.common.WXException; +import org.apache.weex.common.WXModule; +import org.apache.weex.ui.config.ConfigModuleFactory; +import org.apache.weex.ui.module.WXDomModule; +import org.apache.weex.ui.module.WXTimerModule; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.cache.RegisterCache; import java.io.Serializable; import java.util.HashMap; @@ -45,11 +44,12 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.apache.weex.utils.cache.RegisterCache.ModuleCache; /** * Manager class for weex module. There are two types of modules in weex, one is instance-level module, * the other is global-level module. Instance-level module will be created every time an instance - * is created, while global-level module will be singleton in {@link com.taobao.weex.WXSDKEngine}. + * is created, while global-level module will be singleton in {@link WXSDKEngine}. */ public class WXModuleManager { @@ -68,11 +68,11 @@ public class WXModuleManager { private static Map> sInstanceModuleMap = new ConcurrentHashMap<>(); - public static boolean registerModule(Map moduleCacheMap) { + public static boolean registerModule(Map moduleCacheMap) { if (moduleCacheMap.isEmpty()) return true; - final Iterator> iterator = moduleCacheMap.entrySet().iterator(); + final Iterator> iterator = moduleCacheMap.entrySet().iterator(); WXBridgeManager.getInstance() .postWithName(new Runnable() { @Override @@ -80,8 +80,8 @@ public void run() { Map modules = new HashMap<>(); while (iterator.hasNext()) { - Entry next = iterator.next(); - RegisterCache.ModuleCache value = next.getValue(); + Entry next = iterator.next(); + ModuleCache value = next.getValue(); String moduleName = value.name; if (TextUtils.equals(moduleName, WXDomModule.WXDOM)) { WXLogUtils.e("Cannot registered module with name 'dom'."); diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXParams.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXParams.java index 2898f134fb..66b98e606e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXParams.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.base.CalledByNative; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.base.CalledByNative; +import org.apache.weex.utils.WXLogUtils; import java.io.Serializable; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXServiceManager.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXServiceManager.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXServiceManager.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXServiceManager.java index 7b052ccd0d..69ab29a036 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXServiceManager.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXServiceManager.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import android.text.TextUtils; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.common.WXJSService; +import org.apache.weex.WXEnvironment; +import org.apache.weex.common.WXJSService; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXTask.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXTask.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXTask.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXTask.java index c236ba66f0..3f5e526229 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXTask.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXTask.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; -import com.taobao.weex.common.IWXObject; +import org.apache.weex.common.IWXObject; import java.util.ArrayList; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java b/android/sdk/src/main/java/org/apache/weex/bridge/WXValidateProcessor.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java rename to android/sdk/src/main/java/org/apache/weex/bridge/WXValidateProcessor.java index 86be2b18e8..f1678357fc 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXValidateProcessor.java +++ b/android/sdk/src/main/java/org/apache/weex/bridge/WXValidateProcessor.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.bridge; +package org.apache.weex.bridge; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.component.WXComponent; /** * Created by fengjunjie diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/org/apache/weex/common/Constants.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/common/Constants.java rename to android/sdk/src/main/java/org/apache/weex/common/Constants.java index ad00f12aa7..d3d3232dda 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/org/apache/weex/common/Constants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public class Constants { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Destroyable.java b/android/sdk/src/main/java/org/apache/weex/common/Destroyable.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/Destroyable.java rename to android/sdk/src/main/java/org/apache/weex/common/Destroyable.java index 5f5fa1ccd5..8beca57e84 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/Destroyable.java +++ b/android/sdk/src/main/java/org/apache/weex/common/Destroyable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; /** * Created by sospartan on 5/20/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/common/ICheckBindingScroller.java b/android/sdk/src/main/java/org/apache/weex/common/ICheckBindingScroller.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/ICheckBindingScroller.java rename to android/sdk/src/main/java/org/apache/weex/common/ICheckBindingScroller.java index b90137a0cf..3a4ab5d841 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/ICheckBindingScroller.java +++ b/android/sdk/src/main/java/org/apache/weex/common/ICheckBindingScroller.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; /** * Created by zhengshihan on 2017/6/5. diff --git a/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java b/android/sdk/src/main/java/org/apache/weex/common/IWXBridge.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java rename to android/sdk/src/main/java/org/apache/weex/common/IWXBridge.java index 479203dee5..01858eaa06 100755 --- a/android/sdk/src/main/java/com/taobao/weex/common/IWXBridge.java +++ b/android/sdk/src/main/java/org/apache/weex/common/IWXBridge.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; -import com.taobao.weex.bridge.ResultCallback; -import com.taobao.weex.bridge.WXJSObject; -import com.taobao.weex.bridge.WXParams; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.layout.ContentBoxMeasurement; +import org.apache.weex.bridge.ResultCallback; +import org.apache.weex.bridge.WXJSObject; +import org.apache.weex.bridge.WXParams; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.layout.ContentBoxMeasurement; import java.util.HashMap; import java.util.HashSet; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/IWXDebugConfig.java b/android/sdk/src/main/java/org/apache/weex/common/IWXDebugConfig.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/common/IWXDebugConfig.java rename to android/sdk/src/main/java/org/apache/weex/common/IWXDebugConfig.java index 4833ef9662..6d762684bf 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/IWXDebugConfig.java +++ b/android/sdk/src/main/java/org/apache/weex/common/IWXDebugConfig.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.bridge.WXDebugJsBridge; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.bridge.WXDebugJsBridge; public interface IWXDebugConfig { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/IWXObject.java b/android/sdk/src/main/java/org/apache/weex/common/IWXObject.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/IWXObject.java rename to android/sdk/src/main/java/org/apache/weex/common/IWXObject.java index 6629040a97..4b3ae4a4c6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/IWXObject.java +++ b/android/sdk/src/main/java/org/apache/weex/common/IWXObject.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public interface IWXObject { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/OnWXScrollListener.java b/android/sdk/src/main/java/org/apache/weex/common/OnWXScrollListener.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/common/OnWXScrollListener.java rename to android/sdk/src/main/java/org/apache/weex/common/OnWXScrollListener.java index af84d42cd6..450b8aee43 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/OnWXScrollListener.java +++ b/android/sdk/src/main/java/org/apache/weex/common/OnWXScrollListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/RenderTypes.java b/android/sdk/src/main/java/org/apache/weex/common/RenderTypes.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/RenderTypes.java rename to android/sdk/src/main/java/org/apache/weex/common/RenderTypes.java index 0d7d83a783..8e3a105150 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/RenderTypes.java +++ b/android/sdk/src/main/java/org/apache/weex/common/RenderTypes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public class RenderTypes { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/TypeModuleFactory.java b/android/sdk/src/main/java/org/apache/weex/common/TypeModuleFactory.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/common/TypeModuleFactory.java rename to android/sdk/src/main/java/org/apache/weex/common/TypeModuleFactory.java index 636e325954..f31ef932b9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/TypeModuleFactory.java +++ b/android/sdk/src/main/java/org/apache/weex/common/TypeModuleFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.Invoker; -import com.taobao.weex.bridge.MethodInvoker; -import com.taobao.weex.bridge.ModuleFactory; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.Invoker; +import org.apache.weex.bridge.MethodInvoker; +import org.apache.weex.bridge.ModuleFactory; +import org.apache.weex.utils.WXLogUtils; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXCompatModule.java b/android/sdk/src/main/java/org/apache/weex/common/WXCompatModule.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXCompatModule.java rename to android/sdk/src/main/java/org/apache/weex/common/WXCompatModule.java index 9b59d4a5be..1cbf4b0c8a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXCompatModule.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXCompatModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import android.app.Activity; import android.content.BroadcastReceiver; @@ -25,7 +25,7 @@ import android.content.IntentFilter; import android.support.v4.content.LocalBroadcastManager; -import com.taobao.weex.WXEnvironment; +import org.apache.weex.WXEnvironment; /** * Created by lixinke on 16/10/10. diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java b/android/sdk/src/main/java/org/apache/weex/common/WXConfig.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java rename to android/sdk/src/main/java/org/apache/weex/common/WXConfig.java index 5fc6ef7a61..88fd5f15f1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public interface WXConfig { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java b/android/sdk/src/main/java/org/apache/weex/common/WXErrorCode.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java rename to android/sdk/src/main/java/org/apache/weex/common/WXErrorCode.java index e15eb0860a..793d9ea656 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXErrorCode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public enum WXErrorCode { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXException.java b/android/sdk/src/main/java/org/apache/weex/common/WXException.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/WXException.java rename to android/sdk/src/main/java/org/apache/weex/common/WXException.java index 28d8da1430..4afb5e79df 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXException.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public class WXException extends Exception { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXImageSharpen.java b/android/sdk/src/main/java/org/apache/weex/common/WXImageSharpen.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/WXImageSharpen.java rename to android/sdk/src/main/java/org/apache/weex/common/WXImageSharpen.java index 8a6b38eea1..6904ce6407 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXImageSharpen.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXImageSharpen.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public enum WXImageSharpen { UNSHARPEN, diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java b/android/sdk/src/main/java/org/apache/weex/common/WXImageStrategy.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java rename to android/sdk/src/main/java/org/apache/weex/common/WXImageStrategy.java index 31524b26a7..e32e37014a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXImageStrategy.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import android.widget.ImageView; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXInstanceWrap.java b/android/sdk/src/main/java/org/apache/weex/common/WXInstanceWrap.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/common/WXInstanceWrap.java rename to android/sdk/src/main/java/org/apache/weex/common/WXInstanceWrap.java index 46c6274fc4..e51fe0250d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXInstanceWrap.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXInstanceWrap.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.JSMethod; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.JSMethod; /** * Report template error. diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXJSBridgeMsgType.java b/android/sdk/src/main/java/org/apache/weex/common/WXJSBridgeMsgType.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXJSBridgeMsgType.java rename to android/sdk/src/main/java/org/apache/weex/common/WXJSBridgeMsgType.java index 3a66e269e9..f2e3307fbd 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXJSBridgeMsgType.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXJSBridgeMsgType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public class WXJSBridgeMsgType { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXJSEngineListener.java b/android/sdk/src/main/java/org/apache/weex/common/WXJSEngineListener.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXJSEngineListener.java rename to android/sdk/src/main/java/org/apache/weex/common/WXJSEngineListener.java index 10d2aeca9c..8d1b358bd0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXJSEngineListener.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXJSEngineListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public interface WXJSEngineListener { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXJSExceptionInfo.java b/android/sdk/src/main/java/org/apache/weex/common/WXJSExceptionInfo.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXJSExceptionInfo.java rename to android/sdk/src/main/java/org/apache/weex/common/WXJSExceptionInfo.java index 105d2240d2..9b627c378f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXJSExceptionInfo.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXJSExceptionInfo.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; -import com.taobao.weex.WXEnvironment; +import org.apache.weex.WXEnvironment; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXJSService.java b/android/sdk/src/main/java/org/apache/weex/common/WXJSService.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXJSService.java rename to android/sdk/src/main/java/org/apache/weex/common/WXJSService.java index 8cc4350926..bd2d347b6f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXJSService.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXJSService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXModule.java b/android/sdk/src/main/java/org/apache/weex/common/WXModule.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/common/WXModule.java rename to android/sdk/src/main/java/org/apache/weex/common/WXModule.java index 2c029aa791..4086a02db3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXModule.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXModule.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import android.content.Intent; import android.text.TextUtils; import android.view.Menu; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXModuleAnno.java b/android/sdk/src/main/java/org/apache/weex/common/WXModuleAnno.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/common/WXModuleAnno.java rename to android/sdk/src/main/java/org/apache/weex/common/WXModuleAnno.java index 7812453cea..038771c6ad 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXModuleAnno.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXModuleAnno.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; -import com.taobao.weex.annotation.JSMethod; +import org.apache.weex.annotation.JSMethod; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java b/android/sdk/src/main/java/org/apache/weex/common/WXPerformance.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java rename to android/sdk/src/main/java/org/apache/weex/common/WXPerformance.java index aeb1ffb0b7..7024086468 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXPerformance.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXPerformance.java @@ -16,21 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import android.support.annotation.RestrictTo; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.weex.bridge.WXBridgeManager; @Deprecated public class WXPerformance { @@ -187,7 +188,7 @@ public double getMaxRange() { /** * Time used for - * {@link com.taobao.weex.bridge.WXBridgeManager#createInstance(String, String, Map, String)} + * {@link WXBridgeManager#createInstance(String, String, Map, String)} */ @RestrictTo(RestrictTo.Scope.LIBRARY) public long callCreateInstanceTime; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXRefreshData.java b/android/sdk/src/main/java/org/apache/weex/common/WXRefreshData.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/WXRefreshData.java rename to android/sdk/src/main/java/org/apache/weex/common/WXRefreshData.java index bc0122433e..02d6696b3b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXRefreshData.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXRefreshData.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public class WXRefreshData { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXRenderStrategy.java b/android/sdk/src/main/java/org/apache/weex/common/WXRenderStrategy.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXRenderStrategy.java rename to android/sdk/src/main/java/org/apache/weex/common/WXRenderStrategy.java index 52ce118959..2dcc5cd5c7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXRenderStrategy.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXRenderStrategy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public enum WXRenderStrategy { APPEND_ASYNC("APPEND_ASYNC"), diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java b/android/sdk/src/main/java/org/apache/weex/common/WXRequest.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java rename to android/sdk/src/main/java/org/apache/weex/common/WXRequest.java index e266a965f3..d0aa52ce32 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXRequest.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXRequest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXRequestListener.java b/android/sdk/src/main/java/org/apache/weex/common/WXRequestListener.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/WXRequestListener.java rename to android/sdk/src/main/java/org/apache/weex/common/WXRequestListener.java index a9631dd951..f261ac9ff6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXRequestListener.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXRequestListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public interface WXRequestListener { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXResponse.java b/android/sdk/src/main/java/org/apache/weex/common/WXResponse.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/common/WXResponse.java rename to android/sdk/src/main/java/org/apache/weex/common/WXResponse.java index f72eedb90e..4c209ccc1f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXResponse.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXRuntimeException.java b/android/sdk/src/main/java/org/apache/weex/common/WXRuntimeException.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/common/WXRuntimeException.java rename to android/sdk/src/main/java/org/apache/weex/common/WXRuntimeException.java index 7063bdf31c..0673f8d82a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXRuntimeException.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXRuntimeException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; public class WXRuntimeException extends RuntimeException { diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXThread.java b/android/sdk/src/main/java/org/apache/weex/common/WXThread.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/common/WXThread.java rename to android/sdk/src/main/java/org/apache/weex/common/WXThread.java index f8afc56098..f9ee2f44a2 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXThread.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXThread.java @@ -16,20 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import android.os.Handler; import android.os.Handler.Callback; import android.os.HandlerThread; import android.os.Message; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.tools.LogDetail; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.tools.LogDetail; import java.lang.ref.WeakReference; - -import static com.taobao.weex.utils.tools.TimeCalculator.PLATFORM_ANDROID; +import org.apache.weex.utils.tools.TimeCalculator; /** * Thread used in weex @@ -56,7 +55,7 @@ static class SafeRunnable implements Runnable { mTask = runnable; if(taskName != null) { mTimelineLog = new LogDetail(); - mTimelineLog.info.platform = PLATFORM_ANDROID; + mTimelineLog.info.platform = TimeCalculator.PLATFORM_ANDROID; mTimelineLog.name(taskName); mInstance = new WeakReference<>(instance); } diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXWorkThreadManager.java b/android/sdk/src/main/java/org/apache/weex/common/WXWorkThreadManager.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/common/WXWorkThreadManager.java rename to android/sdk/src/main/java/org/apache/weex/common/WXWorkThreadManager.java index ed4df79de7..8753ca9f60 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXWorkThreadManager.java +++ b/android/sdk/src/main/java/org/apache/weex/common/WXWorkThreadManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.common; +package org.apache.weex.common; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/CSSConstants.java b/android/sdk/src/main/java/org/apache/weex/dom/CSSConstants.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/dom/CSSConstants.java rename to android/sdk/src/main/java/org/apache/weex/dom/CSSConstants.java index 221d046c72..70a7a8c364 100755 --- a/android/sdk/src/main/java/com/taobao/weex/dom/CSSConstants.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/CSSConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; public class CSSConstants { diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/CSSShorthand.java b/android/sdk/src/main/java/org/apache/weex/dom/CSSShorthand.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/dom/CSSShorthand.java rename to android/sdk/src/main/java/org/apache/weex/dom/CSSShorthand.java index 3037d99e70..9c20d868e5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/CSSShorthand.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/CSSShorthand.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; import android.support.annotation.NonNull; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; import android.text.TextUtils; -import com.taobao.weex.dom.CSSShorthand.CSSProperty; +import org.apache.weex.dom.CSSShorthand.CSSProperty; import java.util.Arrays; public class CSSShorthand> implements Cloneable { diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/RenderContext.java b/android/sdk/src/main/java/org/apache/weex/dom/RenderContext.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/dom/RenderContext.java rename to android/sdk/src/main/java/org/apache/weex/dom/RenderContext.java index 635039f2cb..f54f12d8fb 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/RenderContext.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/RenderContext.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.component.WXComponent; /** * Created by sospartan on 23/02/2017. diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/TextDecorationSpan.java b/android/sdk/src/main/java/org/apache/weex/dom/TextDecorationSpan.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/dom/TextDecorationSpan.java rename to android/sdk/src/main/java/org/apache/weex/dom/TextDecorationSpan.java index c7d2579110..98be70aa88 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/TextDecorationSpan.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/TextDecorationSpan.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; import android.support.annotation.NonNull; @@ -24,7 +24,7 @@ import android.text.style.CharacterStyle; import android.text.style.UpdateAppearance; -import com.taobao.weex.ui.component.WXTextDecoration; +import org.apache.weex.ui.component.WXTextDecoration; public class TextDecorationSpan extends CharacterStyle implements UpdateAppearance { diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java b/android/sdk/src/main/java/org/apache/weex/dom/WXAttr.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java rename to android/sdk/src/main/java/org/apache/weex/dom/WXAttr.java index 82f853fcd2..a04c70e20f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/WXAttr.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; @@ -31,19 +31,19 @@ import android.support.annotation.UiThread; import android.support.v4.util.ArrayMap; import android.text.TextUtils; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.Constants.Name; -import com.taobao.weex.common.WXImageSharpen; -import com.taobao.weex.dom.binding.ELUtils; -import com.taobao.weex.dom.binding.WXStatement; -import com.taobao.weex.el.parse.Parser; -import com.taobao.weex.ui.view.listview.WXRecyclerView; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; - -import static com.taobao.weex.dom.binding.ELUtils.COMPONENT_PROPS; -import static com.taobao.weex.dom.binding.ELUtils.EXCLUDES_BINDING; +import org.apache.weex.common.Constants; +import org.apache.weex.common.Constants.Name; +import org.apache.weex.common.WXImageSharpen; +import org.apache.weex.dom.binding.ELUtils; +import org.apache.weex.dom.binding.WXStatement; +import org.apache.weex.el.parse.Parser; +import org.apache.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; + +import static org.apache.weex.dom.binding.ELUtils.COMPONENT_PROPS; +import static org.apache.weex.dom.binding.ELUtils.EXCLUDES_BINDING; import static java.lang.Boolean.parseBoolean; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXCustomStyleSpan.java b/android/sdk/src/main/java/org/apache/weex/dom/WXCustomStyleSpan.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/dom/WXCustomStyleSpan.java rename to android/sdk/src/main/java/org/apache/weex/dom/WXCustomStyleSpan.java index d0c61fe032..f8834d6375 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXCustomStyleSpan.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/WXCustomStyleSpan.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; import android.graphics.Typeface; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; -import com.taobao.weex.utils.TypefaceUtil; +import org.apache.weex.utils.TypefaceUtil; public class WXCustomStyleSpan extends MetricAffectingSpan { diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java b/android/sdk/src/main/java/org/apache/weex/dom/WXEvent.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java rename to android/sdk/src/main/java/org/apache/weex/dom/WXEvent.java index 5ee24564da..71277f107b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXEvent.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/WXEvent.java @@ -16,18 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; import android.support.v4.util.ArrayMap; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.dom.binding.ELUtils; -import com.taobao.weex.dom.binding.JSONUtils; +import org.apache.weex.dom.binding.ELUtils; +import org.apache.weex.dom.binding.JSONUtils; import java.io.Serializable; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java b/android/sdk/src/main/java/org/apache/weex/dom/WXImageQuality.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java rename to android/sdk/src/main/java/org/apache/weex/dom/WXImageQuality.java index 6cce8f4a60..303ab2a6a7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/WXImageQuality.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; public enum WXImageQuality { diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXLineHeightSpan.java b/android/sdk/src/main/java/org/apache/weex/dom/WXLineHeightSpan.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/dom/WXLineHeightSpan.java rename to android/sdk/src/main/java/org/apache/weex/dom/WXLineHeightSpan.java index 6f58e45c17..8c7d279af8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXLineHeightSpan.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/WXLineHeightSpan.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; import android.graphics.Paint; import android.text.style.LineHeightSpan; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.utils.WXLogUtils; public class WXLineHeightSpan implements LineHeightSpan{ diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java b/android/sdk/src/main/java/org/apache/weex/dom/WXStyle.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java rename to android/sdk/src/main/java/org/apache/weex/dom/WXStyle.java index 17f549e64b..5a5fd38bcf 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/WXStyle.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom; +package org.apache.weex.dom; import android.graphics.Typeface; import android.support.annotation.NonNull; @@ -26,12 +26,12 @@ import android.support.v4.util.ArrayMap; import android.text.Layout; import android.text.TextUtils; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.binding.ELUtils; -import com.taobao.weex.ui.component.WXText; -import com.taobao.weex.ui.component.WXTextDecoration; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.binding.ELUtils; +import org.apache.weex.ui.component.WXText; +import org.apache.weex.ui.component.WXTextDecoration; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.Collection; import java.util.Iterator; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java b/android/sdk/src/main/java/org/apache/weex/dom/binding/ELUtils.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java rename to android/sdk/src/main/java/org/apache/weex/dom/binding/ELUtils.java index 390b611855..482e8c886c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/ELUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/binding/ELUtils.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom.binding; +package org.apache.weex.dom.binding; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.el.parse.Parser; -import com.taobao.weex.el.parse.Token; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.el.parse.Parser; +import org.apache.weex.el.parse.Token; +import org.apache.weex.utils.WXLogUtils; import java.util.Set; diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/binding/JSONUtils.java b/android/sdk/src/main/java/org/apache/weex/dom/binding/JSONUtils.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/dom/binding/JSONUtils.java rename to android/sdk/src/main/java/org/apache/weex/dom/binding/JSONUtils.java index 30d72d5525..8d54f14953 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/JSONUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/binding/JSONUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom.binding; +package org.apache.weex.dom.binding; import com.alibaba.fastjson.JSONObject; diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java b/android/sdk/src/main/java/org/apache/weex/dom/binding/WXStatement.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java rename to android/sdk/src/main/java/org/apache/weex/dom/binding/WXStatement.java index 6a760cb9bf..e58a583827 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/binding/WXStatement.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/binding/WXStatement.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom.binding; +package org.apache.weex.dom.binding; import android.support.v4.util.ArrayMap; import android.support.v4.util.SimpleArrayMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java b/android/sdk/src/main/java/org/apache/weex/dom/transition/WXTransition.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java rename to android/sdk/src/main/java/org/apache/weex/dom/transition/WXTransition.java index cc468bb992..d4239649f4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java +++ b/android/sdk/src/main/java/org/apache/weex/dom/transition/WXTransition.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.dom.transition; +package org.apache.weex.dom.transition; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -33,23 +33,23 @@ import android.view.View; import android.view.animation.Interpolator; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.Constants; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.Constants; //import com.taobao.weex.dom.DOMActionContext; //import com.taobao.weex.dom.WXDomHandler; //import com.taobao.weex.dom.WXDomObject; //import com.taobao.weex.dom.flex.Spacing; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.ui.animation.BackgroundColorProperty; -import com.taobao.weex.ui.animation.TransformParser; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.SingleFunctionParser; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.ui.animation.BackgroundColorProperty; +import org.apache.weex.ui.animation.TransformParser; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.SingleFunctionParser; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; import java.util.HashSet; @@ -58,13 +58,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; - -import static com.taobao.weex.common.Constants.TimeFunction.CUBIC_BEZIER; -import static com.taobao.weex.common.Constants.TimeFunction.EASE; -import static com.taobao.weex.common.Constants.TimeFunction.EASE_IN; -import static com.taobao.weex.common.Constants.TimeFunction.EASE_IN_OUT; -import static com.taobao.weex.common.Constants.TimeFunction.EASE_OUT; -import static com.taobao.weex.common.Constants.TimeFunction.LINEAR; +import org.apache.weex.common.Constants.TimeFunction; /** * transition on dom thread @@ -336,7 +330,8 @@ private void doPendingTransformAnimation(int token) { List holders = new ArrayList<>(8); String transform = WXUtils.getString(transformPendingUpdates.remove(Constants.Name.TRANSFORM), null); if(!TextUtils.isEmpty(transform)){ - Map, Float> properties = TransformParser.parseTransForm(mWXComponent.getInstanceId(), transform, (int)mWXComponent.getLayoutWidth(), (int)mWXComponent.getLayoutHeight(), mWXComponent.getViewPortWidth()); + Map, Float> properties = TransformParser + .parseTransForm(mWXComponent.getInstanceId(), transform, (int)mWXComponent.getLayoutWidth(), (int)mWXComponent.getLayoutHeight(), mWXComponent.getViewPortWidth()); PropertyValuesHolder[] transformHolders = TransformParser.toHolders(properties); for(PropertyValuesHolder holder : transformHolders){ holders.add(holder); @@ -452,7 +447,8 @@ private PropertyValuesHolder createLayoutPropertyValueHolder(String property, Ob } break; case Constants.Name.MARGIN_TOP:{ - holder = PropertyValuesHolder.ofFloat(Constants.Name.MARGIN_TOP, mWXComponent.getMargin().get(CSSShorthand.EDGE.TOP), + holder = PropertyValuesHolder.ofFloat(Constants.Name.MARGIN_TOP, mWXComponent.getMargin().get( + CSSShorthand.EDGE.TOP), WXViewUtils.getRealPxByWidth(WXUtils.getFloatByViewport(value, mWXComponent.getViewPortWidth()), mWXComponent.getViewPortWidth())); } break; @@ -699,15 +695,15 @@ private static long parseTimeMillis(Map style, String key, long private static Interpolator createTimeInterpolator(String interpolator) { if (!TextUtils.isEmpty(interpolator)) { switch (interpolator) { - case EASE_IN: + case TimeFunction.EASE_IN: return PathInterpolatorCompat.create(0.42f,0f, 1f,1f); - case EASE_OUT: + case TimeFunction.EASE_OUT: return PathInterpolatorCompat.create(0f,0f, 0.58f,1f); - case EASE_IN_OUT: + case TimeFunction.EASE_IN_OUT: return PathInterpolatorCompat.create(0.42f,0f, 0.58f,1f); - case EASE: + case TimeFunction.EASE: return PathInterpolatorCompat.create(0.25f,0.1f, 0.25f,1f); - case LINEAR: + case TimeFunction.LINEAR: return PathInterpolatorCompat.create(0.0f,0f, 1f,1f); default: try { @@ -720,7 +716,7 @@ public Float map(String raw) { return Float.parseFloat(raw); } }); - List params = parser.parse(CUBIC_BEZIER); + List params = parser.parse(TimeFunction.CUBIC_BEZIER); if (params != null && params.size() == 4) { return PathInterpolatorCompat.create( params.get(0), params.get(1), params.get(2), params.get(3)); diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java b/android/sdk/src/main/java/org/apache/weex/el/parse/ArrayStack.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java rename to android/sdk/src/main/java/org/apache/weex/el/parse/ArrayStack.java index 0feb85e47e..b492d53db0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/el/parse/ArrayStack.java +++ b/android/sdk/src/main/java/org/apache/weex/el/parse/ArrayStack.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.el.parse; +package org.apache.weex.el.parse; import java.util.ArrayList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java b/android/sdk/src/main/java/org/apache/weex/el/parse/Block.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java rename to android/sdk/src/main/java/org/apache/weex/el/parse/Block.java index 6c3e29ac3e..d593a0186f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Block.java +++ b/android/sdk/src/main/java/org/apache/weex/el/parse/Block.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.el.parse; +package org.apache.weex.el.parse; import com.alibaba.fastjson.JSONArray; diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java b/android/sdk/src/main/java/org/apache/weex/el/parse/Operator.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java rename to android/sdk/src/main/java/org/apache/weex/el/parse/Operator.java index d597be8122..839d541841 100644 --- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operator.java +++ b/android/sdk/src/main/java/org/apache/weex/el/parse/Operator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.el.parse; +package org.apache.weex.el.parse; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java b/android/sdk/src/main/java/org/apache/weex/el/parse/Operators.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java rename to android/sdk/src/main/java/org/apache/weex/el/parse/Operators.java index d0bcb7e50c..61d1842dc4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Operators.java +++ b/android/sdk/src/main/java/org/apache/weex/el/parse/Operators.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.el.parse; +package org.apache.weex.el.parse; import java.lang.reflect.Array; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Parser.java b/android/sdk/src/main/java/org/apache/weex/el/parse/Parser.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/el/parse/Parser.java rename to android/sdk/src/main/java/org/apache/weex/el/parse/Parser.java index 6609e3f51f..ea850321ed 100644 --- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Parser.java +++ b/android/sdk/src/main/java/org/apache/weex/el/parse/Parser.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.el.parse; +package org.apache.weex.el.parse; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.utils.WXLogUtils; import java.util.ArrayList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Symbol.java b/android/sdk/src/main/java/org/apache/weex/el/parse/Symbol.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/el/parse/Symbol.java rename to android/sdk/src/main/java/org/apache/weex/el/parse/Symbol.java index e42aa78cde..2136633587 100644 --- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Symbol.java +++ b/android/sdk/src/main/java/org/apache/weex/el/parse/Symbol.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.el.parse; +package org.apache.weex.el.parse; /** * Created by furture on 2017/8/29. diff --git a/android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java b/android/sdk/src/main/java/org/apache/weex/el/parse/Token.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java rename to android/sdk/src/main/java/org/apache/weex/el/parse/Token.java index 44f9135b2d..f0d6186f3c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/el/parse/Token.java +++ b/android/sdk/src/main/java/org/apache/weex/el/parse/Token.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.el.parse; +package org.apache.weex.el.parse; /** * Created by furture on 2017/8/28. diff --git a/android/sdk/src/main/java/com/taobao/weex/font/FontAdapter.java b/android/sdk/src/main/java/org/apache/weex/font/FontAdapter.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/font/FontAdapter.java rename to android/sdk/src/main/java/org/apache/weex/font/FontAdapter.java index 4556a39b86..9140e607e1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/font/FontAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/font/FontAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.font; +package org.apache.weex.font; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/android/sdk/src/main/java/com/taobao/weex/font/FontListener.java b/android/sdk/src/main/java/org/apache/weex/font/FontListener.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/font/FontListener.java rename to android/sdk/src/main/java/org/apache/weex/font/FontListener.java index e6d70a573e..50cd1b9199 100644 --- a/android/sdk/src/main/java/com/taobao/weex/font/FontListener.java +++ b/android/sdk/src/main/java/org/apache/weex/font/FontListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.font; +package org.apache.weex.font; public interface FontListener { diff --git a/android/sdk/src/main/java/com/taobao/weex/http/Options.java b/android/sdk/src/main/java/org/apache/weex/http/Options.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/http/Options.java rename to android/sdk/src/main/java/org/apache/weex/http/Options.java index effb241de7..44e9708f06 100644 --- a/android/sdk/src/main/java/com/taobao/weex/http/Options.java +++ b/android/sdk/src/main/java/org/apache/weex/http/Options.java @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.http; +package org.apache.weex.http; import java.util.HashMap; import java.util.Map; import com.taobao.weex.common.*; +import org.apache.weex.common.WXRequest; /** * Created by sospartan on 5/19/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/http/Status.java b/android/sdk/src/main/java/org/apache/weex/http/Status.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/http/Status.java rename to android/sdk/src/main/java/org/apache/weex/http/Status.java index 429f53fa11..69b3892a8e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/http/Status.java +++ b/android/sdk/src/main/java/org/apache/weex/http/Status.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.http; +package org.apache.weex.http; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/http/WXHttpUtil.java b/android/sdk/src/main/java/org/apache/weex/http/WXHttpUtil.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/http/WXHttpUtil.java rename to android/sdk/src/main/java/org/apache/weex/http/WXHttpUtil.java index 4f58841486..d8f2577f1c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/http/WXHttpUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/http/WXHttpUtil.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.http; +package org.apache.weex.http; import android.content.Context; import android.text.TextUtils; -import com.taobao.weex.common.WXConfig; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.common.WXConfig; +import org.apache.weex.utils.WXViewUtils; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java b/android/sdk/src/main/java/org/apache/weex/http/WXStreamModule.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java rename to android/sdk/src/main/java/org/apache/weex/http/WXStreamModule.java index 3e8e9e5378..ba3844b8af 100644 --- a/android/sdk/src/main/java/com/taobao/weex/http/WXStreamModule.java +++ b/android/sdk/src/main/java/org/apache/weex/http/WXStreamModule.java @@ -16,28 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.http; +package org.apache.weex.http; -import static com.taobao.weex.http.WXHttpUtil.KEY_USER_AGENT; +import static org.apache.weex.http.WXHttpUtil.KEY_USER_AGENT; import android.net.Uri; import android.text.TextUtils; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.common.WXRequest; -import com.taobao.weex.common.WXResponse; -import com.taobao.weex.performance.WXStateRecord; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXHttpAdapter; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.WXModule; +import org.apache.weex.common.WXRequest; +import org.apache.weex.common.WXResponse; +import org.apache.weex.performance.WXStateRecord; +import org.apache.weex.utils.WXLogUtils; import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Iterator; @@ -203,7 +203,8 @@ public void onResponse(WXResponse response, Map headers) { resp.put(STATUS_TEXT, Status.getStatusText(response.statusCode)); } resp.put("headers", headers); - WXStateRecord.getInstance().recordAction(instanceId,"stream response code:"+(null!= response?response.statusCode:"null")); + WXStateRecord + .getInstance().recordAction(instanceId,"stream response code:"+(null!= response?response.statusCode:"null")); callback.invoke(resp); } } diff --git a/android/sdk/src/main/java/com/taobao/weex/instance/InstanceOnFireEventInterceptor.java b/android/sdk/src/main/java/org/apache/weex/instance/InstanceOnFireEventInterceptor.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/instance/InstanceOnFireEventInterceptor.java rename to android/sdk/src/main/java/org/apache/weex/instance/InstanceOnFireEventInterceptor.java index 3b142f7857..dd5915df43 100644 --- a/android/sdk/src/main/java/com/taobao/weex/instance/InstanceOnFireEventInterceptor.java +++ b/android/sdk/src/main/java/org/apache/weex/instance/InstanceOnFireEventInterceptor.java @@ -16,11 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.instance; - -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.ui.WXRenderManager; +package org.apache.weex.instance; import java.util.ArrayList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/layout/ContentBoxMeasurement.java b/android/sdk/src/main/java/org/apache/weex/layout/ContentBoxMeasurement.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/layout/ContentBoxMeasurement.java rename to android/sdk/src/main/java/org/apache/weex/layout/ContentBoxMeasurement.java index d25a845f56..309c2bf843 100644 --- a/android/sdk/src/main/java/com/taobao/weex/layout/ContentBoxMeasurement.java +++ b/android/sdk/src/main/java/org/apache/weex/layout/ContentBoxMeasurement.java @@ -16,18 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.layout; +package org.apache.weex.layout; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.taobao.weex.base.CalledByNative; -import com.taobao.weex.common.Destroyable; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.base.CalledByNative; +import org.apache.weex.common.Destroyable; +import org.apache.weex.ui.component.WXComponent; import java.io.Serializable; -import java.lang.ref.WeakReference; -public abstract class ContentBoxMeasurement implements Serializable,Destroyable { +public abstract class ContentBoxMeasurement implements Serializable, Destroyable { @Nullable protected WXComponent mComponent; diff --git a/android/sdk/src/main/java/com/taobao/weex/layout/MeasureMode.java b/android/sdk/src/main/java/org/apache/weex/layout/MeasureMode.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/layout/MeasureMode.java rename to android/sdk/src/main/java/org/apache/weex/layout/MeasureMode.java index fd25f50522..c44b49b4c1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/layout/MeasureMode.java +++ b/android/sdk/src/main/java/org/apache/weex/layout/MeasureMode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.layout; +package org.apache.weex.layout; import java.io.Serializable; diff --git a/android/sdk/src/main/java/com/taobao/weex/layout/MeasureSize.java b/android/sdk/src/main/java/org/apache/weex/layout/MeasureSize.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/layout/MeasureSize.java rename to android/sdk/src/main/java/org/apache/weex/layout/MeasureSize.java index ad671bf491..476027e80f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/layout/MeasureSize.java +++ b/android/sdk/src/main/java/org/apache/weex/layout/MeasureSize.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.layout; +package org.apache.weex.layout; import java.io.Serializable; diff --git a/android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java b/android/sdk/src/main/java/org/apache/weex/layout/measurefunc/TextContentBoxMeasurement.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java rename to android/sdk/src/main/java/org/apache/weex/layout/measurefunc/TextContentBoxMeasurement.java index 3a22532b6f..dca61a04f7 100755 --- a/android/sdk/src/main/java/com/taobao/weex/layout/measurefunc/TextContentBoxMeasurement.java +++ b/android/sdk/src/main/java/org/apache/weex/layout/measurefunc/TextContentBoxMeasurement.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.layout.measurefunc; +package org.apache.weex.layout.measurefunc; import android.graphics.Canvas; import android.os.Build; @@ -33,39 +33,32 @@ import android.text.StaticLayout; import android.text.TextPaint; import android.text.TextUtils; -import android.text.style.AbsoluteSizeSpan; import android.text.style.AlignmentSpan; -import android.text.style.ForegroundColorSpan; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; import android.support.annotation.WorkerThread; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.TextDecorationSpan; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.dom.WXCustomStyleSpan; -import com.taobao.weex.dom.WXLineHeightSpan; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.layout.ContentBoxMeasurement; -import com.taobao.weex.layout.MeasureMode; -import com.taobao.weex.layout.MeasureSize; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXText; -import com.taobao.weex.ui.component.WXTextDecoration; -import com.taobao.weex.utils.WXDomUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXResourceUtils; - -import java.lang.ref.WeakReference; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.TextDecorationSpan; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.dom.WXCustomStyleSpan; +import org.apache.weex.dom.WXLineHeightSpan; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.layout.ContentBoxMeasurement; +import org.apache.weex.layout.MeasureMode; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXText; +import org.apache.weex.ui.component.WXTextDecoration; +import org.apache.weex.utils.WXDomUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXResourceUtils; + import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import static com.taobao.weex.dom.WXStyle.UNSET; -import static com.taobao.weex.utils.WXUtils.isUndefined; +import static org.apache.weex.dom.WXStyle.UNSET; +import static org.apache.weex.utils.WXUtils.isUndefined; /** * Created by miomin on 2018/3/9. diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/IApmGenerator.java b/android/sdk/src/main/java/org/apache/weex/performance/IApmGenerator.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/performance/IApmGenerator.java rename to android/sdk/src/main/java/org/apache/weex/performance/IApmGenerator.java index face350632..45fb7bde97 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/IApmGenerator.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/IApmGenerator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.performance; +package org.apache.weex.performance; public interface IApmGenerator { /** diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/IWXAnalyzer.java b/android/sdk/src/main/java/org/apache/weex/performance/IWXAnalyzer.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/performance/IWXAnalyzer.java rename to android/sdk/src/main/java/org/apache/weex/performance/IWXAnalyzer.java index cbd170c130..5015f01724 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/IWXAnalyzer.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/IWXAnalyzer.java @@ -14,7 +14,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.performance; +package org.apache.weex.performance; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/IWXApmMonitorAdapter.java b/android/sdk/src/main/java/org/apache/weex/performance/IWXApmMonitorAdapter.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/performance/IWXApmMonitorAdapter.java rename to android/sdk/src/main/java/org/apache/weex/performance/IWXApmMonitorAdapter.java index 1fe198e012..de1c56fec0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/IWXApmMonitorAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/IWXApmMonitorAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.performance; +package org.apache.weex.performance; public interface IWXApmMonitorAdapter { diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXAnalyzerDataTransfer.java b/android/sdk/src/main/java/org/apache/weex/performance/WXAnalyzerDataTransfer.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/performance/WXAnalyzerDataTransfer.java rename to android/sdk/src/main/java/org/apache/weex/performance/WXAnalyzerDataTransfer.java index 194046cbea..17e069cf28 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/WXAnalyzerDataTransfer.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/WXAnalyzerDataTransfer.java @@ -14,21 +14,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.performance; +package org.apache.weex.performance; import java.util.Iterator; import java.util.List; import android.util.Log; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.bridge.WXJSObject; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXJSExceptionInfo; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXJSExceptionInfo; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXUtils; import org.json.JSONObject; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java b/android/sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java rename to android/sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java index 12a09f1f5c..273a60e7e7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/WXInstanceApm.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.performance; +package org.apache.weex.performance; import java.util.HashMap; import java.util.Map; @@ -29,17 +29,17 @@ import android.os.Looper; import android.text.TextUtils; import android.util.Log; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXPerformance; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXPerformance; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; public class WXInstanceApm { @@ -336,7 +336,7 @@ public void doInit() { addProperty(KEY_PAGE_PROPERTIES_JSLIB_VERSION, WXEnvironment.JS_LIB_SDK_VERSION); addProperty(KEY_PAGE_PROPERTIES_WEEX_VERSION, WXEnvironment.WXSDK_VERSION); addProperty(KEY_PAGE_PROPERTIES_WEEX_VERSION, WXEnvironment.WXSDK_VERSION); - addStats("wxReInitCount",WXBridgeManager.reInitCount); + addStats("wxReInitCount", WXBridgeManager.reInitCount); if (null != instance){ addProperty(KEY_PAGE_PROPERTIES_UIKIT_TYPE, instance.getRenderType()); } diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXStateRecord.java b/android/sdk/src/main/java/org/apache/weex/performance/WXStateRecord.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/performance/WXStateRecord.java rename to android/sdk/src/main/java/org/apache/weex/performance/WXStateRecord.java index 0711af2378..00328ff33a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/WXStateRecord.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/WXStateRecord.java @@ -17,22 +17,20 @@ * under the License. */ -package com.taobao.weex.performance; +package org.apache.weex.performance; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; import android.support.annotation.NonNull; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.ui.IFComponentHolder; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.utils.WXUtils; /** * @author zhongcang diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WhiteScreenUtils.java b/android/sdk/src/main/java/org/apache/weex/performance/WhiteScreenUtils.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/performance/WhiteScreenUtils.java rename to android/sdk/src/main/java/org/apache/weex/performance/WhiteScreenUtils.java index 6e7543e35b..0ea349c832 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/WhiteScreenUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/performance/WhiteScreenUtils.java @@ -16,19 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.performance; +package org.apache.weex.performance; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.ui.IFComponentHolder; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.utils.WXViewUtils; import org.json.JSONObject; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/render/WXAbstractRenderContainer.java b/android/sdk/src/main/java/org/apache/weex/render/WXAbstractRenderContainer.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/render/WXAbstractRenderContainer.java rename to android/sdk/src/main/java/org/apache/weex/render/WXAbstractRenderContainer.java index ade733910f..2fc3192672 100644 --- a/android/sdk/src/main/java/com/taobao/weex/render/WXAbstractRenderContainer.java +++ b/android/sdk/src/main/java/org/apache/weex/render/WXAbstractRenderContainer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.render; +package org.apache.weex.render; import android.annotation.TargetApi; import android.content.Context; @@ -26,7 +26,7 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; import java.lang.ref.WeakReference; public class WXAbstractRenderContainer extends FrameLayout { diff --git a/android/sdk/src/main/java/com/taobao/weex/tracing/Stopwatch.java b/android/sdk/src/main/java/org/apache/weex/tracing/Stopwatch.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/tracing/Stopwatch.java rename to android/sdk/src/main/java/org/apache/weex/tracing/Stopwatch.java index 10b8be273c..83f2f55297 100644 --- a/android/sdk/src/main/java/com/taobao/weex/tracing/Stopwatch.java +++ b/android/sdk/src/main/java/org/apache/weex/tracing/Stopwatch.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.tracing; +package org.apache.weex.tracing; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/android/sdk/src/main/java/com/taobao/weex/tracing/WXTracing.java b/android/sdk/src/main/java/org/apache/weex/tracing/WXTracing.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/tracing/WXTracing.java rename to android/sdk/src/main/java/org/apache/weex/tracing/WXTracing.java index 0dc11ce2ab..834fb1c6ef 100644 --- a/android/sdk/src/main/java/com/taobao/weex/tracing/WXTracing.java +++ b/android/sdk/src/main/java/org/apache/weex/tracing/WXTracing.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.tracing; +package org.apache.weex.tracing; import android.os.Looper; import android.util.SparseArray; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.ITracingAdapter; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.ITracingAdapter; +import org.apache.weex.utils.WXLogUtils; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/ComponentCreator.java b/android/sdk/src/main/java/org/apache/weex/ui/ComponentCreator.java similarity index 83% rename from android/sdk/src/main/java/com/taobao/weex/ui/ComponentCreator.java rename to android/sdk/src/main/java/org/apache/weex/ui/ComponentCreator.java index c2e7f15599..c249182af3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/ComponentCreator.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/ComponentCreator.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; import java.lang.reflect.InvocationTargetException; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/ExternalLoaderComponentHolder.java b/android/sdk/src/main/java/org/apache/weex/ui/ExternalLoaderComponentHolder.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/ExternalLoaderComponentHolder.java rename to android/sdk/src/main/java/org/apache/weex/ui/ExternalLoaderComponentHolder.java index b33445c936..1b2c6800d9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/ExternalLoaderComponentHolder.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/ExternalLoaderComponentHolder.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; import android.util.Pair; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.bridge.Invoker; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.bridge.Invoker; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; import java.lang.reflect.InvocationTargetException; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/IExternalComponentGetter.java b/android/sdk/src/main/java/org/apache/weex/ui/IExternalComponentGetter.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/ui/IExternalComponentGetter.java rename to android/sdk/src/main/java/org/apache/weex/ui/IExternalComponentGetter.java index 63aaf5c483..d78f535f1f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/IExternalComponentGetter.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/IExternalComponentGetter.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.component.WXComponent; /** * Created by zhengshihan on 16/8/25. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/IExternalModuleGetter.java b/android/sdk/src/main/java/org/apache/weex/ui/IExternalModuleGetter.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/IExternalModuleGetter.java rename to android/sdk/src/main/java/org/apache/weex/ui/IExternalModuleGetter.java index 80f02577d1..bc7ca928ef 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/IExternalModuleGetter.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/IExternalModuleGetter.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; import android.content.Context; -import com.taobao.weex.common.WXModule; +import org.apache.weex.common.WXModule; /** * Created by zhengshihan on 16/8/25. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/IFComponentHolder.java b/android/sdk/src/main/java/org/apache/weex/ui/IFComponentHolder.java similarity index 83% rename from android/sdk/src/main/java/com/taobao/weex/ui/IFComponentHolder.java rename to android/sdk/src/main/java/org/apache/weex/ui/IFComponentHolder.java index 45344d4f5b..d3a21f2af9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/IFComponentHolder.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/IFComponentHolder.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; -import com.taobao.weex.bridge.Invoker; -import com.taobao.weex.bridge.JavascriptInvokable; +import org.apache.weex.bridge.Invoker; +import org.apache.weex.bridge.JavascriptInvokable; /** * Created by sospartan on 6/23/16. */ -public interface IFComponentHolder extends ComponentCreator,JavascriptInvokable { +public interface IFComponentHolder extends ComponentCreator, JavascriptInvokable { /** Prepare component if not a lazy load componnet.**/ void loadIfNonLazy(); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/RenderContextImpl.java b/android/sdk/src/main/java/org/apache/weex/ui/RenderContextImpl.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/RenderContextImpl.java rename to android/sdk/src/main/java/org/apache/weex/ui/RenderContextImpl.java index 852becf89e..fe9d0e603f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/RenderContextImpl.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/RenderContextImpl.java @@ -16,18 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.dom.RenderContext; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.dom.RenderContext; +import org.apache.weex.ui.component.WXComponent; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/SimpleComponentHolder.java b/android/sdk/src/main/java/org/apache/weex/ui/SimpleComponentHolder.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/SimpleComponentHolder.java rename to android/sdk/src/main/java/org/apache/weex/ui/SimpleComponentHolder.java index afd992ac07..48c78ef1ed 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/SimpleComponentHolder.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/SimpleComponentHolder.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; import android.util.Pair; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.Invoker; -import com.taobao.weex.bridge.MethodInvoker; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXComponentProp; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.Invoker; +import org.apache.weex.bridge.MethodInvoker; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponentProp; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -42,8 +42,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; - -import static com.taobao.weex.bridge.WXBridgeManager.METHOD_REGISTER_COMPONENTS; +import org.apache.weex.bridge.WXBridgeManager; /** * Created by sospartan on 6/12/16. @@ -223,7 +222,7 @@ public synchronized String[] getMethods() { String errorMsg = name + ": gen methods failed"; WXExceptionUtils.commitCriticalExceptionRT(null, WXErrorCode.WX_KEY_EXCEPTION_INVOKE_REGISTER_COMPONENT, - METHOD_REGISTER_COMPONENTS, errorMsg, + WXBridgeManager.METHOD_REGISTER_COMPONENTS, errorMsg, null); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java b/android/sdk/src/main/java/org/apache/weex/ui/WXComponentRegistry.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java rename to android/sdk/src/main/java/org/apache/weex/ui/WXComponentRegistry.java index 9aaf6a0c7e..eee9be05ff 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/WXComponentRegistry.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/WXComponentRegistry.java @@ -16,24 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; import android.text.TextUtils; -import android.util.Log; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.WXException; -import com.taobao.weex.ui.config.AutoScanConfigRegister; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.cache.RegisterCache; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.WXException; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.cache.RegisterCache; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import org.apache.weex.utils.cache.RegisterCache.ComponentCache; /** * All components must be registered within this class before used. @@ -43,18 +41,18 @@ public class WXComponentRegistry { private static Map sTypeComponentMap = new ConcurrentHashMap<>(); private static ArrayList> sComponentInfos=new ArrayList<>(); - public static synchronized boolean registerComponent(Map componentCacheMap) { + public static synchronized boolean registerComponent(Map componentCacheMap) { if (componentCacheMap.isEmpty()) return true; - final Iterator> iterator = componentCacheMap.entrySet().iterator(); + final Iterator> iterator = componentCacheMap.entrySet().iterator(); WXBridgeManager.getInstance().post(new Runnable() { @Override public void run() { ArrayList> coms = new ArrayList<>(); while (iterator.hasNext()) { - Map.Entry next = iterator.next(); + Map.Entry next = iterator.next(); try { - RegisterCache.ComponentCache value = next.getValue(); + ComponentCache value = next.getValue(); Map registerInfo = value.componentInfo; if (registerInfo == null) { registerInfo = new HashMap<>(); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java b/android/sdk/src/main/java/org/apache/weex/ui/WXRenderHandler.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java rename to android/sdk/src/main/java/org/apache/weex/ui/WXRenderHandler.java index 2bfb685e6c..58c7b7eb2e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderHandler.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/WXRenderHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; import android.os.Handler; import android.os.Looper; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java b/android/sdk/src/main/java/org/apache/weex/ui/WXRenderManager.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java rename to android/sdk/src/main/java/org/apache/weex/ui/WXRenderManager.java index 85f54b7202..d401643d14 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/WXRenderManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui; +package org.apache.weex.ui; import android.opengl.GLES10; import android.support.annotation.Nullable; @@ -24,18 +24,18 @@ import android.support.annotation.RestrictTo.Scope; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.dom.RenderContext; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.ui.action.BasicGraphicAction; -import com.taobao.weex.ui.action.GraphicActionBatchAction; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.common.WXThread; +import org.apache.weex.dom.RenderContext; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.ui.action.BasicGraphicAction; +import org.apache.weex.ui.action.GraphicActionBatchAction; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; import java.util.ArrayList; import java.util.HashMap; @@ -50,7 +50,6 @@ import javax.microedition.khronos.egl.EGLSurface; - /** * Manager class for render operation, mainly for managing {@link RenderContextImpl}. * This is not a thread-safe class diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionAddRule.java b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionAddRule.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/ActionAddRule.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/ActionAddRule.java index 5e3febeccc..70d3933575 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionAddRule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionAddRule.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.text.TextUtils; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.font.FontAdapter; -import com.taobao.weex.utils.FontDO; -import com.taobao.weex.utils.TypefaceUtil; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.Constants; +import org.apache.weex.font.FontAdapter; +import org.apache.weex.utils.FontDO; +import org.apache.weex.utils.TypefaceUtil; /** * Created by listen on 18/01/10. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionGetComponentRect.java b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionGetComponentRect.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/ActionGetComponentRect.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/ActionGetComponentRect.java index 78c2875e67..9f2e96d492 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionGetComponentRect.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionGetComponentRect.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.graphics.Rect; import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.View; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.bridge.SimpleJSCallback; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.bridge.SimpleJSCallback; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXViewUtils; import java.util.HashMap; import java.util.Map; @@ -62,7 +62,8 @@ public void executeAction() { } else if ("viewport".equalsIgnoreCase(getRef())) { callbackViewport(instance, jsCallback); } else { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionGetLayoutDirection.java b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionGetLayoutDirection.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/ActionGetLayoutDirection.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/ActionGetLayoutDirection.java index 039bdfce08..64de952161 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionGetLayoutDirection.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionGetLayoutDirection.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.View; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.bridge.SimpleJSCallback; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.list.template.jni.NativeRenderObjectUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.bridge.SimpleJSCallback; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.list.template.jni.NativeRenderObjectUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.HashMap; import java.util.Map; @@ -62,7 +62,8 @@ public void executeAction() { } else if ("viewport".equalsIgnoreCase(getRef())) { callbackViewport(instance, jsCallback); } else { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionInvokeMethod.java b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionInvokeMethod.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/ActionInvokeMethod.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/ActionInvokeMethod.java index f078d1b684..0d5bf2a2a7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionInvokeMethod.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionInvokeMethod.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import com.alibaba.fastjson.JSONArray; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXLogUtils; /** * Created by listen on 18/01/10. @@ -44,7 +44,8 @@ public ActionInvokeMethod(String pageId, String ref, String method, JSONArray ar @Override public void executeAction() { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(mPageId, mRef); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(mPageId, mRef); if(component == null){ WXLogUtils.e(TAG,"target component not found."); return; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionReloadPage.java b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionReloadPage.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/ActionReloadPage.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/ActionReloadPage.java index 42705f609a..96830c38c8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/ActionReloadPage.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/ActionReloadPage.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.util.Log; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; /** * Created by listen on 18/01/09. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/BasicComponentData.java b/android/sdk/src/main/java/org/apache/weex/ui/action/BasicComponentData.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/BasicComponentData.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/BasicComponentData.java index 9d124504b2..c91969c095 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/BasicComponentData.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/BasicComponentData.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; import android.view.View; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.ui.component.list.template.jni.NativeRenderObjectUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.ui.component.list.template.jni.NativeRenderObjectUtils; +import org.apache.weex.utils.WXUtils; import java.util.Map; import java.util.Set; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/BasicGraphicAction.java b/android/sdk/src/main/java/org/apache/weex/ui/action/BasicGraphicAction.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/BasicGraphicAction.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/BasicGraphicAction.java index e232584b3d..16e5472b77 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/BasicGraphicAction.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/BasicGraphicAction.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.text.TextUtils; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.utils.WXLogUtils; public abstract class BasicGraphicAction implements IExecutable, Runnable { @@ -59,7 +59,8 @@ public void executeActionOnRender() { } return; } - WXSDKManager.getInstance().getWXRenderManager().postGraphicAction(mInstance.getInstanceId(), this); + WXSDKManager + .getInstance().getWXRenderManager().postGraphicAction(mInstance.getInstanceId(), this); } @Override diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAbstractAddElement.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAbstractAddElement.java index 88baced440..13e429ee33 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAbstractAddElement.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.v4.util.ArrayMap; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXComponentFactory; -import com.taobao.weex.ui.component.WXVContainer; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponentFactory; +import org.apache.weex.ui.component.WXVContainer; import java.util.Map; import java.util.Set; @@ -59,7 +59,8 @@ protected WXComponent createComponent(WXSDKInstance instance, WXVContainer paren } WXComponent component = WXComponentFactory.newInstance(instance, parent, basicComponentData); - WXSDKManager.getInstance().getWXRenderManager().registerComponent(getPageId(), getRef(), component); + WXSDKManager + .getInstance().getWXRenderManager().registerComponent(getPageId(), getRef(), component); if(mStyle != null && mStyle.containsKey(Constants.Name.TRANSFORM) && component.getTransition() == null) { Map animationMap = new ArrayMap<>(2); animationMap.put(Constants.Name.TRANSFORM, mStyle.get(Constants.Name.TRANSFORM)); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddChildToRichtext.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddChildToRichtext.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddChildToRichtext.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddChildToRichtext.java index bddad36217..e2e7ca7212 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddChildToRichtext.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddChildToRichtext.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; -import android.util.Log; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.richtext.WXRichText; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.richtext.WXRichText; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddElement.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddElement.java index a0b2005b97..3557998236 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddElement.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; import android.support.annotation.RestrictTo; @@ -26,17 +26,17 @@ import android.text.TextUtils; import android.util.Log; import com.taobao.weex.BuildConfig; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.dom.transition.WXTransition; -import com.taobao.weex.performance.WXAnalyzerDataTransfer; -import com.taobao.weex.performance.WXStateRecord; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.dom.transition.WXTransition; +import org.apache.weex.performance.WXAnalyzerDataTransfer; +import org.apache.weex.performance.WXStateRecord; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; import java.util.Arrays; import java.util.Locale; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddEvent.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddEvent.java similarity index 79% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddEvent.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddEvent.java index 3ef4a6c79e..0134ead54c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddEvent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAddEvent.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.tracing.Stopwatch; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.tracing.Stopwatch; +import org.apache.weex.ui.component.WXComponent; /** * Created by listen on 18/01/11. @@ -38,7 +38,8 @@ public GraphicActionAddEvent(WXSDKInstance instance, String ref, Object event) { @Override public void executeAction() { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAnimation.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAnimation.java index 4023b0c232..f7831be0bf 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAnimation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -39,22 +39,22 @@ import android.view.animation.LinearInterpolator; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.animation.BackgroundColorProperty; -import com.taobao.weex.ui.animation.HeightProperty; -import com.taobao.weex.ui.animation.WXAnimationBean; -import com.taobao.weex.ui.animation.WXAnimationModule; -import com.taobao.weex.ui.animation.WidthProperty; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.list.template.TemplateDom; -import com.taobao.weex.ui.view.border.BorderDrawable; -import com.taobao.weex.utils.SingleFunctionParser; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.animation.BackgroundColorProperty; +import org.apache.weex.ui.animation.HeightProperty; +import org.apache.weex.ui.animation.WXAnimationBean; +import org.apache.weex.ui.animation.WXAnimationModule; +import org.apache.weex.ui.animation.WidthProperty; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.list.template.TemplateDom; +import org.apache.weex.ui.view.border.BorderDrawable; +import org.apache.weex.utils.SingleFunctionParser; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.HashMap; import java.util.List; @@ -103,7 +103,8 @@ public void executeAction() { return; } - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null) { if(!TemplateDom.isVirtualDomRef(getRef())){ return; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAppendTreeCreateFinish.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAppendTreeCreateFinish.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAppendTreeCreateFinish.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAppendTreeCreateFinish.java index 0fe09f0d82..8e3a62e523 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAppendTreeCreateFinish.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionAppendTreeCreateFinish.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; /** * Created by listen on 18/01/09. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchAction.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchAction.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchAction.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchAction.java index 901db4012c..53cddfb78b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchAction.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchAction.java @@ -17,9 +17,9 @@ * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; import java.util.ArrayList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchBegin.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchBegin.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchBegin.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchBegin.java index d61540a2ee..e99772d3d8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchBegin.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchBegin.java @@ -17,9 +17,9 @@ * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; public class GraphicActionBatchBegin extends BasicGraphicAction { public GraphicActionBatchBegin(WXSDKInstance instance, String ref) { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchEnd.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchEnd.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchEnd.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchEnd.java index 45d9744a33..3ba83555e7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionBatchEnd.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionBatchEnd.java @@ -17,9 +17,9 @@ * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; public class GraphicActionBatchEnd extends BasicGraphicAction { public GraphicActionBatchEnd(WXSDKInstance instance, String ref) { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionCreateBody.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionCreateBody.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionCreateBody.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionCreateBody.java index 49eef03112..dad6032f0a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionCreateBody.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionCreateBody.java @@ -16,18 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; import android.widget.ScrollView; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.dom.transition.WXTransition; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXScroller; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.dom.transition.WXTransition; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXScroller; +import org.apache.weex.utils.WXLogUtils; import java.util.Map; import java.util.Set; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionCreateFinish.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionCreateFinish.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionCreateFinish.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionCreateFinish.java index c768b08866..717934f4cd 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionCreateFinish.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionCreateFinish.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.common.RenderTypes; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.RenderTypes; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.ui.component.WXComponent; /** * Created by listen on 18/01/09. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionLayout.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionLayout.java index cffef17511..c2c2c0c8f7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionLayout.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionLayout.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.WXComponent; public class GraphicActionLayout extends BasicGraphicAction { @@ -37,7 +37,8 @@ public GraphicActionLayout(WXSDKInstance instance, String ref, GraphicPosition l @Override public void executeAction() { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionMoveElement.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionMoveElement.java index 424ee8416e..4c38840e8d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionMoveElement.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; import android.text.TextUtils; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; public class GraphicActionMoveElement extends BasicGraphicAction { @@ -38,7 +38,8 @@ public GraphicActionMoveElement(WXSDKInstance instance, String ref, String paren @Override public void executeAction() { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if(component == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRefreshFinish.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRefreshFinish.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRefreshFinish.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRefreshFinish.java index 0cc78bf090..3f6fde7c90 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRefreshFinish.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRefreshFinish.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.component.WXComponent; /** * Created by listen on 18/01/09. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveChildFromRichtext.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveChildFromRichtext.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveChildFromRichtext.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveChildFromRichtext.java index 5c5cf2cb91..0c405fc44f 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveChildFromRichtext.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveChildFromRichtext.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.richtext.WXRichText; -import com.taobao.weex.ui.component.richtext.node.RichTextNode; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.richtext.WXRichText; public class GraphicActionRemoveChildFromRichtext extends BasicGraphicAction{ private String ref; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveElement.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveElement.java index b7e45512ef..abf4a8bb0e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveElement.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; public class GraphicActionRemoveElement extends BasicGraphicAction { @@ -33,7 +33,8 @@ public GraphicActionRemoveElement(WXSDKInstance instance, String ref) { @Override public void executeAction() { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null || component.getParent() == null || component.getInstance() == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveEvent.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveEvent.java similarity index 78% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveEvent.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveEvent.java index 67fe1335b1..57270445fa 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveEvent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRemoveEvent.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.tracing.Stopwatch; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.tracing.Stopwatch; +import org.apache.weex.ui.component.WXComponent; /** * Created by listen on 18/01/11. @@ -38,7 +38,8 @@ public GraphicActionRemoveEvent(WXSDKInstance instance, String ref, Object event @Override public void executeAction() { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRenderSuccess.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRenderSuccess.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRenderSuccess.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRenderSuccess.java index ecd12b1102..8c8615fdd1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRenderSuccess.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionRenderSuccess.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.annotation.NonNull; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.component.WXComponent; public class GraphicActionRenderSuccess extends BasicGraphicAction { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionScrollToElement.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionScrollToElement.java similarity index 80% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionScrollToElement.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionScrollToElement.java index c03e93094a..5a4b8092e5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionScrollToElement.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionScrollToElement.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.Scrollable; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.Scrollable; +import org.apache.weex.ui.component.WXComponent; /** * Created by listen on 18/01/09. @@ -38,7 +38,8 @@ public GraphicActionScrollToElement(WXSDKInstance instance, String ref, JSONObje @Override public void executeAction() { - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if (component == null) { return; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateAttr.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateAttr.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateAttr.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateAttr.java index 4e6a00f295..d7713cebf0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateAttr.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateAttr.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.WXComponent; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateRichtextAttr.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateRichtextAttr.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateRichtextAttr.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateRichtextAttr.java index 3c30eb5e90..19b896bb01 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateRichtextAttr.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateRichtextAttr.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.richtext.WXRichText; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.richtext.WXRichText; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateRichtextStyle.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateRichtextStyle.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateRichtextStyle.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateRichtextStyle.java index c5c3231af4..b9cc2e5b1b 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateRichtextStyle.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateRichtextStyle.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.richtext.WXRichText; -import com.taobao.weex.ui.component.richtext.node.RichTextNode; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.richtext.WXRichText; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateStyle.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateStyle.java index bddb338df2..fd9e99922f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicActionUpdateStyle.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.support.v4.util.ArrayMap; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.dom.transition.WXTransition; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.dom.transition.WXTransition; +import org.apache.weex.ui.component.WXComponent; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicPosition.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicPosition.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicPosition.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicPosition.java index 9837809458..5796caf6ab 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicPosition.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicPosition.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; public class GraphicPosition { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicSize.java b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicSize.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicSize.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/GraphicSize.java index 35d6439cd0..f52364422a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicSize.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/GraphicSize.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; public class GraphicSize { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/IExecutable.java b/android/sdk/src/main/java/org/apache/weex/ui/action/IExecutable.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/IExecutable.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/IExecutable.java index 399d249287..c140e49394 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/IExecutable.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/IExecutable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; public interface IExecutable { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/UpdateComponentDataAction.java b/android/sdk/src/main/java/org/apache/weex/ui/action/UpdateComponentDataAction.java similarity index 81% rename from android/sdk/src/main/java/com/taobao/weex/ui/action/UpdateComponentDataAction.java rename to android/sdk/src/main/java/org/apache/weex/ui/action/UpdateComponentDataAction.java index b5e412e036..ef14a2e5e5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/UpdateComponentDataAction.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/action/UpdateComponentDataAction.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.action; +package org.apache.weex.ui.action; import android.text.TextUtils; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.SimpleJSCallback; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.list.template.CellDataManager; -import com.taobao.weex.ui.component.list.template.WXRecyclerTemplateList; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.SimpleJSCallback; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.list.template.CellDataManager; +import org.apache.weex.ui.component.list.template.WXRecyclerTemplateList; +import org.apache.weex.utils.WXLogUtils; /** @@ -55,7 +55,8 @@ public void executeAction() { WXLogUtils.e("wrong virtualComponentId split error " + virtualComponentId); return; } - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(getPageId(), getRef()); if(component instanceof WXRecyclerTemplateList){ WXRecyclerTemplateList templateList = (WXRecyclerTemplateList) component; templateList.getCellDataManager().updateVirtualComponentData(virtualComponentId, data); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/BackgroundColorProperty.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/BackgroundColorProperty.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/BackgroundColorProperty.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/BackgroundColorProperty.java index 219f295505..b6eab016ee 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/BackgroundColorProperty.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/BackgroundColorProperty.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.graphics.Color; @@ -25,9 +25,9 @@ import android.util.Property; import android.view.View; -import com.taobao.weex.ui.view.border.BorderDrawable; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.ui.view.border.BorderDrawable; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXViewUtils; public class BackgroundColorProperty extends Property { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/CameraDistanceProperty.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/CameraDistanceProperty.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/CameraDistanceProperty.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/CameraDistanceProperty.java index 67b92351b7..50243884da 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/CameraDistanceProperty.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/CameraDistanceProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/HeightProperty.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/HeightProperty.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/HeightProperty.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/HeightProperty.java index b268ed2e38..9fc404e5d5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/HeightProperty.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/HeightProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.view.ViewGroup.LayoutParams; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/LayoutParamsProperty.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/LayoutParamsProperty.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/LayoutParamsProperty.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/LayoutParamsProperty.java index 312180ec48..f4ef1d7c86 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/LayoutParamsProperty.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/LayoutParamsProperty.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.util.Property; import android.view.View; import android.view.ViewGroup.LayoutParams; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.view.IRenderResult; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.view.IRenderResult; /** * android.util.IntProperty cannot be applied here, as it is only added at API 24. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/TransformParser.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/TransformParser.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/TransformParser.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/TransformParser.java index 38eb709041..9087fab10c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/TransformParser.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/TransformParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.animation.PropertyValuesHolder; import android.support.annotation.NonNull; @@ -27,15 +27,15 @@ import android.util.Property; import android.view.View; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.utils.FunctionParser; -import com.taobao.weex.utils.WXDataStructureUtil; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.utils.FunctionParser; +import org.apache.weex.utils.WXDataStructureUtil; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationBean.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/WXAnimationBean.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationBean.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/WXAnimationBean.java index 4401cb9263..57a8bc73cf 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationBean.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/WXAnimationBean.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.animation.PropertyValuesHolder; import android.support.annotation.NonNull; @@ -26,18 +26,15 @@ import android.util.Pair; import android.util.Property; import android.view.View; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.Constants.Name; -import com.taobao.weex.utils.FunctionParser; -import com.taobao.weex.utils.WXDataStructureUtil; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.Constants; +import org.apache.weex.common.Constants.Name; +import org.apache.weex.utils.FunctionParser; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/WXAnimationModule.java similarity index 85% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/WXAnimationModule.java index a614ba3202..6874630f82 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/WXAnimationModule.java @@ -16,18 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.support.annotation.Nullable; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.ui.action.GraphicActionAnimation; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.list.template.TemplateDom; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.WXModule; +import org.apache.weex.ui.action.GraphicActionAnimation; +import org.apache.weex.ui.component.WXComponent; public class WXAnimationModule extends WXModule { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WidthProperty.java b/android/sdk/src/main/java/org/apache/weex/ui/animation/WidthProperty.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/animation/WidthProperty.java rename to android/sdk/src/main/java/org/apache/weex/ui/animation/WidthProperty.java index ca4288f790..1e9bf82eff 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WidthProperty.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/animation/WidthProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.animation; +package org.apache.weex.ui.animation; import android.view.ViewGroup.LayoutParams; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/AbstractEditComponent.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/AbstractEditComponent.java index 351ac08e86..3111b4f672 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/AbstractEditComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.app.Activity; import android.content.Context; @@ -28,7 +28,6 @@ import android.text.TextPaint; import android.text.TextUtils; import android.text.TextWatcher; -import android.text.method.DigitsKeyListener; import android.text.method.PasswordTransformationMethod; import android.util.Log; import android.util.TypedValue; @@ -41,26 +40,25 @@ import android.widget.TextView; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.dom.CSSConstants; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.layout.ContentBoxMeasurement; -import com.taobao.weex.layout.MeasureMode; -import com.taobao.weex.layout.MeasureSize; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.helper.SoftKeyboardDetector; -import com.taobao.weex.ui.component.helper.WXTimeInputHelper; -import com.taobao.weex.ui.view.WXEditText; -import com.taobao.weex.utils.TypefaceUtil; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXThread; +import org.apache.weex.dom.CSSConstants; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.layout.ContentBoxMeasurement; +import org.apache.weex.layout.MeasureMode; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.helper.SoftKeyboardDetector; +import org.apache.weex.ui.component.helper.WXTimeInputHelper; +import org.apache.weex.ui.view.WXEditText; +import org.apache.weex.utils.TypefaceUtil; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; import java.util.HashMap; @@ -69,7 +67,7 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import static com.taobao.weex.dom.WXStyle.UNSET; +import static org.apache.weex.dom.WXStyle.UNSET; /** * Created by sospartan on 7/11/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/AppearanceHelper.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/AppearanceHelper.java index 4481be8170..1668171e84 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/AppearanceHelper.java @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.graphics.Rect; import android.view.View; -import com.taobao.weex.utils.WXLogUtils; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/NestedContainer.java b/android/sdk/src/main/java/org/apache/weex/ui/component/NestedContainer.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/NestedContainer.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/NestedContainer.java index 04515020e1..32637b7e53 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/NestedContainer.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/NestedContainer.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.view.ViewGroup; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXSDKInstance; /** * Created by sospartan on 8/24/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/Scrollable.java b/android/sdk/src/main/java/org/apache/weex/ui/component/Scrollable.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/Scrollable.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/Scrollable.java index 1094bd1520..7a8299a4b8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/Scrollable.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/Scrollable.java @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.view.ViewGroup; import java.util.Map; +import org.apache.weex.common.Constants.Orientation; /** * Created by sospartan on 7/5/16. @@ -51,7 +52,7 @@ public interface Scrollable { /** * - * @return {@link com.taobao.weex.common.Constants.Orientation#HORIZONTAL} or {@link com.taobao.weex.common.Constants.Orientation#VERTICAL} + * @return {@link Orientation#HORIZONTAL} or {@link Orientation#VERTICAL} */ int getOrientation(); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/Textarea.java b/android/sdk/src/main/java/org/apache/weex/ui/component/Textarea.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/Textarea.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/Textarea.java index acc910038c..06b0da5ff8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/Textarea.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/Textarea.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.text.TextUtils; import android.view.Gravity; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXEditText; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXEditText; +import org.apache.weex.utils.WXUtils; /** * Created by sospartan on 7/11/16. @@ -35,7 +35,8 @@ public class Textarea extends AbstractEditComponent { public static final int DEFAULT_ROWS = 2; private int mNumberOfLines = DEFAULT_ROWS; - public Textarea(WXSDKInstance instance, WXVContainer parent, boolean isLazy, BasicComponentData basicComponentData) { + public Textarea( + WXSDKInstance instance, WXVContainer parent, boolean isLazy, BasicComponentData basicComponentData) { super(instance, parent, isLazy, basicComponentData); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXA.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXA.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXA.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXA.java index e0b84426a1..f8d45bc4d3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXA.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXA.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXFrameLayout; -import com.taobao.weex.utils.ATagUtil; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXFrameLayout; +import org.apache.weex.utils.ATagUtil; @Component(lazyload = false) public class WXA extends WXDiv { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBaseRefresh.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXBaseRefresh.java similarity index 82% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXBaseRefresh.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXBaseRefresh.java index 45a21e87b0..5ab59e6211 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBaseRefresh.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXBaseRefresh.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.support.annotation.NonNull; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXFrameLayout; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXFrameLayout; /** * div component @@ -34,7 +34,8 @@ public class WXBaseRefresh extends WXVContainer { private WXLoadingIndicator mLoadingIndicator; - public WXBaseRefresh(WXSDKInstance instance, WXVContainer parent, boolean lazy, BasicComponentData basicComponentData) { + public WXBaseRefresh( + WXSDKInstance instance, WXVContainer parent, boolean lazy, BasicComponentData basicComponentData) { super(instance, parent, lazy, basicComponentData); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXBasicComponentType.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXBasicComponentType.java index 936206f812..b6f7ccc60d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXBasicComponentType.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXBasicComponentType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; /** * basic Component types diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponent.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXComponent.java index 17630e1401..9bdee051ee 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -54,64 +54,63 @@ import android.view.ViewOverlay; import android.widget.FrameLayout; import com.alibaba.fastjson.JSONArray; -import com.taobao.weex.ComponentObserver; -import com.taobao.weex.IWXActivityStateListener; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXAccessibilityRoleAdapter; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.bridge.EventResult; -import com.taobao.weex.bridge.Invoker; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.IWXObject; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXPerformance; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.dom.CSSShorthand.CORNER; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.dom.transition.WXTransition; -import com.taobao.weex.layout.ContentBoxMeasurement; -import com.taobao.weex.performance.WXAnalyzerDataTransfer; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.tracing.Stopwatch; -import com.taobao.weex.tracing.WXTracing; -import com.taobao.weex.ui.IFComponentHolder; -import com.taobao.weex.ui.WXRenderManager; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.action.GraphicActionAnimation; -import com.taobao.weex.ui.action.GraphicActionUpdateStyle; -import com.taobao.weex.ui.action.GraphicPosition; -import com.taobao.weex.ui.action.GraphicSize; -import com.taobao.weex.ui.animation.WXAnimationBean; -import com.taobao.weex.ui.animation.WXAnimationModule; -import com.taobao.weex.ui.component.basic.WXBasicComponent; -import com.taobao.weex.ui.component.binding.Statements; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.component.list.template.jni.NativeRenderObjectUtils; -import com.taobao.weex.ui.component.pesudo.OnActivePseudoListner; -import com.taobao.weex.ui.component.pesudo.PesudoStatus; -import com.taobao.weex.ui.component.pesudo.TouchActivePseudoListener; -import com.taobao.weex.ui.flat.FlatComponent; -import com.taobao.weex.ui.flat.FlatGUIContext; -import com.taobao.weex.ui.flat.WidgetContainer; -import com.taobao.weex.ui.flat.widget.AndroidViewWidget; -import com.taobao.weex.ui.flat.widget.Widget; -import com.taobao.weex.ui.view.border.BorderDrawable; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.ui.view.gesture.WXGestureType; -import com.taobao.weex.utils.BoxShadowUtil; -import com.taobao.weex.utils.WXDataStructureUtil; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXReflectionUtils; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.ComponentObserver; +import org.apache.weex.IWXActivityStateListener; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXAccessibilityRoleAdapter; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.bridge.EventResult; +import org.apache.weex.bridge.Invoker; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.Constants; +import org.apache.weex.common.IWXObject; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXPerformance; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.dom.CSSShorthand.CORNER; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.dom.transition.WXTransition; +import org.apache.weex.layout.ContentBoxMeasurement; +import org.apache.weex.performance.WXAnalyzerDataTransfer; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.tracing.Stopwatch; +import org.apache.weex.tracing.WXTracing; +import org.apache.weex.ui.IFComponentHolder; +import org.apache.weex.ui.WXRenderManager; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.action.GraphicActionAnimation; +import org.apache.weex.ui.action.GraphicActionUpdateStyle; +import org.apache.weex.ui.action.GraphicPosition; +import org.apache.weex.ui.action.GraphicSize; +import org.apache.weex.ui.animation.WXAnimationBean; +import org.apache.weex.ui.component.basic.WXBasicComponent; +import org.apache.weex.ui.component.binding.Statements; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.component.list.template.jni.NativeRenderObjectUtils; +import org.apache.weex.ui.component.pesudo.OnActivePseudoListner; +import org.apache.weex.ui.component.pesudo.PesudoStatus; +import org.apache.weex.ui.component.pesudo.TouchActivePseudoListener; +import org.apache.weex.ui.flat.FlatComponent; +import org.apache.weex.ui.flat.FlatGUIContext; +import org.apache.weex.ui.flat.WidgetContainer; +import org.apache.weex.ui.flat.widget.AndroidViewWidget; +import org.apache.weex.ui.flat.widget.Widget; +import org.apache.weex.ui.view.border.BorderDrawable; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.ui.view.gesture.WXGestureType; +import org.apache.weex.utils.BoxShadowUtil; +import org.apache.weex.utils.WXDataStructureUtil; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXReflectionUtils; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -128,11 +127,15 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.weex.common.Constants.Event; +import org.apache.weex.tracing.WXTracing.TraceInfo; +import org.apache.weex.ui.animation.WXAnimationModule.AnimationHolder; /** * abstract component */ -public abstract class WXComponent extends WXBasicComponent implements IWXObject, IWXActivityStateListener, OnActivePseudoListner { +public abstract class WXComponent extends WXBasicComponent implements IWXObject, + IWXActivityStateListener, OnActivePseudoListner { public static final String PROP_FIXED_SIZE = "fixedSize"; public static final String PROP_FS_MATCH_PARENT = "m"; @@ -167,7 +170,7 @@ public abstract class WXComponent extends WXBasicComponent imple private List mHostClickListeners; private List mFocusChangeListeners; private Set mAppendEvents; - private WXAnimationModule.AnimationHolder mAnimationHolder; + private AnimationHolder mAnimationHolder; private PesudoStatus mPesudoStatus; private boolean mIsDestroyed = false; private boolean mIsDisabled = false; @@ -182,7 +185,7 @@ public abstract class WXComponent extends WXBasicComponent imple protected int mChildrensWidth = 0; private boolean mHasAddFocusListener = false; - public WXTracing.TraceInfo mTraceInfo = new WXTracing.TraceInfo(); + public TraceInfo mTraceInfo = new TraceInfo(); public static final int TYPE_COMMON = 0; public static final int TYPE_VIRTUAL = 1; @@ -442,7 +445,7 @@ public String getAttrByKey(String key) { } //Holding the animation bean when component is uninitialized - public void postAnimation(WXAnimationModule.AnimationHolder holder) { + public void postAnimation(AnimationHolder holder) { this.mAnimationHolder = holder; } @@ -1381,7 +1384,7 @@ public View getRealView() { * Judge whether need to set an onTouchListener.
* As there is only one onTouchListener in each view, so all the gesture that use onTouchListener should put there. * - * @param type eventType {@link com.taobao.weex.common.Constants.Event} + * @param type eventType {@link Event} * @return true for set an onTouchListener, otherwise false */ private boolean needGestureDetector(String type) { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponentFactory.java similarity index 80% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXComponentFactory.java index ce3b986fb0..7a4290c690 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentFactory.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponentFactory.java @@ -16,24 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.text.TextUtils; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.ui.IFComponentHolder; -import com.taobao.weex.ui.WXComponentRegistry; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.ui.IFComponentHolder; +import org.apache.weex.ui.WXComponentRegistry; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; /** * Component factory diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentProp.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponentProp.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentProp.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXComponentProp.java index 65b9b51632..d2a8fbfee5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponentProp.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponentProp.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXDiv.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXDiv.java index c4fbbab64f..e22acd7218 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXDiv.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXDiv.java @@ -16,23 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.support.annotation.NonNull; -import android.text.TextUtils; -import android.util.Log; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.flat.FlatComponent; -import com.taobao.weex.ui.flat.WidgetContainer; -import com.taobao.weex.ui.flat.widget.WidgetGroup; -import com.taobao.weex.ui.view.WXFrameLayout; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.flat.FlatComponent; +import org.apache.weex.ui.flat.WidgetContainer; +import org.apache.weex.ui.flat.widget.WidgetGroup; +import org.apache.weex.ui.view.WXFrameLayout; import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXEmbed.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXEmbed.java index b95c8a0338..257c9ef705 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXEmbed.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -28,29 +28,30 @@ import android.widget.ImageView; import com.taobao.weex.R; -import com.taobao.weex.IWXRenderListener; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.OnWXScrollListener; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXRenderStrategy; -import com.taobao.weex.instance.InstanceOnFireEventInterceptor; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.IWXRenderListener; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.common.OnWXScrollListener; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXRenderStrategy; +import org.apache.weex.instance.InstanceOnFireEventInterceptor; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayDeque; import java.util.Comparator; import java.util.Map; import java.util.PriorityQueue; import java.util.Queue; +import org.apache.weex.WXSDKInstance.OnInstanceVisibleListener; @Component(lazyload = false) -public class WXEmbed extends WXDiv implements WXSDKInstance.OnInstanceVisibleListener,NestedContainer { +public class WXEmbed extends WXDiv implements OnInstanceVisibleListener,NestedContainer { public static final String STRATEGY_NONE = "none"; public static final String STRATEGY_NORMAL = "normal"; @@ -547,7 +548,8 @@ public void removeLayerOverFlowListener(String ref) { mNestedInstance.removeLayerOverFlowListener(ref); } - static class EmbedInstanceOnScrollFireEventInterceptor extends InstanceOnFireEventInterceptor implements OnWXScrollListener{ + static class EmbedInstanceOnScrollFireEventInterceptor extends + InstanceOnFireEventInterceptor implements OnWXScrollListener { private WXEmbed mEmbed; private WXComponent firstLayerScroller; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXHeader.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXHeader.java index a07f6282d1..4172cfa909 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXHeader.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXHeader.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.list.WXCell; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.list.WXCell; /** * The same as sticky cell diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXImage.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXImage.java index f165e1cfdb..dbb70d3eb7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXImage.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; -import com.taobao.weex.dom.WXImageQuality; +import org.apache.weex.dom.WXImageQuality; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationTargetException; @@ -46,31 +46,31 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.ImageView.ScaleType; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.adapter.IWXImgLoaderAdapter; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXImageSharpen; -import com.taobao.weex.common.WXImageStrategy; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.performance.WXAnalyzerDataTransfer; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXImageView; -import com.taobao.weex.ui.view.border.BorderDrawable; -import com.taobao.weex.utils.ImageDrawable; -import com.taobao.weex.utils.ImgURIUtil; -import com.taobao.weex.utils.SingleFunctionParser; -import com.taobao.weex.utils.WXDomUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewToImageUtil; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.adapter.IWXImgLoaderAdapter; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.annotation.Component; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXImageSharpen; +import org.apache.weex.common.WXImageStrategy; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.performance.WXAnalyzerDataTransfer; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXImageView; +import org.apache.weex.ui.view.border.BorderDrawable; +import org.apache.weex.utils.ImageDrawable; +import org.apache.weex.utils.ImgURIUtil; +import org.apache.weex.utils.SingleFunctionParser; +import org.apache.weex.utils.WXDomUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewToImageUtil; +import org.apache.weex.utils.WXViewUtils; /** * Image component diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXIndicator.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXIndicator.java index 449c12ee25..c5688e2d14 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXIndicator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.support.annotation.NonNull; @@ -24,16 +24,16 @@ import android.view.View; import android.widget.FrameLayout; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXCircleIndicator; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXCircleIndicator; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; /** * diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXInput.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXInput.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXInput.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXInput.java index d1a272d914..51cc895d41 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXInput.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXInput.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXEditText; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXEditText; /** * diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXLoading.java similarity index 81% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXLoading.java index 9ddd15a75a..f83349ccb1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXLoading.java @@ -16,35 +16,36 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.support.annotation.NonNull; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.list.WXListComponent; -import com.taobao.weex.ui.view.WXFrameLayout; -import com.taobao.weex.ui.view.WXLoadingLayout; -import com.taobao.weex.ui.view.refresh.core.WXSwipeLayout; -import com.taobao.weex.ui.view.refresh.wrapper.BaseBounceView; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.list.WXListComponent; +import org.apache.weex.ui.view.WXFrameLayout; +import org.apache.weex.ui.view.WXLoadingLayout; +import org.apache.weex.ui.view.refresh.wrapper.BaseBounceView; +import org.apache.weex.utils.WXUtils; import java.util.HashMap; import java.util.Map; +import org.apache.weex.ui.view.refresh.core.WXSwipeLayout.WXOnLoadingListener; /** * div component */ @Component(lazyload = false) -public class WXLoading extends WXBaseRefresh implements WXSwipeLayout.WXOnLoadingListener { +public class WXLoading extends WXBaseRefresh implements WXOnLoadingListener { public static final String HIDE = "hide"; - public WXLoading(WXSDKInstance instance, WXVContainer parent, boolean lazy, BasicComponentData basicComponentData) { + public WXLoading( + WXSDKInstance instance, WXVContainer parent, boolean lazy, BasicComponentData basicComponentData) { super(instance, parent, lazy, basicComponentData); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoadingIndicator.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXLoadingIndicator.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoadingIndicator.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXLoadingIndicator.java index be6bdd1d7a..25e4682e8e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoadingIndicator.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXLoadingIndicator.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.graphics.Color; import android.support.annotation.NonNull; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.refresh.circlebar.CircleProgressBar; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.refresh.circlebar.CircleProgressBar; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; @Component(lazyload = false) diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXRefresh.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXRefresh.java index bf8c99cbb9..7a9cd79789 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXRefresh.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXRefresh.java @@ -16,31 +16,31 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.support.annotation.NonNull; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.list.WXListComponent; -import com.taobao.weex.ui.view.WXFrameLayout; -import com.taobao.weex.ui.view.WXRefreshLayout; -import com.taobao.weex.ui.view.refresh.core.WXSwipeLayout; -import com.taobao.weex.ui.view.refresh.wrapper.BaseBounceView; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.list.WXListComponent; +import org.apache.weex.ui.view.WXFrameLayout; +import org.apache.weex.ui.view.WXRefreshLayout; +import org.apache.weex.ui.view.refresh.wrapper.BaseBounceView; +import org.apache.weex.utils.WXUtils; import java.util.HashMap; import java.util.Map; +import org.apache.weex.ui.view.refresh.core.WXSwipeLayout.WXOnRefreshListener; /** * div component */ @Component(lazyload = false) -public class WXRefresh extends WXBaseRefresh implements WXSwipeLayout.WXOnRefreshListener{ +public class WXRefresh extends WXBaseRefresh implements WXOnRefreshListener { public static final String HIDE = "hide"; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXScroller.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXScroller.java index c4608494c8..d814eb35ee 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXScroller.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -37,29 +37,29 @@ import android.view.ViewTreeObserver; import android.widget.FrameLayout; import android.widget.FrameLayout.LayoutParams; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.ICheckBindingScroller; -import com.taobao.weex.common.OnWXScrollListener; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.helper.ScrollStartEndHelper; -import com.taobao.weex.ui.component.helper.WXStickyHelper; -import com.taobao.weex.ui.view.IWXScroller; -import com.taobao.weex.ui.view.WXBaseRefreshLayout; -import com.taobao.weex.ui.view.WXHorizontalScrollView; -import com.taobao.weex.ui.view.WXScrollView; -import com.taobao.weex.ui.view.WXScrollView.WXScrollViewListener; -import com.taobao.weex.ui.view.refresh.wrapper.BaseBounceView; -import com.taobao.weex.ui.view.refresh.wrapper.BounceScrollerView; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.Constants; +import org.apache.weex.common.ICheckBindingScroller; +import org.apache.weex.common.OnWXScrollListener; +import org.apache.weex.common.WXThread; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.helper.ScrollStartEndHelper; +import org.apache.weex.ui.component.helper.WXStickyHelper; +import org.apache.weex.ui.view.IWXScroller; +import org.apache.weex.ui.view.WXBaseRefreshLayout; +import org.apache.weex.ui.view.WXHorizontalScrollView; +import org.apache.weex.ui.view.WXScrollView; +import org.apache.weex.ui.view.WXScrollView.WXScrollViewListener; +import org.apache.weex.ui.view.refresh.wrapper.BaseBounceView; +import org.apache.weex.ui.view.refresh.wrapper.BounceScrollerView; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXSlider.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXSlider.java index c2806fadf7..9459f87500 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXSlider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.annotation.SuppressLint; import android.content.Context; @@ -31,22 +31,22 @@ import android.view.ViewGroup.LayoutParams; import android.widget.FrameLayout; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.BaseFrameLayout; -import com.taobao.weex.ui.view.WXCircleIndicator; -import com.taobao.weex.ui.view.WXCirclePageAdapter; -import com.taobao.weex.ui.view.WXCircleViewPager; -import com.taobao.weex.ui.view.gesture.WXGestureType; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.BaseFrameLayout; +import org.apache.weex.ui.view.WXCircleIndicator; +import org.apache.weex.ui.view.WXCirclePageAdapter; +import org.apache.weex.ui.view.WXCircleViewPager; +import org.apache.weex.ui.view.gesture.WXGestureType; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationTargetException; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXSliderNeighbor.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXSliderNeighbor.java index bfcaa4b603..cfd7d0b19b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXSliderNeighbor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.support.annotation.NonNull; @@ -27,16 +27,16 @@ import android.view.ViewGroup; import android.widget.FrameLayout; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.BaseFrameLayout; -import com.taobao.weex.ui.view.WXCircleIndicator; -import com.taobao.weex.ui.view.WXCirclePageAdapter; -import com.taobao.weex.ui.view.WXCircleViewPager; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.WXThread; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.BaseFrameLayout; +import org.apache.weex.ui.view.WXCircleIndicator; +import org.apache.weex.ui.view.WXCirclePageAdapter; +import org.apache.weex.ui.view.WXCircleViewPager; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -64,7 +64,8 @@ public class WXSliderNeighbor extends WXSlider { private ZoomTransformer mCachedTransformer; - public WXSliderNeighbor(WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { + public WXSliderNeighbor( + WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { super(instance, parent, basicComponentData); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXSwitch.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXSwitch.java index 714986ef91..32c06a23df 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXSwitch.java @@ -16,22 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.support.annotation.NonNull; import android.view.View; import android.widget.CompoundButton; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.layout.ContentBoxMeasurement; -import com.taobao.weex.layout.MeasureSize; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXSwitchView; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.layout.ContentBoxMeasurement; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXSwitchView; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXText.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXText.java index 1236e373ef..729414be9e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXText.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.BroadcastReceiver; import android.content.Context; @@ -25,20 +25,20 @@ import android.support.annotation.NonNull; import android.support.v4.content.LocalBroadcastManager; import android.text.Layout; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.layout.measurefunc.TextContentBoxMeasurement; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.flat.FlatComponent; -import com.taobao.weex.ui.flat.widget.TextWidget; -import com.taobao.weex.ui.view.WXTextView; -import com.taobao.weex.utils.FontDO; -import com.taobao.weex.utils.TypefaceUtil; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.Constants; +import org.apache.weex.layout.measurefunc.TextContentBoxMeasurement; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.flat.FlatComponent; +import org.apache.weex.ui.flat.widget.TextWidget; +import org.apache.weex.ui.view.WXTextView; +import org.apache.weex.utils.FontDO; +import org.apache.weex.utils.TypefaceUtil; +import org.apache.weex.utils.WXLogUtils; import java.lang.reflect.InvocationTargetException; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXTextDecoration.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXTextDecoration.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXTextDecoration.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXTextDecoration.java index 44638fff9d..5f6db1b047 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXTextDecoration.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXTextDecoration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; public enum WXTextDecoration { INVALID, diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXVContainer.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXVContainer.java index 167eeb5b67..6b238e48e7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXVContainer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.content.Intent; @@ -28,15 +28,15 @@ import android.view.ViewGroup; import android.view.ViewParent; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXImageView; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXImageView; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVideo.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXVideo.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXVideo.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXVideo.java index 08518253a4..a4f875fe10 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVideo.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXVideo.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.media.MediaPlayer; @@ -27,25 +27,27 @@ import android.view.View; import android.widget.FrameLayout; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.WXVideoView; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.Component; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.WXVideoView; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; import java.util.HashMap; import java.util.Map; +import org.apache.weex.ui.view.WXVideoView.Wrapper; + @Component(lazyload = false) public class WXVideo extends WXComponent { private boolean mAutoPlay; - private WXVideoView.Wrapper mWrapper; + private Wrapper mWrapper; /** * package @@ -64,7 +66,7 @@ public WXVideo(WXSDKInstance instance, WXVContainer parent, boolean isLazy, Basi @Override protected FrameLayout initComponentHostView(@NonNull Context context) { - final WXVideoView.Wrapper video = new WXVideoView.Wrapper(context); + final Wrapper video = new Wrapper(context); video.setOnErrorListener(new MediaPlayer.OnErrorListener() { @Override diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXWeb.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXWeb.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/WXWeb.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/WXWeb.java index a536c463aa..321c36a671 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXWeb.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/WXWeb.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component; +package org.apache.weex.ui.component; import android.content.Context; import android.net.Uri; @@ -24,19 +24,20 @@ import android.text.TextUtils; import android.view.View; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.view.IWebView; -import com.taobao.weex.ui.view.WXWebView; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.Component; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.view.IWebView; +import org.apache.weex.ui.view.WXWebView; +import org.apache.weex.utils.WXUtils; import java.util.HashMap; import java.util.Map; + @Component(lazyload = false) public class WXWeb extends WXComponent { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/basic/WXBasicComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/basic/WXBasicComponent.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/basic/WXBasicComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/basic/WXBasicComponent.java index 4164475438..85b063ff2f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/basic/WXBasicComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/basic/WXBasicComponent.java @@ -16,19 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.basic; +package org.apache.weex.ui.component.basic; import android.support.annotation.NonNull; import android.view.View; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.action.GraphicPosition; -import com.taobao.weex.ui.action.GraphicSize; -import com.taobao.weex.ui.component.WXBasicComponentType; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.action.GraphicPosition; +import org.apache.weex.ui.action.GraphicSize; +import org.apache.weex.ui.component.WXComponent; import java.util.Map; import java.util.Set; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/AsynLayoutTask.java b/android/sdk/src/main/java/org/apache/weex/ui/component/binding/AsynLayoutTask.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/binding/AsynLayoutTask.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/binding/AsynLayoutTask.java index 564c0586d5..8b9e364fb7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/AsynLayoutTask.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/binding/AsynLayoutTask.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.binding; +package org.apache.weex.ui.component.binding; import android.os.AsyncTask; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.list.template.TemplateDom; -import com.taobao.weex.ui.component.list.template.TemplateViewHolder; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.list.template.TemplateDom; +import org.apache.weex.ui.component.list.template.TemplateViewHolder; /** * Created by furture on 2018/5/11. @@ -61,7 +61,8 @@ protected void onPostExecute(Void aVoid) { if(component.getInstance() != null && !component.getInstance().isDestroy()) { Layouts.setLayout(component, false); if(templateViewHolder.getHolderPosition() >= 0){ - templateViewHolder.getTemplateList().fireEvent("_attach_slot", TemplateDom.findAllComponentRefs(templateViewHolder.getTemplateList().getRef(), position, component)); + templateViewHolder.getTemplateList().fireEvent("_attach_slot", TemplateDom + .findAllComponentRefs(templateViewHolder.getTemplateList().getRef(), position, component)); } } } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java b/android/sdk/src/main/java/org/apache/weex/ui/component/binding/Layouts.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/binding/Layouts.java index 9320bce6d9..2095e029a5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Layouts.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/binding/Layouts.java @@ -16,24 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.binding; +package org.apache.weex.ui.component.binding; import android.os.AsyncTask; -import android.util.Log; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.component.list.template.TemplateDom; -import com.taobao.weex.ui.component.list.template.TemplateViewHolder; -import com.taobao.weex.ui.component.list.template.WXRecyclerTemplateList; -import com.taobao.weex.ui.component.list.template.jni.NativeRenderObjectUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.component.list.template.TemplateDom; +import org.apache.weex.ui.component.list.template.TemplateViewHolder; +import org.apache.weex.ui.component.list.template.WXRecyclerTemplateList; +import org.apache.weex.ui.component.list.template.jni.NativeRenderObjectUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; /** * Created by furture on 2017/8/21. @@ -58,7 +57,8 @@ public static void doLayoutAsync(final TemplateViewHolder templateViewHolder, bo doLayoutOnly(component, templateViewHolder); setLayout(component, false); if(templateViewHolder.getHolderPosition() >= 0){ - templateViewHolder.getTemplateList().fireEvent("_attach_slot", TemplateDom.findAllComponentRefs(templateViewHolder.getTemplateList().getRef(), position, component)); + templateViewHolder.getTemplateList().fireEvent("_attach_slot", TemplateDom + .findAllComponentRefs(templateViewHolder.getTemplateList().getRef(), position, component)); } } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java b/android/sdk/src/main/java/org/apache/weex/ui/component/binding/Statements.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/binding/Statements.java index e19ff8b9d9..5529048c2c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/binding/Statements.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/binding/Statements.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.binding; +package org.apache.weex.ui.component.binding; import android.os.Looper; import android.support.v4.util.ArrayMap; @@ -24,35 +24,35 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.bridge.EventResult; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.dom.binding.ELUtils; -import com.taobao.weex.dom.binding.JSONUtils; -import com.taobao.weex.dom.binding.WXStatement; -import com.taobao.weex.el.parse.ArrayStack; -import com.taobao.weex.el.parse.Operators; -import com.taobao.weex.el.parse.Token; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.action.GraphicPosition; -import com.taobao.weex.ui.action.GraphicSize; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXComponentFactory; -import com.taobao.weex.ui.component.WXImage; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.component.list.template.CellDataManager; -import com.taobao.weex.ui.component.list.template.CellRenderContext; -import com.taobao.weex.ui.component.list.template.TemplateDom; -import com.taobao.weex.ui.component.list.template.VirtualComponentLifecycle; -import com.taobao.weex.ui.component.list.template.WXRecyclerTemplateList; -import com.taobao.weex.ui.component.list.template.jni.NativeRenderObjectUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.bridge.EventResult; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.dom.binding.ELUtils; +import org.apache.weex.dom.binding.JSONUtils; +import org.apache.weex.dom.binding.WXStatement; +import org.apache.weex.el.parse.ArrayStack; +import org.apache.weex.el.parse.Operators; +import org.apache.weex.el.parse.Token; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.action.GraphicPosition; +import org.apache.weex.ui.action.GraphicSize; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponentFactory; +import org.apache.weex.ui.component.WXImage; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.component.list.template.CellDataManager; +import org.apache.weex.ui.component.list.template.CellRenderContext; +import org.apache.weex.ui.component.list.template.TemplateDom; +import org.apache.weex.ui.component.list.template.VirtualComponentLifecycle; +import org.apache.weex.ui.component.list.template.WXRecyclerTemplateList; +import org.apache.weex.ui.component.list.template.jni.NativeRenderObjectUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; import java.util.ArrayList; import java.util.Collection; @@ -131,7 +131,8 @@ private static final WXComponent copyComponentTree(WXComponent source, WXVContai } catch (CloneNotSupportedException e) { e.printStackTrace(); } - WXComponent component = WXComponentFactory.newInstance(source.getInstance(), parent, basicComponentData); + WXComponent component = WXComponentFactory + .newInstance(source.getInstance(), parent, basicComponentData); GraphicPosition graphicPosition = source.getLayoutPosition(); GraphicSize graphicSize = source.getLayoutSize(); component.updateDemission(graphicPosition.getTop(), graphicPosition.getBottom(), graphicPosition.getLeft(), graphicPosition.getRight(), diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/ScrollStartEndHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/ScrollStartEndHelper.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/helper/ScrollStartEndHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/helper/ScrollStartEndHelper.java index 29eb775849..339c267273 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/ScrollStartEndHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/ScrollStartEndHelper.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.helper; +package org.apache.weex.ui.component.helper; import android.os.Handler; import android.os.Looper; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.OnWXScrollListener; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXScroller; -import com.taobao.weex.ui.component.list.BasicListComponent; -import com.taobao.weex.ui.component.list.ListComponentView; -import com.taobao.weex.ui.component.list.template.WXRecyclerTemplateList; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.common.Constants; +import org.apache.weex.common.OnWXScrollListener; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXScroller; +import org.apache.weex.ui.component.list.BasicListComponent; +import org.apache.weex.ui.component.list.ListComponentView; +import org.apache.weex.ui.component.list.template.WXRecyclerTemplateList; +import org.apache.weex.utils.WXUtils; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/SoftKeyboardDetector.java b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/SoftKeyboardDetector.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/helper/SoftKeyboardDetector.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/helper/SoftKeyboardDetector.java index afbabd0bc8..b524e1665f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/SoftKeyboardDetector.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/SoftKeyboardDetector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.helper; +package org.apache.weex.ui.component.helper; import android.app.Activity; import android.graphics.Rect; @@ -26,8 +26,8 @@ import android.view.ViewTreeObserver; import android.view.WindowManager; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXViewUtils; import java.lang.ref.WeakReference; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/WXStickyHelper.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/helper/WXStickyHelper.java index fca3c14639..58b1d94d2c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXStickyHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/WXStickyHelper.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.helper; +package org.apache.weex.ui.component.helper; -import com.taobao.weex.ui.component.Scrollable; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.Scrollable; +import org.apache.weex.ui.component.WXComponent; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXTimeInputHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/WXTimeInputHelper.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXTimeInputHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/helper/WXTimeInputHelper.java index d6664394f5..600fde7d3b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/helper/WXTimeInputHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/helper/WXTimeInputHelper.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.helper; +package org.apache.weex.ui.component.helper; import android.support.annotation.Nullable; import android.widget.TextView; -import com.taobao.weex.appfram.pickers.DatePickerImpl; -import com.taobao.weex.ui.component.AbstractEditComponent; +import org.apache.weex.appfram.pickers.DatePickerImpl; +import org.apache.weex.ui.component.AbstractEditComponent; /** * Created by moxun on 16/10/12. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/BasicListComponent.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/BasicListComponent.java index eba3b3fea5..ecbd621314 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/BasicListComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -44,36 +44,36 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.ICheckBindingScroller; -import com.taobao.weex.common.OnWXScrollListener; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.AppearanceHelper; -import com.taobao.weex.ui.component.Scrollable; -import com.taobao.weex.ui.component.WXBaseRefresh; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXComponentProp; -import com.taobao.weex.ui.component.WXHeader; -import com.taobao.weex.ui.component.WXLoading; -import com.taobao.weex.ui.component.WXRefresh; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.component.helper.ScrollStartEndHelper; -import com.taobao.weex.ui.component.helper.WXStickyHelper; -import com.taobao.weex.ui.view.listview.WXRecyclerView; -import com.taobao.weex.ui.view.listview.adapter.IOnLoadMoreListener; -import com.taobao.weex.ui.view.listview.adapter.IRecyclerAdapterListener; -import com.taobao.weex.ui.view.listview.adapter.ListBaseViewHolder; -import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; -import com.taobao.weex.ui.view.listview.adapter.WXRecyclerViewOnScrollListener; -import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.Constants; +import org.apache.weex.common.ICheckBindingScroller; +import org.apache.weex.common.OnWXScrollListener; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.AppearanceHelper; +import org.apache.weex.ui.component.Scrollable; +import org.apache.weex.ui.component.WXBaseRefresh; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponentProp; +import org.apache.weex.ui.component.WXHeader; +import org.apache.weex.ui.component.WXLoading; +import org.apache.weex.ui.component.WXRefresh; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.component.helper.ScrollStartEndHelper; +import org.apache.weex.ui.component.helper.WXStickyHelper; +import org.apache.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.ui.view.listview.adapter.IOnLoadMoreListener; +import org.apache.weex.ui.view.listview.adapter.IRecyclerAdapterListener; +import org.apache.weex.ui.view.listview.adapter.ListBaseViewHolder; +import org.apache.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; +import org.apache.weex.ui.view.listview.adapter.WXRecyclerViewOnScrollListener; +import org.apache.weex.ui.view.refresh.wrapper.BounceRecyclerView; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayDeque; import java.util.ArrayList; @@ -88,7 +88,8 @@ * Created by sospartan on 13/12/2016. */ -public abstract class BasicListComponent extends WXVContainer implements +public abstract class BasicListComponent extends + WXVContainer implements IRecyclerAdapterListener, IOnLoadMoreListener, Scrollable { public static final String TRANSFORM = "transform"; public static final String LOADMOREOFFSET = "loadmoreoffset"; @@ -170,7 +171,8 @@ interface DragTriggerType { private long keepPositionLayoutDelay = 150; - public BasicListComponent(WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { + public BasicListComponent( + WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { super(instance, parent, basicComponentData); stickyHelper = new WXStickyHelper(this); } @@ -803,7 +805,7 @@ private void relocateAppearanceHelper() { /** * RecyclerView manage its children in a way that different from {@link WXVContainer}. Therefore, * {@link WXVContainer#addSubView(View, int)} is an empty implementation in {@link - * com.taobao.weex.ui.view.listview.WXRecyclerView} + * WXRecyclerView} */ @Override public void addSubView(View child, int index) { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/DefaultDragHelper.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/DefaultDragHelper.java index 50c4bb714a..944e91c6e1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/DefaultDragHelper.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXLogUtils; import java.util.Collections; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DragHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/DragHelper.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/DragHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/DragHelper.java index ea66feb79f..21ef91c2e7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DragHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/DragHelper.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponent; /** * Description: diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DragSupportCallback.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/DragSupportCallback.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/DragSupportCallback.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/DragSupportCallback.java index 9b82517983..bed03f3044 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DragSupportCallback.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/DragSupportCallback.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.support.annotation.NonNull; import android.support.v7.widget.GridLayoutManager; @@ -24,8 +24,8 @@ import android.support.v7.widget.StaggeredGridLayoutManager; import android.support.v7.widget.helper.ItemTouchHelper; -import com.taobao.weex.ui.view.listview.adapter.ListBaseViewHolder; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.ui.view.listview.adapter.ListBaseViewHolder; +import org.apache.weex.utils.WXLogUtils; /** * Description: diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/EventTrigger.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/EventTrigger.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/EventTrigger.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/EventTrigger.java index 26c9e5c9f2..9cf2c370f3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/EventTrigger.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/EventTrigger.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/GapItemDecoration.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/GapItemDecoration.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/GapItemDecoration.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/GapItemDecoration.java index 96d177045e..0f58a25c16 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/GapItemDecoration.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/GapItemDecoration.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.graphics.Rect; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.View; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.utils.WXViewUtils; /** * Created by furture on 2018/2/12. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/HorizontalListComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/HorizontalListComponent.java similarity index 82% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/HorizontalListComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/HorizontalListComponent.java index aebde71113..1473b8d690 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/HorizontalListComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/HorizontalListComponent.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXVContainer; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXVContainer; /** * Created by sospartan on 6/2/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/ListComponentView.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/ListComponentView.java index d29aeec904..0b6fdd7f37 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/ListComponentView.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; -import com.taobao.weex.ui.view.listview.WXRecyclerView; -import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; +import org.apache.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; /** * Created by sospartan on 13/12/2016. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/RecyclerTransform.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/RecyclerTransform.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/RecyclerTransform.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/RecyclerTransform.java index 15beedef22..61177415c0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/RecyclerTransform.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/RecyclerTransform.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.support.v7.widget.RecyclerView; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.view.listview.adapter.TransformItemDecoration; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.view.listview.adapter.TransformItemDecoration; +import org.apache.weex.utils.WXLogUtils; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/SimpleListComponent.java similarity index 79% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/SimpleListComponent.java index 288abe08e2..4f3b3d851b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleListComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/SimpleListComponent.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.content.Context; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.view.listview.WXRecyclerView; /** * A simple list component based on regular recyclerview, do not support refreshing and loading. @@ -32,7 +32,8 @@ */ public class SimpleListComponent extends BasicListComponent{ - public SimpleListComponent(WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { + public SimpleListComponent( + WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { super(instance, parent, basicComponentData); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/SimpleRecyclerView.java similarity index 85% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/SimpleRecyclerView.java index 269e804338..f6ea5ccb89 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/SimpleRecyclerView.java @@ -16,18 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.content.Context; -import android.view.View; -import android.view.ViewGroup; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.view.listview.WXRecyclerView; -import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; - -import java.util.Stack; +import org.apache.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; /** * Simple list is used for specific occasion, NOT Support sticky,load more,bounce etc. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/StickyHeaderHelper.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/StickyHeaderHelper.java index 5a12e2e5d9..8b0efd92a5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/StickyHeaderHelper.java @@ -16,21 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.view.View; import android.view.ViewGroup; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.common.WXThread; +import org.apache.weex.utils.WXLogUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; /** * Created by sospartan on 17/03/2017. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/WXCell.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/WXCell.java index 168754597d..4efee98880 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/WXCell.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.content.Context; import android.os.Build; @@ -27,28 +27,26 @@ import android.view.ViewGroup; import android.widget.FrameLayout; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXHeader; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.flat.WidgetContainer; -import com.taobao.weex.ui.view.WXFrameLayout; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; -import org.w3c.dom.Text; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXHeader; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.flat.WidgetContainer; +import org.apache.weex.ui.view.WXFrameLayout; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; +import org.apache.weex.common.Constants.Name; import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; -import static com.taobao.weex.common.Constants.Name.STICKY_OFFSET; - /** * Root component for components in {@link WXListComponent} */ @@ -230,10 +228,10 @@ public boolean intendToBeFlatContainer() { } public int getStickyOffset(){ - if(getAttrs().get(STICKY_OFFSET) == null){ + if(getAttrs().get(Name.STICKY_OFFSET) == null){ return 0; } - float offset = WXUtils.getFloat(getAttrs().get(STICKY_OFFSET)); + float offset = WXUtils.getFloat(getAttrs().get(Name.STICKY_OFFSET)); return (int)(WXViewUtils.getRealPxByWidth(offset, getViewPortWidth())); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/WXListComponent.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/WXListComponent.java index 95364e1edb..542d7ad10c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/WXListComponent.java @@ -16,35 +16,33 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; - -import static com.taobao.weex.ui.view.listview.WXRecyclerView.TYPE_LINEAR_LAYOUT; +package org.apache.weex.ui.component.list; import android.content.Context; import android.support.v4.util.ArrayMap; import android.support.v7.widget.PagerSnapHelper; import android.text.TextUtils; import com.alibaba.fastjson.JSON; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXBaseRefresh; -import com.taobao.weex.ui.component.WXBasicComponentType; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXComponentProp; -import com.taobao.weex.ui.component.WXLoading; -import com.taobao.weex.ui.component.WXRefresh; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.view.listview.WXRecyclerView; -import com.taobao.weex.ui.view.listview.adapter.ListBaseViewHolder; -import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXThread; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXBaseRefresh; +import org.apache.weex.ui.component.WXBasicComponentType; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponentProp; +import org.apache.weex.ui.component.WXLoading; +import org.apache.weex.ui.component.WXRefresh; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.ui.view.listview.adapter.ListBaseViewHolder; +import org.apache.weex.ui.view.refresh.wrapper.BounceRecyclerView; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.List; @@ -172,7 +170,7 @@ public void run() { private void updateRecyclerAttr() { mColumnCount = WXUtils.parseInt(getAttrs().get(Constants.Name.COLUMN_COUNT)); - if (mColumnCount <= 0 && mLayoutType != TYPE_LINEAR_LAYOUT) { + if (mColumnCount <= 0 && mLayoutType != WXRecyclerView.TYPE_LINEAR_LAYOUT) { Map ext = new ArrayMap<>(); ext.put("componentType", getComponentType()); ext.put("attribute", getAttrs().toString()); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXPagerSnapHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/WXPagerSnapHelper.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXPagerSnapHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/WXPagerSnapHelper.java index 633ac0c6ef..7419aaf2fb 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXPagerSnapHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/WXPagerSnapHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list; +package org.apache.weex.ui.component.list; import android.support.annotation.NonNull; import android.support.annotation.Nullable; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/AsyncCellLoadTask.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/AsyncCellLoadTask.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/AsyncCellLoadTask.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/AsyncCellLoadTask.java index d186c81290..098405df99 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/AsyncCellLoadTask.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/AsyncCellLoadTask.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import android.os.AsyncTask; import android.os.Looper; import android.os.MessageQueue; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.utils.WXLogUtils; import java.util.Iterator; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellDataManager.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellDataManager.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellDataManager.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellDataManager.java index 5b75346f1e..1abfd213b3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellDataManager.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellDataManager.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import android.support.v4.util.ArrayMap; import android.text.TextUtils; import com.alibaba.fastjson.JSONArray; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.utils.WXUtils; import java.util.Collection; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellRenderContext.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellRenderContext.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellRenderContext.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellRenderContext.java index 36fea10d7d..9e1c1ca77d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellRenderContext.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellRenderContext.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; -import com.taobao.weex.el.parse.ArrayStack; +import org.apache.weex.el.parse.ArrayStack; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellRenderState.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellRenderState.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellRenderState.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellRenderState.java index 2f71a81c8b..1fc0593747 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/CellRenderState.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/CellRenderState.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import android.support.v7.widget.RecyclerView; -import com.taobao.weex.el.parse.ArrayStack; +import org.apache.weex.el.parse.ArrayStack; import java.util.HashMap; import java.util.Map; @@ -69,7 +69,7 @@ public class CellRenderState { /** * mark once statements has rendered * */ - private Map onceComponentStates; + private Map onceComponentStates; public Map getVirtualComponentIds() { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/PositionRef.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/PositionRef.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/PositionRef.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/PositionRef.java index d1763025b8..3af1e37818 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/PositionRef.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/PositionRef.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import com.alibaba.fastjson.JSONAware; -import com.alibaba.fastjson.annotation.JSONType; /** * position render state, when render state change, position changed diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/Selector.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/Selector.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/Selector.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/Selector.java index 3765c811eb..4564c96b7d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/Selector.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/Selector.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import android.text.TextUtils; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.component.list.WXCell; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.component.list.WXCell; import java.util.List; @@ -81,7 +80,7 @@ private static void closestByAttrs(WXComponent component, String key, String val if(matchAttrs(component, key, value)){ componentList.add(component); } - if(component instanceof WXCell || component instanceof WXRecyclerTemplateList){ + if(component instanceof WXCell || component instanceof WXRecyclerTemplateList){ return; } queryElementAllByAttrs(component.getParent(), key, value, componentList); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateCache.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateCache.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateCache.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateCache.java index 4ae98c3fec..1021ea790d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateCache.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateCache.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; -import com.taobao.weex.ui.component.list.WXCell; +import org.apache.weex.ui.component.list.WXCell; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateDom.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateDom.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateDom.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateDom.java index 78f7d90a5b..3ab9d3311a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateDom.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateDom.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import android.support.v4.view.ViewCompat; import android.view.View; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.WXSDKManager; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.view.listview.WXRecyclerView; import java.util.ArrayList; import java.util.HashMap; @@ -63,7 +63,8 @@ public static WXComponent findVirtualComponentByVRef(String pageId, String virtu String[] segments = virtualRef.split(SEPARATOR + ""); String listRef = segments[0]; // list ref - WXComponent component = WXSDKManager.getInstance().getWXRenderManager().getWXComponent(pageId, listRef); + WXComponent component = WXSDKManager + .getInstance().getWXRenderManager().getWXComponent(pageId, listRef); if(!(component instanceof WXRecyclerTemplateList)){ return null; } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateStickyHelper.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateStickyHelper.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateStickyHelper.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateStickyHelper.java index ffc6b07d49..e0630f5a86 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateStickyHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateStickyHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import android.support.v4.util.ArrayMap; import android.support.v7.widget.LinearLayoutManager; @@ -26,8 +26,8 @@ import android.view.ViewGroup; import android.widget.FrameLayout; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.view.refresh.wrapper.BounceRecyclerView; import java.util.ArrayList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateViewHolder.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateViewHolder.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateViewHolder.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateViewHolder.java index c0d4fb0253..0742a80086 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/TemplateViewHolder.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/TemplateViewHolder.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; import android.os.AsyncTask; import android.view.View; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.view.listview.adapter.ListBaseViewHolder; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.view.listview.adapter.ListBaseViewHolder; /** * Created by furture on 2017/8/17. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/VirtualComponentLifecycle.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/VirtualComponentLifecycle.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/VirtualComponentLifecycle.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/VirtualComponentLifecycle.java index 5466621ccc..30fbfcf200 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/VirtualComponentLifecycle.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/VirtualComponentLifecycle.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; +package org.apache.weex.ui.component.list.template; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/WXRecyclerTemplateList.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/WXRecyclerTemplateList.java index 33f6de630a..4cd5311431 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/WXRecyclerTemplateList.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/WXRecyclerTemplateList.java @@ -16,10 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template; - -import static com.taobao.weex.common.Constants.Name.LOADMOREOFFSET; -import static com.taobao.weex.ui.view.listview.WXRecyclerView.TYPE_LINEAR_LAYOUT; +package org.apache.weex.ui.component.list.template; import android.annotation.TargetApi; import android.content.Context; @@ -42,44 +39,44 @@ import android.widget.LinearLayout; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.annotation.Component; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.ICheckBindingScroller; -import com.taobao.weex.common.OnWXScrollListener; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.el.parse.ArrayStack; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.AppearanceHelper; -import com.taobao.weex.ui.component.Scrollable; -import com.taobao.weex.ui.component.WXBaseRefresh; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXComponentProp; -import com.taobao.weex.ui.component.WXLoading; -import com.taobao.weex.ui.component.WXRefresh; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.component.binding.Layouts; -import com.taobao.weex.ui.component.binding.Statements; -import com.taobao.weex.ui.component.helper.ScrollStartEndHelper; -import com.taobao.weex.ui.component.list.RecyclerTransform; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.view.listview.WXRecyclerView; -import com.taobao.weex.ui.view.listview.adapter.IOnLoadMoreListener; -import com.taobao.weex.ui.view.listview.adapter.IRecyclerAdapterListener; -import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; -import com.taobao.weex.ui.view.listview.adapter.WXRecyclerViewOnScrollListener; -import com.taobao.weex.ui.view.refresh.wrapper.BounceRecyclerView; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.annotation.Component; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.common.Constants; +import org.apache.weex.common.ICheckBindingScroller; +import org.apache.weex.common.OnWXScrollListener; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXThread; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.el.parse.ArrayStack; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.AppearanceHelper; +import org.apache.weex.ui.component.Scrollable; +import org.apache.weex.ui.component.WXBaseRefresh; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponentProp; +import org.apache.weex.ui.component.WXLoading; +import org.apache.weex.ui.component.WXRefresh; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.component.binding.Layouts; +import org.apache.weex.ui.component.binding.Statements; +import org.apache.weex.ui.component.helper.ScrollStartEndHelper; +import org.apache.weex.ui.component.list.RecyclerTransform; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.ui.view.listview.adapter.IOnLoadMoreListener; +import org.apache.weex.ui.view.listview.adapter.IRecyclerAdapterListener; +import org.apache.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; +import org.apache.weex.ui.view.listview.adapter.WXRecyclerViewOnScrollListener; +import org.apache.weex.ui.view.refresh.wrapper.BounceRecyclerView; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -88,6 +85,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.apache.weex.common.Constants.Name; /** * weex template list supported, high performance recycler-list @@ -96,7 +94,7 @@ */ @Component(lazyload = false) public class WXRecyclerTemplateList extends WXVContainer implements - IRecyclerAdapterListener, IOnLoadMoreListener, Scrollable { + IRecyclerAdapterListener, IOnLoadMoreListener, Scrollable { /** * trace log for template list @@ -112,7 +110,7 @@ public class WXRecyclerTemplateList extends WXVContainer imp // TODO // private WXRecyclerDomObject mDomObject; - protected int mLayoutType = TYPE_LINEAR_LAYOUT; + protected int mLayoutType = WXRecyclerView.TYPE_LINEAR_LAYOUT; protected int mColumnCount = 1; protected float mColumnGap = 0; protected float mColumnWidth = 0; @@ -198,7 +196,8 @@ public class WXRecyclerTemplateList extends WXVContainer imp * */ private boolean hasLayoutDone = false; - public WXRecyclerTemplateList(WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { + public WXRecyclerTemplateList( + WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) { super(instance, parent, basicComponentData); initRecyclerTemplateList(instance, basicComponentData, parent); } @@ -255,7 +254,8 @@ protected BounceRecyclerView initComponentHostView(@NonNull Context context) { WXAttr attrs = getAttrs(); String transforms = (String) attrs.get(Constants.Name.TRANSFORM); if (transforms != null) { - bounceRecyclerView.getInnerView().addItemDecoration(RecyclerTransform.parseTransforms(getOrientation(), transforms)); + bounceRecyclerView.getInnerView().addItemDecoration( + RecyclerTransform.parseTransforms(getOrientation(), transforms)); } mItemAnimator = bounceRecyclerView.getInnerView().getItemAnimator(); @@ -835,7 +835,7 @@ protected void setHostLayoutParams(BounceRecyclerView host, int width, int heigh /** * RecyclerView manage its children in a way that different from {@link WXVContainer}. Therefore, * {@link WXVContainer#addSubView(View, int)} is an empty implementation in {@link - * com.taobao.weex.ui.view.listview.WXRecyclerView} + * WXRecyclerView} */ @Override public void addSubView(View child, int index) { @@ -893,7 +893,7 @@ protected boolean setProperty(String key, Object param) { case Constants.Name.Recycler.SLOT_TEMPLATE_CASE: listDataTemplateKey = WXUtils.getString(param, Constants.Name.Recycler.SLOT_TEMPLATE_CASE); return true; - case LOADMOREOFFSET: + case Name.LOADMOREOFFSET: return true; case Constants.Name.SCROLLABLE: boolean scrollable = WXUtils.getBoolean(param, true); @@ -932,7 +932,7 @@ public void setOffsetAccuracy(int accuracy) { private void updateRecyclerAttr(){ mLayoutType = getAttrs().getLayoutType(); mColumnCount = getAttrs().getColumnCount(); - if (mColumnCount <= 0 && mLayoutType != TYPE_LINEAR_LAYOUT) { + if (mColumnCount <= 0 && mLayoutType != WXRecyclerView.TYPE_LINEAR_LAYOUT) { Map ext = new ArrayMap<>(); ext.put("componentType", getComponentType()); ext.put("attribute", getAttrs().toString()); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/jni/NativeRenderLayoutDirection.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/jni/NativeRenderLayoutDirection.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/jni/NativeRenderLayoutDirection.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/jni/NativeRenderLayoutDirection.java index 443dcf6db7..1fdde016ae 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/jni/NativeRenderLayoutDirection.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/jni/NativeRenderLayoutDirection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template.jni; +package org.apache.weex.ui.component.list.template.jni; public class NativeRenderLayoutDirection { public static final int inherit = 0; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/jni/NativeRenderObjectUtils.java b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/jni/NativeRenderObjectUtils.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/jni/NativeRenderObjectUtils.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/list/template/jni/NativeRenderObjectUtils.java index 12f125a44e..6031a9faa3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/template/jni/NativeRenderObjectUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/list/template/jni/NativeRenderObjectUtils.java @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.list.template.jni; +package org.apache.weex.ui.component.list.template.jni; -import android.util.Log; - -import com.taobao.weex.base.CalledByNative; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.base.CalledByNative; +import org.apache.weex.ui.component.WXComponent; /** * Created by furture on 2018/5/3. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/OnActivePseudoListner.java b/android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/OnActivePseudoListner.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/OnActivePseudoListner.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/OnActivePseudoListner.java index 961e3b8b03..8585fe604c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/OnActivePseudoListner.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/OnActivePseudoListner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.pesudo; +package org.apache.weex.ui.component.pesudo; /** * Created by sospartan on 05/01/2017. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/PesudoStatus.java b/android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/PesudoStatus.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/PesudoStatus.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/PesudoStatus.java index 04e5fee4bd..0a9af49596 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/PesudoStatus.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/PesudoStatus.java @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.pesudo; +package org.apache.weex.ui.component.pesudo; import android.support.annotation.Nullable; import android.support.v4.util.ArrayMap; -import com.taobao.weex.common.Constants; +import org.apache.weex.common.Constants; import java.util.Map; +import org.apache.weex.common.Constants.PSEUDO; /** * Created by sospartan on 05/01/2017. @@ -32,7 +33,7 @@ public class PesudoStatus { /** - * See {@link Constants.PSEUDO} + * See {@link PSEUDO} */ private int[] mStatuses = new int[4]; @@ -52,7 +53,7 @@ public PesudoStatus(){ /** * - * @param clzName See {@link Constants.PSEUDO} + * @param clzName See {@link PSEUDO} * @param status */ public void setStatus(String clzName,boolean status){ diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/TouchActivePseudoListener.java b/android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/TouchActivePseudoListener.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/TouchActivePseudoListener.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/TouchActivePseudoListener.java index 1834675069..eb92540a05 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/TouchActivePseudoListener.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/pesudo/TouchActivePseudoListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.pesudo; +package org.apache.weex.ui.component.pesudo; import android.annotation.SuppressLint; import android.view.MotionEvent; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichText.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/WXRichText.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichText.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/WXRichText.java index 06357a6484..0e8180a191 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichText.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/WXRichText.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext; +package org.apache.weex.ui.component.richtext; import android.content.Context; @@ -27,15 +27,15 @@ import android.text.SpannedString; import android.text.TextUtils; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.layout.measurefunc.TextContentBoxMeasurement; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXText; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.component.richtext.node.RichTextNode; -import com.taobao.weex.ui.component.richtext.node.RichTextNodeManager; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.layout.measurefunc.TextContentBoxMeasurement; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXText; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.component.richtext.node.RichTextNode; +import org.apache.weex.ui.component.richtext.node.RichTextNodeManager; import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichTextView.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/WXRichTextView.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichTextView.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/WXRichTextView.java index 4605201c6b..7ca9e8bd6b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichTextView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/WXRichTextView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext; +package org.apache.weex.ui.component.richtext; import android.annotation.SuppressLint; import android.content.Context; @@ -29,8 +29,8 @@ import android.view.MotionEvent; import android.widget.TextView; -import com.taobao.weex.ui.component.richtext.span.ImgSpan; -import com.taobao.weex.ui.view.WXTextView; +import org.apache.weex.ui.component.richtext.span.ImgSpan; +import org.apache.weex.ui.view.WXTextView; public class WXRichTextView extends WXTextView { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/ANode.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/ANode.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/ANode.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/ANode.java index b6571882b3..5ecd963902 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/ANode.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/ANode.java @@ -16,16 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.node; +package org.apache.weex.ui.component.richtext.node; import android.content.Context; -import android.support.v4.util.ArrayMap; import android.text.SpannableStringBuilder; -import com.taobao.weex.ui.component.richtext.span.ASpan; -import com.taobao.weex.ui.component.richtext.span.ItemClickSpan; +import org.apache.weex.ui.component.richtext.span.ASpan; +import org.apache.weex.ui.component.richtext.span.ItemClickSpan; -import java.util.ArrayList; import java.util.Map; class ANode extends RichTextNode { @@ -67,8 +65,9 @@ protected boolean isInternalNode() { @Override protected void updateSpans(SpannableStringBuilder spannableStringBuilder, int level) { super.updateSpans(spannableStringBuilder, level); - if (attr != null && attr.containsKey(RichTextNode.PSEUDO_REF)) { - ItemClickSpan itemClickSpan = new ItemClickSpan(mInstanceId, mComponentRef, attr.get(RichTextNode.PSEUDO_REF).toString()); + if (attr != null && attr.containsKey(PSEUDO_REF)) { + ItemClickSpan itemClickSpan = new ItemClickSpan(mInstanceId, mComponentRef, attr.get( + PSEUDO_REF).toString()); spannableStringBuilder.setSpan(itemClickSpan, 0, spannableStringBuilder.length(), createSpanFlag(level)); } else if (attr != null && attr.containsKey(HREF)) { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/ImgNode.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/ImgNode.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/ImgNode.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/ImgNode.java index 69f66ee3a6..c8362976d9 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/ImgNode.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/ImgNode.java @@ -16,28 +16,26 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.node; +package org.apache.weex.ui.component.richtext.node; -import static com.taobao.weex.utils.WXViewUtils.getRealPxByWidth; +import static org.apache.weex.utils.WXViewUtils.getRealPxByWidth; import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; import android.support.annotation.NonNull; -import android.support.v4.util.ArrayMap; import android.text.SpannableStringBuilder; -import com.taobao.weex.WXSDKEngine; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.DrawableStrategy; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.component.richtext.span.ImgSpan; -import com.taobao.weex.ui.component.richtext.span.ItemClickSpan; -import com.taobao.weex.utils.ImgURIUtil; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.WXSDKEngine; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.DrawableStrategy; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.component.richtext.span.ImgSpan; +import org.apache.weex.ui.component.richtext.span.ItemClickSpan; +import org.apache.weex.utils.ImgURIUtil; +import org.apache.weex.utils.WXUtils; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -87,9 +85,9 @@ protected void updateSpans(SpannableStringBuilder spannableStringBuilder, int le List spans = new LinkedList<>(); spans.add(createImgSpan(instance)); - if (attr.containsKey(RichTextNode.PSEUDO_REF)) { + if (attr.containsKey(PSEUDO_REF)) { spans.add(new ItemClickSpan(mInstanceId, mComponentRef, - attr.get(RichTextNode.PSEUDO_REF).toString())); + attr.get(PSEUDO_REF).toString())); } for (Object span : spans) { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNode.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNode.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNode.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNode.java index 036940b51a..d0a6e606ca 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNode.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNode.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.node; +package org.apache.weex.ui.component.richtext.node; -import static com.taobao.weex.dom.WXStyle.UNSET; +import static org.apache.weex.dom.WXStyle.UNSET; import android.content.Context; import android.graphics.Color; @@ -36,13 +36,13 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.WXCustomStyleSpan; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXResourceUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.WXCustomStyleSpan; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXResourceUtils; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNodeCreator.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNodeCreator.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNodeCreator.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNodeCreator.java index faaf6ca646..a1d3313757 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNodeCreator.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNodeCreator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.node; +package org.apache.weex.ui.component.richtext.node; import android.content.Context; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNodeManager.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNodeManager.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNodeManager.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNodeManager.java index d47cabc13a..24c69f96af 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/RichTextNodeManager.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/RichTextNodeManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.node; +package org.apache.weex.ui.component.richtext.node; import android.content.Context; import android.support.annotation.NonNull; @@ -24,7 +24,7 @@ import android.support.v4.util.ArrayMap; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/SpanNode.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/SpanNode.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/SpanNode.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/SpanNode.java index dc48c1e0cc..6f0d499858 100755 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/node/SpanNode.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/node/SpanNode.java @@ -16,17 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.node; +package org.apache.weex.ui.component.richtext.node; import android.content.Context; -import android.support.v4.util.ArrayMap; import android.text.SpannableStringBuilder; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.TextDecorationSpan; -import com.taobao.weex.dom.WXStyle; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.TextDecorationSpan; +import org.apache.weex.dom.WXStyle; -import java.util.ArrayList; import java.util.Map; class SpanNode extends RichTextNode { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ASpan.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ASpan.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ASpan.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ASpan.java index 8f5dd72689..2a4e7b4f44 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ASpan.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ASpan.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.span; +package org.apache.weex.ui.component.richtext.span; import android.text.TextPaint; import android.text.style.ClickableSpan; import android.view.View; -import com.taobao.weex.utils.ATagUtil; +import org.apache.weex.utils.ATagUtil; public class ASpan extends ClickableSpan { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ImgSpan.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ImgSpan.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ImgSpan.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ImgSpan.java index f3bdc3c497..d27b20240e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ImgSpan.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ImgSpan.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.span; +package org.apache.weex.ui.component.richtext.span; import android.graphics.Canvas; import android.graphics.Paint; @@ -24,10 +24,10 @@ import android.text.style.ReplacementSpan; import android.view.View; -import com.taobao.weex.adapter.IDrawableLoader; +import org.apache.weex.adapter.IDrawableLoader.StaticTarget; -public class ImgSpan extends ReplacementSpan implements IDrawableLoader.StaticTarget { +public class ImgSpan extends ReplacementSpan implements StaticTarget { private int width, height; private Drawable mDrawable; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ItemClickSpan.java b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ItemClickSpan.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ItemClickSpan.java rename to android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ItemClickSpan.java index c7146da3a1..6e6286cf3f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/span/ItemClickSpan.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/component/richtext/span/ItemClickSpan.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.component.richtext.span; +package org.apache.weex.ui.component.richtext.span; import android.text.style.ClickableSpan; import android.view.View; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.ui.component.richtext.node.RichTextNode; -import com.taobao.weex.utils.WXDataStructureUtil; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.ui.component.richtext.node.RichTextNode; +import org.apache.weex.utils.WXDataStructureUtil; import java.util.Map; public class ItemClickSpan extends ClickableSpan { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java b/android/sdk/src/main/java/org/apache/weex/ui/config/AutoScanConfigRegister.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java rename to android/sdk/src/main/java/org/apache/weex/ui/config/AutoScanConfigRegister.java index a6cbae0087..26477d0a20 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/config/AutoScanConfigRegister.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/config/AutoScanConfigRegister.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.config; +package org.apache.weex.ui.config; import android.content.res.AssetManager; import android.text.TextUtils; @@ -24,15 +24,13 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKEngine; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.JavascriptInvokable; -import com.taobao.weex.utils.WXFileUtils; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKEngine; +import org.apache.weex.WXSDKManager; +import org.apache.weex.utils.WXFileUtils; +import org.apache.weex.utils.WXLogUtils; import java.io.IOException; -import java.util.concurrent.ConcurrentLinkedQueue; /** * Created by furture on 2018/2/7. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/config/ConfigComponentHolder.java b/android/sdk/src/main/java/org/apache/weex/ui/config/ConfigComponentHolder.java similarity index 87% rename from android/sdk/src/main/java/com/taobao/weex/ui/config/ConfigComponentHolder.java rename to android/sdk/src/main/java/org/apache/weex/ui/config/ConfigComponentHolder.java index 7a9948dac2..16759ebfc2 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/config/ConfigComponentHolder.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/config/ConfigComponentHolder.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.config; +package org.apache.weex.ui.config; import android.text.TextUtils; import android.util.Pair; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.bridge.Invoker; -import com.taobao.weex.ui.ComponentCreator; -import com.taobao.weex.ui.IFComponentHolder; -import com.taobao.weex.ui.SimpleComponentHolder; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.bridge.Invoker; +import org.apache.weex.ui.ComponentCreator; +import org.apache.weex.ui.IFComponentHolder; +import org.apache.weex.ui.SimpleComponentHolder; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.utils.WXLogUtils; import java.lang.reflect.InvocationTargetException; import java.util.Map; @@ -83,7 +83,8 @@ private synchronized boolean generate(){ @Override public synchronized WXComponent createInstance(WXSDKInstance instance, WXVContainer parent, BasicComponentData basicComponentData) throws IllegalAccessException, InvocationTargetException, InstantiationException { if(mClass == null || mClassLoader != instance.getContext().getClassLoader()){ - mClass = WXSDKManager.getInstance().getClassLoaderAdapter().getComponentClass(mType, mClassName, instance); + mClass = WXSDKManager + .getInstance().getClassLoaderAdapter().getComponentClass(mType, mClassName, instance); mClassLoader = instance.getContext().getClassLoader(); } ComponentCreator creator = new SimpleComponentHolder.ClazzComponentCreator(mClass); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/config/ConfigModuleFactory.java b/android/sdk/src/main/java/org/apache/weex/ui/config/ConfigModuleFactory.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/ui/config/ConfigModuleFactory.java rename to android/sdk/src/main/java/org/apache/weex/ui/config/ConfigModuleFactory.java index 4b8f973cf5..c3973ee41e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/config/ConfigModuleFactory.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/config/ConfigModuleFactory.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.config; +package org.apache.weex.ui.config; import android.text.TextUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.Invoker; -import com.taobao.weex.bridge.MethodInvoker; -import com.taobao.weex.bridge.ModuleFactory; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.common.WXModuleAnno; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.Invoker; +import org.apache.weex.bridge.MethodInvoker; +import org.apache.weex.bridge.ModuleFactory; +import org.apache.weex.common.WXModule; +import org.apache.weex.common.WXModuleAnno; +import org.apache.weex.utils.WXLogUtils; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -79,7 +79,9 @@ public Invoker getMethodInvoker(String name) { @Override public T buildInstance() throws IllegalAccessException, InstantiationException { if(mClazz == null){ - mClazz = (Class) WXSDKManager.getInstance().getClassLoaderAdapter().getModuleClass(mName, mClassName, WXEnvironment.getApplication().getApplicationContext()); + mClazz = (Class) WXSDKManager + .getInstance().getClassLoaderAdapter().getModuleClass(mName, mClassName, WXEnvironment + .getApplication().getApplicationContext()); } return mClazz.newInstance(); } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/FlatComponent.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatComponent.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/FlatComponent.java index 823da47594..f18b149074 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatComponent.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/FlatComponent.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat; +package org.apache.weex.ui.flat; import android.support.annotation.NonNull; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; -import com.taobao.weex.ui.flat.widget.Widget; +import org.apache.weex.ui.flat.widget.Widget; @RestrictTo(Scope.LIBRARY) public interface FlatComponent { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/FlatGUIContext.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/FlatGUIContext.java index 16f1d62666..9bb3ddaa86 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/FlatGUIContext.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/FlatGUIContext.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat; +package org.apache.weex.ui.flat; import android.support.annotation.NonNull; @@ -27,13 +27,13 @@ import android.text.TextUtils; import android.view.View; -import com.taobao.weex.common.Constants.Name; -import com.taobao.weex.common.Destroyable; -import com.taobao.weex.dom.WXAttr; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.flat.widget.AndroidViewWidget; -import com.taobao.weex.ui.flat.widget.Widget; +import org.apache.weex.common.Constants.Name; +import org.apache.weex.common.Destroyable; +import org.apache.weex.dom.WXAttr; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.flat.widget.AndroidViewWidget; +import org.apache.weex.ui.flat.widget.Widget; import java.util.Map; import java.util.Map.Entry; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/WidgetContainer.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/WidgetContainer.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/WidgetContainer.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/WidgetContainer.java index 0946800bec..58b8e0dadd 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/WidgetContainer.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/WidgetContainer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat; +package org.apache.weex.ui.flat; import android.support.annotation.RestrictTo; @@ -24,12 +24,12 @@ import android.util.Pair; import android.view.ViewGroup; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.ui.action.BasicComponentData; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXVContainer; -import com.taobao.weex.ui.flat.widget.AndroidViewWidget; -import com.taobao.weex.ui.flat.widget.Widget; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.ui.action.BasicComponentData; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXVContainer; +import org.apache.weex.ui.flat.widget.AndroidViewWidget; +import org.apache.weex.ui.flat.widget.Widget; import java.util.LinkedList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/AndroidViewWidget.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/AndroidViewWidget.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/AndroidViewWidget.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/widget/AndroidViewWidget.java index ad72054348..f2682deadf 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/AndroidViewWidget.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/AndroidViewWidget.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat.widget; +package org.apache.weex.ui.flat.widget; import android.graphics.Canvas; @@ -26,8 +26,8 @@ import android.support.annotation.RestrictTo.Scope; import android.view.View; -import com.taobao.weex.common.Destroyable; -import com.taobao.weex.ui.flat.FlatGUIContext; +import org.apache.weex.common.Destroyable; +import org.apache.weex.ui.flat.FlatGUIContext; @RestrictTo(Scope.LIBRARY) public class AndroidViewWidget extends BaseWidget implements Destroyable { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/BaseWidget.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/BaseWidget.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/BaseWidget.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/widget/BaseWidget.java index 09cd14a31e..c766a5d1a4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/BaseWidget.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/BaseWidget.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat.widget; +package org.apache.weex.ui.flat.widget; import android.graphics.Canvas; @@ -28,9 +28,9 @@ import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; import android.view.View; -import com.taobao.weex.ui.flat.FlatGUIContext; -import com.taobao.weex.ui.view.border.BorderDrawable; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.ui.flat.FlatGUIContext; +import org.apache.weex.ui.view.border.BorderDrawable; +import org.apache.weex.utils.WXViewUtils; @RestrictTo(Scope.LIBRARY) abstract class BaseWidget implements Widget { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/TextWidget.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/TextWidget.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/TextWidget.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/widget/TextWidget.java index fee01b94e6..30b0faf561 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/TextWidget.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/TextWidget.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat.widget; +package org.apache.weex.ui.flat.widget; import android.graphics.Canvas; @@ -25,7 +25,7 @@ import android.support.annotation.RestrictTo.Scope; import android.text.Layout; -import com.taobao.weex.ui.flat.FlatGUIContext; +import org.apache.weex.ui.flat.FlatGUIContext; @RestrictTo(Scope.LIBRARY) public class TextWidget extends BaseWidget { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/Widget.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/Widget.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/Widget.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/widget/Widget.java index ac9eb6f802..73e3993451 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/Widget.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/Widget.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat.widget; +package org.apache.weex.ui.flat.widget; import android.graphics.Canvas; @@ -27,7 +27,7 @@ import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; -import com.taobao.weex.ui.view.border.BorderDrawable; +import org.apache.weex.ui.view.border.BorderDrawable; @RestrictTo(Scope.LIBRARY) public interface Widget { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/WidgetGroup.java b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/WidgetGroup.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/WidgetGroup.java rename to android/sdk/src/main/java/org/apache/weex/ui/flat/widget/WidgetGroup.java index 942a4b18c0..9d89e9d4d1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/flat/widget/WidgetGroup.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/flat/widget/WidgetGroup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.flat.widget; +package org.apache.weex.ui.flat.widget; import android.graphics.Canvas; @@ -24,7 +24,7 @@ import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; -import com.taobao.weex.ui.flat.FlatGUIContext; +import org.apache.weex.ui.flat.FlatGUIContext; import java.util.LinkedList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/ConsoleLogModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/ConsoleLogModule.java similarity index 88% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/ConsoleLogModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/ConsoleLogModule.java index 3db7cef35e..ff1b5949fa 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/ConsoleLogModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/ConsoleLogModule.java @@ -16,19 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; +package org.apache.weex.ui.module; import android.support.annotation.Nullable; import android.support.v4.util.ArrayMap; import android.text.TextUtils; -import android.util.Log; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.utils.LogLevel; +import org.apache.weex.WXEnvironment; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.WXModule; +import org.apache.weex.utils.LogLevel; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXDeviceInfoModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/WXDeviceInfoModule.java similarity index 84% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/WXDeviceInfoModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/WXDeviceInfoModule.java index 02392c6941..243a8cedb6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXDeviceInfoModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/WXDeviceInfoModule.java @@ -16,15 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; +package org.apache.weex.ui.module; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.common.WXModule; +import org.apache.weex.utils.WXViewUtils; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXDomModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/WXDomModule.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/WXDomModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/WXDomModule.java index 08ce0542f8..11e5a360da 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXDomModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/WXDomModule.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; +package org.apache.weex.ui.module; import android.support.annotation.RestrictTo; import android.support.annotation.RestrictTo.Scope; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.dom.binding.JSONUtils; -import com.taobao.weex.ui.action.ActionAddRule; -import com.taobao.weex.ui.action.ActionGetComponentRect; -import com.taobao.weex.ui.action.ActionGetLayoutDirection; -import com.taobao.weex.ui.action.ActionInvokeMethod; -import com.taobao.weex.ui.action.GraphicActionBatchBegin; -import com.taobao.weex.ui.action.GraphicActionBatchEnd; -import com.taobao.weex.ui.action.GraphicActionScrollToElement; -import com.taobao.weex.ui.action.UpdateComponentDataAction; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.common.WXModule; +import org.apache.weex.dom.binding.JSONUtils; +import org.apache.weex.ui.action.ActionAddRule; +import org.apache.weex.ui.action.ActionGetComponentRect; +import org.apache.weex.ui.action.ActionGetLayoutDirection; +import org.apache.weex.ui.action.ActionInvokeMethod; +import org.apache.weex.ui.action.GraphicActionBatchBegin; +import org.apache.weex.ui.action.GraphicActionBatchEnd; +import org.apache.weex.ui.action.GraphicActionScrollToElement; +import org.apache.weex.ui.action.UpdateComponentDataAction; +import org.apache.weex.utils.WXLogUtils; /** *

diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/WXLocaleModule.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/WXLocaleModule.java index 41a0c55104..63cf9c2977 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/WXLocaleModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; +package org.apache.weex.ui.module; import android.content.Context; import android.content.res.Configuration; @@ -25,10 +25,10 @@ import android.os.LocaleList; import android.text.TextUtils; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.common.WXModule; +import org.apache.weex.WXEnvironment; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.common.WXModule; import java.util.Arrays; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/WXMetaModule.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/WXMetaModule.java index 04bb8e4e15..59112294e3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/WXMetaModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; +package org.apache.weex.ui.module; import android.app.Application; import android.content.Context; @@ -26,15 +26,15 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.common.WXModule; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.net.URLDecoder; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXModalUIModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/WXModalUIModule.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/WXModalUIModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/WXModalUIModule.java index a158dcccd8..bbd0574f94 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXModalUIModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/WXModalUIModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; +package org.apache.weex.ui.module; import android.annotation.SuppressLint; import android.app.Activity; @@ -29,12 +29,12 @@ import android.widget.EditText; import android.widget.Toast; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.WXSDKEngine; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.JSCallback; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.JSCallback; +import org.apache.weex.utils.WXLogUtils; import java.util.HashMap; import java.util.Map; +import org.apache.weex.WXSDKEngine.DestroyableModule; /** @@ -42,7 +42,7 @@ * for example(weex JS): * this.$call('modal','toast',{'message':'test toast','duration': 2.0}); */ -public class WXModalUIModule extends WXSDKEngine.DestroyableModule { +public class WXModalUIModule extends DestroyableModule { public static final String OK = "OK"; public static final String CANCEL = "Cancel"; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/WXTimerModule.java similarity index 78% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/WXTimerModule.java index aacd25a34f..f0d419fd53 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXTimerModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/WXTimerModule.java @@ -16,14 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; - -import static com.taobao.weex.bridge.WXBridgeManager.KEY_ARGS; -import static com.taobao.weex.bridge.WXBridgeManager.KEY_METHOD; -import static com.taobao.weex.bridge.WXBridgeManager.METHOD_CALLBACK; -import static com.taobao.weex.bridge.WXBridgeManager.METHOD_CALL_JS; -import static com.taobao.weex.common.WXJSBridgeMsgType.MODULE_INTERVAL; -import static com.taobao.weex.common.WXJSBridgeMsgType.MODULE_TIMEOUT; +package org.apache.weex.ui.module; import android.annotation.SuppressLint; import android.os.Handler; @@ -34,27 +27,28 @@ import android.support.annotation.VisibleForTesting; import android.util.SparseArray; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.bridge.WXBridgeManager; -import com.taobao.weex.bridge.WXHashMap; -import com.taobao.weex.bridge.WXJSObject; -import com.taobao.weex.common.Destroyable; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.utils.WXJsonUtils; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.bridge.WXBridgeManager; +import org.apache.weex.bridge.WXHashMap; +import org.apache.weex.bridge.WXJSObject; +import org.apache.weex.common.Destroyable; +import org.apache.weex.common.WXModule; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.utils.WXJsonUtils; +import org.apache.weex.utils.WXLogUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.HashMap; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.common.WXJSBridgeMsgType; public class WXTimerModule extends WXModule implements Destroyable, Handler.Callback { - @IntDef({MODULE_TIMEOUT, MODULE_INTERVAL}) + @IntDef({WXJSBridgeMsgType.MODULE_TIMEOUT, WXJSBridgeMsgType.MODULE_INTERVAL}) @Retention(RetentionPolicy.SOURCE) @interface MessageType {} @@ -72,7 +66,7 @@ public WXTimerModule() { @JSMethod(uiThread = false) public void setTimeout(@IntRange(from = 1) int funcId, @FloatRange(from = 0) float delay) { if(mWXSDKInstance != null) { - postOrHoldMessage(MODULE_TIMEOUT, funcId, (int) delay, WXUtils.parseInt(mWXSDKInstance.getInstanceId())); + postOrHoldMessage(WXJSBridgeMsgType.MODULE_TIMEOUT, funcId, (int) delay, WXUtils.parseInt(mWXSDKInstance.getInstanceId())); if (null != mWXSDKInstance.getWXPerformance()){ mWXSDKInstance.getWXPerformance().timerInvokeCount++; } @@ -83,7 +77,7 @@ public void setTimeout(@IntRange(from = 1) int funcId, @FloatRange(from = 0) flo @JSMethod(uiThread = false) public void setInterval(@IntRange(from = 1) int funcId, @FloatRange(from = 0) float interval) { if(mWXSDKInstance != null) { - postOrHoldMessage(MODULE_INTERVAL, funcId, (int) interval, WXUtils.parseInt(mWXSDKInstance.getInstanceId())); + postOrHoldMessage(WXJSBridgeMsgType.MODULE_INTERVAL, funcId, (int) interval, WXUtils.parseInt(mWXSDKInstance.getInstanceId())); if (null != mWXSDKInstance.getWXPerformance()){ mWXSDKInstance.getWXPerformance().timerInvokeCount++; } @@ -96,7 +90,7 @@ public void clearTimeout(@IntRange(from = 1) int funcId) { if (funcId <= 0) { return; } - removeOrHoldMessage(MODULE_TIMEOUT, funcId); + removeOrHoldMessage(WXJSBridgeMsgType.MODULE_TIMEOUT, funcId); } @JSMethod(uiThread = false) @@ -104,7 +98,7 @@ public void clearInterval(@IntRange(from = 1) int funcId) { if (funcId <= 0) { return; } - removeOrHoldMessage(MODULE_INTERVAL, funcId); + removeOrHoldMessage(WXJSBridgeMsgType.MODULE_INTERVAL, funcId); } @Override @@ -128,23 +122,23 @@ public boolean handleMessage(Message msg) { WXLogUtils.d(TAG, "Timer Module handleMessage : " + msg.what); } switch (what) { - case MODULE_TIMEOUT: + case WXJSBridgeMsgType.MODULE_TIMEOUT: if (msg.obj == null) { break; } checkIfTimerInBack(msg.arg1); args = createTimerArgs(msg.arg1, (Integer) msg.obj, false); - WXBridgeManager.getInstance().invokeExecJS(String.valueOf(msg.arg1), null, METHOD_CALL_JS, args, true); + WXBridgeManager.getInstance().invokeExecJS(String.valueOf(msg.arg1), null, WXBridgeManager.METHOD_CALL_JS, args, true); ret = true; break; - case MODULE_INTERVAL: + case WXJSBridgeMsgType.MODULE_INTERVAL: if (msg.obj == null) { break; } checkIfTimerInBack(msg.arg1); - postMessage(MODULE_INTERVAL, (Integer) msg.obj, msg.arg2, msg.arg1); + postMessage(WXJSBridgeMsgType.MODULE_INTERVAL, (Integer) msg.obj, msg.arg2, msg.arg1); args = createTimerArgs(msg.arg1, (Integer) msg.obj, true); - WXBridgeManager.getInstance().invokeExecJS(String.valueOf(msg.arg1), null, METHOD_CALL_JS, args, true); + WXBridgeManager.getInstance().invokeExecJS(String.valueOf(msg.arg1), null, WXBridgeManager.METHOD_CALL_JS, args, true); ret = true; break; default: @@ -175,8 +169,8 @@ private WXJSObject[] createTimerArgs(int instanceId, int funcId, boolean keepAli argsList.add(new HashMap<>()); argsList.add(keepAlive); WXHashMap task = new WXHashMap<>(); - task.put(KEY_METHOD, METHOD_CALLBACK); - task.put(KEY_ARGS, argsList); + task.put(WXBridgeManager.KEY_METHOD, WXBridgeManager.METHOD_CALLBACK); + task.put(WXBridgeManager.KEY_ARGS, argsList); Object[] tasks = {task}; return new WXJSObject[]{ new WXJSObject(WXJSObject.String, String.valueOf(instanceId)), diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXWebViewModule.java b/android/sdk/src/main/java/org/apache/weex/ui/module/WXWebViewModule.java similarity index 86% rename from android/sdk/src/main/java/com/taobao/weex/ui/module/WXWebViewModule.java rename to android/sdk/src/main/java/org/apache/weex/ui/module/WXWebViewModule.java index 9878c85120..2513d36287 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXWebViewModule.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/module/WXWebViewModule.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.module; +package org.apache.weex.ui.module; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.annotation.JSMethod; -import com.taobao.weex.common.WXModule; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXWeb; +import org.apache.weex.WXSDKManager; +import org.apache.weex.annotation.JSMethod; +import org.apache.weex.common.WXModule; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXWeb; -public class WXWebViewModule extends WXModule{ +public class WXWebViewModule extends WXModule { private enum Action { reload, diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/BaseFrameLayout.java b/android/sdk/src/main/java/org/apache/weex/ui/view/BaseFrameLayout.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/BaseFrameLayout.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/BaseFrameLayout.java index e12d52edbc..8c008f7782 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/BaseFrameLayout.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/BaseFrameLayout.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; import android.widget.FrameLayout; -import com.taobao.weex.ui.flat.widget.Widget; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.ui.flat.widget.Widget; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.List; public class BaseFrameLayout extends FrameLayout{ diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/IRenderResult.java b/android/sdk/src/main/java/org/apache/weex/ui/view/IRenderResult.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/IRenderResult.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/IRenderResult.java index dab1106715..fc46fe96cb 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/IRenderResult.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/IRenderResult.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponent; public interface IRenderResult { T getComponent(); diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/IRenderStatus.java b/android/sdk/src/main/java/org/apache/weex/ui/view/IRenderStatus.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/IRenderStatus.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/IRenderStatus.java index f61b0fa88b..ae7effe604 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/IRenderStatus.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/IRenderStatus.java @@ -17,10 +17,10 @@ * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; -import com.taobao.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXComponent; public interface IRenderStatus { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/IWXScroller.java b/android/sdk/src/main/java/org/apache/weex/ui/view/IWXScroller.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/IWXScroller.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/IWXScroller.java index 942c7aa70f..a2c8314031 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/IWXScroller.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/IWXScroller.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; public interface IWXScroller { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/IWXTextView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/IWXTextView.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/IWXTextView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/IWXTextView.java index 60b2533987..da7130764d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/IWXTextView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/IWXTextView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; public interface IWXTextView { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/IWebView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/IWebView.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/IWebView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/IWebView.java index b3bc8e7924..7a0f8a86b3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/IWebView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/IWebView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.view.View; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXBaseCircleIndicator.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXBaseCircleIndicator.java index 43264bdb19..070fda4054 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseCircleIndicator.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXBaseCircleIndicator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.content.Context; @@ -30,9 +30,9 @@ import android.view.MotionEvent; import android.widget.FrameLayout; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.utils.WXViewUtils; public class WXBaseCircleIndicator extends FrameLayout implements WXGestureObservable { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseRefreshLayout.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXBaseRefreshLayout.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseRefreshLayout.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXBaseRefreshLayout.java index ff45491c11..559958169d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXBaseRefreshLayout.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXBaseRefreshLayout.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.content.Context; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleIndicator.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXCircleIndicator.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleIndicator.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXCircleIndicator.java index b3acdb77a4..4e73942bd1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleIndicator.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXCircleIndicator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.content.Context; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCirclePageAdapter.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXCirclePageAdapter.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXCirclePageAdapter.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXCirclePageAdapter.java index 1b5b219d83..83edc06d6c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCirclePageAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXCirclePageAdapter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.support.v4.view.PagerAdapter; import android.view.View; import android.view.ViewGroup; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.utils.WXLogUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXCircleViewPager.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXCircleViewPager.java index fc48fe45aa..65e8d8abb6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXCircleViewPager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -30,9 +30,9 @@ import android.view.View; import android.view.animation.Interpolator; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.utils.WXLogUtils; import java.lang.reflect.Field; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXEditText.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXEditText.java index 3607c41f48..acadf8d7f8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXEditText.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -28,8 +28,8 @@ import android.view.ViewParent; import android.widget.EditText; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; /** * Wrapper class for editText diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXFrameLayout.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXFrameLayout.java index 04b8257097..199d0a0840 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXFrameLayout.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.content.Context; import android.graphics.Canvas; import android.support.annotation.Nullable; import android.view.MotionEvent; import android.view.View; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXDiv; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.utils.WXExceptionUtils; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXDiv; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.utils.WXExceptionUtils; +import org.apache.weex.utils.WXLogUtils; import java.lang.ref.WeakReference; import java.util.HashMap; import java.util.Map; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXHorizontalScrollView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXHorizontalScrollView.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXHorizontalScrollView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXHorizontalScrollView.java index 8ae842d599..dd6771e804 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXHorizontalScrollView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXHorizontalScrollView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -25,8 +25,8 @@ import android.view.MotionEvent; import android.view.View; import android.widget.HorizontalScrollView; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXImageView.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXImageView.java index 5ef242f0b0..96b3784743 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXImageView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -29,11 +29,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import com.taobao.weex.ui.component.WXImage; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.utils.ImageDrawable; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.ui.component.WXImage; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.utils.ImageDrawable; +import org.apache.weex.utils.WXLogUtils; import java.lang.ref.WeakReference; import java.util.Arrays; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXLoadingLayout.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXLoadingLayout.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXLoadingLayout.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXLoadingLayout.java index e4b356d478..d728efd512 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXLoadingLayout.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXLoadingLayout.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.content.Context; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXRefreshLayout.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXRefreshLayout.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXRefreshLayout.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXRefreshLayout.java index 427adc5fac..78bcf75d54 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXRefreshLayout.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXRefreshLayout.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.content.Context; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXScrollView.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXScrollView.java index cc5b1c206a..8932c0205e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXScrollView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -33,13 +33,13 @@ import android.view.View; import android.widget.ScrollView; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXScroller; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXReflectionUtils; +import org.apache.weex.common.WXThread; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXScroller; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXReflectionUtils; import java.util.ArrayList; import java.util.Iterator; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSmoothScroller.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXSmoothScroller.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXSmoothScroller.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXSmoothScroller.java index 4dfed7ee00..e943ce87c2 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSmoothScroller.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXSmoothScroller.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXSwitchView.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXSwitchView.java index dd64e7a82c..f02fe6327d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXSwitchView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -24,8 +24,8 @@ import android.view.Gravity; import android.view.MotionEvent; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; public class WXSwitchView extends SwitchCompat implements WXGestureObservable { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXTextView.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXTextView.java index 73a84c9973..06073b33d9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXTextView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.ClipData; @@ -31,9 +31,9 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; -import com.taobao.weex.ui.component.WXText; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.ui.component.WXText; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; import java.lang.ref.WeakReference; /** diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXVideoView.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXVideoView.java index 6b671cb8cc..4df2d4af10 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXVideoView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -36,9 +36,9 @@ import android.widget.ProgressBar; import android.widget.VideoView; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.utils.WXResourceUtils; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.utils.WXResourceUtils; public class WXVideoView extends VideoView implements WXGestureObservable { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXWebView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/WXWebView.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/WXWebView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/WXWebView.java index 135efc92f6..bca5350a62 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXWebView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/WXWebView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view; +package org.apache.weex.ui.view; import android.annotation.SuppressLint; import android.content.Context; @@ -47,7 +47,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.lang.ref.WeakReference; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderCorner.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderCorner.java index 918d2f0d6f..a997132fd7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderCorner.java @@ -16,16 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.PointF; import android.graphics.RectF; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; -import com.taobao.weex.base.FloatUtil; +import org.apache.weex.base.FloatUtil; abstract class BorderCorner { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderDrawable.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderDrawable.java index e4c0dfba74..72b21e0b8b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderDrawable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import java.util.ArrayList; import java.util.Collections; @@ -37,23 +37,23 @@ import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; import android.util.SparseIntArray; -import com.taobao.weex.dom.CSSShorthand; -import com.taobao.weex.dom.CSSShorthand.CORNER; -import com.taobao.weex.dom.CSSShorthand.EDGE; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXViewUtils; - -import static com.taobao.weex.dom.CSSShorthand.CORNER.ALL; -import static com.taobao.weex.dom.CSSShorthand.CORNER.BORDER_BOTTOM_LEFT; -import static com.taobao.weex.dom.CSSShorthand.CORNER.BORDER_BOTTOM_RIGHT; -import static com.taobao.weex.dom.CSSShorthand.CORNER.BORDER_TOP_LEFT; -import static com.taobao.weex.dom.CSSShorthand.CORNER.BORDER_TOP_RIGHT; +import org.apache.weex.dom.CSSShorthand; +import org.apache.weex.dom.CSSShorthand.CORNER; +import org.apache.weex.dom.CSSShorthand.EDGE; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXViewUtils; +import org.apache.weex.ui.component.WXComponent; + +import static org.apache.weex.dom.CSSShorthand.CORNER.ALL; +import static org.apache.weex.dom.CSSShorthand.CORNER.BORDER_BOTTOM_LEFT; +import static org.apache.weex.dom.CSSShorthand.CORNER.BORDER_BOTTOM_RIGHT; +import static org.apache.weex.dom.CSSShorthand.CORNER.BORDER_TOP_LEFT; +import static org.apache.weex.dom.CSSShorthand.CORNER.BORDER_TOP_RIGHT; /** * A subclass of - * {@link Drawable} used for background of {@link com.taobao.weex.ui.component.WXComponent}. + * {@link Drawable} used for background of {@link WXComponent}. * It supports drawing background color and borders (including rounded borders) by providing a react * friendly API (setter for each of those properties). The implementation tries to allocate as few * objects as possible depending on which properties are set. E.g. for views with rounded diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderEdge.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderEdge.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderEdge.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderEdge.java index 76c4e95566..8d4d17e083 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderEdge.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderEdge.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.PointF; import android.support.annotation.NonNull; -import com.taobao.weex.dom.CSSShorthand; +import org.apache.weex.dom.CSSShorthand; /** * Edge for border. Every border has four edges, and each edge has a previous corner and a post diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderRadiusType.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderRadiusType.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderRadiusType.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderRadiusType.java index 930ef1445d..955991bb85 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderRadiusType.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderRadiusType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.support.annotation.IntDef; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderStyle.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderStyle.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderStyle.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderStyle.java index 91f4ad7c64..c31d060b2c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderStyle.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderStyle.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.graphics.Color; import android.graphics.LinearGradient; import android.graphics.PathEffect; import android.graphics.Shader; import android.support.annotation.Nullable; -import com.taobao.weex.dom.CSSShorthand; +import org.apache.weex.dom.CSSShorthand; enum BorderStyle { SOLID, diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderUtil.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderUtil.java index 9779dbef67..8aad832621 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BorderUtil.java @@ -17,13 +17,12 @@ * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.util.SparseArray; import android.util.SparseIntArray; -import com.taobao.weex.dom.CSSShorthand; +import org.apache.weex.dom.CSSShorthand; class BorderUtil { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BottomLeftCorner.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BottomLeftCorner.java index 40c3d14701..79d964ef84 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BottomLeftCorner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.graphics.RectF; import android.support.annotation.NonNull; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BottomRightCorner.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/BottomRightCorner.java index 82ef5484cd..0d309123ad 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/BottomRightCorner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.graphics.RectF; import android.support.annotation.NonNull; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/TopLeftCorner.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/TopLeftCorner.java index 42c9cb2a29..5d9422dbb7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/TopLeftCorner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.graphics.RectF; import android.support.annotation.NonNull; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java b/android/sdk/src/main/java/org/apache/weex/ui/view/border/TopRightCorner.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/border/TopRightCorner.java index 73a0adce26..58b8384802 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/border/TopRightCorner.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.border; +package org.apache.weex.ui.view.border; import android.graphics.RectF; import android.support.annotation.NonNull; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java b/android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGesture.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGesture.java index 6e88d67e97..4b76bea950 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGesture.java @@ -16,10 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.gesture; - -import static com.taobao.weex.common.Constants.Event.STOP_PROPAGATION; -import static com.taobao.weex.common.Constants.Event.STOP_PROPAGATION_RAX; +package org.apache.weex.ui.view.gesture; import android.annotation.SuppressLint; import android.content.Context; @@ -36,22 +33,24 @@ import android.view.ViewParent; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.taobao.weex.bridge.EventResult; -import com.taobao.weex.common.Constants; -import com.taobao.weex.dom.WXEvent; -import com.taobao.weex.ui.component.Scrollable; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.view.gesture.WXGestureType.GestureInfo; -import com.taobao.weex.ui.view.gesture.WXGestureType.HighLevelGesture; -import com.taobao.weex.ui.view.gesture.WXGestureType.LowLevelGesture; -import com.taobao.weex.utils.WXLogUtils; -import com.taobao.weex.utils.WXUtils; -import com.taobao.weex.utils.WXViewUtils; +import org.apache.weex.bridge.EventResult; +import org.apache.weex.common.Constants; +import org.apache.weex.dom.WXEvent; +import org.apache.weex.ui.component.Scrollable; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.view.gesture.WXGestureType.GestureInfo; +import org.apache.weex.ui.view.gesture.WXGestureType.HighLevelGesture; +import org.apache.weex.ui.view.gesture.WXGestureType.LowLevelGesture; +import org.apache.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXUtils; +import org.apache.weex.utils.WXViewUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.common.Constants.Event; public class WXGesture extends GestureDetector.SimpleOnGestureListener implements OnTouchListener { @@ -112,7 +111,8 @@ private boolean isParentScrollable() { } private boolean hasSameOrientationWithParent(){ - return (mParentOrientation == Constants.Orientation.HORIZONTAL && component.containsGesture(HighLevelGesture.HORIZONTALPAN)) + return (mParentOrientation == Constants.Orientation.HORIZONTAL && component.containsGesture( + HighLevelGesture.HORIZONTALPAN)) || (mParentOrientation == Constants.Orientation.VERTICAL && component.containsGesture(HighLevelGesture.VERTICALPAN)); } @@ -175,9 +175,9 @@ private boolean shouldBubbleTouchEvent(MotionEvent event){ eventMap.put("action", MOVE); } - String name = STOP_PROPAGATION; - if(!component.getEvents().contains(STOP_PROPAGATION)){ - name = STOP_PROPAGATION_RAX; + String name = Event.STOP_PROPAGATION; + if(!component.getEvents().contains(Event.STOP_PROPAGATION)){ + name = Event.STOP_PROPAGATION_RAX; } EventResult result = component.fireEventWait(name, eventMap); if(result.isSuccess() && result.getResult() != null){ @@ -327,7 +327,7 @@ private boolean handlePanMotionEvent(MotionEvent motionEvent) { /** * - * @param WXGestureType possible low-level gesture, defined in {@link com.taobao.weex.common.Constants.Event} + * @param WXGestureType possible low-level gesture, defined in {@link Event} * @param motionEvent motionEvent, which contains all pointers event in a period of time * @return true if this event is handled, otherwise false. */ @@ -344,7 +344,7 @@ private boolean handleMotionEvent(WXGestureType WXGestureType, MotionEvent motio } /** - * Create a list of event for {@link com.taobao.weex.WXSDKInstance#fireEvent(String, String, Map, Map)}. + * Create a list of event for {@link WXSDKInstance#fireEvent(String, String, Map, Map)}. * As there is a batch mechanism in MotionEvent, so this method returns a list. * @param motionEvent motionEvent, which contains all pointers event in a period of time * @return List of Map, which contains touch object. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGestureObservable.java b/android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGestureObservable.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGestureObservable.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGestureObservable.java index e56879397d..9cab4995be 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGestureObservable.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGestureObservable.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.gesture; +package org.apache.weex.ui.view.gesture; import android.support.annotation.Nullable; import android.view.MotionEvent; import android.view.View; -import com.taobao.weex.ui.view.WXFrameLayout; +import org.apache.weex.ui.view.WXFrameLayout; /** * Views that want to receive Gesture Event must implement this interface. Besides, diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGestureType.java b/android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGestureType.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGestureType.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGestureType.java index 807daac2eb..f6620fe292 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGestureType.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/gesture/WXGestureType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.gesture; +package org.apache.weex.ui.view.gesture; public interface WXGestureType { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/ExtendedLinearLayoutManager.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/ExtendedLinearLayoutManager.java index bdb5f915b0..c4dd32a936 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedLinearLayoutManager.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/ExtendedLinearLayoutManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview; +package org.apache.weex.ui.view.listview; import android.content.Context; import android.graphics.PointF; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java index ee27ab272a..a49d110e70 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/ExtendedStaggeredGridLayoutManager.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview; +package org.apache.weex.ui.view.listview; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.StaggeredGridLayoutManager; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.WXEnvironment; +import org.apache.weex.utils.WXLogUtils; /** * Created by zhengshihan on 2017/5/5. diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/WXRecyclerView.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/WXRecyclerView.java index 3f0d990b11..0bc6b96d7c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/WXRecyclerView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview; +package org.apache.weex.ui.view.listview; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -30,10 +30,10 @@ import android.support.v7.widget.StaggeredGridLayoutManager; import android.view.MotionEvent; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXThread; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; public class WXRecyclerView extends RecyclerView implements WXGestureObservable { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/IOnLoadMoreListener.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/IOnLoadMoreListener.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/IOnLoadMoreListener.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/IOnLoadMoreListener.java index e703149fe3..79632b24a2 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/IOnLoadMoreListener.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/IOnLoadMoreListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview.adapter; +package org.apache.weex.ui.view.listview.adapter; public interface IOnLoadMoreListener { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/IRecyclerAdapterListener.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/IRecyclerAdapterListener.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/IRecyclerAdapterListener.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/IRecyclerAdapterListener.java index 36094f2735..934cd5dc53 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/IRecyclerAdapterListener.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/IRecyclerAdapterListener.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview.adapter; +package org.apache.weex.ui.view.listview.adapter; import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/ListBaseViewHolder.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/ListBaseViewHolder.java index 3c332da181..ce959ae13d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/ListBaseViewHolder.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/ListBaseViewHolder.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview.adapter; +package org.apache.weex.ui.view.listview.adapter; import android.support.v7.widget.RecyclerView; import android.view.View; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.component.WXHeader; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.component.WXHeader; import java.lang.ref.WeakReference; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java index b7ba22de2a..38ce0a281b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/RecyclerViewBaseAdapter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview.adapter; +package org.apache.weex.ui.view.listview.adapter; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.StaggeredGridLayoutManager; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/TransformItemDecoration.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/TransformItemDecoration.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/TransformItemDecoration.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/TransformItemDecoration.java index 415c7d5268..2dae5c35fa 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/TransformItemDecoration.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/TransformItemDecoration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview.adapter; +package org.apache.weex.ui.view.listview.adapter; import android.graphics.Canvas; import android.support.v7.widget.RecyclerView; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java index 694c8b59d2..fd14e1b805 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/listview/adapter/WXRecyclerViewOnScrollListener.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.listview.adapter; +package org.apache.weex.ui.view.listview.adapter; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.StaggeredGridLayoutManager; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.lang.ref.WeakReference; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/circlebar/CircleProgressBar.java b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/circlebar/CircleProgressBar.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/circlebar/CircleProgressBar.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/refresh/circlebar/CircleProgressBar.java index 7780624087..cbb581f24c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/circlebar/CircleProgressBar.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/circlebar/CircleProgressBar.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.refresh.circlebar; +package org.apache.weex.ui.view.refresh.circlebar; import android.annotation.SuppressLint; import android.content.Context; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/circlebar/MaterialProgressDrawable.java b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/circlebar/MaterialProgressDrawable.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/circlebar/MaterialProgressDrawable.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/refresh/circlebar/MaterialProgressDrawable.java index 476e6c1db8..86716ba102 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/circlebar/MaterialProgressDrawable.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/circlebar/MaterialProgressDrawable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.refresh.circlebar; +package org.apache.weex.ui.view.refresh.circlebar; import android.content.Context; import android.content.res.Resources; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXRefreshView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/core/WXRefreshView.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXRefreshView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/refresh/core/WXRefreshView.java index 7c69be89b6..1edc5b7843 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXRefreshView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/core/WXRefreshView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.refresh.core; +package org.apache.weex.ui.view.refresh.core; import android.content.Context; import android.util.AttributeSet; @@ -26,8 +26,8 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.taobao.weex.common.WXThread; -import com.taobao.weex.ui.view.refresh.circlebar.CircleProgressBar; +import org.apache.weex.common.WXThread; +import org.apache.weex.ui.view.refresh.circlebar.CircleProgressBar; public class WXRefreshView extends FrameLayout { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/core/WXSwipeLayout.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/refresh/core/WXSwipeLayout.java index 91f2711cf0..67f9333256 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/core/WXSwipeLayout.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.refresh.core; +package org.apache.weex.ui.view.refresh.core; import android.animation.Animator; import android.animation.ValueAnimator; diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BaseBounceView.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BaseBounceView.java index ca8f510c8d..0e6070ab55 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BaseBounceView.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.refresh.wrapper; +package org.apache.weex.ui.view.refresh.wrapper; import android.content.Context; import android.graphics.Color; @@ -26,14 +26,14 @@ import android.view.View; import android.widget.FrameLayout; -import com.taobao.weex.common.Constants; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.view.WXLoadingLayout; -import com.taobao.weex.ui.view.WXRefreshLayout; -import com.taobao.weex.ui.view.refresh.core.WXRefreshView; -import com.taobao.weex.ui.view.refresh.core.WXSwipeLayout; -import com.taobao.weex.utils.WXResourceUtils; -import com.taobao.weex.utils.WXUtils; +import org.apache.weex.common.Constants; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.view.WXLoadingLayout; +import org.apache.weex.ui.view.WXRefreshLayout; +import org.apache.weex.ui.view.refresh.core.WXRefreshView; +import org.apache.weex.ui.view.refresh.core.WXSwipeLayout; +import org.apache.weex.utils.WXResourceUtils; +import org.apache.weex.utils.WXUtils; /** * BounceView(SwipeLayout) contains Scroller/List and refresh/loading view diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BounceRecyclerView.java similarity index 89% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BounceRecyclerView.java index 84e7ac78c2..761cfb828b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BounceRecyclerView.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.refresh.wrapper; +package org.apache.weex.ui.view.refresh.wrapper; import android.annotation.SuppressLint; import android.content.Context; import android.support.annotation.Nullable; import android.view.MotionEvent; -import com.taobao.weex.ui.component.list.ListComponentView; -import com.taobao.weex.ui.component.list.StickyHeaderHelper; -import com.taobao.weex.ui.component.list.WXCell; -import com.taobao.weex.ui.view.gesture.WXGesture; -import com.taobao.weex.ui.view.gesture.WXGestureObservable; -import com.taobao.weex.ui.view.listview.WXRecyclerView; -import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; +import org.apache.weex.ui.component.list.ListComponentView; +import org.apache.weex.ui.component.list.StickyHeaderHelper; +import org.apache.weex.ui.component.list.WXCell; +import org.apache.weex.ui.view.gesture.WXGesture; +import org.apache.weex.ui.view.gesture.WXGestureObservable; +import org.apache.weex.ui.view.listview.WXRecyclerView; +import org.apache.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter; @SuppressLint("ViewConstructor") public class BounceRecyclerView extends BaseBounceView implements ListComponentView,WXGestureObservable { diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BounceScrollerView.java similarity index 91% rename from android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java rename to android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BounceScrollerView.java index 20e224975b..7a4b6f94d1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceScrollerView.java +++ b/android/sdk/src/main/java/org/apache/weex/ui/view/refresh/wrapper/BounceScrollerView.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.ui.view.refresh.wrapper; +package org.apache.weex.ui.view.refresh.wrapper; import android.annotation.SuppressLint; import android.content.Context; -import com.taobao.weex.ui.component.WXScroller; -import com.taobao.weex.ui.view.WXScrollView; +import org.apache.weex.ui.component.WXScroller; +import org.apache.weex.ui.view.WXScrollView; @SuppressLint("ViewConstructor") public class BounceScrollerView extends BaseBounceView { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/ATagUtil.java b/android/sdk/src/main/java/org/apache/weex/utils/ATagUtil.java similarity index 90% rename from android/sdk/src/main/java/com/taobao/weex/utils/ATagUtil.java rename to android/sdk/src/main/java/org/apache/weex/utils/ATagUtil.java index cc179e37fc..c7c133d0c8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/ATagUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/ATagUtil.java @@ -17,15 +17,15 @@ * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.net.Uri; import android.view.View; import com.alibaba.fastjson.JSONArray; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.URIAdapter; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.URIAdapter; public class ATagUtil { public static void onClick(View widget, String instanceId, String url) { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java b/android/sdk/src/main/java/org/apache/weex/utils/BoxShadowUtil.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java rename to android/sdk/src/main/java/org/apache/weex/utils/BoxShadowUtil.java index 66df2c9f4a..96872c6671 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/BoxShadowUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/BoxShadowUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.content.res.Resources; import android.graphics.Bitmap; @@ -46,8 +46,8 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.common.WXThread; +import org.apache.weex.WXEnvironment; +import org.apache.weex.common.WXThread; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java b/android/sdk/src/main/java/org/apache/weex/utils/FontDO.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java rename to android/sdk/src/main/java/org/apache/weex/utils/FontDO.java index a79ade08f7..2e91459184 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/FontDO.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.graphics.Typeface; import android.net.Uri; import android.text.TextUtils; import android.util.Base64; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.adapter.URIAdapter; -import com.taobao.weex.common.Constants; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.adapter.URIAdapter; +import org.apache.weex.common.Constants; import java.io.File; public class FontDO { @@ -88,7 +88,7 @@ private void parseSrc(String src, WXSDKInstance instance) { String url = src.substring(5, src.length() - 2); Uri uri = Uri.parse(url); if( instance != null){ - uri = instance.rewriteUri(uri,URIAdapter.FONT); + uri = instance.rewriteUri(uri, URIAdapter.FONT); } mUrl = uri.toString(); try { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java b/android/sdk/src/main/java/org/apache/weex/utils/FunctionParser.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java rename to android/sdk/src/main/java/org/apache/weex/utils/FunctionParser.java index 93ace9058e..72953cdf53 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/FunctionParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.support.annotation.NonNull; @@ -28,7 +28,7 @@ /** * Parser for function like "rotate(30 ) transform(50 , 20)". * This class will translate the raw string presentation of a group of function(s) to give type - * according to the {@link com.taobao.weex.utils.FunctionParser.Mapper} + * according to the {@link FunctionParser.Mapper} */ public class FunctionParser { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/ImageDrawable.java b/android/sdk/src/main/java/org/apache/weex/utils/ImageDrawable.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/ImageDrawable.java rename to android/sdk/src/main/java/org/apache/weex/utils/ImageDrawable.java index f6f10106d7..6714a39a79 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/ImageDrawable.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/ImageDrawable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.graphics.Bitmap; import android.graphics.BitmapShader; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/ImgURIUtil.java b/android/sdk/src/main/java/org/apache/weex/utils/ImgURIUtil.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/ImgURIUtil.java rename to android/sdk/src/main/java/org/apache/weex/utils/ImgURIUtil.java index db8a5388fa..15f56d4b07 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/ImgURIUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/ImgURIUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.content.Context; import android.content.res.Resources; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/LogLevel.java b/android/sdk/src/main/java/org/apache/weex/utils/LogLevel.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/LogLevel.java rename to android/sdk/src/main/java/org/apache/weex/utils/LogLevel.java index a59082086b..9279a65bed 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/LogLevel.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/LogLevel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.util.Log; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java b/android/sdk/src/main/java/org/apache/weex/utils/OsVersion.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java rename to android/sdk/src/main/java/org/apache/weex/utils/OsVersion.java index 7c53095155..9f39f31e53 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/OsVersion.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/OsVersion.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; /** * Android OS version utilities. diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/SingleFunctionParser.java b/android/sdk/src/main/java/org/apache/weex/utils/SingleFunctionParser.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/SingleFunctionParser.java rename to android/sdk/src/main/java/org/apache/weex/utils/SingleFunctionParser.java index c67b323406..ac0f771cf3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/SingleFunctionParser.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/SingleFunctionParser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.support.annotation.NonNull; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/StaticLayoutProxy.java b/android/sdk/src/main/java/org/apache/weex/utils/StaticLayoutProxy.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/StaticLayoutProxy.java rename to android/sdk/src/main/java/org/apache/weex/utils/StaticLayoutProxy.java index ac1d660ac1..cacd2b6d37 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/StaticLayoutProxy.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/StaticLayoutProxy.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.text.Layout; import android.text.StaticLayout; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java b/android/sdk/src/main/java/org/apache/weex/utils/Trace.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/Trace.java rename to android/sdk/src/main/java/org/apache/weex/utils/Trace.java index cfe307effa..0544555f6d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/Trace.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/Trace.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.annotation.TargetApi; import android.os.Build; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java b/android/sdk/src/main/java/org/apache/weex/utils/TypefaceUtil.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java rename to android/sdk/src/main/java/org/apache/weex/utils/TypefaceUtil.java index a6ad566c46..a028c4d948 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/TypefaceUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.content.Intent; import android.graphics.Paint; @@ -24,15 +24,14 @@ import android.net.Uri; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; -import android.util.Log; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXHttpAdapter; -import com.taobao.weex.common.WXRequest; -import com.taobao.weex.common.WXResponse; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.font.FontAdapter; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXHttpAdapter; +import org.apache.weex.common.WXRequest; +import org.apache.weex.common.WXResponse; +import org.apache.weex.dom.WXStyle; +import org.apache.weex.font.FontAdapter; import java.io.File; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java b/android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java index ee28e45c49..0d01487a8d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXDeviceUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXDeviceUtils.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXDeviceUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXDeviceUtils.java index c5dd78b7e4..e6ff59fec0 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXDeviceUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXDeviceUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.content.Context; import android.os.Build; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXDomUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXDomUtils.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXDomUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXDomUtils.java index bfd0ea5288..2d26a273c4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXDomUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXDomUtils.java @@ -17,14 +17,13 @@ * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.support.annotation.NonNull; -import com.taobao.weex.dom.CSSConstants; -import com.taobao.weex.dom.CSSShorthand.EDGE; -import com.taobao.weex.dom.WXStyle; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.dom.CSSShorthand; +import org.apache.weex.dom.CSSConstants; +import org.apache.weex.dom.CSSShorthand.EDGE; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.dom.CSSShorthand; public class WXDomUtils { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXExceptionUtils.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXExceptionUtils.java index 1bf7d7fbd5..84705f244c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXExceptionUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import java.util.ArrayList; import java.util.Collections; @@ -30,18 +30,18 @@ import android.support.annotation.Nullable; import android.text.TextUtils; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.adapter.IWXJSExceptionAdapter; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXErrorCode.ErrorGroup; -import com.taobao.weex.common.WXJSExceptionInfo; -import com.taobao.weex.common.WXPerformance; -import com.taobao.weex.performance.WXAnalyzerDataTransfer; -import com.taobao.weex.performance.WXInstanceApm; -import com.taobao.weex.performance.WXStateRecord; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.adapter.IWXJSExceptionAdapter; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXErrorCode.ErrorGroup; +import org.apache.weex.common.WXJSExceptionInfo; +import org.apache.weex.common.WXPerformance; +import org.apache.weex.performance.WXAnalyzerDataTransfer; +import org.apache.weex.performance.WXInstanceApm; +import org.apache.weex.performance.WXStateRecord; /** * Created on 2017/10/13. @@ -56,7 +56,7 @@ public class WXExceptionUtils { */ public static String degradeUrl = "BundleUrlDefaultDegradeUrl"; - private static boolean checkNeedReportCauseRepeat(String instanceId,WXErrorCode errCode,String exception){ + private static boolean checkNeedReportCauseRepeat(String instanceId, WXErrorCode errCode,String exception){ if (TextUtils.isEmpty(exception)){ return true; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXFileUtils.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXFileUtils.java index 82a4efab49..a81c7bac04 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXFileUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXFileUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.content.Context; import android.text.TextUtils; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXInterception.java b/android/sdk/src/main/java/org/apache/weex/utils/WXInterception.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXInterception.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXInterception.java index c667c94ae1..04bdcab3b7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXInterception.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXInterception.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXJsonUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXJsonUtils.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXJsonUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXJsonUtils.java index cb8e2a7b46..629879b6b8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXJsonUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXJsonUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.support.annotation.NonNull; @@ -24,8 +24,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.common.WXRuntimeException; +import org.apache.weex.WXEnvironment; +import org.apache.weex.common.WXRuntimeException; import java.util.ArrayList; import java.util.List; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXLogUtils.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXLogUtils.java index d8bc7a9fc9..6e21f8fa09 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXLogUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXLogUtils.java @@ -16,18 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; -import com.alibaba.fastjson.JSON; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.performance.WXStateRecord; -import com.taobao.weex.utils.tools.LogDetail; +import org.apache.weex.WXEnvironment; +import org.apache.weex.performance.WXStateRecord; import java.io.IOException; import java.io.PrintWriter; @@ -37,8 +33,6 @@ import java.util.HashMap; import java.util.List; -import static com.taobao.weex.utils.tools.TimeCalculator.TIMELINE_TAG; - public class WXLogUtils { public static final String WEEX_TAG = "weex"; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXMap.java b/android/sdk/src/main/java/org/apache/weex/utils/WXMap.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXMap.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXMap.java index a3b60883d0..00b2f15f72 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXMap.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXMap.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import java.io.Serializable; import java.util.HashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXReflectionUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXReflectionUtils.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXReflectionUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXReflectionUtils.java index 31ecd2fe6e..4c9126f9cb 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXReflectionUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXReflectionUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.text.TextUtils; import com.alibaba.fastjson.JSON; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXResourceUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXResourceUtils.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXResourceUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXResourceUtils.java index c36868976e..d305e3e765 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXResourceUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXResourceUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.graphics.Color; import android.graphics.LinearGradient; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java b/android/sdk/src/main/java/org/apache/weex/utils/WXSoInstallMgrSdk.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXSoInstallMgrSdk.java index 35a3086dbb..a7d97b35da 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXSoInstallMgrSdk.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.annotation.SuppressLint; import android.app.Application; @@ -24,11 +24,11 @@ import android.content.pm.ApplicationInfo; import android.os.Build; import android.text.TextUtils; -import com.taobao.weex.IWXStatisticsListener; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.adapter.IWXSoLoaderAdapter; -import com.taobao.weex.adapter.IWXUserTrackAdapter; -import com.taobao.weex.common.WXErrorCode; +import org.apache.weex.IWXStatisticsListener; +import org.apache.weex.WXEnvironment; +import org.apache.weex.adapter.IWXSoLoaderAdapter; +import org.apache.weex.adapter.IWXUserTrackAdapter; +import org.apache.weex.common.WXErrorCode; import dalvik.system.PathClassLoader; import java.io.File; import java.io.FileOutputStream; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXUtils.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXUtils.java index 95bdfaed1a..a06d47e905 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.app.ActivityManager; import android.content.Context; @@ -26,10 +26,10 @@ import android.support.annotation.Nullable; import android.support.v4.util.LruCache; import android.text.TextUtils; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.adapter.IWXConfigAdapter; -import com.taobao.weex.common.Constants; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKManager; +import org.apache.weex.adapter.IWXConfigAdapter; +import org.apache.weex.common.Constants; public class WXUtils { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewToImageUtil.java b/android/sdk/src/main/java/org/apache/weex/utils/WXViewToImageUtil.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXViewToImageUtil.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXViewToImageUtil.java index b486fb524c..07b30ddf43 100755 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewToImageUtil.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXViewToImageUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.content.Context; import android.content.Intent; @@ -30,7 +30,7 @@ import android.support.annotation.ColorInt; import android.view.View; -import com.taobao.weex.WXSDKManager; +import org.apache.weex.WXSDKManager; import java.io.File; import java.io.FileNotFoundException; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java b/android/sdk/src/main/java/org/apache/weex/utils/WXViewUtils.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXViewUtils.java index e6c0ee7d96..a01176ccd9 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXViewUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.annotation.SuppressLint; import android.content.Context; @@ -43,16 +43,16 @@ import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; -import com.taobao.weex.WXSDKManager; -import com.taobao.weex.common.Constants; -import com.taobao.weex.common.WXErrorCode; -import com.taobao.weex.common.WXRuntimeException; -import com.taobao.weex.ui.component.WXComponent; -import com.taobao.weex.ui.flat.widget.Widget; -import com.taobao.weex.ui.flat.widget.WidgetGroup; -import com.taobao.weex.ui.view.border.BorderDrawable; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; +import org.apache.weex.WXSDKManager; +import org.apache.weex.common.Constants; +import org.apache.weex.common.WXErrorCode; +import org.apache.weex.common.WXRuntimeException; +import org.apache.weex.ui.component.WXComponent; +import org.apache.weex.ui.flat.widget.Widget; +import org.apache.weex.ui.flat.widget.WidgetGroup; +import org.apache.weex.ui.view.border.BorderDrawable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.concurrent.atomic.AtomicInteger; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXWsonJSONSwitch.java b/android/sdk/src/main/java/org/apache/weex/utils/WXWsonJSONSwitch.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/WXWsonJSONSwitch.java rename to android/sdk/src/main/java/org/apache/weex/utils/WXWsonJSONSwitch.java index 0271bdf4ea..7676a07b5d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXWsonJSONSwitch.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/WXWsonJSONSwitch.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils; +package org.apache.weex.utils; import android.support.annotation.NonNull; import com.alibaba.fastjson.JSON; -import com.taobao.weex.bridge.WXJSObject; -import com.taobao.weex.wson.Wson; -import com.taobao.weex.wson.WsonUtils; +import org.apache.weex.bridge.WXJSObject; +import org.apache.weex.wson.Wson; +import org.apache.weex.wson.WsonUtils; /** * Created by furture on 2018/5/17. diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/batch/BactchExecutor.java b/android/sdk/src/main/java/org/apache/weex/utils/batch/BactchExecutor.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/batch/BactchExecutor.java rename to android/sdk/src/main/java/org/apache/weex/utils/batch/BactchExecutor.java index 60ac7f43f6..6024dec028 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/batch/BactchExecutor.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/batch/BactchExecutor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.batch; +package org.apache.weex.utils.batch; /** * Created by sospartan on 8/24/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/batch/BatchOperationHelper.java b/android/sdk/src/main/java/org/apache/weex/utils/batch/BatchOperationHelper.java similarity index 92% rename from android/sdk/src/main/java/com/taobao/weex/utils/batch/BatchOperationHelper.java rename to android/sdk/src/main/java/org/apache/weex/utils/batch/BatchOperationHelper.java index 3c79d538ee..b8d75c27ba 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/batch/BatchOperationHelper.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/batch/BatchOperationHelper.java @@ -16,12 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.batch; +package org.apache.weex.utils.batch; -import com.taobao.weex.utils.batch.BactchExecutor; -import com.taobao.weex.utils.batch.Interceptor; - -import java.util.ArrayList; import java.util.Iterator; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/batch/Interceptor.java b/android/sdk/src/main/java/org/apache/weex/utils/batch/Interceptor.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/batch/Interceptor.java rename to android/sdk/src/main/java/org/apache/weex/utils/batch/Interceptor.java index 80194ece97..a63142c2e7 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/batch/Interceptor.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/batch/Interceptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.batch; +package org.apache.weex.utils.batch; /** * Created by sospartan on 8/24/16. diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/cache/RegisterCache.java b/android/sdk/src/main/java/org/apache/weex/utils/cache/RegisterCache.java similarity index 93% rename from android/sdk/src/main/java/com/taobao/weex/utils/cache/RegisterCache.java rename to android/sdk/src/main/java/org/apache/weex/utils/cache/RegisterCache.java index 69f18f3ef3..d55e3eeafe 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/cache/RegisterCache.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/cache/RegisterCache.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.cache; - -import com.taobao.weex.bridge.ModuleFactory; -import com.taobao.weex.bridge.WXModuleManager; -import com.taobao.weex.ui.IFComponentHolder; -import com.taobao.weex.ui.WXComponentRegistry; -import com.taobao.weex.ui.config.AutoScanConfigRegister; -import com.taobao.weex.utils.WXLogUtils; +package org.apache.weex.utils.cache; + +import org.apache.weex.bridge.ModuleFactory; +import org.apache.weex.bridge.WXModuleManager; +import org.apache.weex.ui.IFComponentHolder; +import org.apache.weex.ui.WXComponentRegistry; +import org.apache.weex.ui.config.AutoScanConfigRegister; +import org.apache.weex.utils.WXLogUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/tools/Info.java b/android/sdk/src/main/java/org/apache/weex/utils/tools/Info.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/utils/tools/Info.java rename to android/sdk/src/main/java/org/apache/weex/utils/tools/Info.java index a9dd4010ec..dd982132a5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/tools/Info.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/tools/Info.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.tools; +package org.apache.weex.utils.tools; import com.alibaba.fastjson.annotation.JSONField; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/tools/LogDetail.java b/android/sdk/src/main/java/org/apache/weex/utils/tools/LogDetail.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/tools/LogDetail.java rename to android/sdk/src/main/java/org/apache/weex/utils/tools/LogDetail.java index c257296f32..81ff122dd4 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/tools/LogDetail.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/tools/LogDetail.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.tools; +package org.apache.weex.utils.tools; import android.text.TextUtils; import android.util.Log; import com.alibaba.fastjson.annotation.JSONField; -import com.taobao.weex.WXEnvironment; +import org.apache.weex.WXEnvironment; import java.util.Locale; public class LogDetail { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/tools/LogSwitch.java b/android/sdk/src/main/java/org/apache/weex/utils/tools/LogSwitch.java similarity index 97% rename from android/sdk/src/main/java/com/taobao/weex/utils/tools/LogSwitch.java rename to android/sdk/src/main/java/org/apache/weex/utils/tools/LogSwitch.java index 8dc4c4ad1d..bc5c12a5d5 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/tools/LogSwitch.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/tools/LogSwitch.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.tools; +package org.apache.weex.utils.tools; public class LogSwitch { diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/tools/TaskInfo.java b/android/sdk/src/main/java/org/apache/weex/utils/tools/TaskInfo.java similarity index 96% rename from android/sdk/src/main/java/com/taobao/weex/utils/tools/TaskInfo.java rename to android/sdk/src/main/java/org/apache/weex/utils/tools/TaskInfo.java index 67bae849d8..34abfcf0a6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/tools/TaskInfo.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/tools/TaskInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.tools; +package org.apache.weex.utils.tools; import com.alibaba.fastjson.annotation.JSONField; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/tools/Time.java b/android/sdk/src/main/java/org/apache/weex/utils/tools/Time.java similarity index 98% rename from android/sdk/src/main/java/com/taobao/weex/utils/tools/Time.java rename to android/sdk/src/main/java/org/apache/weex/utils/tools/Time.java index edeab93b8c..eb5a6c755f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/tools/Time.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/tools/Time.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.tools; +package org.apache.weex.utils.tools; import com.alibaba.fastjson.annotation.JSONField; diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/tools/TimeCalculator.java b/android/sdk/src/main/java/org/apache/weex/utils/tools/TimeCalculator.java similarity index 94% rename from android/sdk/src/main/java/com/taobao/weex/utils/tools/TimeCalculator.java rename to android/sdk/src/main/java/org/apache/weex/utils/tools/TimeCalculator.java index 1e3eb2d6d3..deb4809240 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/tools/TimeCalculator.java +++ b/android/sdk/src/main/java/org/apache/weex/utils/tools/TimeCalculator.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.utils.tools; +package org.apache.weex.utils.tools; import android.util.Log; import com.alibaba.fastjson.JSON; -import com.taobao.weex.WXEnvironment; -import com.taobao.weex.WXSDKInstance; +import org.apache.weex.WXEnvironment; +import org.apache.weex.WXSDKInstance; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/android/sdk/src/main/java/com/taobao/weex/wson/Wson.java b/android/sdk/src/main/java/org/apache/weex/wson/Wson.java similarity index 99% rename from android/sdk/src/main/java/com/taobao/weex/wson/Wson.java rename to android/sdk/src/main/java/org/apache/weex/wson/Wson.java index b8b89928e3..4d1098b93f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/wson/Wson.java +++ b/android/sdk/src/main/java/org/apache/weex/wson/Wson.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.wson; +package org.apache.weex.wson; import android.support.v4.util.LruCache; @@ -25,7 +25,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; import java.lang.reflect.Array; import java.lang.reflect.Field; diff --git a/android/sdk/src/main/java/com/taobao/weex/wson/WsonUtils.java b/android/sdk/src/main/java/org/apache/weex/wson/WsonUtils.java similarity index 95% rename from android/sdk/src/main/java/com/taobao/weex/wson/WsonUtils.java rename to android/sdk/src/main/java/org/apache/weex/wson/WsonUtils.java index dc514384bb..edd1a154a2 100644 --- a/android/sdk/src/main/java/com/taobao/weex/wson/WsonUtils.java +++ b/android/sdk/src/main/java/org/apache/weex/wson/WsonUtils.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package com.taobao.weex.wson; +package org.apache.weex.wson; -import com.taobao.weex.utils.WXLogUtils; +import org.apache.weex.utils.WXLogUtils; /** * Created by furture on 2018/5/17. diff --git a/weex_core/Source/WXBridge_jni.h b/weex_core/Source/WXBridge_jni.h index 685f9f58e1..b889289d6c 100644 --- a/weex_core/Source/WXBridge_jni.h +++ b/weex_core/Source/WXBridge_jni.h @@ -23,7 +23,7 @@ // This file is autogenerated by // base/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/bridge/WXBridge +// org/apache/weex/bridge/WXBridge #ifndef com_taobao_weex_bridge_WXBridge_JNI #define com_taobao_weex_bridge_WXBridge_JNI @@ -34,7 +34,7 @@ // Step 1: forward declarations. namespace { -const char kWXBridgeClassPath[] = "com/taobao/weex/bridge/WXBridge"; +const char kWXBridgeClassPath[] = "org/apache/weex/bridge/WXBridge"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_WXBridge_clazz = NULL; #define WXBridge_clazz(env) g_WXBridge_clazz @@ -915,7 +915,7 @@ static base::android::ScopedLocalJavaRef "Ljava/lang/String;" "J" ")" -"Lcom/taobao/weex/layout/ContentBoxMeasurement;", +"Lorg/apache/weex/layout/ContentBoxMeasurement;", &g_WXBridge_getMeasurementFunc); jobject ret = @@ -957,7 +957,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { { "nativeInitFrameworkEnv", "(" "Ljava/lang/String;" -"Lcom/taobao/weex/bridge/WXParams;" +"Lorg/apache/weex/bridge/WXParams;" "Ljava/lang/String;" "Z" ")" @@ -965,7 +965,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { { "nativeInitFramework", "(" "Ljava/lang/String;" -"Lcom/taobao/weex/bridge/WXParams;" +"Lorg/apache/weex/bridge/WXParams;" ")" "I", reinterpret_cast(InitFramework) }, { "nativeRefreshInstance", @@ -973,7 +973,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" -"[Lcom/taobao/weex/bridge/WXJSObject;" +"[Lorg/apache/weex/bridge/WXJSObject;" ")" "V", reinterpret_cast(RefreshInstance) }, { "nativeExecJS", @@ -981,7 +981,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" -"[Lcom/taobao/weex/bridge/WXJSObject;" +"[Lorg/apache/weex/bridge/WXJSObject;" ")" "I", reinterpret_cast(ExecJS) }, { "nativeExecJSService", @@ -994,7 +994,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" -"[Lcom/taobao/weex/bridge/WXJSObject;" +"[Lorg/apache/weex/bridge/WXJSObject;" ")" "[B", reinterpret_cast(ExecJSWithResult) }, { "nativeExecJSWithCallback", @@ -1002,7 +1002,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" -"[Lcom/taobao/weex/bridge/WXJSObject;" +"[Lorg/apache/weex/bridge/WXJSObject;" "J" ")" "V", reinterpret_cast(ExecJSWithCallback) }, @@ -1011,7 +1011,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" -"[Lcom/taobao/weex/bridge/WXJSObject;" +"[Lorg/apache/weex/bridge/WXJSObject;" ")" "I", reinterpret_cast(CreateInstanceContext) }, { "nativeDestoryInstance", @@ -1019,7 +1019,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" -"[Lcom/taobao/weex/bridge/WXJSObject;" +"[Lorg/apache/weex/bridge/WXJSObject;" ")" "I", reinterpret_cast(DestoryInstance) }, { "nativeExecJSOnInstance", diff --git a/weex_core/Source/android/wrap/log_utils.cpp b/weex_core/Source/android/wrap/log_utils.cpp index 1942259cca..0c432c0980 100644 --- a/weex_core/Source/android/wrap/log_utils.cpp +++ b/weex_core/Source/android/wrap/log_utils.cpp @@ -27,7 +27,7 @@ namespace WeexCore { -const char kWXLogUtilsClassPath[] = "com/taobao/weex/utils/WXLogUtils"; +const char kWXLogUtilsClassPath[] = "org/apache/weex/utils/WXLogUtils"; static jclass g_WXLogUtils_clazz = nullptr; static intptr_t g_WXLogUtils_d = 0; diff --git a/weex_core/Source/android/wrap/wml_bridge.cpp b/weex_core/Source/android/wrap/wml_bridge.cpp index f93dbfd90b..63741f874b 100644 --- a/weex_core/Source/android/wrap/wml_bridge.cpp +++ b/weex_core/Source/android/wrap/wml_bridge.cpp @@ -189,7 +189,7 @@ jclass g_WMLBridge_clazz = nullptr; static JNINativeMethod gWMMethods[] = { {"nativeInitAppFramework", - "(Ljava/lang/String;Ljava/lang/String;[Lcom/taobao/weex/bridge/" + "(Ljava/lang/String;Ljava/lang/String;[Lorg/apache/weex/bridge/" "WXJSObject;)I", (void*)InitAppFramework}, {"nativeCreateAppContext", @@ -197,7 +197,7 @@ static JNINativeMethod gWMMethods[] = { (void*)CreateAppContext}, {"nativeExecJsOnApp", "(Ljava/lang/String;Ljava/lang/String;" - "[Lcom/taobao/weex/bridge/WXJSObject;)I", + "[Lorg/apache/weex/bridge/WXJSObject;)I", (void*)ExecJsOnApp}, {"nativeExecJsOnAppWithResult", "(Ljava/lang/String;Ljava/lang/String;" diff --git a/weex_core/Source/android/wrap/wx_js_object.cpp b/weex_core/Source/android/wrap/wx_js_object.cpp index 50a10dc494..adceb5c305 100644 --- a/weex_core/Source/android/wrap/wx_js_object.cpp +++ b/weex_core/Source/android/wrap/wx_js_object.cpp @@ -22,7 +22,7 @@ #include "base/android/jni/android_jni.h" namespace WeexCore { -const char kWXJSObjectClassPath[] = "com/taobao/weex/bridge/WXJSObject"; +const char kWXJSObjectClassPath[] = "org/apache/weex/bridge/WXJSObject"; jclass g_WXJSObject_clazz = nullptr; jfieldID g_WXJSObject_filedID_type = nullptr; diff --git a/weex_core/Source/android/wrap/wx_map.cpp b/weex_core/Source/android/wrap/wx_map.cpp index 116d75404e..2470ab4cda 100644 --- a/weex_core/Source/android/wrap/wx_map.cpp +++ b/weex_core/Source/android/wrap/wx_map.cpp @@ -24,7 +24,7 @@ #include "base/android/jni/android_jni.h" namespace WeexCore { -const char kWXMapClassPath[] = "com/taobao/weex/utils/WXMap"; +const char kWXMapClassPath[] = "org/apache/weex/utils/WXMap"; jclass g_WXMap_clazz = nullptr; static intptr_t g_WXMap_constructor = 0; diff --git a/weex_core/Source/base/android/jniprebuild/jni_files b/weex_core/Source/base/android/jniprebuild/jni_files index 1662c2771b..c8276c5035 100644 --- a/weex_core/Source/base/android/jniprebuild/jni_files +++ b/weex_core/Source/base/android/jniprebuild/jni_files @@ -1 +1 @@ -com/taobao/weex/bridge/WXBridge.java +org/apache/weex/bridge/WXBridge.java diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h index dd92724640..5a055e921b 100644 --- a/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h @@ -21,7 +21,7 @@ // This file is autogenerated by // weex-core2/weex_core/Source/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/layout/ContentBoxMeasurement +// org/apache/weex/layout/ContentBoxMeasurement #ifndef com_taobao_weex_layout_ContentBoxMeasurement_JNI #define com_taobao_weex_layout_ContentBoxMeasurement_JNI @@ -33,7 +33,7 @@ // Step 1: forward declarations. namespace { const char kContentBoxMeasurementClassPath[] = - "com/taobao/weex/layout/ContentBoxMeasurement"; + "org/apache/weex/layout/ContentBoxMeasurement"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_ContentBoxMeasurement_clazz = NULL; #define ContentBoxMeasurement_clazz(env) g_ContentBoxMeasurement_clazz diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h index 2a71a70dd4..e15dac301c 100644 --- a/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h @@ -20,7 +20,7 @@ // This file is autogenerated by // incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/ui/component/list/template/jni/NativeRenderObjectUtils +// org/apache/weex/ui/component/list/template/jni/NativeRenderObjectUtils #ifndef com_taobao_weex_ui_component_list_template_jni_NativeRenderObjectUtils_JNI #define com_taobao_weex_ui_component_list_template_jni_NativeRenderObjectUtils_JNI @@ -32,7 +32,7 @@ // Step 1: forward declarations. namespace { const char kNativeRenderObjectUtilsClassPath[] = - "com/taobao/weex/ui/component/list/template/jni/NativeRenderObjectUtils"; + "org/apache/weex/ui/component/list/template/jni/NativeRenderObjectUtils"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_NativeRenderObjectUtils_clazz = NULL; #define NativeRenderObjectUtils_clazz(env) g_NativeRenderObjectUtils_clazz @@ -107,7 +107,7 @@ static void Java_NativeRenderObjectUtils_updateComponentSize(JNIEnv* env, "updateComponentSize", "(" -"Lcom/taobao/weex/ui/component/WXComponent;" +"Lorg/apache/weex/ui/component/WXComponent;" "F" "F" "F" @@ -189,7 +189,7 @@ static const JNINativeMethod kMethodsNativeRenderObjectUtils[] = { { "nativeRenderObjectUpdateComponent", "(" "J" -"Lcom/taobao/weex/ui/component/WXComponent;" +"Lorg/apache/weex/ui/component/WXComponent;" ")" "V", reinterpret_cast(RenderObjectUpdateComponent) }, { "nativeRenderObjectChildWaste", diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h index e4ffd3cd30..a7f053516a 100644 --- a/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/RequestHandler_jni.h @@ -20,7 +20,7 @@ // This file is autogenerated by // weex/weex_core/Source/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/bridge/RequestHandler +// org/apache/weex/bridge/RequestHandler #ifndef com_taobao_weex_bridge_RequestHandler_JNI #define com_taobao_weex_bridge_RequestHandler_JNI @@ -31,7 +31,7 @@ // Step 1: forward declarations. namespace { -const char kRequestHandlerClassPath[] = "com/taobao/weex/bridge/RequestHandler"; +const char kRequestHandlerClassPath[] = "org/apache/weex/bridge/RequestHandler"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_RequestHandler_clazz = NULL; #define RequestHandler_clazz(env) g_RequestHandler_clazz @@ -62,7 +62,7 @@ static base::android::ScopedLocalJavaRef "(" ")" -"Lcom/taobao/weex/bridge/RequestHandler;", +"Lorg/apacheweex/bridge/RequestHandler;", &g_RequestHandler_create); jobject ret = diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h index 3df56e98a9..bebf2e5a88 100644 --- a/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/SystemMessageHandler_jni.h @@ -20,7 +20,7 @@ // This file is autogenerated by // incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/base/SystemMessageHandler +// org/apache/weex/base/SystemMessageHandler #ifndef com_taobao_weex_base_SystemMessageHandler_JNI #define com_taobao_weex_base_SystemMessageHandler_JNI @@ -32,7 +32,7 @@ // Step 1: forward declarations. namespace { const char kSystemMessageHandlerClassPath[] = - "com/taobao/weex/base/SystemMessageHandler"; + "org/apache/weex/base/SystemMessageHandler"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_SystemMessageHandler_clazz = NULL; #define SystemMessageHandler_clazz(env) g_SystemMessageHandler_clazz @@ -60,7 +60,7 @@ static base::android::ScopedLocalJavaRef "(" "J" ")" -"Lcom/taobao/weex/base/SystemMessageHandler;", +"Lorg/apache/weex/base/SystemMessageHandler;", &g_SystemMessageHandler_create); jobject ret = diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h index f7955cd834..b1fef6f9fe 100755 --- a/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXBridge_jni.h @@ -20,7 +20,7 @@ // This file is autogenerated by // incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/bridge/WXBridge +// org/apache/weex/bridge/WXBridge #ifndef com_taobao_weex_bridge_WXBridge_JNI #define com_taobao_weex_bridge_WXBridge_JNI @@ -32,7 +32,7 @@ // Step 1: forward declarations. namespace { -const char kWXBridgeClassPath[] = "com/taobao/weex/bridge/WXBridge"; +const char kWXBridgeClassPath[] = "org/apache/weex/bridge/WXBridge"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_WXBridge_clazz = NULL; #define WXBridge_clazz(env) g_WXBridge_clazz @@ -1077,7 +1077,7 @@ instanceId, "Ljava/lang/String;" "J" ")" - "Lcom/taobao/weex/layout/ContentBoxMeasurement;", + "Lorg/apache/weex/layout/ContentBoxMeasurement;", &g_WXBridge_getMeasurementFunc); jobject ret = @@ -1144,7 +1144,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { {"nativeInitFrameworkEnv", "(" "Ljava/lang/String;" - "Lcom/taobao/weex/bridge/WXParams;" + "Lorg/apache/weex/bridge/WXParams;" "Ljava/lang/String;" "Z" ")" @@ -1152,7 +1152,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { {"nativeInitFramework", "(" "Ljava/lang/String;" - "Lcom/taobao/weex/bridge/WXParams;" + "Lorg/apache/weex/bridge/WXParams;" ")" "I", reinterpret_cast(InitFramework)}, {"nativeRefreshInstance", @@ -1160,7 +1160,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" - "[Lcom/taobao/weex/bridge/WXJSObject;" + "[Lorg/apache/weex/bridge/WXJSObject;" ")" "V", reinterpret_cast(RefreshInstance)}, {"nativeExecJS", @@ -1168,7 +1168,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" - "[Lcom/taobao/weex/bridge/WXJSObject;" + "[Lorg/apache/weex/bridge/WXJSObject;" ")" "I", reinterpret_cast(ExecJS)}, {"nativeExecJSService", @@ -1181,7 +1181,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" - "[Lcom/taobao/weex/bridge/WXJSObject;" + "[Lorg/apache/weex/bridge/WXJSObject;" "J" ")" "V", reinterpret_cast(ExecJSWithCallback)}, @@ -1190,7 +1190,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" - "[Lcom/taobao/weex/bridge/WXJSObject;" + "[Lorg/apache/weex/bridge/WXJSObject;" ")" "I", reinterpret_cast(CreateInstanceContext)}, {"nativeDestoryInstance", @@ -1198,7 +1198,7 @@ static const JNINativeMethod kMethodsWXBridge[] = { "Ljava/lang/String;" "Ljava/lang/String;" "Ljava/lang/String;" - "[Lcom/taobao/weex/bridge/WXJSObject;" + "[Lorg/apache/weex/bridge/WXJSObject;" ")" "I", reinterpret_cast(DestoryInstance)}, {"nativeExecJSOnInstance", diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h index 458f4356d2..78859cea9e 100644 --- a/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXDebugJsBridge_jni.h @@ -20,7 +20,7 @@ // This file is autogenerated by // weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/bridge/WxDebugJsBridge +// org/apache/weex/bridge/WxDebugJsBridge #ifndef WEEX_PROJECT_WXDEBUGJSBRIDGE_JNI_H #define WEEX_PROJECT_WXDEBUGJSBRIDGE_JNI_H @@ -29,7 +29,7 @@ #include "base/android/jni/android_jni.h" namespace { - const char kWXDebugJsBridgeClassPath[] = "com/taobao/weex/bridge/WXDebugJsBridge"; + const char kWXDebugJsBridgeClassPath[] = "org/apache/weex/bridge/WXDebugJsBridge"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_WXDebugJsBridge_clazz = NULL; #define WXDebugJsBridge_clazz(env) g_WXDebugJsBridge_clazz diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h index 2a18241d36..62a6e5e486 100644 --- a/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXJsFunctions_jni.h @@ -20,7 +20,7 @@ // This file is autogenerated by // weex_core_debug/Source/WeexCore/platform/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/bridge/JsFunctions +// org/apache/weex/bridge/JsFunctions #ifndef WEEX_PROJECT_WXJSFUNCTIONS_JNI_H #define WEEX_PROJECT_WXJSFUNCTIONS_JNI_H @@ -29,7 +29,7 @@ #include "base/android/jni/android_jni.h" namespace { - const char kWXJsFunctionClassPath[] = "com/taobao/weex/bridge/WXJsFunctions"; + const char kWXJsFunctionClassPath[] = "org/apache/weex/bridge/WXJsFunctions"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_WXJsFunction_clazz = NULL; #define WXJsFunction_clazz(env) g_WXJsFunction_clazz diff --git a/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h b/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h index a215be42bf..7b68ba8e64 100644 --- a/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h +++ b/weex_core/Source/base/android/jniprebuild/jniheader/WXParams_jni.h @@ -20,7 +20,7 @@ // This file is autogenerated by // incubator-weex/weex_core/Source/android/jniprebuild/jni_generator.py // For -// com/taobao/weex/bridge/WXParams +// org/apache/weex/bridge/WXParams #ifndef com_taobao_weex_bridge_WXParams_JNI #define com_taobao_weex_bridge_WXParams_JNI @@ -32,7 +32,7 @@ // Step 1: forward declarations. namespace { -const char kWXParamsClassPath[] = "com/taobao/weex/bridge/WXParams"; +const char kWXParamsClassPath[] = "org/apache/weex/bridge/WXParams"; // Leaking this jclass as we cannot use LazyInstance from some threads. jclass g_WXParams_clazz = NULL; #define WXParams_clazz(env) g_WXParams_clazz