Skip to content

Commit 7bfdee0

Browse files
committed
* [html5] fix merge conflicts
2 parents e9c66c2 + 2b41423 commit 7bfdee0

File tree

107 files changed

+3063
-862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3063
-862
lines changed

.github/ISSUE_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
(Please ***REMOVE*** the following description before submiting)
2-
1+
<!--
32
0. It's ***RECOMMENDED*** to [submit PR](https://github.com/alibaba/weex/pulls) for typo, new demo or tiny bugfix.
43
0. If this's a ***BUG***, pls provide: course repetition, error/crash log, device model, OS version, App version (playground or other apps).
54
0. If this's a ***FEATURE***, pls provide: details, pseudo codes if necessary.
@@ -11,3 +10,4 @@
1110
0. 我们***推荐***小问题直接[提 PR](https://github.com/alibaba/weex/pulls),如错别字、新 demo 或 bugfix。
1211
0. 如果是 ***Bug***,请提供:复现步骤(推荐有截图)、error/crash log、设备型号、OS 版本、App 版本(playground 版本或自己的 app)。
1312
0. 如果是***新需求***,请提供:详细描述、应用场景、适当的伪代码(如有)。
13+
-->

.github/PULL_REQUEST_TEMPLATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
(Please ***REMOVE*** the following description before submiting)
2-
1+
<!--
32
It's ***RECOMMENDED*** to submit typo fix, new demo and tiny bugfix to `dev` branch. New feature and other modifications can be submitted to "domain" branch including `ios`, `android`, `jsfm`, `html5`.
43
54
See [Branch Strategy](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management) for more detail.
@@ -11,3 +10,4 @@ See [Branch Strategy](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#b
1110
错别字修改、新 demo、较小的 bugfix 都可以直接提到 `dev` 分支;新需求以及任何你不确定影响面的改动,请提交到对应“领域”的分支(`ios`、`android`、`jsfm`、`html5`)。
1211
1312
查看完整的[分支策略 (英文)](https://github.com/alibaba/weex/blob/dev/CONTRIBUTING.md#branch-management)。
13+
-->

android/inspector/src/main/java/com/taobao/weex/devtools/debug/DebugServerProxy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void run() {
117117
@Override
118118
public void onFailure(Throwable cause) {
119119
mContext.sendBroadcast(new Intent(ACTION_DEBUG_SERVER_CONNECT_FAILED));
120-
WXLogUtils.d("connect debugger server failure!! " + cause.toString());
120+
WXLogUtils.d("connect debugger server failure!! ", cause);
121121
}
122122

123123
});

android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ private static String getAppVersionName() {
299299
info = manager.getPackageInfo(sApplication.getPackageName(), 0);
300300
versionName = info.versionName;
301301
} catch (Exception e) {
302-
WXLogUtils.e("WXEnvironment getAppVersionName Exception: " + WXLogUtils.getStackTrace(e));
302+
WXLogUtils.e("WXEnvironment getAppVersionName Exception: ", e);
303303
}
304304
return versionName;
305305
}
@@ -337,7 +337,7 @@ public static boolean isApkDebugable() {
337337
isApkDebug = (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
338338
return isApkDebug;
339339
} catch (Exception e) {
340-
WXLogUtils.e("WXEnvironment isApkDebugable Exception: " + WXLogUtils.getStackTrace(e));
340+
WXLogUtils.e("WXEnvironment isApkDebugable Exception: ", e);
341341
}
342342
return false;
343343
}

android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
import com.taobao.weex.adapter.IWXHttpAdapter;
120120
import com.taobao.weex.adapter.IWXImgLoaderAdapter;
121121
import com.taobao.weex.adapter.IWXUserTrackAdapter;
122+
import com.taobao.weex.appfram.clipboard.WXClipboardModule;
122123
import com.taobao.weex.appfram.navigator.IActivityNavBarSetter;
123124
import com.taobao.weex.appfram.navigator.WXNavigatorModule;
124125
import com.taobao.weex.appfram.storage.IWXStorageAdapter;
@@ -308,13 +309,14 @@ private static void register() {
308309
registerModule("navigator", WXNavigatorModule.class);
309310
registerModule("stream", WXStreamModule.class);
310311
registerModule("timer", WXTimerModule.class, true);
311-
registerModule("storage", WXStorageModule.class,true);
312+
registerModule("storage", WXStorageModule.class, true);
313+
registerModule("clipboard", WXClipboardModule.class, true);
312314

313315
registerDomObject(WXBasicComponentType.TEXT, WXTextDomObject.class);
314316
registerDomObject(WXBasicComponentType.INPUT, WXTextDomObject.class);
315317
registerDomObject(WXBasicComponentType.SWITCH, WXSwitchDomObject.class);
316318
} catch (WXException e) {
317-
WXLogUtils.e("[WXSDKEngine] register:" + WXLogUtils.getStackTrace(e));
319+
WXLogUtils.e("[WXSDKEngine] register:", e);
318320
}
319321
}
320322

@@ -489,19 +491,19 @@ public static void switchDebugModel(boolean debug, String debugUrl) {
489491
WXEnvironment.sDebugMode = true;
490492
WXEnvironment.sDebugWsUrl = debugUrl;
491493
try {
492-
Class cls = Class.forName("com.taobao.weex.WXDebugTool");
493-
Method m = cls.getMethod("connect", new Class[]{String.class});
494-
m.invoke(cls, new Object[]{debugUrl});
494+
Class<?> cls = Class.forName("com.taobao.weex.WXDebugTool");
495+
Method m = cls.getMethod("connect", String.class);
496+
m.invoke(cls, debugUrl);
495497
} catch (Exception e) {
496498
Log.d("weex","WXDebugTool not found!");
497499
}
498500
} else {
499501
WXEnvironment.sDebugMode = false;
500502
WXEnvironment.sDebugWsUrl = null;
501503
try {
502-
Class cls = Class.forName("com.taobao.weex.WXDebugTool");
503-
Method m = cls.getMethod("close", new Class[]{});
504-
m.invoke(cls, new Object[]{});
504+
Class<?> cls = Class.forName("com.taobao.weex.WXDebugTool");
505+
Method m = cls.getMethod("close");
506+
m.invoke(cls);
505507
} catch (Exception e) {
506508
Log.d("weex","WXDebugTool not found!");
507509
}

android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ private void destroyView(View rootView) {
887887

888888
}
889889
} catch (Exception e) {
890-
WXLogUtils.e("WXSDKInstance destroyView Exception: " + WXLogUtils.getStackTrace(e));
890+
WXLogUtils.e("WXSDKInstance destroyView Exception: ", e);
891891
}
892892
}
893893

android/sdk/src/main/java/com/taobao/weex/adapter/DefaultWXHttpAdapter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208

209209
import com.taobao.weex.common.WXRequest;
210210
import com.taobao.weex.common.WXResponse;
211+
import com.taobao.weex.utils.WXLogUtils;
211212

212213
import java.io.*;
213214
import java.net.HttpURLConnection;
@@ -257,7 +258,7 @@ public void run() {
257258
listener.onHttpFinish(response);
258259
}
259260
} catch (IOException e) {
260-
e.printStackTrace();
261+
WXLogUtils.e("", e);
261262
response.statusCode = "-1";
262263
response.errorCode="-1";
263264
response.errorMsg=e.getMessage();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
/**
2+
*
3+
* Apache License
4+
* Version 2.0, January 2004
5+
* http://www.apache.org/licenses/
6+
*
7+
* TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8+
*
9+
* 1. Definitions.
10+
*
11+
* "License" shall mean the terms and conditions for use, reproduction,
12+
* and distribution as defined by Sections 1 through 9 of this document.
13+
*
14+
* "Licensor" shall mean the copyright owner or entity authorized by
15+
* the copyright owner that is granting the License.
16+
*
17+
* "Legal Entity" shall mean the union of the acting entity and all
18+
* other entities that control, are controlled by, or are under common
19+
* control with that entity. For the purposes of this definition,
20+
* "control" means (i) the power, direct or indirect, to cause the
21+
* direction or management of such entity, whether by contract or
22+
* otherwise, or (ii) ownership of fifty percent (50%) or more of the
23+
* outstanding shares, or (iii) beneficial ownership of such entity.
24+
*
25+
* "You" (or "Your") shall mean an individual or Legal Entity
26+
* exercising permissions granted by this License.
27+
*
28+
* "Source" form shall mean the preferred form for making modifications,
29+
* including but not limited to software source code, documentation
30+
* source, and configuration files.
31+
*
32+
* "Object" form shall mean any form resulting from mechanical
33+
* transformation or translation of a Source form, including but
34+
* not limited to compiled object code, generated documentation,
35+
* and conversions to other media types.
36+
*
37+
* "Work" shall mean the work of authorship, whether in Source or
38+
* Object form, made available under the License, as indicated by a
39+
* copyright notice that is included in or attached to the work
40+
* (an example is provided in the Appendix below).
41+
*
42+
* "Derivative Works" shall mean any work, whether in Source or Object
43+
* form, that is based on (or derived from) the Work and for which the
44+
* editorial revisions, annotations, elaborations, or other modifications
45+
* represent, as a whole, an original work of authorship. For the purposes
46+
* of this License, Derivative Works shall not include works that remain
47+
* separable from, or merely link (or bind by name) to the interfaces of,
48+
* the Work and Derivative Works thereof.
49+
*
50+
* "Contribution" shall mean any work of authorship, including
51+
* the original version of the Work and any modifications or additions
52+
* to that Work or Derivative Works thereof, that is intentionally
53+
* submitted to Licensor for inclusion in the Work by the copyright owner
54+
* or by an individual or Legal Entity authorized to submit on behalf of
55+
* the copyright owner. For the purposes of this definition, "submitted"
56+
* means any form of electronic, verbal, or written communication sent
57+
* to the Licensor or its representatives, including but not limited to
58+
* communication on electronic mailing lists, source code control systems,
59+
* and issue tracking systems that are managed by, or on behalf of, the
60+
* Licensor for the purpose of discussing and improving the Work, but
61+
* excluding communication that is conspicuously marked or otherwise
62+
* designated in writing by the copyright owner as "Not a Contribution."
63+
*
64+
* "Contributor" shall mean Licensor and any individual or Legal Entity
65+
* on behalf of whom a Contribution has been received by Licensor and
66+
* subsequently incorporated within the Work.
67+
*
68+
* 2. Grant of Copyright License. Subject to the terms and conditions of
69+
* this License, each Contributor hereby grants to You a perpetual,
70+
* worldwide, non-exclusive, no-charge, royalty-free, irrevocable
71+
* copyright license to reproduce, prepare Derivative Works of,
72+
* publicly display, publicly perform, sublicense, and distribute the
73+
* Work and such Derivative Works in Source or Object form.
74+
*
75+
* 3. Grant of Patent License. Subject to the terms and conditions of
76+
* this License, each Contributor hereby grants to You a perpetual,
77+
* worldwide, non-exclusive, no-charge, royalty-free, irrevocable
78+
* (except as stated in this section) patent license to make, have made,
79+
* use, offer to sell, sell, import, and otherwise transfer the Work,
80+
* where such license applies only to those patent claims licensable
81+
* by such Contributor that are necessarily infringed by their
82+
* Contribution(s) alone or by combination of their Contribution(s)
83+
* with the Work to which such Contribution(s) was submitted. If You
84+
* institute patent litigation against any entity (including a
85+
* cross-claim or counterclaim in a lawsuit) alleging that the Work
86+
* or a Contribution incorporated within the Work constitutes direct
87+
* or contributory patent infringement, then any patent licenses
88+
* granted to You under this License for that Work shall terminate
89+
* as of the date such litigation is filed.
90+
*
91+
* 4. Redistribution. You may reproduce and distribute copies of the
92+
* Work or Derivative Works thereof in any medium, with or without
93+
* modifications, and in Source or Object form, provided that You
94+
* meet the following conditions:
95+
*
96+
* (a) You must give any other recipients of the Work or
97+
* Derivative Works a copy of this License; and
98+
*
99+
* (b) You must cause any modified files to carry prominent notices
100+
* stating that You changed the files; and
101+
*
102+
* (c) You must retain, in the Source form of any Derivative Works
103+
* that You distribute, all copyright, patent, trademark, and
104+
* attribution notices from the Source form of the Work,
105+
* excluding those notices that do not pertain to any part of
106+
* the Derivative Works; and
107+
*
108+
* (d) If the Work includes a "NOTICE" text file as part of its
109+
* distribution, then any Derivative Works that You distribute must
110+
* include a readable copy of the attribution notices contained
111+
* within such NOTICE file, excluding those notices that do not
112+
* pertain to any part of the Derivative Works, in at least one
113+
* of the following places: within a NOTICE text file distributed
114+
* as part of the Derivative Works; within the Source form or
115+
* documentation, if provided along with the Derivative Works; or,
116+
* within a display generated by the Derivative Works, if and
117+
* wherever such third-party notices normally appear. The contents
118+
* of the NOTICE file are for informational purposes only and
119+
* do not modify the License. You may add Your own attribution
120+
* notices within Derivative Works that You distribute, alongside
121+
* or as an addendum to the NOTICE text from the Work, provided
122+
* that such additional attribution notices cannot be construed
123+
* as modifying the License.
124+
*
125+
* You may add Your own copyright statement to Your modifications and
126+
* may provide additional or different license terms and conditions
127+
* for use, reproduction, or distribution of Your modifications, or
128+
* for any such Derivative Works as a whole, provided Your use,
129+
* reproduction, and distribution of the Work otherwise complies with
130+
* the conditions stated in this License.
131+
*
132+
* 5. Submission of Contributions. Unless You explicitly state otherwise,
133+
* any Contribution intentionally submitted for inclusion in the Work
134+
* by You to the Licensor shall be under the terms and conditions of
135+
* this License, without any additional terms or conditions.
136+
* Notwithstanding the above, nothing herein shall supersede or modify
137+
* the terms of any separate license agreement you may have executed
138+
* with Licensor regarding such Contributions.
139+
*
140+
* 6. Trademarks. This License does not grant permission to use the trade
141+
* names, trademarks, service marks, or product names of the Licensor,
142+
* except as required for reasonable and customary use in describing the
143+
* origin of the Work and reproducing the content of the NOTICE file.
144+
*
145+
* 7. Disclaimer of Warranty. Unless required by applicable law or
146+
* agreed to in writing, Licensor provides the Work (and each
147+
* Contributor provides its Contributions) on an "AS IS" BASIS,
148+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
149+
* implied, including, without limitation, any warranties or conditions
150+
* of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
151+
* PARTICULAR PURPOSE. You are solely responsible for determining the
152+
* appropriateness of using or redistributing the Work and assume any
153+
* risks associated with Your exercise of permissions under this License.
154+
*
155+
* 8. Limitation of Liability. In no event and under no legal theory,
156+
* whether in tort (including negligence), contract, or otherwise,
157+
* unless required by applicable law (such as deliberate and grossly
158+
* negligent acts) or agreed to in writing, shall any Contributor be
159+
* liable to You for damages, including any direct, indirect, special,
160+
* incidental, or consequential damages of any character arising as a
161+
* result of this License or out of the use or inability to use the
162+
* Work (including but not limited to damages for loss of goodwill,
163+
* work stoppage, computer failure or malfunction, or any and all
164+
* other commercial damages or losses), even if such Contributor
165+
* has been advised of the possibility of such damages.
166+
*
167+
* 9. Accepting Warranty or Additional Liability. While redistributing
168+
* the Work or Derivative Works thereof, You may choose to offer,
169+
* and charge a fee for, acceptance of support, warranty, indemnity,
170+
* or other liability obligations and/or rights consistent with this
171+
* License. However, in accepting such obligations, You may act only
172+
* on Your own behalf and on Your sole responsibility, not on behalf
173+
* of any other Contributor, and only if You agree to indemnify,
174+
* defend, and hold each Contributor harmless for any liability
175+
* incurred by, or claims asserted against, such Contributor by reason
176+
* of your accepting any such warranty or additional liability.
177+
*
178+
* END OF TERMS AND CONDITIONS
179+
*
180+
* APPENDIX: How to apply the Apache License to your work.
181+
*
182+
* To apply the Apache License to your work, attach the following
183+
* boilerplate notice, with the fields enclosed by brackets "[]"
184+
* replaced with your own identifying information. (Don't include
185+
* the brackets!) The text should be enclosed in the appropriate
186+
* comment syntax for the file format. We also recommend that a
187+
* file or class name and description of purpose be included on the
188+
* same "printed page" as the copyright notice for easier
189+
* identification within third-party archives.
190+
*
191+
* Copyright 2016 Alibaba Group
192+
*
193+
* Licensed under the Apache License, Version 2.0 (the "License");
194+
* you may not use this file except in compliance with the License.
195+
* You may obtain a copy of the License at
196+
*
197+
* http://www.apache.org/licenses/LICENSE-2.0
198+
*
199+
* Unless required by applicable law or agreed to in writing, software
200+
* distributed under the License is distributed on an "AS IS" BASIS,
201+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
202+
* See the License for the specific language governing permissions and
203+
* limitations under the License.
204+
*/
205+
package com.taobao.weex.appfram.clipboard;
206+
207+
import android.support.annotation.Nullable;
208+
209+
import com.taobao.weex.bridge.JSCallback;
210+
211+
/**
212+
* Created by yiyuan.zhangyy(xingjiu) <br/>
213+
*/
214+
interface IWXClipboard {
215+
public void setString(String text);
216+
public void getString(@Nullable JSCallback callback);
217+
}

0 commit comments

Comments
 (0)