Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

补齐web的API #14136

Closed
wants to merge 57 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
b3dad21
chore(release): publish 3.6.8
Chen-jj Jun 7, 2023
84166fe
build: 完成工具链开发,支持鸿蒙和Android的编译类型
Jun 15, 2023
86beadd
feat: 添加小程序demo,AndroidSDK添加
Jun 16, 2023
3596f95
Merge pull request #1 from handsomeliuyang/release-3.6.8-app-kxj
handsomeliuyang Jun 20, 2023
245c34a
fix: 目录结构优化
Jun 21, 2023
aeee6c5
feat: init harmony components project,init
Jun 21, 2023
88963b9
feat: 尝试迁移grid组件
Jun 25, 2023
1c403e9
feat: grid组件迁移,可展示
Jun 26, 2023
dd2987d
feat: grid组件,完善demo
Jun 26, 2023
b24d509
feat: api库添加,目录结构调整
Jun 26, 2023
246b6b4
Merge branch 'f-3.6.8-compoment-hzp' of github.com:handsomeliuyang/ta…
Jun 26, 2023
8338b33
feat: change config
Jun 26, 2023
27c9b3d
Merge branch 'f-3.6.8-compoment-hzp' of github.com:handsomeliuyang/ta…
Jun 26, 2023
b3e7e5b
feat: change config
Jun 26, 2023
0c97860
Merge branch 'f-3.6.8-compoment-hzp' of github.com:handsomeliuyang/ta…
Jun 26, 2023
3a21241
feat: change config
Jun 26, 2023
2befd63
feat: 组件库添加
Jun 26, 2023
1619a34
feat: add list view
Jun 26, 2023
44c8d14
fix: 使用本地的taro-plugin-react库
Jun 26, 2023
0cf7e79
fix: taro-mpharmony补充上api-loader
Jun 26, 2023
ab10fad
Merge branch 'release-3.6.8-app-kxj' of github.com:handsomeliuyang/ta…
Jun 26, 2023
c3f0de0
Merge pull request #3 from handsomeliuyang/release-3.6.8-app-kxj
handsomeliuyang Jun 26, 2023
6b42336
Merge branch 'release-3.6.8-app' of github.com:handsomeliuyang/taro i…
Jun 26, 2023
21a723d
Merge pull request #4 from handsomeliuyang/f-3.6.8-compoment-hzp
handsomeliuyang Jun 26, 2023
f565ca6
fix: 编译时组件库替换为components-mpharmony
Jun 26, 2023
2d18b3b
feat: 组件加载问题联调测试,暂时有问题
Jun 27, 2023
86601dc
feat: 组件加载问题联调测试,问题解决
Jun 27, 2023
3467e7c
feat: 组件加载问题联调测试,问题解决
Jun 27, 2023
2785fb4
Merge branch 'release-3.6.8-app' of github.com:handsomeliuyang/taro i…
Jun 27, 2023
96a6e8a
Merge branch 'release-3.6.8-app-kxj' of github.com:handsomeliuyang/ta…
Jun 27, 2023
aefce54
feat: 调试PageContainer组件,功能初步完成
Jun 28, 2023
469ea79
feat: 调试PageContainer组件,功能初步完成
Jun 28, 2023
6b8a2f3
feat: 调试PageContainer组件,功能初步完成
Jun 28, 2023
eae0cc9
feat: 调试PageContainer组件,完成遮罩层样式自定义、圆角自定义
Jun 28, 2023
cd6cd8b
fix: 去掉测试组件
Jun 29, 2023
772c212
Merge pull request #5 from handsomeliuyang/release-3.6.8-app-kxj
handsomeliuyang Jun 29, 2023
6037587
feat: 调试PageContainer组件,支持z-index属性和duration属性
Jun 29, 2023
1c419f9
feat: 调试PageContainer组件,支持customStyle属性
Jun 29, 2023
1a3c7ea
feat: 完成RootPortal组件开发
Jun 29, 2023
f63d326
feat: 完成RootPortal组件开发
Jun 29, 2023
5bc65b6
feat: 完成吸顶布局组件(StickyHeader、StickySection)开发
Jul 3, 2023
2561c80
Merge pull request #6 from handsomeliuyang/release-3.6.8-app-kxj
handsomeliuyang Jul 3, 2023
a6b9fa0
feat: 调试GridVew组件,迁移为react-grid-layout实现。支持自定义瀑布流效果
Jul 3, 2023
8f6d9da
feat: 调试MatchMedia组件,基本功能完成
Jul 4, 2023
1292178
feat: 添加Label控件
Jul 5, 2023
dae1a94
feat: 添加Label控件示例
Jul 5, 2023
3a80431
Merge pull request #7 from coofee/release-3.6.8-app-zcy
handsomeliuyang Jul 5, 2023
c356881
feat: 解决GridView点击事件崩溃问题
Jul 5, 2023
3959f7b
feat: 整理example工程,分页面显示demo
Jul 5, 2023
2d04f9f
feat: 整理example工程,分页面显示demo
Jul 5, 2023
9e83aaf
Merge branch 'release-3.6.8-app' of github.com:handsomeliuyang/taro i…
Jul 5, 2023
8cc463e
feat: 整理example工程,分页面显示demo
Jul 5, 2023
c83534b
Merge pull request #8 from handsomeliuyang/f-3.6.8-compoment-hzp
handsomeliuyang Jul 5, 2023
62d9359
fix: 从2.x迁移taro-transform-wx模块,升级taroize和taro-transform-wx到babel7
qican77 Jul 5, 2023
8ea19ed
Merge branch 'release-3.6.8-app' of github.com:handsomeliuyang/taro i…
qican77 Jul 5, 2023
1096792
Merge pull request #10 from handsomeliuyang/release-3.6.8-app-qc
likailong180 Jul 7, 2023
ab01f78
feat: 桥接native接口,补齐web能力
tangcq-code Jul 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = {
'react/prop-types': 0,
'react/no-find-dom-node': 0,
'react/no-unknown-property': 0,
'import/no-named-default': 'off',
quotes: [2, 'single', { avoidEscape: true, allowTemplateLiterals: true }],
semi: [2, 'never'],
'simple-import-sort/imports': [2, {
Expand Down
13 changes: 13 additions & 0 deletions client/android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
*.iml
.gradle
/local.properties
.idea/
misc.xml
deploymentTargetDropDown.xml
render.experimental.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
5 changes: 5 additions & 0 deletions client/android/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Taro小程序Android端SDK

## 测试方式

把编译完成的小程序dist目录复制到android/library/src/main/assets目录下,重新运行此项目即可
1 change: 1 addition & 0 deletions client/android/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
45 changes: 45 additions & 0 deletions client/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
namespace 'com.taro.android.sample'
compileSdk 33

defaultConfig {
applicationId "com.taro.android.sample"
minSdk 21
targetSdk 33
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {

implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation project(path: ':library')
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
}
21 changes: 21 additions & 0 deletions client/android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.taro.android.sample

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.taro.android.sample", appContext.packageName)
}
}
26 changes: 26 additions & 0 deletions client/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.TaroAndroidSDK"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.taro.android.sample

import android.content.Intent
import android.os.Bundle
import android.widget.Button
import androidx.appcompat.app.AppCompatActivity
import com.taro.android.TaroActivity

class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)

findViewById<Button>(R.id.open_miniprogram).setOnClickListener {
startActivity(Intent(this@MainActivity, TaroActivity::class.java))
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
170 changes: 170 additions & 0 deletions client/android/app/src/main/res/drawable/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>
Loading