diff --git a/core/function-impl/mogo-core-function-bindingcar/.gitignore b/core/function-impl/mogo-core-function-bindingcar/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/build.gradle b/core/function-impl/mogo-core-function-bindingcar/build.gradle new file mode 100644 index 0000000000..111633d37e --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' + id 'com.alibaba.arouter' +} +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + // buildToolsVersion rootProject.ext.android.buildToolsVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode Integer.valueOf(VERSION_CODE) + versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + //ARouter apt 参数 + kapt { + useBuildCache = false + arguments { + arg("AROUTER_MODULE_NAME", project.getName()) + } + } + + javaCompileOptions{ + annotationProcessorOptions{ + arguments = ["room.schemaLocation":"$projectDir/schemas".toString()] + } + } + + } + + 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 fileTree(dir: 'libs', include: ['*.jar']) + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 + implementation rootProject.ext.dependencies.androidxccorektx + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.androidxconstraintlayout + implementation rootProject.ext.dependencies.arouter + implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.androidxrecyclerview + implementation rootProject.ext.dependencies.androidxroomruntime + implementation rootProject.ext.dependencies.androidxroomktx + implementation rootProject.ext.dependencies.litezxing + kapt rootProject.ext.dependencies.androidxroomcompiler + kapt rootProject.ext.dependencies.aroutercompiler + + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { + implementation rootProject.ext.dependencies.mogocommons + implementation rootProject.ext.dependencies.mogoserviceapi + implementation rootProject.ext.dependencies.modulecommon + + implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_utils + implementation rootProject.ext.dependencies.mogo_core_res + implementation rootProject.ext.dependencies.mogo_core_network + implementation rootProject.ext.dependencies.mogo_core_function_call + } else { + implementation project(":foudations:mogo-commons") + implementation project(':services:mogo-service-api') + implementation project(':modules:mogo-module-common') + + implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-res') + implementation project(':core:mogo-core-network') + implementation project(':core:mogo-core-function-call') + } +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-bindingcar/consumer-rules.pro b/core/function-impl/mogo-core-function-bindingcar/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/function-impl/mogo-core-function-bindingcar/gradle.properties b/core/function-impl/mogo-core-function-bindingcar/gradle.properties new file mode 100644 index 0000000000..eb2cf9c236 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=notice +VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-bindingcar/proguard-rules.pro b/core/function-impl/mogo-core-function-bindingcar/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/proguard-rules.pro @@ -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 \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..dc77613661 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java new file mode 100644 index 0000000000..97b71e95fd --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java @@ -0,0 +1,27 @@ +package com.mogo.eagle.core.function.bindingcar; + +import android.content.Context; + +/** + * @author lixiaopeng + * @description + * @since: 10/27/21 + */ +public class BindingcarManager { + private String TAG = "BindingcarManager"; + private static BindingcarManager mBindingcarManager; + private Context mContext; + + public static synchronized BindingcarManager getInstance() { + synchronized (BindingcarManager.class) { + if (mBindingcarManager == null) { + mBindingcarManager = new BindingcarManager(); + } + } + return mBindingcarManager; + } + + + +} + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java new file mode 100644 index 0000000000..953cf7e03a --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -0,0 +1,40 @@ +package com.mogo.eagle.core.function.bindingcar; + +import android.content.Context; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.eagle.core.data.constants.MogoServicePaths; +import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider; +import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; + +import org.jetbrains.annotations.NotNull; + + +/** + * @author Jing + * @description 云公告公告 + * @since: 10/27/21 + */ +@Route(path = MogoServicePaths.PATH_BINDING_CAR) +public class BindingcarProvider implements IMoGoBindingcarProvider { + + @NotNull + @Override + public String getFunctionName() { + return null; + } + + @Override + public void onDestroy() { + } + + @Override + public void init(Context context) { + } + + + @Override + public void modifyCarInfo() { + BindingcarNetWorkManager.getInstance().requestAccidentInfo(""); + } +} diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java new file mode 100644 index 0000000000..289c993022 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java @@ -0,0 +1,28 @@ +package com.mogo.eagle.core.function.bindingcar.network; + +import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; + +import io.reactivex.Observable; +import okhttp3.RequestBody; +import retrofit2.http.Body; +import retrofit2.http.Headers; +import retrofit2.http.POST; + +/** + * @author lixiaopeng + * @description 绑定车辆 + * @since: 10/28/21 + */ +public interface BindingcarApiService { + /** + * 获取道路事故详情 + * + * @param requestBody 请求体(infoId 交警任务id) + * @return {@link NoticeTrafficStyleInfo} + */ + @Headers("Content-Type:application/json;charset=UTF-8") + @POST("/deva/accidentInfoManage/queryMyAccidentHandleInfo/server/v1") + Observable getAccidentInfo(@Body RequestBody requestBody); + + +} diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java new file mode 100644 index 0000000000..dcb5e8faf6 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -0,0 +1,45 @@ +package com.mogo.eagle.core.function.bindingcar.network; + +import com.mogo.cloud.network.NetConstants; +import com.mogo.cloud.network.RetrofitFactory; + +import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack; + +/** + * @author Jing + * @description 云公告网络请求类 + * @since: 10/28/21 + */ +public class BindingcarNetWorkManager { + private static volatile BindingcarNetWorkManager requestNoticeManager; + private final BindingcarApiService mBindingcarApiService; + + private BindingcarNetWorkManager() { + mBindingcarApiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST) + .create(BindingcarApiService.class); + } + + public static BindingcarNetWorkManager getInstance() { + if (requestNoticeManager == null) { + synchronized (BindingcarNetWorkManager.class) { + if (requestNoticeManager == null) { + requestNoticeManager = new BindingcarNetWorkManager(); + } + } + } + return requestNoticeManager; + } + + /** + * 获取事故详细信息 + * + * @param macAddress mac地址 + * @param callBack 回调 + */ + public void requestAccidentInfo(String macAddress) { + + } + + + +} diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java new file mode 100644 index 0000000000..e367f4ae2f --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java @@ -0,0 +1,22 @@ +package com.mogo.eagle.core.function.bindingcar.network; + +/** + * @author lixiaopeng + * @description + * @since: 11/15/21 + */ +public class BindingcarRequest { + private String infoId; + + public BindingcarRequest(String infoId) { + this.infoId = infoId; + } + + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } +} diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_close.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_close.png new file mode 100755 index 0000000000..c1381dc44c Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_close.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_item_background_p.9.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_item_background_p.9.png new file mode 100644 index 0000000000..a5dedc9ca3 Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_item_background_p.9.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_message_background.9.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_message_background.9.png new file mode 100644 index 0000000000..bf455a0ea2 Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-ldpi/module_push_message_background.9.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_close.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_close.png new file mode 100755 index 0000000000..c1381dc44c Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_close.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_item_background_p.9.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_item_background_p.9.png new file mode 100644 index 0000000000..5b43f7451d Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_item_background_p.9.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_message_background.9.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_message_background.9.png new file mode 100644 index 0000000000..bf455a0ea2 Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-mdpi/module_push_message_background.9.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_close.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_close.png new file mode 100755 index 0000000000..bb3e2b1195 Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_close.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_dialog_close.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_dialog_close.png new file mode 100644 index 0000000000..ba03e033d8 Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_dialog_close.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png new file mode 100644 index 0000000000..87a3f9179d Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_message_background.9.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_message_background.9.png new file mode 100644 index 0000000000..d4a8803684 Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable-xhdpi/module_push_message_background.9.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_clear_bg.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_clear_bg.xml new file mode 100644 index 0000000000..cb38368310 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_clear_bg.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_close.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_close.png new file mode 100755 index 0000000000..c1381dc44c Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_close.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_content_background.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_content_background.xml new file mode 100644 index 0000000000..8091d466be --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_content_background.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_decrease_timer_bkg.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_decrease_timer_bkg.xml new file mode 100644 index 0000000000..7031a78049 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_decrease_timer_bkg.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_dialog_check_background.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_dialog_check_background.xml new file mode 100644 index 0000000000..4d721f27c8 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_dialog_check_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_item_background.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_item_background.xml new file mode 100644 index 0000000000..a70936cd5d --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_item_background.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_item_background_origin.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_item_background_origin.xml new file mode 100644 index 0000000000..0d24d54394 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_item_background_origin.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_left_button.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_left_button.xml new file mode 100644 index 0000000000..c17bfd5f97 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_left_button.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_message_background.9.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_message_background.9.png new file mode 100644 index 0000000000..80ab4b841f Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_message_background.9.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_recycler_item_background.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_recycler_item_background.xml new file mode 100644 index 0000000000..2c16e3f684 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_recycler_item_background.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_right_button.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_right_button.xml new file mode 100644 index 0000000000..3f828dcc61 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_right_button.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_ui_delay_background.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_ui_delay_background.xml new file mode 100644 index 0000000000..77a14ee943 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_ui_delay_background.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_ui_ic_message2.png b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_ui_ic_message2.png new file mode 100644 index 0000000000..10f53d3374 Binary files /dev/null and b/core/function-impl/mogo-core-function-bindingcar/src/main/res/drawable/module_push_ui_ic_message2.png differ diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_dialog_check.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_dialog_check.xml new file mode 100644 index 0000000000..8b13014fe8 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_dialog_check.xml @@ -0,0 +1,43 @@ + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item.xml new file mode 100644 index 0000000000..f6375db0f6 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_origin.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_origin.xml new file mode 100644 index 0000000000..3b2d2dc278 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_origin.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_vertical.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_vertical.xml new file mode 100644 index 0000000000..d7829a2fb7 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_item_vertical.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_hisotry_fragment.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_hisotry_fragment.xml new file mode 100644 index 0000000000..15f8e2974e --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_hisotry_fragment.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_item.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_item.xml new file mode 100644 index 0000000000..a01bc6197c --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/layout/module_push_message_item.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-ldpi/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..1f1106b6c5 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,101 @@ + + + 16px + 352px + 32px + 32px + 16.5px + 12px + 20px + 18px + 210px + 13px + 15px + 18px + 320px + 180px + 16px + 320px + 160px + 9px + 20px + 0px + 48px + 10px + 14px + 28px + 20px + 20px + 90px + 5px + 84px + 38px + 36px + 100px + 64px + 24px + 16px + 44px + 2px + 20px + 27px + 16px + 64px + 8px + 16px + + 22px + 27px + 14px + 1.5px + 24px + 10px + 8px + 560px + 194px + 266px + 178px + 8px + 12px + 16px + 19px + 30px + 16px + 8px + 17px + 19px + 16px + 11px + 6px + 18px + 10px + 17px + 10px + 8px + 242px + 270px + 374px + 24px + 19px + 8px + 328px + 164px + 15px + 150px + 20px + 0px + 310px + 350px + 60px + 2px + 2px + 8px + 28px + 16px + 16px + 12px + 5px + 118px + 86px + 8px + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-mdpi/dimens.xml new file mode 100644 index 0000000000..1f1106b6c5 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-mdpi/dimens.xml @@ -0,0 +1,101 @@ + + + 16px + 352px + 32px + 32px + 16.5px + 12px + 20px + 18px + 210px + 13px + 15px + 18px + 320px + 180px + 16px + 320px + 160px + 9px + 20px + 0px + 48px + 10px + 14px + 28px + 20px + 20px + 90px + 5px + 84px + 38px + 36px + 100px + 64px + 24px + 16px + 44px + 2px + 20px + 27px + 16px + 64px + 8px + 16px + + 22px + 27px + 14px + 1.5px + 24px + 10px + 8px + 560px + 194px + 266px + 178px + 8px + 12px + 16px + 19px + 30px + 16px + 8px + 17px + 19px + 16px + 11px + 6px + 18px + 10px + 17px + 10px + 8px + 242px + 270px + 374px + 24px + 19px + 8px + 328px + 164px + 15px + 150px + 20px + 0px + 310px + 350px + 60px + 2px + 2px + 8px + 28px + 16px + 16px + 12px + 5px + 118px + 86px + 8px + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi-2560x1440/dimens.xml new file mode 100644 index 0000000000..4afc379245 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -0,0 +1,39 @@ + + + + 230px + 230px + 230px + 30px + 21px + 34px + 33px + 2px + 120px + 30px + 55px + 42px + 208px + 394px + 42px + 567px + 100px + 20px + 34px + 34px + + + 1200px + 763px + 32px + 107px + 107px + 40px + 54px + 56px + 1000px + 33px + 43px + 20px + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..c7e71bf8e5 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,101 @@ + + + 30px + 660px + 60px + 60px + 31px + 22px + 38px + 32px + 394px + 24px + 28px + 34px + 600px + 338px + 30px + 605px + 300px + 16px + 53px + 0px + 90px + 20px + 26px + 50px + 36px + 36px + 160px + 10px + 151px + 72px + 68px + 180px + 120px + 50px + 22px + 6px + 84px + + 40px + 52px + 28px + 120px + 11px + 26px + 42px + 51px + 27px + 3px + 45px + 20px + 16px + 1000px + 350px + 480px + 320px + 17px + 21px + 30px + 33px + 50px + 30px + 14px + 30px + 27px + 30px + 21px + 11px + 34px + 20px + 30px + 20px + 15px + 242px + 486px + 700px + 30px + 33px + 16px + 640px + 296px + 30px + 250px + 20px + 0px + 618px + 350px + 120px + 20px + 20px + 20px + 50px + 28px + 29px + 22px + 11px + 212px + 154px + 10px + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/attr.xml new file mode 100644 index 0000000000..ca8014fc39 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/attr.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/colors.xml new file mode 100644 index 0000000000..d01c09cbad --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFFFFFFF + #FFFFFF + #B2FFFFFF + #999999 + #B3FFFFFF + #5A8EFD + #E63B4577 + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..dc5f0d6635 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/dimens.xml @@ -0,0 +1,126 @@ + + + 16px + 352px + 32px + 32px + 16.5px + 12px + 20px + 18px + 210px + 13px + 15px + 18px + 320px + 180px + 16px + 320px + 160px + 9px + 20px + 0px + 48px + 10px + 14px + 50px + 20px + 20px + 90px + 5px + 84px + 38px + 36px + 100px + 64px + 24px + 16px + 44px + 2px + 20px + 27px + 16px + 64px + 8px + 16px + + 22px + 27px + 14px + 1.5px + 24px + 10px + 8px + 560px + 194px + 266px + 178px + 8px + 12px + 16px + 19px + 30px + 16px + 8px + 17px + 19px + 16px + 11px + 6px + 18px + 10px + 17px + 10px + 8px + 242px + 270px + 374px + 24px + 19px + 8px + 328px + 164px + 15px + 150px + 20px + 0px + 310px + 350px + 60px + 2px + 2px + 8px + 28px + 16px + 16px + 12px + 5px + 118px + 86px + 8px + + + 34px + 567px + 100px + + 2px + 120px + 30px + 55px + 42px + 208px + + 1200px + 763px + 32px + 107px + 107px + 40px + 54px + 56px + 1000px + 33px + 43px + 20px + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/strings.xml new file mode 100644 index 0000000000..648d863848 --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + mogo-core-function-notice + 清除 + 清空历史消息 + 暂无消息 + 查看 + diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/styles.xml new file mode 100644 index 0000000000..bb44cc75bc --- /dev/null +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/res/values/styles.xml @@ -0,0 +1,9 @@ + + + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 7e343fef53..9cc0593200 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -933,4 +933,5 @@ class MoGoHmiFragment : MvpFragment } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/BindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/BindingCarDialog.kt index f9d8e8941d..93d3eb8858 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/BindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/BindingCarDialog.kt @@ -1,27 +1,13 @@ package com.mogo.eagle.core.function.hmi.ui.bindingcar import android.content.Context -import android.graphics.Bitmap -import android.text.TextUtils -import android.util.Log -import android.view.View -import android.widget.ImageView import android.widget.TextView import androidx.lifecycle.LifecycleObserver -import com.mogo.eagle.core.data.notice.NoticeNormalData import com.mogo.eagle.core.function.hmi.R -import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp -import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform -import com.mogo.eagle.core.utilcode.util.BitmapHelper -import com.mogo.eagle.core.widget.media.video.NoticeSimpleVideoPlayer -import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.dialog.BaseFloatDialog import com.mogo.service.IMogoServiceApis import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor -import com.shuyu.gsyvideoplayer.GSYVideoManager -import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder -import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack /** @@ -42,14 +28,14 @@ class BindingCarDialog(context: Context) : BaseFloatDialog(context), LifecycleOb } init { - setContentView(R.layout.dialog_binding_car) + setContentView(R.layout.dialog_modify_bindingcar) setCanceledOnTouchOutside(true) confirmTv = findViewById(R.id.tv_bindingcar_confirm) cancleTv = findViewById(R.id.tv_bindingcar_cancel) confirmTv?.setOnClickListener { - dismiss() + modifyBindingcar() } cancleTv?.setOnClickListener { @@ -57,14 +43,18 @@ class BindingCarDialog(context: Context) : BaseFloatDialog(context), LifecycleOb } } + /** + * 修改绑定车机 TODO + */ + fun modifyBindingcar() { + + } + override fun dismiss() { super.dismiss() } - /** - * 展示详情页面 - */ - fun showCheckDialog() { + fun showModifyBindingcarDialog() { if (isShowing) { return } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml new file mode 100644 index 0000000000..64c3ef0350 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index 829ada6ab6..579ee51972 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -39,4 +39,9 @@ 确认 取消 + + 绑定车机 + 是否修改车机绑定? + 是否绑定车机? + diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index ece45dd1c2..58076f0352 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -79,6 +79,7 @@ dependencies { api rootProject.ext.dependencies.mogo_core_function_obu_mogo api rootProject.ext.dependencies.mogo_core_function_hmi api rootProject.ext.dependencies.mogo_core_function_notice + api rootProject.ext.dependencies.mogo_core_function_bindingcar api rootProject.ext.dependencies.mogo_core_function_autopilot api rootProject.ext.dependencies.mogo_core_function_check api rootProject.ext.dependencies.mogo_core_function_map @@ -116,6 +117,7 @@ dependencies { api project(':core:function-impl:mogo-core-function-dispatch') api project(':core:mogo-core-function-call') api project(':core:function-impl:mogo-core-function-chat') + api project(':core:function-impl:mogo-core-function-bindingcar') } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index ffc67746ce..1744e94233 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -247,6 +247,13 @@ public class MogoServicePaths { @Deprecated public static final String PATH_AI_NOTICE = "/notice/api"; + /** + * 绑定车机 模块 + */ + @Keep + @Deprecated + public static final String PATH_BINDING_CAR = "/bindingcar/api"; + /** * 云公告 模块 */ diff --git a/modules.txt b/modules.txt index a9d71cb233..cb16026052 100644 --- a/modules.txt +++ b/modules.txt @@ -34,3 +34,4 @@ :core:function-impl:mogo-core-function-chat :core:function-impl:mogo-core-function-devatools :core:function-impl:mogo-core-function-main +:core:function-impl:mogo-core-function-bindingcar \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index a4e3c5175e..391339c25e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -44,7 +44,8 @@ include ':core:function-impl:mogo-core-function-monitoring' include ':core:function-impl:mogo-core-function-carcorder' // 调度业务 include ':core:function-impl:mogo-core-function-dispatch' - +// 绑定车机 +include ':core:function-impl:mogo-core-function-bindingcar' // 车聊聊业务 include ':core:function-impl:mogo-core-function-chat'