diff --git a/app/build.gradle b/app/build.gradle index 002a53bf2..003bc9cb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -289,6 +289,8 @@ dependencies { implementation files('libs/msa_mdid_1.0.13.aar') implementation 'com.huawei.hms:push:4.0.4.301' implementation fileTree(dir: 'libs', include: ['oppo-mcssdk-2.0.2.jar']) + // xplan flutter module + implementation project(path: ':flutter') } repositories { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7052f4498..b8d39752f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1270,6 +1270,12 @@ android:theme="@android:style/Theme.Translucent.NoTitleBar" tools:remove="android:screenOrientation" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java index 41d45c0d5..8a7b98532 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java @@ -18,6 +18,8 @@ import com.yizhuan.xchat_android_library.utils.pref.CommonPref; import java.util.ArrayList; +import io.flutter.embedding.android.FlutterActivity; + /** * Created by chenran on 2017/10/16. */ @@ -31,6 +33,7 @@ public class LabActivity extends BaseActivity { findViewById(R.id.rb_h5_test).setOnClickListener(v -> CommonWebViewActivity.start(context, "http://192.168.10.7:5503/")); //vue测试地址 findViewById(R.id.rb_vue_test).setOnClickListener(v -> CommonWebViewActivity.start(context, "http://192.168.10.7:8080/")); + findViewById(R.id.rb_flutter_test).setOnClickListener(v -> startActivity(FlutterActivity.createDefaultIntent(context))); int enviroment = CommonPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt(Env.KEY_ENVIRONMENT); //根据ID找到RadioGroup实例 RadioGroup group = (RadioGroup) this.findViewById(R.id.radioGroup); diff --git a/app/src/main/res/layout/activity_lab.xml b/app/src/main/res/layout/activity_lab.xml index 7c1130063..8296d370e 100644 --- a/app/src/main/res/layout/activity_lab.xml +++ b/app/src/main/res/layout/activity_lab.xml @@ -61,4 +61,15 @@ android:background="@color/color_f5f5f5" android:textColor="@color/color_333333" android:textSize="15sp" /> + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 060557d0f..eab46f086 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,10 @@ include ':app', ':agora-ktv-kit-release', ':android_crop_lib' include ':core' include ':library' -include ':nim_uikit' \ No newline at end of file +include ':nim_uikit' +// 添加 flutter module 依赖 +setBinding(new Binding([gradle: this]))// new +evaluate(new File( // new + settingsDir.parentFile, // new + 'accompany-android/xplan-flutter/.android/include_flutter.groovy' // new +)) \ No newline at end of file diff --git a/xplan-flutter b/xplan-flutter index 4c8d77416..56db6f3e6 160000 --- a/xplan-flutter +++ b/xplan-flutter @@ -1 +1 @@ -Subproject commit 4c8d77416a58334c156f8450092a338a87c885ff +Subproject commit 56db6f3e626936904e3d6c8a3c867bcd38fe2403