迁移网络基础数据BaseData.java

Signed-off-by: 董宏宇 <martindhy@gmail.com>

core/function-impl/mogo-core-function-check/build.gradle

@@ -65,6 +65,7 @@ dependencies {
         implementation project(':modules:mogo-module-service')
         implementation project(':modules:mogo-module-carchattingprovider')
 
+        implementation project(':core:mogo-core-network')
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-function-call')

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt

@@ -1,12 +1,10 @@
 package com.mogo.eagle.core.function.check.net
 
 import android.content.Context
-import android.util.Log
 import com.elegant.network.ParamsBuilder
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.network.SubscribeImpl
 import com.mogo.eagle.core.function.check.api.ICheckResultCallBack
-import com.mogo.eagle.core.function.check.view.CheckActivity
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.utils.network.RequestOptions
 import io.reactivex.android.schedulers.AndroidSchedulers

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckResultData.java

@@ -1,9 +1,8 @@
 package com.mogo.eagle.core.function.check.net;
 
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

core/function-impl/mogo-core-function-notice/build.gradle

@@ -53,17 +53,19 @@ dependencies {
     kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
-        api rootProject.ext.dependencies.mogocommons
-        api rootProject.ext.dependencies.mogoserviceapi
+        implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.mogoserviceapi
         implementation rootProject.ext.dependencies.modulecommon
     } else {
-        api project(":foudations:mogo-commons")
-        api project(':services:mogo-service-api')
-        implementation project(':core:mogo-core-utils')
+        implementation project(":foudations:mogo-commons")
+        implementation project(':services:mogo-service-api')
         implementation project(':modules:mogo-module-common')
+
+        implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
         implementation project(':core:mogo-core-res')
         implementation project(':core:mogo-core-data')
+        implementation project(':core:mogo-core-network')
     }
 }
 

core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java

@@ -10,10 +10,6 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.data.notice.NoticePushData;
 import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider;
-import com.mogo.eagle.core.function.call.notice.CallerNoticeManager;
-import com.mogo.eagle.core.function.notice.receiver.NoticeMessageListener;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.cloud.socket.IMogoLifecycleListener;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java

@@ -3,10 +3,8 @@ package com.mogo.eagle.core.function.notice;
 import android.content.Context;
 import android.util.Log;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.eagle.core.function.notice.receiver.NoticeMessageListener;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.IMogoServiceApis;
 
 /**
  * @author Jing

core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java

@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.function.notice.network;
 
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
 
 import java.util.Map;
 

core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java

@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.notice.network;
 import com.mogo.cloud.network.NetConstants;
 import com.mogo.cloud.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
 
 import java.util.HashMap;
 import java.util.Map;

core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/receiver/NoticeMessageListener.java

@@ -1,8 +1,6 @@
 package com.mogo.eagle.core.function.notice.receiver;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
 import android.util.Log;
 
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;

core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.java

@@ -5,8 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.mogo.eagle.core.data.notice.NoticePushData;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
-import com.mogo.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 
 /**
  * @author Jing

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/BaseData.java

@@ -0,0 +1,12 @@
+package com.mogo.eagle.core.data;
+
+import java.io.Serializable;
+
+/**
+ * Created by congtaowang on 2019/1/7.
+ */
+public class BaseData implements Serializable, Cloneable {
+
+    public int code = -1;
+    public String msg;
+}

core/mogo-core-network/.gitignore

@@ -0,0 +1 @@
+/build

core/mogo-core-network/build.gradle

@@ -0,0 +1,65 @@
+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())
+            }
+        }
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxrecyclerview
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+
+    implementation rootProject.ext.dependencies.videoarmv7
+    implementation rootProject.ext.dependencies.videoarm64
+    implementation rootProject.ext.dependencies.videojava
+    implementation rootProject.ext.dependencies.livesdk
+
+    if (Boolean.valueOf(RELEASE)) {
+
+    } else {
+        implementation project(':core:mogo-core-utils')
+    }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/mogo-core-network/gradle.properties

@@ -0,0 +1,3 @@
+GROUP=com.mogo.eagle.core
+POM_ARTIFACT_ID=mogo-core-network
+VERSION_CODE=1

core/mogo-core-network/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

core/mogo-core-network/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.eagle.core.network">
+
+</manifest>

core/mogo-core-network/src/main/res/layout/item_v2x_crossroad_live_video.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_video_cover"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/surface_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center">
+
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/start"
+        android:layout_width="56px"
+        android:layout_height="56px"
+        android:visibility="gone"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical" />
+</RelativeLayout>

core/mogo-core-network/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_ext_speed_width">460px</dimen>
+    <dimen name="module_ext_speed_height">460px</dimen>
+
+    <dimen name="module_ext_speed_width_sm_radius">30px</dimen>
+    <dimen name="module_ext_speed_width_big_radius">130px</dimen>
+
+    <dimen name="module_ext_arcView_top">40px</dimen>
+    <dimen name="module_ext_arcView_width">320px</dimen>
+    <dimen name="module_ext_arcView_height">320px</dimen>
+    <dimen name="module_ext_arcView_stroke_with">20px</dimen>
+    <dimen name="module_ext_arcView_center_text_size">110px</dimen>
+    <dimen name="module_ext_arcView_des_text_size">40px</dimen>
+
+    <dimen name="module_mogo_autopilot_status_icon_width">74px</dimen>
+    <dimen name="module_mogo_autopilot_status_icon_margin">92px</dimen>
+
+    <dimen name="module_mogo_autopilot_status_bg_width">460px</dimen>
+    <dimen name="module_mogo_autopilot_status_bg_height">140px</dimen>
+    <dimen name="module_mogo_autopilot_status_margin_left">40px</dimen>
+    <dimen name="module_mogo_autopilot_status_margin_top">30px</dimen>
+    <dimen name="module_mogo_autopilot_status_padding">92px</dimen>
+    <dimen name="module_mogo_autopilot_status_text_size">44px</dimen>
+    <dimen name="module_mogo_autopilot_status_text_margin_start">28px</dimen>
+
+    <dimen name="module_hmi_autopilot_status_bg_sm_radius">30px</dimen>
+    <dimen name="module_hmi_autopilot_status_bg_big_radius">70px</dimen>
+
+    <dimen name="module_hmi_check_size">138px</dimen>
+    <dimen name="module_hmi_check_left">368px</dimen>
+    <dimen name="module_hmi_btn_size">60px</dimen>
+    <dimen name="module_hmi_btn_text_size">44px</dimen>
+
+
+    <dimen name="module_switch_map">280px</dimen>
+    <dimen name="module_switch_map_height">120px</dimen>
+    <dimen name="module_switch_margin_left">20px</dimen>
+    <dimen name="module_switch_text_size">38px</dimen>
+    <dimen name="module_switch_image">50px</dimen>
+    <dimen name="module_switch_image_circle">60px</dimen>
+
+
+</resources>

core/mogo-core-network/src/main/res/values/color.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="module_mogo_autopilot_status_enable">#FFFFFF</color>
+    <color name="module_mogo_autopilot_status_disable">#4DFFFFFF</color>
+
+    <color name="module_switch_map_bg">#323C6F</color>
+
+    <color name="module_ext_color_voice_text">#FFFFFF</color>
+
+</resources>

core/mogo-core-network/src/main/res/values/dimens.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_ext_speed_width">300px</dimen>
+    <dimen name="module_ext_speed_height">300px</dimen>
+
+    <dimen name="module_ext_speed_width_sm_radius">20px</dimen>
+    <dimen name="module_ext_speed_width_big_radius">110px</dimen>
+
+    <dimen name="module_ext_arcView_top">40px</dimen>
+    <dimen name="module_ext_arcView_width">200px</dimen>
+    <dimen name="module_ext_arcView_height">200px</dimen>
+    <dimen name="module_ext_arcView_stroke_with">10px</dimen>
+    <dimen name="module_ext_arcView_center_text_size">80px</dimen>
+    <dimen name="module_ext_arcView_des_text_size">28px</dimen>
+
+    <dimen name="module_mogo_autopilot_status_icon_width">46px</dimen>
+    <dimen name="module_mogo_autopilot_status_icon_margin">60px</dimen>
+
+    <dimen name="module_mogo_autopilot_status_bg_width">300px</dimen>
+    <dimen name="module_mogo_autopilot_status_bg_height">100px</dimen>
+    <dimen name="module_mogo_autopilot_status_margin_left">40px</dimen>
+    <dimen name="module_mogo_autopilot_status_margin_top">30px</dimen>
+    <dimen name="module_mogo_autopilot_status_padding">20px</dimen>
+    <dimen name="module_mogo_autopilot_status_text_size">30px</dimen>
+    <dimen name="module_mogo_autopilot_status_text_margin_start">18px</dimen>
+
+    <dimen name="module_hmi_autopilot_status_bg_sm_radius">20px</dimen>
+    <dimen name="module_hmi_autopilot_status_bg_big_radius">50px</dimen>
+
+    <dimen name="module_hmi_check_size">138px</dimen>
+    <dimen name="module_hmi_check_left">368px</dimen>
+    <dimen name="module_hmi_btn_size">38px</dimen>
+    <dimen name="module_hmi_btn_text_size">33px</dimen>
+
+
+    <dimen name="module_switch_map">190px</dimen>
+    <dimen name="module_switch_map_height">76px</dimen>
+    <dimen name="module_switch_margin_left">16px</dimen>
+    <dimen name="module_switch_text_size">24px</dimen>
+    <dimen name="module_switch_image">35px</dimen>
+    <dimen name="module_switch_image_circle">38px</dimen>
+
+
+
+</resources>

core/mogo-core-network/src/main/res/values/string.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="VideoView_info_text_video_not_supported">"不支持该视频。"</string>
+    <string name="file_not_support">此文件不支持播放</string>
+
+
+    <string name="module_map_model_normal">近距视角</string>
+    <string name="module_map_model_faster">远距视角</string>
+</resources>

core/mogo-core-network/src/main/res/values/styles.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="RoundLayout">
+        <attr name="roundLayoutRadius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="CustomCircleImageView">
+        <attr name="civ_border_width" format="dimension" />
+        <attr name="civ_border_color" format="color" />
+        <attr name="civ_border_overlay" format="boolean" />
+        <attr name="civ_fill_color" format="color" />
+    </declare-styleable>
+
+
+</resources>