listeners = mListeners.get(module);
+ if (listeners != null && !listeners.isEmpty()) {
+ for (IMogoCheckListener listener : listeners) {
+ if (listener != null) {
+ listener.updateMonitoringStatus(hasError);
+ }
+ }
+ }
+ }
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/api/ICheckListener.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/api/ICheckListener.java
new file mode 100644
index 0000000000..171853046c
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/api/ICheckListener.java
@@ -0,0 +1,19 @@
+package com.mogo.module.check.api;
+
+/**
+ * @author liujing
+ * @description 描述
+ * @since: 8/6/21
+ */
+public interface ICheckListener {
+
+ /**
+ * 工控机->鹰眼定位数据延时
+ */
+ void getAutoLocationTimeCallbackDelayed(long time);
+
+ /**
+ * 工控机->鹰眼识别数据延时
+ */
+ void getAutoDataCallbackDelayed(long time);
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/api/SoftCheckApi.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/api/SoftCheckApi.java
new file mode 100644
index 0000000000..4f44271014
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/api/SoftCheckApi.java
@@ -0,0 +1,23 @@
+package com.mogo.module.check.api;
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/7/5 2:54 下午
+ *
+ * 软件环境检测
+ * -----> 自动驾驶版本
+ * -----> 鹰眼版本
+ */
+public interface SoftCheckApi {
+
+ /**
+ * 检测「自动驾驶」版本
+ */
+ void checkAutoPilotSoftVersion();
+
+ /**
+ * 检测「鹰眼」版本
+ */
+ void checkEagleEyeSoftVersion();
+
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java
new file mode 100644
index 0000000000..d61d8e908b
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java
@@ -0,0 +1,135 @@
+package com.mogo.module.check.model;
+
+import com.tencent.bugly.proguard.A;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+/**
+ * @author liujing
+ * @description 描述
+ * @since: 7/28/21
+ */
+public class CheckItemInfo implements Serializable {
+ //view类型
+ private int style;
+ //view顶端标题
+ private String viewTitle;
+
+ //icon 下第一行title 自动驾驶软件\鹰眼系统
+ private String title;
+
+ private String value;
+ private ArrayList itemList;
+ //是否存在异常
+ private boolean usual;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public ArrayList getItemList() {
+ return itemList;
+ }
+
+ public void setItemList(ArrayList itemList) {
+ this.itemList = itemList;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public boolean isUsual() {
+ return usual;
+ }
+
+ public void setUsual(boolean usual) {
+ this.usual = usual;
+ }
+
+ public int getStyle() {
+ return style;
+ }
+
+ public void setStyle(int style) {
+ this.style = style;
+ }
+
+ public String getViewTitle() {
+ return viewTitle;
+ }
+
+ public void setViewTitle(String viewTitle) {
+ this.viewTitle = viewTitle;
+ }
+
+ @Override
+ public String toString() {
+ return "CheckItemInfo{" +
+ "style=" + style +
+ ", viewTitle='" + viewTitle + '\'' +
+ ", title='" + title + '\'' +
+ ", value='" + value + '\'' +
+ ", itemList=" + itemList +
+ ", usual=" + usual +
+ '}';
+ }
+
+ public static class DetailItem implements Serializable {
+ private boolean usual;
+ private String title;
+ private String value;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public boolean isUsual() {
+ return usual;
+ }
+
+ public void setUsual(boolean usual) {
+ this.usual = usual;
+ }
+
+ @Override
+ public String toString() {
+ return "DetailItem{" +
+ "usual=" + usual +
+ ", title='" + title + '\'' +
+ ", value='" + value + '\'' +
+ '}';
+ }
+ }
+
+ public interface CheckAdapterStyleEnum {
+ int ITEM_TYPE_CHECK_TITLE = 0;
+ int ITEM_TYPE_CHECK_LIST = 1;
+ int ITEM_TYPE_CHECK_IMAGE = 2;
+ }
+}
+
+
+
+
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckApiServiceFactory.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckApiServiceFactory.java
new file mode 100644
index 0000000000..acb9402978
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckApiServiceFactory.java
@@ -0,0 +1,10 @@
+package com.mogo.module.check.net;
+
+/**
+ * @author liujing
+ * @description 描述
+ * @since: 8/13/21
+ */
+public class CheckApiServiceFactory {
+
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckApiServices.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckApiServices.java
new file mode 100644
index 0000000000..4afbfe836c
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckApiServices.java
@@ -0,0 +1,17 @@
+package com.mogo.module.check.net;
+
+import android.database.Observable;
+import java.util.Map;
+import retrofit2.http.FieldMap;
+import retrofit2.http.POST;
+
+/**
+ * @author liujing
+ * @description 描述
+ * @since: 8/13/21
+ */
+public interface CheckApiServices {
+
+ @POST("/yycp-vehicle-management-service/monitor/reciveInfo")
+ Observable uploadCheckDetail(@FieldMap Map param);
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckResultData.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckResultData.java
new file mode 100644
index 0000000000..a55e27e972
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/net/CheckResultData.java
@@ -0,0 +1,11 @@
+package com.mogo.module.check.net;
+
+import com.mogo.commons.data.BaseData;
+
+/**
+ * @author liujing
+ * @description 描述
+ * @since: 8/13/21
+ */
+public class CheckResultData extends BaseData {
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java
new file mode 100644
index 0000000000..f9afa2cc34
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java
@@ -0,0 +1,581 @@
+package com.mogo.module.check.view;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.commons.voice.AIAssist;
+import com.mogo.map.check.IMogoCheckListener;
+import com.mogo.module.check.R;
+import com.mogo.module.check.model.CheckItemInfo;
+import com.mogo.module.common.MogoApisHandler;
+import com.mogo.module.common.view.ImageViewClipBounds;
+import com.mogo.module.common.view.SpacesItemDecoration;
+import com.mogo.module.service.receiver.MogoReceiver;
+import com.mogo.utils.CommonUtils;
+import com.mogo.utils.network.utils.NetworkStatusUtil;
+import com.tencent.bugly.beta.Beta;
+import com.tencent.bugly.beta.UpgradeInfo;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author liujing
+ * @description 车辆监控页面
+ * @since: 7/27/21
+ */
+public class CheckActivity extends AppCompatActivity {
+
+ private static final String TAG = "CheckActivity";
+ private RecyclerView mRecyclerView;
+ private static ArrayList dataArrayList = new ArrayList();
+ private static Context context;
+ private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus;
+ private ImageView mImageView;
+ private static String packageName = "com.mogo.launcher.f";
+ //车模
+ private ImageView scanBottomCarImage;
+ //扫描束
+ private ImageView scanLineImage;
+ //车辆模型顶部色值加深车模
+ private ImageViewClipBounds scanTopImageView;
+ //车模顶部小部件图片
+ private ImageViewClipBounds tipsImageView;
+ //动画组
+ private AnimatorSet setAnimation = null;
+ private ValueAnimator mValueAnimator;
+ private float movement = 1162f;
+ //进度条
+ private ProgressBar mProgressBar;
+ private final static long DURATION_TIME = 3000;
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_check);
+ initView();
+ }
+
+ /**
+ * 列表View初始化
+ */
+ public void initView() {
+ setAnimation = new AnimatorSet();
+ mImageView = findViewById(R.id.btnBack);
+ scanBottomCarImage = findViewById(R.id.scan_car_image);
+ scanLineImage = findViewById(R.id.scan_line_image);
+ scanTopImageView = findViewById(R.id.scan_car_top_image);
+ tipsImageView = findViewById(R.id.scan_car_tips);
+ mProgressBar = findViewById(R.id.check_progress);
+ context = mImageView.getContext();
+ packageName = getPackageName(context);
+ mImageView.setOnClickListener(v -> {
+ finish();
+ });
+ //检测动画
+ animation();
+ //版本检测 和系统检查放在第二期
+// versionCheckResult();
+// //系统检测
+// systemCheckResult();
+ //软件检测
+ software();
+ //硬件检测
+ hardware();
+ //根据以上4个结果插入第一个元素(自动驾驶车辆是否存在风险)
+ topListTitle();
+
+ mRecyclerView = findViewById(R.id.check_list);
+ mRecyclerView.setAdapter(new CheckAdapter(context, dataArrayList));
+ CheckLinearLayout linearLayoutManager =
+ new CheckLinearLayout(this, CheckLinearLayout.VERTICAL, false);
+ mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.check_item_space_vr)));
+ mRecyclerView.setLayoutManager(linearLayoutManager);
+
+
+ }
+
+ /**
+ * 自动驾驶状态下指标监测
+ */
+ public static boolean checkMonitor() {
+ dataArrayList.clear();
+ Log.d(TAG, "checkMonitor");
+ //版本检测
+// versionCheckResult();
+// //系统检测
+// systemCheckResult();
+ //软件检测
+ software();
+ //硬件检测
+ hardware();
+ //根据以上4个结果插入第一个元素(自动驾驶车辆是否存在风险)
+ topListTitle();
+ MogoApisHandler.getInstance().getApis().getCheckProvider().updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING,false);
+ return true;
+ }
+
+ /**
+ * 自动驾驶是否存在风险
+ */
+ private static void topListTitle() {
+ ArrayList list = new ArrayList(1);
+ CheckItemInfo info = new CheckItemInfo();
+ info.setUsual(false);
+ info.setTitle("自动驾驶车辆存在风险");
+ info.setStyle(CheckItemInfo.CheckAdapterStyleEnum.ITEM_TYPE_CHECK_TITLE);
+ list.add(info);
+ dataArrayList.add(0, list);
+ }
+
+ /**
+ * @param context
+ * @return 当前应用的版本名称
+ */
+ public static synchronized String getPackageName(Context context) {
+ try {
+ PackageManager packageManager = context.getPackageManager();
+ PackageInfo packageInfo = packageManager.getPackageInfo(
+ context.getPackageName(), 0);
+ Log.d(TAG, "包名:" + packageInfo.packageName);
+ return packageInfo.packageName;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "com.mogo.launcher.f";
+ }
+
+ /**
+ * **************************************************************************************检测动画
+ */
+ public void animation() {
+ ObjectAnimator animatorX = ObjectAnimator.ofFloat(scanLineImage, "translationX", scanBottomCarImage.getWidth(), 0);
+ ObjectAnimator animatorAl = ObjectAnimator.ofFloat(scanLineImage, "alpha", 0, 1);
+ setAnimation.playTogether(animatorX, animatorAl);
+ setAnimation.setDuration(800);
+ setAnimation.start();
+ setAnimation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ super.onAnimationEnd(animation);
+ if (scanTopImageView != null) {
+ movement = (float) scanTopImageView.getWidth();
+ scanLineImage.setVisibility(View.VISIBLE);
+ scanTopImageView.setVisibility(View.VISIBLE);
+ tipsImageView.setVisibility(View.VISIBLE);
+ }
+ if (scanLineImage != null) {
+ scanLineImage
+ .animate()
+ .translationX(movement)
+ .setDuration(DURATION_TIME)
+ .setListener(new Animator.AnimatorListener() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ animatorScanCarBorder(true, scanTopImageView.getWidth());
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+
+ }
+
+ @Override
+ public void onAnimationRepeat(Animator animation) {
+
+ }
+ }).start();
+ }
+ }
+ });
+ }
+
+ /**
+ * 扫描动画:实现扫描束位移+顶部深色车模及检测元件的显示
+ */
+ public void animatorScanCarBorder(boolean show, int weight) {
+ if (show) {
+ mValueAnimator = ValueAnimator.ofInt(0, weight);
+ } else {
+ }
+ mValueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animation) {
+ Rect rect = new Rect(0, 0, (int) mValueAnimator.getAnimatedValue(), scanTopImageView.getHeight());
+ setProgressBarRefresh((int) mValueAnimator.getAnimatedValue());
+ scanTopImageView.setClip(rect);
+ tipsImageView.setClip(rect);
+ }
+ });
+ mValueAnimator.setDuration(DURATION_TIME);
+ mValueAnimator.start();
+ }
+
+ /**
+ * 进度条状态刷新
+ */
+ public void setProgressBarRefresh(int animateValue) {
+ if (mProgressBar != null) {
+ double scale = new BigDecimal((float) animateValue / scanBottomCarImage.getWidth())
+ .setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() * 100;
+ if (mProgressBar.getProgress() < 100) {
+ mProgressBar.setProgress((int) scale);
+ } else {
+ findViewById(R.id.animationLayout).setVisibility(View.GONE);
+ }
+ }
+ }
+
+ /**
+ * **************************************************************************************版本检测
+ */
+ public static void versionCheckResult() {
+ ArrayList arrayVer = new ArrayList();
+ //adas 检测指标
+
+ //鹰眼当前版本
+ String verCodeStr = CommonUtils.getVersionName(context, true);
+ Log.d(TAG, "版本检测结果:鹰眼" + verCodeStr);
+
+ //测试数据
+ CheckItemInfo itemInfo = new CheckItemInfo();
+ itemInfo.setViewTitle("版本检测：");
+ itemInfo.setTitle("自动驾驶升级到\n 版本3.1.2.7");
+ if ("不是最新版本" != null) {
+ itemInfo.setUsual(false);
+ itemInfo.setValue("版本升级");
+ } else {
+ itemInfo.setUsual(true);
+ itemInfo.setValue("最新版本 无风险");
+ }
+ arrayVer.add(itemInfo);
+
+ CheckItemInfo yingyan = new CheckItemInfo();
+ UpgradeInfo upgradeInfo = Beta.getUpgradeInfo();
+ if (upgradeInfo == null) {
+ yingyan.setUsual(true);
+ yingyan.setTitle(" 鹰眼 \n版本" + verCodeStr);
+ yingyan.setValue("最新版本 无风险");
+ } else {
+ yingyan.setUsual(false);
+ yingyan.setTitle(" 鹰眼升级到 \n版本" + upgradeInfo.versionName);
+ yingyan.setValue("版本升级");
+ }
+ arrayVer.add(yingyan);
+ dataArrayList.add(arrayVer);
+ }
+
+ /**
+ * **************************************************************************************系统检测
+ */
+ public static void systemCheckResult() {
+ ArrayList arrSys = new ArrayList();
+ //网络
+ netStatus();
+ //电量
+ float battery = CommonUtils.getBattery(context);
+ //cpu占比
+ double cpu = CommonUtils.getCPU(packageName);
+ //内存占比
+ double memory = CommonUtils.getMemory(packageName);
+ //风险状态
+ CheckItemInfo itemInfo = new CheckItemInfo();
+ itemInfo.setViewTitle("系统检测：");
+ itemInfo.setTitle("自动驾驶系统");
+ itemInfo.setUsual(false);
+ itemInfo.setValue("存在风险");
+ ArrayList list = new ArrayList();
+ //详细指标值
+ CheckItemInfo.DetailItem item = new CheckItemInfo.DetailItem();
+ item.setTitle("工控机链接状态");
+ item.setValue("断开");
+ list.add(item);
+ arrSys.add(itemInfo);
+
+ //鹰眼测试数据
+ CheckItemInfo yingyan = new CheckItemInfo();
+ yingyan.setTitle("鹰眼软件");
+ yingyan.setUsual(false);
+ yingyan.setValue("无风险");
+
+ CheckItemInfo.DetailItem netItem = new CheckItemInfo.DetailItem();
+ netItem.setTitle("网络状态");
+ netItem.setValue(String.valueOf(sNetWorkStatus.getSignalStrength()));
+ list.add(netItem);
+
+ CheckItemInfo.DetailItem batteryItem = new CheckItemInfo.DetailItem();
+ batteryItem.setTitle("电池状态");
+ batteryItem.setValue(String.valueOf(battery));
+ list.add(batteryItem);
+
+ CheckItemInfo.DetailItem cpuItem = new CheckItemInfo.DetailItem();
+ cpuItem.setTitle("CPU占比");
+ cpuItem.setValue(String.valueOf(cpu));
+ list.add(cpuItem);
+
+ CheckItemInfo.DetailItem memoryItem = new CheckItemInfo.DetailItem();
+ memoryItem.setTitle("内存占比");
+ memoryItem.setValue(String.valueOf(memory));
+ list.add(memoryItem);
+ yingyan.setItemList(list);
+ arrSys.add(yingyan);
+
+ dataArrayList.add(arrSys);
+
+ }
+
+ /**
+ * 网络
+ */
+ public static NetworkStatusUtil.NetWorkStatus netStatus() {
+ //网络类型
+ sNetWorkStatus = NetworkStatusUtil.networkState(context);
+ //网络强度
+ if (sNetWorkStatus != null && sNetWorkStatus.getStatus() != null && sNetWorkStatus.getStatus() != "UNKNOWN") {
+ Log.d(TAG, "网络类型:" + sNetWorkStatus.getStatus() + "网络强度:" + sNetWorkStatus.getSignalStrength());
+ if (sNetWorkStatus.getSignalStrength() <= -90) {
+ AIAssist.getInstance(context).speakTTSVoice("网络信号差");
+ }
+ } else {
+ Log.d(TAG, "网络未连接");
+ AIAssist.getInstance(context).speakTTSVoice("网络未连接");
+ }
+ return sNetWorkStatus;
+
+ }
+
+ /**
+ * **************************************************************************************软件测试
+ * 自动驾驶侧:
+ * 1、车控节点
+ *
+ * 2、轨迹地图加载节点
+ *
+ * 3、轨迹规划节点
+ *
+ * 4、定位转化节点
+ *
+ * 5、融合节点
+ *
+ * 6、yolov5节点（包含红绿灯检测）
+ *
+ * 7、激光雷达渲染节点
+ *
+ * 8、摄像头驱动节点
+ *
+ * 9、gnss定位驱动节点
+ *
+ * 10、中激光驱动节点
+ *
+ * 11、左激光解码节点
+ *
+ * 12、左激光驱动节点
+ *
+ * 13、右激光解码节点
+ *
+ * 14、右激光驱动节点
+ *
+ * 15、监控节点
+ *
+ * 16、通讯交互节点
+ *
+ * 17、轨迹录制节点
+ *
+ * 18、can车辆控制节点
+ *
+ * 数据上报频率 什么数据的上报频率
+ *
+ * 时延 工控机->云 工控机->鹰眼 什么数据的时延
+ */
+ public static void software() {
+ ArrayList arrSoftware = new ArrayList();
+ CheckItemInfo itemInfo = new CheckItemInfo();
+ itemInfo.setViewTitle("软件检测：");
+ itemInfo.setTitle("自动驾驶系统");
+ itemInfo.setUsual(true);
+ itemInfo.setValue("无风险");
+ arrSoftware.add(itemInfo);
+
+ CheckItemInfo itemY = new CheckItemInfo();
+ itemY.setTitle("鹰眼软件");
+ itemY.setUsual(true);
+ itemY.setValue("无风险");
+ arrSoftware.add(itemY);
+ dataArrayList.add(arrSoftware);
+
+ time();
+ }
+
+ /**
+ * 时延
+ * 需要产品确认哪些指标? 定位+周边识别?
+ */
+ public static long time() {
+
+ final long start = System.nanoTime();
+ long adasDataTime = TimeUnit.NANOSECONDS.toMillis((System.nanoTime() - start));
+ Log.i("ADAS数据延时", "接收数据 -> 发出 cost :" + adasDataTime + "ms");
+ return adasDataTime;
+ }
+
+ /**
+ * **************************************************************************************硬件测试
+ * 1、主激光雷达
+ *
+ * 2、侧激光雷达-2个
+ *
+ * 3、ADAS长焦摄像头-前
+ *
+ * 4、ADAS广角摄像头-前
+ *
+ * 5、ADAS标准摄像头-前
+ *
+ * 6、ADAS广角摄像头-后
+ *
+ * 7、RTK设备
+ *
+ * 8、OBU设备
+ *
+ * 9、路由器
+ */
+ public static void hardware() {
+ ArrayList arrHardware = new ArrayList();
+ CheckItemInfo itemInfo = new CheckItemInfo();
+ itemInfo.setViewTitle("硬件检测：");
+ itemInfo.setTitle("自动驾驶系统");
+ itemInfo.setUsual(false);
+
+ ArrayList detailItem = new ArrayList();
+ CheckItemInfo.DetailItem padItem = new CheckItemInfo.DetailItem();
+ padItem.setTitle("Pad");
+ padItem.setValue("异常");
+ detailItem.add(padItem);
+
+ CheckItemInfo.DetailItem cameraTop = new CheckItemInfo.DetailItem();
+ cameraTop.setTitle("摄像头_top");
+ cameraTop.setValue("正常");
+ detailItem.add(cameraTop);
+
+ CheckItemInfo.DetailItem cameraMiddle = new CheckItemInfo.DetailItem();
+ cameraMiddle.setTitle("摄像头_Middle");
+ cameraMiddle.setValue("正常");
+ detailItem.add(cameraMiddle);
+
+ CheckItemInfo.DetailItem cameraBottom = new CheckItemInfo.DetailItem();
+ cameraBottom.setTitle("摄像头_Bottom");
+ cameraBottom.setValue("正常");
+ detailItem.add(cameraBottom);
+
+ CheckItemInfo.DetailItem zhuJiGuang = new CheckItemInfo.DetailItem();
+ zhuJiGuang.setTitle("主机光雷达");
+ zhuJiGuang.setValue("异常");
+ detailItem.add(zhuJiGuang);
+
+
+ CheckItemInfo.DetailItem jiGuangLeft = new CheckItemInfo.DetailItem();
+ jiGuangLeft.setTitle("左侧激光雷达");
+ jiGuangLeft.setValue("异常");
+ detailItem.add(jiGuangLeft);
+
+ CheckItemInfo.DetailItem jiGuangRight = new CheckItemInfo.DetailItem();
+ jiGuangRight.setTitle("右侧激光雷达");
+ jiGuangRight.setValue("正常");
+ detailItem.add(jiGuangRight);
+
+ CheckItemInfo.DetailItem changjiao = new CheckItemInfo.DetailItem();
+ changjiao.setTitle("ADAS长焦摄像头");
+ changjiao.setValue("正常");
+ detailItem.add(changjiao);
+
+ CheckItemInfo.DetailItem guangJiaoFront = new CheckItemInfo.DetailItem();
+ guangJiaoFront.setTitle("ADAS广焦摄像头-前");
+ guangJiaoFront.setValue("正常");
+ detailItem.add(guangJiaoFront);
+
+ CheckItemInfo.DetailItem custom = new CheckItemInfo.DetailItem();
+ custom.setTitle("ADAS标准摄像头");
+ custom.setValue("正常");
+ detailItem.add(custom);
+
+ CheckItemInfo.DetailItem guangJiaoBe = new CheckItemInfo.DetailItem();
+ guangJiaoBe.setTitle("ADAS广焦摄像头-后");
+ guangJiaoBe.setValue("正常");
+ detailItem.add(guangJiaoBe);
+
+ CheckItemInfo.DetailItem rtk = new CheckItemInfo.DetailItem();
+ rtk.setTitle("RTK设备");
+ rtk.setValue("正常");
+ detailItem.add(rtk);
+
+ CheckItemInfo.DetailItem obu = new CheckItemInfo.DetailItem();
+ obu.setTitle("OUB设备");
+ obu.setValue("正常");
+ detailItem.add(obu);
+
+ CheckItemInfo.DetailItem luyou = new CheckItemInfo.DetailItem();
+ luyou.setTitle("路由器");
+ luyou.setValue("正常");
+ detailItem.add(luyou);
+ itemInfo.setItemList(detailItem);
+
+ arrHardware.add(itemInfo);
+ dataArrayList.add(arrHardware);
+
+ }
+
+ /**
+ * 检测指标上报
+ */
+ public void publishCheckDetail() {
+// MogoApisHandler.getInstance().getApis().getNetworkApi().create(CheckApiServices.class,
+// HostConst.DEVA_HOST).uploadCheckDetail().
+ }
+
+ public static void start(Context context) {
+ Intent starter = new Intent(context, CheckActivity.class);
+ context.startActivity(starter);
+ }
+
+ /**
+ * 指标异常弹框
+ */
+ public static void showDialog(Context context) {
+ CheckDialog dialog = new CheckDialog(context, true);
+ dialog.show();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ dataArrayList.clear();
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ }
+
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java
new file mode 100644
index 0000000000..b52ba88b14
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java
@@ -0,0 +1,241 @@
+package com.mogo.module.check.view;
+
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.module.check.R;
+import com.mogo.module.check.model.CheckItemInfo;
+import com.mogo.module.common.MogoApisHandler;
+import com.tencent.bugly.proguard.A;
+
+import java.util.ArrayList;
+
+/**
+ * @author liujing
+ * @description 检测界面单元格
+ * @since: 7/27/21
+ */
+public class CheckAdapter extends RecyclerView.Adapter {
+
+ private static final String TAG = "CheckActivity";
+ LayoutInflater mLayoutInflater;
+ ArrayList dataArrayList;
+ private Context mContext;
+
+ public CheckAdapter(@NonNull Context context, @NonNull ArrayList checkArray) {
+ mContext = context;
+ mLayoutInflater = LayoutInflater.from(context);
+ dataArrayList = checkArray;
+ Log.d(TAG, dataArrayList.toString());
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ if (position == 0) {
+ return CheckItemInfo.CheckAdapterStyleEnum.ITEM_TYPE_CHECK_TITLE;
+
+ } else if (position == 1) {
+ return CheckItemInfo.CheckAdapterStyleEnum.ITEM_TYPE_CHECK_LIST;
+ }
+ return CheckItemInfo.CheckAdapterStyleEnum.ITEM_TYPE_CHECK_IMAGE;
+ }
+
+ @NonNull
+ @Override
+ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ if (viewType == CheckItemInfo.CheckAdapterStyleEnum.ITEM_TYPE_CHECK_TITLE) {
+ View v = mLayoutInflater.inflate(R.layout.check_titel, parent,
+ false);
+ CheckTitleViewHolder holder = new CheckTitleViewHolder(v);
+ return holder;
+ }
+ if (viewType == CheckItemInfo.CheckAdapterStyleEnum.ITEM_TYPE_CHECK_IMAGE) {
+ View v = mLayoutInflater.inflate(R.layout.check_hardware, parent,
+ false);
+ CheckImage holder = new CheckImage(v);
+ return holder;
+ }
+ View v = mLayoutInflater.inflate(R.layout.check_list, parent,
+ false);
+ CheckListViewHolder holder = new CheckListViewHolder(v);
+ return holder;
+ }
+
+ /**
+ * 顶部view列表
+ */
+ class CheckTitleViewHolder extends RecyclerView.ViewHolder {
+ private ImageView errorImage;
+ private TextView mTextView;
+
+ public CheckTitleViewHolder(@NonNull View itemView) {
+ super(itemView);
+ errorImage = itemView.findViewById(R.id.error_tip_image);
+ mTextView = itemView.findViewById(R.id.error_title);
+ }
+ }
+
+ /**
+ * 版本->软件检测
+ */
+ class CheckListViewHolder extends RecyclerView.ViewHolder {
+ private TextView viewTitle;
+ private TextView iconAutoTitle;
+ private TextView autoRiskState;
+
+ private TextView iconyingTitle;
+ private TextView yingRiskState;
+
+ public CheckListViewHolder(@NonNull View itemView) {
+ super(itemView);
+ viewTitle = itemView.findViewById(R.id.list_item_title);
+ //自动驾驶
+ iconAutoTitle = itemView.findViewById(R.id.icon_auto_title);
+ autoRiskState = itemView.findViewById(R.id.auto_risk_state);
+ //鹰眼应用
+ iconyingTitle = itemView.findViewById(R.id.icon_ying_title);
+ yingRiskState = itemView.findViewById(R.id.ying_risk_state);
+ itemView.setLongClickable(true);
+ itemView.setOnLongClickListener(v -> {
+ Log.d(TAG, "长按显示状态工具栏");
+ Intent intent = new Intent();
+ intent.putExtra("oper", 52);
+ return true;
+ });
+
+ }
+ }
+
+ /**
+ * 硬件检测
+ */
+ class CheckImage extends RecyclerView.ViewHolder {
+ private ImageView pad;
+ private ImageView jiaoJiGuangTop;
+ private TextView jiaoJiGuangTopText;
+ private ImageView jiaoJiGuangBottom;
+ private TextView jiaoJiGuangBottomText;
+ private ImageView zhuJiGuang;
+ private ImageView rtk;
+ private ImageView cameraTop;
+ private ImageView cameraMiddle;
+ private ImageView cameraBottom;
+ private ImageView cameraBehind;
+ private ImageView luyouqi;
+ private ImageView obu;
+
+ public CheckImage(@NonNull View itemView) {
+ super(itemView);
+ pad = itemView.findViewById(R.id.pad);
+ jiaoJiGuangTop = itemView.findViewById(R.id.jiaoJiGuangTop);
+ jiaoJiGuangTopText = itemView.findViewById(R.id.jiaoJiGuangTop_txt);
+ jiaoJiGuangBottom = itemView.findViewById(R.id.jiaoJiGuangBottom);
+ jiaoJiGuangBottomText = itemView.findViewById(R.id.jiaoJiGuangBottom_txt);
+ zhuJiGuang = itemView.findViewById(R.id.zhujiguang);
+ rtk = itemView.findViewById(R.id.rtk);
+ cameraTop = itemView.findViewById(R.id.top);
+ cameraMiddle = itemView.findViewById(R.id.middle);
+ cameraBottom = itemView.findViewById(R.id.bottom);
+ cameraBehind = itemView.findViewById(R.id.camera_begind);
+ luyouqi = itemView.findViewById(R.id.luyouqi);
+ obu = itemView.findViewById(R.id.obu);
+ }
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+ try {
+ Object list = dataArrayList.get(position);
+ if (position == 0) {
+ if (list instanceof ArrayList && ((ArrayList) list).size() > 0) {
+ CheckItemInfo item = (CheckItemInfo) ((ArrayList) list).get(0);
+ ((CheckTitleViewHolder) holder).mTextView.setText(item.getTitle());
+ if (item.isUsual() == true) {
+ ((CheckTitleViewHolder) holder).errorImage.setImageResource(R.drawable.check_right);
+ } else {
+ ((CheckTitleViewHolder) holder).errorImage.setImageResource(R.drawable.check_wrong);
+ }
+ }
+ } else if (position == dataArrayList.size() - 1) {
+ ((CheckListViewHolder) holder).viewTitle.setText("硬件检测：");
+ if (list instanceof ArrayList) {
+ refreshHardware(holder, (ArrayList) list);
+ }
+ } else {
+ if (list instanceof ArrayList && ((ArrayList) list).size() > 1) {
+ CheckItemInfo item = (CheckItemInfo) ((ArrayList) list).get(0);
+ ((CheckListViewHolder) holder).viewTitle.setText(item.getViewTitle());
+ //自动驾驶 状态展示
+ ((CheckListViewHolder) holder).iconAutoTitle.setText(item.getTitle());
+ ((CheckListViewHolder) holder).autoRiskState.setText(item.getValue());
+ if (item.isUsual() == true) {
+ ((CheckListViewHolder) holder).autoRiskState.setTextColor(mContext.getResources().getColor(R.color.check_little_btn_green));
+ } else {
+ ((CheckListViewHolder) holder).autoRiskState.setTextColor(mContext.getResources().getColor(R.color.check_tip_error_color));
+ }
+ if (position == 1) {
+ if (item.isUsual() == false) {
+ ((CheckListViewHolder) holder).autoRiskState.setTextColor(mContext.getResources().getColor(R.color.modules_commons_toast_text_color));
+ ((CheckListViewHolder) holder).autoRiskState.setBackground(mContext.getResources().getDrawable(R.drawable.check_detail));
+ ((CheckListViewHolder) holder).autoRiskState.setOnClickListener(v -> {
+ Log.d(TAG, "点击自动驾驶升级");
+ });
+ } else {
+ ((CheckListViewHolder) holder).autoRiskState.setTextColor(mContext.getResources().getColor(R.color.check_little_btn_green));
+ }
+ }
+ //鹰眼 状态展示
+ CheckItemInfo itemForYing = (CheckItemInfo) ((ArrayList) list).get(1);
+ ((CheckListViewHolder) holder).iconyingTitle.setText(itemForYing.getTitle());
+ ((CheckListViewHolder) holder).yingRiskState.setText(itemForYing.getValue());
+ if (itemForYing.isUsual() == true) {
+ ((CheckListViewHolder) holder).yingRiskState.setTextColor(mContext.getResources().getColor(R.color.check_little_btn_green));
+ } else {
+ ((CheckListViewHolder) holder).yingRiskState.setTextColor(mContext.getResources().getColor(R.color.check_tip_error_color));
+ }
+ if (position == 1) {
+ if (itemForYing.isUsual() == false) {
+ ((CheckListViewHolder) holder).yingRiskState.setTextColor(mContext.getResources().getColor(R.color.modules_commons_toast_text_color));
+ ((CheckListViewHolder) holder).yingRiskState.setBackground(mContext.getResources().getDrawable(R.drawable.check_detail));
+ ((CheckListViewHolder) holder).yingRiskState.setOnClickListener(v -> {
+ Log.d(TAG, "点击鹰眼升级");
+ });
+ } else {
+ ((CheckListViewHolder) holder).yingRiskState.setTextColor(mContext.getResources().getColor(R.color.check_little_btn_green));
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 硬件检测指标
+ *
+ * @param list
+ */
+ public void refreshHardware(@NonNull RecyclerView.ViewHolder holder, ArrayList list) {
+ if (list.size() > 0) {
+ CheckItemInfo info = (CheckItemInfo) list.get(0);
+ }
+
+ }
+
+ @Override
+ public int getItemCount() {
+ return dataArrayList.size();
+ }
+
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckDialog.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckDialog.java
new file mode 100644
index 0000000000..45335b2972
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckDialog.java
@@ -0,0 +1,59 @@
+package com.mogo.module.check.view;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+
+import com.mogo.module.check.R;
+import com.mogo.module.common.dialog.BaseFloatDialog;
+
+/**
+ * @author liujing
+ * @description 车辆监控弹框提示
+ * @since: 7/30/21
+ */
+public class CheckDialog extends BaseFloatDialog {
+
+ private ImageView cancel;
+ private boolean showWarning;
+
+ public CheckDialog(@NonNull Context context, boolean hasError) {
+ super(context);
+ showWarning = hasError;
+ initView();
+ }
+
+ public CheckDialog(@NonNull Context context, int themeResId) {
+ super(context, themeResId);
+ }
+
+ public void initView() {
+ setContentView(R.layout.check_dialog);
+ cancel = findViewById(R.id.cancel_button);
+ cancel.setOnClickListener(v -> {
+ cancel();
+ });
+
+ //根据条件显示体检页面/风险提示
+ if (showWarning == true) {
+ findViewById(R.id.error_view).setVisibility(View.VISIBLE);
+ findViewById(R.id.check_view).setVisibility(View.INVISIBLE);
+
+ } else {
+ findViewById(R.id.error_view).setVisibility(View.INVISIBLE);
+ findViewById(R.id.check_view).setVisibility(View.VISIBLE);
+ }
+ }
+
+
+ public void cancel() {
+ super.dismiss();
+ }
+
+ @Override
+ public void dismiss() {
+
+ }
+}
diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java
new file mode 100644
index 0000000000..f29ced75ee
--- /dev/null
+++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java
@@ -0,0 +1,36 @@
+package com.mogo.module.check.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * @author liujing
+ * @description 描述
+ * @since: 7/27/21
+ */
+class CheckLinearLayout extends LinearLayoutManager {
+ public CheckLinearLayout(Context context) {
+ super(context);
+ }
+
+ public CheckLinearLayout(Context context, int orientation, boolean reverseLayout) {
+ super(context, orientation, reverseLayout);
+ }
+
+ public CheckLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ @Override
+ public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+ try {
+ super.onLayoutChildren(recycler, state);
+ } catch (IndexOutOfBoundsException e) {
+ Log.d("CheckLinearLayout", "崩溃信息--" + e.toString());
+ }
+ }
+}
diff --git a/modules/mogo-module-check/src/main/res/drawable/auto.png b/modules/mogo-module-check/src/main/res/drawable/auto.png
new file mode 100644
index 0000000000..4e284d9e32
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/auto.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/camera_unusual.png b/modules/mogo-module-check/src/main/res/drawable/camera_unusual.png
new file mode 100644
index 0000000000..7ff9dda063
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/camera_unusual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/camera_usual.png b/modules/mogo-module-check/src/main/res/drawable/camera_usual.png
new file mode 100644
index 0000000000..aff0548ccc
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/camera_usual.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cover_bg.xml b/modules/mogo-module-check/src/main/res/drawable/check_button.xml
similarity index 54%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_cover_bg.xml
rename to modules/mogo-module-check/src/main/res/drawable/check_button.xml
index 8784811d52..d159511f69 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_cover_bg.xml
+++ b/modules/mogo-module-check/src/main/res/drawable/check_button.xml
@@ -1,5 +1,5 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_help_info_speed_bg.xml b/modules/mogo-module-check/src/main/res/drawable/check_chage_color.xml
similarity index 54%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_help_info_speed_bg.xml
rename to modules/mogo-module-check/src/main/res/drawable/check_chage_color.xml
index 5f565118a6..b4ea5bed32 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_help_info_speed_bg.xml
+++ b/modules/mogo-module-check/src/main/res/drawable/check_chage_color.xml
@@ -1,11 +1,10 @@
-
+
+
-
+ android:endColor="#2B6EFF"
+ android:startColor="#3DCCFF" />
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_detail.xml b/modules/mogo-module-check/src/main/res/drawable/check_detail.xml
new file mode 100644
index 0000000000..dbb28cdb41
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/drawable/check_detail.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_dialog_back.xml b/modules/mogo-module-check/src/main/res/drawable/check_dialog_back.xml
new file mode 100644
index 0000000000..b6a2eaefba
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/drawable/check_dialog_back.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_list_item_back.xml b/modules/mogo-module-check/src/main/res/drawable/check_list_item_back.xml
new file mode 100644
index 0000000000..c9bb7eb22b
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/drawable/check_list_item_back.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_little_btn.xml b/modules/mogo-module-check/src/main/res/drawable/check_little_btn.xml
new file mode 100644
index 0000000000..6ea2fa4947
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/drawable/check_little_btn.xml
@@ -0,0 +1,14 @@
+
+
+
+ //填充
+
+ //描边
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_little_btn_green.xml b/modules/mogo-module-check/src/main/res/drawable/check_little_btn_green.xml
new file mode 100644
index 0000000000..14b5651e19
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/drawable/check_little_btn_green.xml
@@ -0,0 +1,14 @@
+
+
+
+ //填充
+
+ //描边
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_progress.xml b/modules/mogo-module-check/src/main/res/drawable/check_progress.xml
new file mode 100644
index 0000000000..0b87954cb8
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/drawable/check_progress.xml
@@ -0,0 +1,29 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_right.png b/modules/mogo-module-check/src/main/res/drawable/check_right.png
new file mode 100644
index 0000000000..7fdd87a843
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_right.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_scan_first.png b/modules/mogo-module-check/src/main/res/drawable/check_scan_first.png
new file mode 100644
index 0000000000..b5b5db831d
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_scan_first.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_scan_second.png b/modules/mogo-module-check/src/main/res/drawable/check_scan_second.png
new file mode 100644
index 0000000000..2e82c94f54
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_scan_second.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_scan_tips.png b/modules/mogo-module-check/src/main/res/drawable/check_scan_tips.png
new file mode 100644
index 0000000000..10b640481b
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_scan_tips.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_tip_image.png b/modules/mogo-module-check/src/main/res/drawable/check_tip_image.png
new file mode 100644
index 0000000000..acea2ccf6e
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_tip_image.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/check_wrong.png b/modules/mogo-module-check/src/main/res/drawable/check_wrong.png
new file mode 100644
index 0000000000..b9e28642d6
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/check_wrong.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/jiaojiguang_usual.png b/modules/mogo-module-check/src/main/res/drawable/jiaojiguang_usual.png
new file mode 100644
index 0000000000..54329fe739
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/jiaojiguang_usual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/luyouqi_unusual.png b/modules/mogo-module-check/src/main/res/drawable/luyouqi_unusual.png
new file mode 100644
index 0000000000..0177872fdb
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/luyouqi_unusual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/luyouqi_usual.png b/modules/mogo-module-check/src/main/res/drawable/luyouqi_usual.png
new file mode 100644
index 0000000000..a4fb0c4188
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/luyouqi_usual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/obu_unusual.png b/modules/mogo-module-check/src/main/res/drawable/obu_unusual.png
new file mode 100644
index 0000000000..1a616ac4e4
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/obu_unusual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/oub_usual.png b/modules/mogo-module-check/src/main/res/drawable/oub_usual.png
new file mode 100644
index 0000000000..ebe65505fe
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/oub_usual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/pad_unusual.png b/modules/mogo-module-check/src/main/res/drawable/pad_unusual.png
new file mode 100644
index 0000000000..1615d021e4
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/pad_unusual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/rtk_unusual.png b/modules/mogo-module-check/src/main/res/drawable/rtk_unusual.png
new file mode 100644
index 0000000000..0f8112ef85
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/rtk_unusual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/rtk_usual.png b/modules/mogo-module-check/src/main/res/drawable/rtk_usual.png
new file mode 100644
index 0000000000..c4c7983c16
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/rtk_usual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/scan_tip_line.png b/modules/mogo-module-check/src/main/res/drawable/scan_tip_line.png
new file mode 100644
index 0000000000..569f5f61dc
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/scan_tip_line.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/yingyan.png b/modules/mogo-module-check/src/main/res/drawable/yingyan.png
new file mode 100644
index 0000000000..e9b13a2082
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/yingyan.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/zhujiguang_unusual.png b/modules/mogo-module-check/src/main/res/drawable/zhujiguang_unusual.png
new file mode 100644
index 0000000000..bc0460b8c6
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/zhujiguang_unusual.png differ
diff --git a/modules/mogo-module-check/src/main/res/drawable/zhujiguang_usual.png b/modules/mogo-module-check/src/main/res/drawable/zhujiguang_usual.png
new file mode 100644
index 0000000000..12bc7f3f0f
Binary files /dev/null and b/modules/mogo-module-check/src/main/res/drawable/zhujiguang_usual.png differ
diff --git a/modules/mogo-module-check/src/main/res/layout/activity_check.xml b/modules/mogo-module-check/src/main/res/layout/activity_check.xml
new file mode 100644
index 0000000000..aad2686b5d
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/layout/activity_check.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/layout/check_dialog.xml b/modules/mogo-module-check/src/main/res/layout/check_dialog.xml
new file mode 100644
index 0000000000..0df7874ad0
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/layout/check_dialog.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/layout/check_hardware.xml b/modules/mogo-module-check/src/main/res/layout/check_hardware.xml
new file mode 100644
index 0000000000..0f2653d31d
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/layout/check_hardware.xml
@@ -0,0 +1,314 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/layout/check_list.xml b/modules/mogo-module-check/src/main/res/layout/check_list.xml
new file mode 100644
index 0000000000..8f9869e6e8
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/layout/check_list.xml
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/layout/check_titel.xml b/modules/mogo-module-check/src/main/res/layout/check_titel.xml
new file mode 100644
index 0000000000..e226db0ae3
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/layout/check_titel.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml
new file mode 100644
index 0000000000..d3a41425ff
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -0,0 +1,17 @@
+
+
+ 30px
+ 38px
+ 70px
+ 133px
+ 50px
+ 50px
+ 1452px
+ 715px
+ 32px
+ 1078px
+ 1660px
+ 1162px
+ 570px
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/values/colors.xml b/modules/mogo-module-check/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..3d6008947a
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/values/colors.xml
@@ -0,0 +1,12 @@
+
+
+ #1A1F40
+ #4192FF
+ #F03232
+ #99FA1F21
+ #FF1F1F
+ #997AFF87
+ #7AFF87
+ #242B59
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/values/strings.xml b/modules/mogo-module-check/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..73862c416f
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/values/strings.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/modules/mogo-module-check/src/main/res/values/styles.xml b/modules/mogo-module-check/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..7b4a8dce13
--- /dev/null
+++ b/modules/mogo-module-check/src/main/res/values/styles.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
index 2078100a2d..f40121cca2 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
@@ -79,14 +79,17 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
* @param resultList adas感知融合数据
*/
public void renderAdasRecognizedResult(List resultList) {
+
final long start = System.nanoTime();
if (resultList == null || resultList.isEmpty() || !DebugConfig.isUseAdasRecognize()) {
clearOldMarker();
+ Log.w("ADAS数据延时绘制", "resultList==>" + resultList + " DebugConfig.isUseAdasRecognize()==>" + DebugConfig.isUseAdasRecognize());
return;
}
if (!MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
clearOldMarker();
+ Log.w("ADAS数据延时绘制", "当前不是VR模式");
return;
}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
index ce4a652999..cb5b948acb 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
@@ -9,10 +9,8 @@ import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.R;
import com.mogo.module.common.drawer.marker.EmptyMarkerView;
import com.mogo.module.common.drawer.marker.IMarkerView;
-import com.mogo.module.common.drawer.marker.MapMarker3DResAdapter;
import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
import com.mogo.module.common.drawer.marker.OnlineCarMarkerView;
import com.mogo.module.common.entity.MarkerExploreWay;
@@ -20,6 +18,7 @@ import com.mogo.module.common.entity.MarkerNoveltyInfo;
import com.mogo.module.common.entity.MarkerOnlineCar;
import com.mogo.module.common.entity.MarkerShareMusic;
import com.mogo.module.common.entity.MarkerShowEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.utils.logger.Logger;
import java.util.HashMap;
@@ -91,7 +90,7 @@ class MarkerDrawer {
Object bindObj = markerShowEntity.getBindObj();
if (bindObj instanceof MarkerExploreWay && ((MarkerExploreWay) bindObj).getPoiType() != null) {
String poiType = ((MarkerExploreWay) bindObj).getPoiType();
- options.icon3DRes(MapMarker3DResAdapter.getMarker3DRes(poiType));
+ options.icon3DRes(EventTypeEnum.getMarker3DRes(poiType));
}
}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarker3DResAdapter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarker3DResAdapter.java
deleted file mode 100644
index ded2b29d4a..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapMarker3DResAdapter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mogo.module.common.drawer.marker;
-
-import android.content.Context;
-
-import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.R;
-import com.mogo.module.common.entity.MarkerShowEntity;
-
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_ACCIDENT;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_FOG;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_ICE;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_LIVING;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_PONDING;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_ROAD_WORK;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.TRAFFIC_CHECK;
-
-/**
- * created by wujifei on 2021/4/28 18:04
- * describe:地图Marker的3d资源适配器
- */
-public class MapMarker3DResAdapter {
-
- public static int getMarker3DRes(String poiType) {
- int res = 0;
- switch (poiType) {
- case FOURS_BLOCK_UP:
- res = R.raw.v2x_yongdu;
- break;
- case FOURS_ACCIDENT:
- res = R.raw.v2x_shigu;
- break;
- case FOURS_LIVING:
- res = R.raw.v2x_shishilukuang;
- break;
- case FOURS_FOG:
- res = R.raw.v2x_nongwu;
- break;
- case TRAFFIC_CHECK:
- res = R.raw.v2x_jiaotongjiancha;
- break;
- case FOURS_ROAD_WORK:
- res = R.raw.v2x_daolushigong;
- break;
- case FOURS_ICE:
- res = R.raw.v2x_daolujiebing;
- break;
- case FOURS_PONDING:
- res = R.raw.v2x_daolujishui;
- break;
- }
-
- return res;
- }
-}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
index a21132d754..8c1b155556 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
@@ -3,6 +3,8 @@ package com.mogo.module.common.entity;
import android.text.TextUtils;
+import com.mogo.module.common.enums.EventTypeEnum;
+
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
@@ -13,7 +15,7 @@ public class MarkerExploreWay implements Serializable {
private String infoId;
private String type;//卡片类型,
/**
- * @see MarkerPoiTypeEnum
+ * @see EventTypeEnum
*/
private String poiType;
private String sn;
@@ -154,7 +156,7 @@ public class MarkerExploreWay implements Serializable {
public String getPoiType() {
if (TextUtils.isEmpty(poiType)) {
- return MarkerPoiTypeEnum.FOURS_BLOCK_UP;
+ return EventTypeEnum.FOURS_BLOCK_UP.getPoiType();
}
return poiType;
}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
index a0a0d527a2..fe9375e3c8 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
@@ -9,7 +9,7 @@ public class MarkerNoveltyInfo {
private String sn;
private MarkerLocation location;
/**
- * @see MarkerPoiTypeEnum
+ * @see com.mogo.module.common.enums.EventTypeEnum
*/
private String poiType;
private ContentData contentData;
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java
deleted file mode 100644
index ead583110a..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.mogo.module.common.entity;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date : 2020-01-1514:47
- * desc : 车机启动状态
- * version: 1.0
- */
-public interface MarkerPoiTypeEnum {
- //加油站
- String GAS_STATION = "10001";
- //交通检查
- String TRAFFIC_CHECK = "10002";
- //封路
- String ROAD_CLOSED = "10003";
- //商场打折
- String SHOP_DISCOUNT = "10004";
- //4S店
- String FOURS_4S = "10005";
- //施工
- String FOURS_ROAD_WORK = "10006";
- //拥堵
- String FOURS_BLOCK_UP = "10007";
- //积水
- String FOURS_PONDING = "10008";
- //超市打折
- String FOURS_SHOP_FREE = "10009";
- //浓雾
- String FOURS_FOG = "10010";
- //结冰
- String FOURS_ICE = "10011";
- //停车场
- String FOURS_PARKING = "10012";
- //事故
- String FOURS_ACCIDENT = "10013";
- //重大事故
- String FOURS_ACCIDENT_01 = "1001301";
- //特大事故
- String FOURS_ACCIDENT_02 = "1001302";
- //较大事故
- String FOURS_ACCIDENT_03 = "1001303";
- //一般事故
- String FOURS_ACCIDENT_04 = "1001304";
- //轻微事故
- String FOURS_ACCIDENT_05 = "1001305";
- //身边
- String FOURS_NEALY = "10014";
- //实时路况
- String FOURS_LIVING = "10015";
- //违章停车
- String ILLEGAL_PARK_LIVING = "10016";
- //路面湿滑
- String ROAD_SLIPPERY = "10021";
-}
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java
deleted file mode 100644
index a972ffe0e6..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.mogo.module.common.entity;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date : 2020/3/31 4:53 PM
- * desc : V2X 道路事件类型
- * version: 1.0
- */
-public interface V2XPoiTypeEnum extends MarkerPoiTypeEnum {
- // 前方静止or慢速车辆报警
- String ALERT_FRONT_CAR = "99999";
- // 限行管理
- String ALERT_TRAFFIC_CONTROL = "99998";
- // 红绿灯事件、是建议以多少速度驶过
- String ALERT_TRAFFIC_LIGHT_SUGGEST = "99997";
- // 红绿灯事件、一种是绿灯不足3秒
- String ALERT_TRAFFIC_LIGHT_WARNING = "99996";
- // 故障车辆
- int ALERT_CAR_TROUBLE_WARNING = 20007;
- // 疲劳驾驶
- String ALERT_FATIGUE_DRIVING = "99993";
- // 违章停车
- String ALERT_ILLEGAL_PARK = "99992";
-
- // TODO 这里目前是演示DEMO会用到，想着是打算商用，先这么处理的
- // 取快递
- String ALERT_TRAFFIC_EXPRESS = "99995";
- // 顺风车
- String ALERT_TRAFFIC_TAXI = "99994";
-}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java
index a950a82ba0..d78cc335d4 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRoadEventEntity.java
@@ -2,6 +2,8 @@ package com.mogo.module.common.entity;
import android.text.TextUtils;
+import com.mogo.module.common.enums.EventTypeEnum;
+
import java.io.Serializable;
import java.util.Objects;
@@ -14,7 +16,7 @@ import java.util.Objects;
*/
public class V2XRoadEventEntity implements Serializable {
/**
- * @see MarkerPoiTypeEnum
+ * @see EventTypeEnum
*/
// 事件类型
private String poiType;
@@ -57,56 +59,7 @@ public class V2XRoadEventEntity implements Serializable {
public String getTts(boolean haveLiveCar) {
tts = "前方#" + (int) getDistance() + "米#";
- switch (getPoiType()) {
- // 停车场
- case V2XPoiTypeEnum.FOURS_PARKING:
- tts += "停车场";
- break;
- // 加油站
- case V2XPoiTypeEnum.GAS_STATION:
- tts += "加油站";
- break;
- // 交通检查
- case V2XPoiTypeEnum.TRAFFIC_CHECK:
- tts += "交通检查";
- break;
- // 封路
- case V2XPoiTypeEnum.ROAD_CLOSED:
- tts += "道路封路";
- break;
- // 施工
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- tts += "道路施工";
- break;
- // 拥堵
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- tts += "道路拥堵";
- break;
- // 积水
- case V2XPoiTypeEnum.FOURS_PONDING:
- tts += "道路积水";
- break;
- // 浓雾
- case V2XPoiTypeEnum.FOURS_FOG:
- tts += "出现浓雾";
- break;
- // 结冰
- case V2XPoiTypeEnum.FOURS_ICE:
- tts += "路面结冰";
- break;
- // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- tts += "交通事故";
- break;
- default:
- tts += "道路事件";
- break;
- }
+ tts += EventTypeEnum.getTts(getPoiType());
if (haveLiveCar) {
tts += "，查看实况请说确定。";
setShowEventButton(true);
@@ -122,56 +75,7 @@ public class V2XRoadEventEntity implements Serializable {
*/
public String getTtsWithFeedback() {
tts = "检测到附近";
- switch (getPoiType()) {
- // 停车场
- case V2XPoiTypeEnum.FOURS_PARKING:
- tts += "有停车场";
- break;
- // 加油站
- case V2XPoiTypeEnum.GAS_STATION:
- tts += "有加油站";
- break;
- // 交通检查
- case V2XPoiTypeEnum.TRAFFIC_CHECK:
- tts += "交通检查";
- break;
- // 封路
- case V2XPoiTypeEnum.ROAD_CLOSED:
- tts += "封路";
- break;
- // 施工
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- tts += "施工";
- break;
- // 拥堵
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- tts += "道路拥堵";
- break;
- // 积水
- case V2XPoiTypeEnum.FOURS_PONDING:
- tts += "道路积水";
- break;
- // 浓雾
- case V2XPoiTypeEnum.FOURS_FOG:
- tts += "出现浓雾";
- break;
- // 结冰
- case V2XPoiTypeEnum.FOURS_ICE:
- tts += "路面结冰";
- break;
- // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- tts += "交通事故";
- break;
- default:
- tts += "道路事件";
- break;
- }
+ tts += EventTypeEnum.getTtsWithFeedback(getPoiType());
tts += "，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。";
return tts;
}
@@ -193,56 +97,7 @@ public class V2XRoadEventEntity implements Serializable {
}
public String getAlarmContent() {
- switch (getPoiType()) {
- // 停车场
- case V2XPoiTypeEnum.FOURS_PARKING:
- alarmContent = "停车场附近";
- break;
- // 加油站
- case V2XPoiTypeEnum.GAS_STATION:
- alarmContent = "加油站附近";
- break;
- // 交通检查
- case V2XPoiTypeEnum.TRAFFIC_CHECK:
- alarmContent = "前方交通检查";
- break;
- // 封路
- case V2XPoiTypeEnum.ROAD_CLOSED:
- alarmContent = "前方封路";
- break;
- // 施工
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- alarmContent = "前方施工";
- break;
- // 拥堵
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- alarmContent = "前方道路拥堵";
- break;
- // 积水
- case V2XPoiTypeEnum.FOURS_PONDING:
- alarmContent = "前方道路积水";
- break;
- // 浓雾
- case V2XPoiTypeEnum.FOURS_FOG:
- alarmContent = "前方出现浓雾";
- break;
- // 结冰
- case V2XPoiTypeEnum.FOURS_ICE:
- alarmContent = "前方路面结冰";
- break;
- // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- alarmContent = "前方交通事故";
- break;
- default:
- tts += "道路事件";
- break;
- }
+ alarmContent = EventTypeEnum.getAlarmContent(getPoiType());
return alarmContent;
}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt
new file mode 100644
index 0000000000..57b80da672
--- /dev/null
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/EventTypeEnum.kt
@@ -0,0 +1,852 @@
+package com.mogo.module.common.enums
+
+import com.mogo.module.common.R
+import com.mogo.module.common.utils.CloudPoiManager
+import com.mogo.module.common.utils.Const.*
+import com.zhidao.support.obu.constants.ObuConstants
+
+/**
+ * OBU、V2N事件类型枚举类
+ */
+enum class EventTypeEnum(
+ val poiType: String, val poiTypeStr: String = "",
+ val poiTypeStrVr: String = "",
+ val poiTypeSrcVr: Int = R.drawable.v2x_icon_live_logo,
+ val content: String = "", val tts: String = ""
+) {
+ //加油站
+ GAS_STATION("10001", "加油站", content = "加油站附近", tts = "加油站"),
+
+ //交通检查
+ TRAFFIC_CHECK("10002", "交通检查", "前方交通检查",
+ R.drawable.v2x_icon_jiaotongjiancha_vr, "前方交通检查", "交通检查"),
+
+ //封路
+ ROAD_CLOSED("10003", "封路", "前方封路", R.drawable.v2x_icon_fenglu_vr,
+ "前方封路", "道路封路"),
+
+ //商场打折
+ SHOP_DISCOUNT("10004", ""),
+
+ //4S店
+ FOURS_4S("10005", ""),
+
+ //施工
+ FOURS_ROAD_WORK("10006", "道路施工", "前方施工", R.drawable.v2x_icon_daolushigong_vr,
+ "前方施工", "道路施工"),
+
+ //拥堵
+ FOURS_BLOCK_UP("10007", "道路拥堵", "前方拥堵", R.drawable.v2x_icon_yongdu_vr,
+ "前方道路拥堵", "道路拥堵"),
+
+ //积水
+ FOURS_PONDING("10008", "道路积水", "前方道路积水", R.drawable.v2x_icon_jishui_vr,
+ "前方道路积水", "道路积水"),
+
+ //超市打折
+ FOURS_SHOP_FREE("10009", ""),
+
+ //浓雾
+ FOURS_FOG("10010", "出现浓雾", "浓雾预警", R.drawable.v2x_icon_nongwu_vr,
+ "前方出现浓雾", "出现浓雾"),
+
+ //结冰
+ FOURS_ICE("10011", "路面结冰", content = "前方路面结冰", tts = "路面结冰"),
+
+ //停车场
+ FOURS_PARKING("10012", "停车场", content = "停车场附近", tts = "停车场"),
+
+ //事故
+ FOURS_ACCIDENT("10013", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "前方交通事故", "交通事故"),
+
+ //重大事故
+ FOURS_ACCIDENT_01("1001301", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "前方交通事故", "交通事故"),
+
+ //特大事故
+ FOURS_ACCIDENT_02("1001302", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "前方交通事故", "交通事故"),
+
+ //较大事故
+ FOURS_ACCIDENT_03("1001303", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "前方交通事故", "交通事故"),
+
+ //一般事故
+ FOURS_ACCIDENT_04("1001304", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "前方交通事故", "交通事故"),
+
+ //轻微事故
+ FOURS_ACCIDENT_05("1001305", "交通事故", "前方交通事故", R.drawable.v2x_icon_jiaotongshigu_vr,
+ "前方交通事故", "交通事故"),
+
+ //身边
+ FOURS_NEALY("10014", "身边事件"),
+
+ //实时路况
+ FOURS_LIVING("10015", "实时路况"),
+
+ //违章停车
+ ILLEGAL_PARK_LIVING("10016"),
+
+ //路面湿滑
+ ROAD_SLIPPERY("10021"),
+
+ // 前方静止or慢速车辆报警
+ ALERT_FRONT_CAR("99999"),
+
+ // 限行管理
+ ALERT_TRAFFIC_CONTROL("99998"),
+
+ // 红绿灯事件、是建议以多少速度驶过
+ ALERT_TRAFFIC_LIGHT_SUGGEST("99997"),
+
+ // 红绿灯事件、一种是绿灯不足3秒
+ ALERT_TRAFFIC_LIGHT_WARNING("99996"),
+
+ // 故障车辆
+ ALERT_CAR_TROUBLE_WARNING("20007"),
+
+ // 疲劳驾驶
+ ALERT_FATIGUE_DRIVING("99993"),
+
+ // 违章停车
+ ALERT_ILLEGAL_PARK("99992"),
+
+ // TODO 这里目前是演示DEMO会用到，想着是打算商用，先这么处理的
+ // 取快递
+ ALERT_TRAFFIC_EXPRESS("99995"),
+
+ // 顺风车
+ ALERT_TRAFFIC_TAXI("99994"),
+
+ TYPE_USECASE_ID_EBW(
+ ObuConstants.USE_CASE_ID.EBW.toString(),
+ "紧急制动预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_emergency_brake,
+ content="前车急刹车",
+ tts = "前车急刹车"
+ ),
+ TYPE_USECASE_ID_FCW(
+ ObuConstants.USE_CASE_ID.FCW.toString(),
+ "前向碰撞预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_collision_warning,
+ content="前车碰撞预警",
+ tts="小心前车"
+ ),
+ TYPE_USECASE_ID_ICW(
+ ObuConstants.USE_CASE_ID.ICW.toString(),
+ "交叉路口碰撞预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_collision_warning,
+ content="交叉路口碰撞预警",
+ tts="注意交叉路口车辆"
+ ),
+ TYPE_USECASE_ID_CLW(
+ ObuConstants.USE_CASE_ID.CLW.toString(),
+ "车辆失控预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_vehicle_control,
+ content="前%s失控预警",
+ tts="小心%s失控车辆"
+ ),
+ TYPE_USECASE_ID_DNPW(
+ ObuConstants.USE_CASE_ID.DNPW.toString(),
+ "逆向超车预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_reverse_overtaking,
+ content="逆向超车预警",
+ tts="注意对向来车"
+ ),
+ TYPE_USECASE_ID_AVW(
+ ObuConstants.USE_CASE_ID.AVW.toString(),
+ "异常车辆提醒",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_abnormal_vehicle,
+ content="%s车异常",
+ tts="小心%s异常车辆"
+ ),
+ TYPE_USECASE_ID_BSW(
+ ObuConstants.USE_CASE_ID.BSW.toString(),
+ "盲区预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_blind_area_collision,
+ content="%s后盲区预警",
+ tts="注意%s后车辆"
+ ),
+ TYPE_USECASE_ID_LCW(
+ ObuConstants.USE_CASE_ID.LCW.toString(),
+ "变道预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_reverse_overtaking,
+ content="%s向变道预警",
+ tts="注意%s后车辆"
+ ),//注意左后车辆/注意右后车辆
+ TYPE_USECASE_ID_EVW(
+ ObuConstants.USE_CASE_ID.EVW.toString(),
+ "紧急车辆提醒",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_special_vehicle_access,
+ content="请避让特种车辆",
+ tts="后方特种车辆请避让"
+ ),
+ TYPE_USECASE_ID_VRUCW_PERSON(
+ 0X2B0201.toString(),
+ "弱势交通参与者碰撞预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_pedestrian_crossing,
+ content="行人碰撞预警",
+ tts="行人碰撞预警"
+ ),//行人/摩托车碰撞预警
+ TYPE_USECASE_ID_VRUCW_MOTORBIKE(
+ 0X2B0202.toString(),
+ "弱势交通参与者碰撞预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_motorcycle_collision,
+ content="摩托车碰撞预警",
+ tts="摩托车碰撞预警"
+ ),//摩托车碰撞预警
+ TYPE_USECASE_ID_SLW(
+ ObuConstants.USE_CASE_ID.SLW.toString(),
+ "限速预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_over_speed,
+ content="已超速",
+ tts=""
+ ),
+ TYPE_USECASE_ID_LTA(
+ ObuConstants.USE_CASE_ID.LTA.toString(),
+ "左转辅助",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_collision_warning,
+ content="左转碰撞预警",
+ tts="注意%s后车辆"
+ ),
+ TYPE_USECASE_ID_HLW(
+ ObuConstants.USE_CASE_ID.HLW.toString(),
+ "道路危险情况预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_road_dangerous,
+ content="道路危险情况预警",
+ tts="前方路况危险，小心行驶"
+ ),//（如果能给出具体的类别，则播报具体危险类别）
+ TYPE_USECASE_ID_IVS(
+ ObuConstants.USE_CASE_ID.IVS.toString(),
+ "车内标牌",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_road_construction,
+ content="前方施工",
+ tts=""
+ ),
+ TYPE_USECASE_ID_TJW(
+ ObuConstants.USE_CASE_ID.TJW.toString(),
+ "前方拥堵提醒",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_congestion,
+ content="前方道路拥堵",
+ tts="前方%d米道路拥堵，请减速慢行"
+ ),
+ TYPE_USECASE_ID_IVP(
+ ObuConstants.USE_CASE_ID.IVP.toString(),
+ "闯红灯预警",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_traffic_lights_red,
+ content="路口红灯，禁止通行",
+ tts="路口红灯，禁止通行"
+ ),
+ TYPE_USECASE_ID_IVP_GREEN(
+ 0x2B091.toString(),
+ "绿波通行",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_traffic_lights_green,
+ content="绿波通行 %s km/h",
+ tts="前方路口建议车速 %s 公里每小时"
+ ),
+ TYPE_USECASE_ID_COC(
+ ObuConstants.USE_CASE_ID.COC.toString(),
+ "预留",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_abnormal_vehicle,
+ content="路况预警",
+ tts="路况预警"
+ ),
+ TYPE_USECASE_ID_ROAD_TRAMCAR(
+ 0x2C01.toString(),
+ "前方有轨电车提醒",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_tramcar,
+ content="前方有轨电车提醒",
+ tts="前方有轨电车经过，请注意行驶安全"
+ ),
+ TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP(
+ 0x2C02.toString(),
+ "前方左转急弯",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_turn_left_sharp,
+ content="前方左转急弯",
+ tts="前方路口左转急弯，请减速慢行",
+ ),
+ TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP(
+ 0x2C03.toString(),
+ "前方右转急弯",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_turn_right_sharp,
+ content="前方右转急弯",
+ tts="前方路口右转急弯，请减速慢行"
+ ),
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING(
+ 0x2C04.toString(),
+ "人行横道",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_pedestrian_crossing,
+ content="前方人行横道",
+ tts="前方人行横道"
+ ),
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL(
+ 0x2C05.toString(),
+ "学校",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_school,
+ content="前方学校，减速慢行",
+ tts="前方人行横道，请减速慢行"
+ ),
+ TYPE_USECASE_ID_ROAD_COLLISION_WARNING(
+ 0x2C06.toString(),
+ "事故易发路段",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_collision_warning,
+ content="当前路段事故多发",
+ tts="当前路段事故多发，请谨慎行驶"
+ ),
+ TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG(
+ 0x2C07.toString(),
+ "环岛行驶",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_roundaboutpng,
+ content="前方驶入环岛",
+ tts="前方驶入环岛，请谨慎行驶"
+ ),
+ TYPE_USECASE_ID_ROAD_TEST_SECTION(
+ 0x2C08.toString(),
+ "驾校考试路段",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_test_section,
+ content="前方考试路段",
+ tts="前方考试路段，减速慢行"
+ ),
+ TYPE_USECASE_ID_ROAD_HUMP_BRIDGE(
+ 0x2C09.toString(),
+ "驼峰桥",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_hump_bridge,
+ content="前方驼峰桥",
+ tts="即将驶入桥梁，请减速慢行"
+ ),
+ TYPE_USECASE_ID_ROAD_NO_PARKING(
+ 0x2C10.toString(),
+ "禁止停车",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_no_parking,
+ content="当前路段禁止停车",
+ tts="当前路段，禁止停车"
+ ),
+ TYPE_USECASE_ID_ROAD_GIVE_WAY(
+ 0x2C11.toString(),
+ "减速慢行",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_give_way,
+ content="有车出入，减速慢行",
+ tts="有车出入，减速慢行"
+ ),
+ TYPE_ERROR(
+ ObuConstants.USE_CASE_ID.ERROR.toString(),
+ "未知/错误/异常",
+ poiTypeSrcVr=R.drawable.icon_warning_v2x_abnormal_vehicle,
+ content="",
+ tts=""
+ );
+
+ companion object {
+ @JvmStatic
+ fun getPoiTypeStr(poiType: String): String {
+ // 先获取网络配置的poi对应的名称
+ CloudPoiManager.getInstance().getWrapperByPoiType(poiType)?.let {
+ return it.title
+ }
+ // 如果获取不到，那么就用本地默认的
+ return when (poiType) {
+ GAS_STATION.poiType -> GAS_STATION.poiTypeStr
+ TRAFFIC_CHECK.poiType -> TRAFFIC_CHECK.poiTypeStr
+ ROAD_CLOSED.poiType -> ROAD_CLOSED.poiTypeStr
+ SHOP_DISCOUNT.poiType -> SHOP_DISCOUNT.poiTypeStr
+ FOURS_4S.poiType -> FOURS_4S.poiTypeStr
+ FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeStr
+ FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeStr
+ FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeStr
+ FOURS_SHOP_FREE.poiType -> FOURS_SHOP_FREE.poiTypeStr
+ FOURS_FOG.poiType -> FOURS_FOG.poiTypeStr
+ FOURS_ICE.poiType -> FOURS_ICE.poiTypeStr
+ FOURS_PARKING.poiType -> FOURS_PARKING.poiTypeStr
+
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
+ FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType,
+ FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> FOURS_ACCIDENT.poiTypeStr
+
+ FOURS_NEALY.poiType -> FOURS_NEALY.poiTypeStr
+ FOURS_LIVING.poiType -> FOURS_LIVING.poiTypeStr
+ else -> "其它道路事件"
+ }
+ }
+
+ @JvmStatic
+ fun getPoiTypeStrVr(poiType: String): String {
+ return when (poiType) {
+ GAS_STATION.poiType -> GAS_STATION.poiTypeStrVr
+ TRAFFIC_CHECK.poiType -> TRAFFIC_CHECK.poiTypeStrVr
+ ROAD_CLOSED.poiType -> ROAD_CLOSED.poiTypeStrVr
+ SHOP_DISCOUNT.poiType -> SHOP_DISCOUNT.poiTypeStrVr
+ FOURS_4S.poiType -> FOURS_4S.poiTypeStrVr
+ FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeStrVr
+ FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeStrVr
+ FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeStrVr
+ FOURS_SHOP_FREE.poiType -> FOURS_SHOP_FREE.poiTypeStrVr
+ FOURS_FOG.poiType -> FOURS_FOG.poiTypeStrVr
+ FOURS_ICE.poiType -> FOURS_ICE.poiTypeStrVr
+ FOURS_PARKING.poiType -> FOURS_PARKING.poiTypeStrVr
+
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
+ FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType,
+ FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> FOURS_ACCIDENT.poiTypeStrVr
+
+ FOURS_NEALY.poiType -> FOURS_NEALY.poiTypeStrVr
+ FOURS_LIVING.poiType -> FOURS_LIVING.poiTypeStrVr
+ else -> "其它道路事件"
+ }
+ }
+
+ @JvmStatic
+ fun getPoiTypeSrcVr(poiType: String): Int {
+ return when (poiType) {
+ TRAFFIC_CHECK.poiType -> TRAFFIC_CHECK.poiTypeSrcVr
+ ROAD_CLOSED.poiType -> ROAD_CLOSED.poiTypeSrcVr
+ FOURS_4S.poiType -> FOURS_4S.poiTypeSrcVr
+ FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.poiTypeSrcVr
+ FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.poiTypeSrcVr
+ FOURS_PONDING.poiType -> FOURS_PONDING.poiTypeSrcVr
+ FOURS_SHOP_FREE.poiType -> FOURS_SHOP_FREE.poiTypeSrcVr
+ FOURS_FOG.poiType -> FOURS_FOG.poiTypeSrcVr
+ FOURS_ICE.poiType -> FOURS_ICE.poiTypeSrcVr
+ FOURS_PARKING.poiType -> FOURS_PARKING.poiTypeSrcVr
+
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
+ FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType,
+ FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> FOURS_ACCIDENT.poiTypeSrcVr
+
+ FOURS_NEALY.poiType -> FOURS_NEALY.poiTypeSrcVr
+ FOURS_LIVING.poiType -> FOURS_LIVING.poiTypeSrcVr
+ else -> R.drawable.v2x_icon_live_logo
+ }
+ }
+
+ /**
+ * 获取道路事件的背景色
+ */
+ @JvmStatic
+ fun getPoiTypeBg(poiType: String, isVrMode: Boolean): Int {
+ return when (poiType) {
+ FOURS_PARKING.poiType, GAS_STATION.poiType -> R.drawable.bg_v2x_event_type_blue
+ FOURS_BLOCK_UP.poiType, FOURS_LIVING.poiType, FOURS_NEALY.poiType -> if (isVrMode) R.drawable.bg_v2x_event_type_orange_vr else R.drawable.bg_v2x_event_type_orange
+ TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType, FOURS_ROAD_WORK.poiType,
+ FOURS_PONDING.poiType, FOURS_FOG.poiType, FOURS_ICE.poiType, FOURS_ACCIDENT.poiType,
+ FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType,
+ FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> if (isVrMode) R.drawable.bg_v2x_event_type_red_vr else R.drawable.bg_v2x_event_type_read
+ else -> {
+ if (isVrMode) R.drawable.bg_v2x_event_type_red_vr else R.drawable.bg_v2x_event_type_read
+ }
+ }
+ }
+
+ @JvmStatic
+ fun getPoiTypeBgForShareItem(poiType: String): Int {
+ return when (poiType) {
+ FOURS_PARKING.poiType, GAS_STATION.poiType ->
+ R.drawable.bg_v2x_event_type_blue
+ FOURS_BLOCK_UP.poiType, FOURS_LIVING.poiType, FOURS_NEALY.poiType ->
+ R.drawable.bg_v2x_event_type_orange
+ TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType,
+ FOURS_ROAD_WORK.poiType, FOURS_PONDING.poiType,
+ FOURS_FOG.poiType, FOURS_ICE.poiType,
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType,
+ FOURS_ACCIDENT_02.poiType, FOURS_ACCIDENT_03.poiType,
+ FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType ->
+ R.drawable.bg_v2x_event_type_read
+ else -> R.drawable.bg_v2x_event_type_read
+ }
+ }
+
+ /**
+ * 判断是否是道路预警事件
+ */
+ @JvmStatic
+ fun isRoadEvent(poiType: String?): Boolean {
+ return when (poiType) {
+ TRAFFIC_CHECK.poiType, ROAD_CLOSED.poiType,
+ FOURS_ROAD_WORK.poiType, FOURS_BLOCK_UP.poiType,
+ FOURS_PONDING.poiType, FOURS_FOG.poiType,
+ FOURS_ICE.poiType, FOURS_ACCIDENT.poiType,
+ FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType,
+ FOURS_ACCIDENT_05.poiType -> true
+ else -> false
+ }
+ }
+
+ /**
+ * 是否需要UGC预警
+ */
+ @JvmStatic
+ fun isNeedRoadEventUgc(poiType: String?): Boolean {
+ return when (poiType) {
+ ROAD_CLOSED.poiType, FOURS_ROAD_WORK.poiType,
+ FOURS_BLOCK_UP.poiType, FOURS_ACCIDENT.poiType,
+ FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType,
+ FOURS_ACCIDENT_05.poiType -> true
+ else -> false
+ }
+ }
+
+ /**
+ * 获取 UGC 问答使用的 Title 和 TTS 以及展示图表
+ */
+ @JvmStatic
+ fun getUgcTitleStr(poiType: String?): Array? {
+ val str = arrayOfNulls(5)
+ when (poiType) {
+ ROAD_CLOSED.poiType -> {
+ str[0] = "你刚经过 #### \n封路吗？"
+ str[1] = "你刚路过的路段封路吗？您可以直接对我说封路、或者不封路。"
+ str[2] = R.drawable.v_to_x_event_ugc_fenglu
+ str[3] = COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP
+ str[4] = COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP
+ }
+ FOURS_ROAD_WORK.poiType -> {
+ str[0] = "你刚经过 #### \n有道路施工吗？"
+ str[1] = "你刚路过的路段道路施工吗？您可以直接对我说有施工、或者没有施工。"
+ str[2] = R.drawable.bg_v2x_cancel_help
+ str[3] = COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP
+ str[4] = COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP
+ }
+ FOURS_BLOCK_UP.poiType -> {
+ str[0] = "你刚路过 #### \n堵不堵？"
+ str[1] = "你刚路过的路段堵不堵？您可以直接对我说拥赌、或者不堵。"
+ str[2] = R.drawable.v_to_x_event_ugc_yongdu
+ str[3] = COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP
+ str[4] = COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP
+ }
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> {
+ str[0] = "你刚经过 #### \n有事故发生吗？"
+ str[1] = "你刚路过的路段有交通事故吗？您可以直接对我说有事故、或者没有事故。"
+ str[2] = R.drawable.v_to_x_event_ugc_shigu
+ str[3] = COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP
+ str[4] = COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP
+ }
+ else -> return null
+ }
+ return str
+ }
+
+ @JvmStatic
+ fun getTts(poiType: String?): String {
+ return when (poiType) {
+ FOURS_PARKING.poiType -> FOURS_PARKING.tts
+ GAS_STATION.poiType -> GAS_STATION.tts
+ TRAFFIC_CHECK.poiType -> TRAFFIC_CHECK.tts
+ ROAD_CLOSED.poiType -> ROAD_CLOSED.tts
+ FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.tts
+ FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.tts
+ FOURS_PONDING.poiType -> FOURS_PONDING.tts
+ FOURS_FOG.poiType -> FOURS_FOG.tts
+ FOURS_ICE.poiType -> FOURS_ICE.tts
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> FOURS_ACCIDENT.tts
+ else -> "道路事件"
+ }
+ }
+
+ @JvmStatic
+ fun getTtsWithFeedback(poiType: String?): String {
+ return when (poiType) {
+ FOURS_PARKING.poiType -> "有停车场"
+ GAS_STATION.poiType -> "有加油站"
+ TRAFFIC_CHECK.poiType -> "交通检查"
+ ROAD_CLOSED.poiType -> "封路"
+ FOURS_ROAD_WORK.poiType -> "施工"
+ FOURS_BLOCK_UP.poiType -> "道路拥堵"
+ FOURS_PONDING.poiType -> "道路积水"
+ FOURS_FOG.poiType -> "出现浓雾"
+ FOURS_ICE.poiType -> "路面结冰"
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> "交通事故"
+ else -> "道路事件"
+ }
+ }
+
+ @JvmStatic
+ fun getAlarmContent(poiType: String?): String {
+ return when (poiType) {
+ FOURS_PARKING.poiType -> FOURS_PARKING.content
+ GAS_STATION.poiType -> GAS_STATION.content
+ TRAFFIC_CHECK.poiType -> TRAFFIC_CHECK.content
+ ROAD_CLOSED.poiType -> ROAD_CLOSED.content
+ FOURS_ROAD_WORK.poiType -> FOURS_ROAD_WORK.content
+ FOURS_BLOCK_UP.poiType -> FOURS_BLOCK_UP.content
+ FOURS_PONDING.poiType -> FOURS_PONDING.content
+ FOURS_FOG.poiType -> FOURS_FOG.content
+ FOURS_ICE.poiType -> FOURS_ICE.content
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType ->
+ FOURS_ACCIDENT.content
+ else -> "道路事件"
+ }
+ }
+
+ @JvmStatic
+ fun getTypeSmallRes(type: String): Int {
+ return when (type) {
+ TRAFFIC_CHECK.poiType ->
+ R.drawable.mogo_image_jiaotongjiancha_small
+ ROAD_CLOSED.poiType -> R.drawable.mogo_image_fenglu_small
+ FOURS_ROAD_WORK.poiType -> R.drawable.mogo_image_daolushigong_small
+ FOURS_BLOCK_UP.poiType -> R.drawable.mogo_image_yongdu_small
+ FOURS_PONDING.poiType -> R.drawable.mogo_image_jishui_small
+ FOURS_ICE.poiType -> R.drawable.mogo_image_jiebing_small
+ FOURS_FOG.poiType -> R.drawable.mogo_image_nongwu_small
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType ->
+ R.drawable.mogo_image_accident_small
+ else -> R.drawable.mogo_image_shishilukuang_small
+ }
+ }
+
+ @JvmStatic
+ fun getTypeRes(type: String): Int {
+ return when (type) {
+ TRAFFIC_CHECK.poiType -> R.drawable.mogo_image_jiaotongjiancha_nor
+ ROAD_CLOSED.poiType -> R.drawable.mogo_image_fenglu_nor
+ FOURS_ROAD_WORK.poiType -> R.drawable.mogo_image_daolushigong_nor
+ FOURS_BLOCK_UP.poiType -> R.drawable.mogo_image_yongdu_nor
+ FOURS_PONDING.poiType -> R.drawable.mogo_image_jishui_nor
+ FOURS_ICE.poiType -> R.drawable.mogo_image_jiebing_nor
+ FOURS_FOG.poiType -> R.drawable.mogo_image_nongwu_nor
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType ->
+ R.drawable.mogo_image_jiaotongshigu_nor
+ else -> R.drawable.mogo_image_shishlukuang_nor
+ }
+ }
+
+ @JvmStatic
+ fun getTypeName(type: String?): String {
+ return when (type) {
+ ROAD_CLOSED.poiType -> "封路"
+ FOURS_ICE.poiType -> "道路结冰"
+ FOURS_FOG.poiType -> "浓雾"
+ TRAFFIC_CHECK.poiType -> "交通检查"
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> "交通事故"
+ FOURS_BLOCK_UP.poiType -> "拥堵"
+ FOURS_ROAD_WORK.poiType -> "施工"
+ FOURS_PONDING.poiType -> "道路积水"
+ else -> "实时路况"
+ }
+ }
+
+ @JvmStatic
+ fun getMarker3DRes(poiType: String?): Int {
+ return when (poiType) {
+ FOURS_BLOCK_UP.poiType -> R.raw.v2x_yongdu
+ FOURS_ACCIDENT.poiType -> R.raw.v2x_shigu
+ FOURS_LIVING.poiType -> R.raw.v2x_shishilukuang
+ FOURS_FOG.poiType -> R.raw.v2x_nongwu
+ TRAFFIC_CHECK.poiType -> R.raw.v2x_jiaotongjiancha
+ FOURS_ROAD_WORK.poiType -> R.raw.v2x_daolushigong
+ FOURS_ICE.poiType -> R.raw.v2x_daolujiebing
+ FOURS_PONDING.poiType -> R.raw.v2x_daolujishui
+ else -> 0
+ }
+ }
+
+ @JvmStatic
+ fun getTypeNameTTS(type: String?): String {
+ return when (type) {
+ ROAD_CLOSED.poiType -> "封路"
+ FOURS_ICE.poiType -> "道路结冰"
+ FOURS_FOG.poiType -> "浓雾"
+ TRAFFIC_CHECK.poiType -> "交通检查"
+ FOURS_ACCIDENT.poiType, FOURS_ACCIDENT_01.poiType, FOURS_ACCIDENT_02.poiType,
+ FOURS_ACCIDENT_03.poiType, FOURS_ACCIDENT_04.poiType, FOURS_ACCIDENT_05.poiType -> "交通事故"
+ FOURS_BLOCK_UP.poiType -> "拥堵"
+ FOURS_ROAD_WORK.poiType -> "施工"
+ FOURS_PONDING.poiType -> "道路积水"
+ else -> "实时路况"
+ }
+ }
+
+ @JvmStatic
+ fun getUpdateIconRes(poiType: String?): Int {
+ return when (poiType) {
+ //交通检查
+ TRAFFIC_CHECK.poiType -> {
+ R.drawable.v_to_x_marker_2
+ }
+ //封路
+ ROAD_CLOSED.poiType -> {
+ R.drawable.v_to_x_marker_16
+ }
+ //施工
+ FOURS_ROAD_WORK.poiType -> {
+ R.drawable.v_to_x_marker_11
+ }
+ //拥堵
+ FOURS_BLOCK_UP.poiType -> {
+ R.drawable.v_to_x_marker_5
+ }
+ //积水
+ FOURS_PONDING.poiType -> {
+ R.drawable.v_to_x_marker_6
+ }
+ //浓雾
+ FOURS_FOG.poiType -> {
+ R.drawable.v_to_x_marker_9
+ }
+ //结冰
+ FOURS_ICE.poiType -> {
+ R.drawable.v_to_x_marker_8
+ }
+ //事故
+ FOURS_ACCIDENT.poiType -> {
+ R.drawable.v_to_x_marker_7
+ }
+ //事故
+ FOURS_LIVING.poiType -> {
+ R.drawable.v_to_x_marker_1
+ }
+ //红绿灯数据
+ ALERT_TRAFFIC_LIGHT_SUGGEST.poiType -> {
+ R.drawable.v_to_x_marker_3
+ }
+ //红绿灯数据
+ ALERT_TRAFFIC_LIGHT_WARNING.poiType -> {
+ R.drawable.v_to_x_marker_3
+ }
+ //前方静止or慢速车辆报警
+ ALERT_FRONT_CAR.poiType -> {
+ R.drawable.v_to_x_warning_car_red
+ }
+ // 故障车辆
+ ALERT_CAR_TROUBLE_WARNING.poiType -> {
+ R.drawable.icon_car_red
+ }
+ // 取快递
+ ALERT_TRAFFIC_EXPRESS.poiType -> {
+ R.drawable.v_to_x_marker_express
+ }
+ // 顺风车
+ ALERT_TRAFFIC_TAXI.poiType -> {
+ R.drawable.v_to_x_marker_taxi
+ }
+ else -> 0
+ }
+ }
+
+ //===================告警类事件===================
+
+ @JvmStatic
+ fun getWarningIcon(poiType: String?): Int {
+ return when (poiType) {
+ TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.poiTypeSrcVr
+ TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.poiTypeSrcVr
+ TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.poiTypeSrcVr
+ TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.poiTypeSrcVr
+ TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.poiTypeSrcVr
+ TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.poiTypeSrcVr
+ TYPE_USECASE_ID_BSW.poiType -> TYPE_USECASE_ID_BSW.poiTypeSrcVr
+ TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.poiTypeSrcVr
+ TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.poiTypeSrcVr
+ TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.poiTypeSrcVr
+ TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiTypeSrcVr
+ TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr
+ TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.poiTypeSrcVr
+ TYPE_USECASE_ID_HLW.poiType -> TYPE_USECASE_ID_HLW.poiTypeSrcVr
+ TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.poiTypeSrcVr
+ TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.poiTypeSrcVr
+ TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.poiTypeSrcVr
+ TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.poiTypeSrcVr
+ TYPE_USECASE_ID_COC.poiType -> TYPE_USECASE_ID_COC.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_TRAMCAR.poiType -> TYPE_USECASE_ID_ROAD_TRAMCAR.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiType -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_TEST_SECTION.poiType -> TYPE_USECASE_ID_ROAD_TEST_SECTION.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr
+ TYPE_USECASE_ID_ROAD_GIVE_WAY.poiType -> TYPE_USECASE_ID_ROAD_GIVE_WAY.poiTypeSrcVr
+ TYPE_ERROR.poiType -> TYPE_ERROR.poiTypeSrcVr
+ else -> TYPE_USECASE_ID_AVW.poiTypeSrcVr
+ }
+ }
+
+ @JvmStatic
+ fun getWarningContent(poiType: String?): String {
+ return when (poiType) {
+ TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.content
+ TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.content
+ TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.content
+ TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.content
+ TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.content
+ TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.content
+ TYPE_USECASE_ID_BSW.poiType -> TYPE_USECASE_ID_BSW.content
+ TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.content
+ TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.content
+ TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.content
+ TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.content
+ TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.content
+ TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.content
+ TYPE_USECASE_ID_HLW.poiType -> TYPE_USECASE_ID_HLW.content
+ TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.content
+ TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.content
+ TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.content
+ TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.content
+ TYPE_USECASE_ID_COC.poiType -> TYPE_USECASE_ID_COC.content
+ TYPE_USECASE_ID_ROAD_TRAMCAR.poiType -> TYPE_USECASE_ID_ROAD_TRAMCAR.content
+ TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.content
+ TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.content
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.content
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content
+ TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.content
+ TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiType -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.content
+ TYPE_USECASE_ID_ROAD_TEST_SECTION.poiType -> TYPE_USECASE_ID_ROAD_TEST_SECTION.content
+ TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.content
+ TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content
+ TYPE_USECASE_ID_ROAD_GIVE_WAY.poiType -> TYPE_USECASE_ID_ROAD_GIVE_WAY.content
+ TYPE_ERROR.poiType -> TYPE_ERROR.content
+ else -> TYPE_USECASE_ID_AVW.content
+ }
+ }
+
+ @JvmStatic
+ fun getWarningTts(poiType: String?): String {
+ return when (poiType) {
+ TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.tts
+ TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.tts
+ TYPE_USECASE_ID_ICW.poiType -> TYPE_USECASE_ID_ICW.tts
+ TYPE_USECASE_ID_CLW.poiType -> TYPE_USECASE_ID_CLW.tts
+ TYPE_USECASE_ID_DNPW.poiType -> TYPE_USECASE_ID_DNPW.tts
+ TYPE_USECASE_ID_AVW.poiType -> TYPE_USECASE_ID_AVW.tts
+ TYPE_USECASE_ID_BSW.poiType -> TYPE_USECASE_ID_BSW.tts
+ TYPE_USECASE_ID_LCW.poiType -> TYPE_USECASE_ID_LCW.tts
+ TYPE_USECASE_ID_EVW.poiType -> TYPE_USECASE_ID_EVW.tts
+ TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.tts
+ TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.tts
+ TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.tts
+ TYPE_USECASE_ID_LTA.poiType -> TYPE_USECASE_ID_LTA.tts
+ TYPE_USECASE_ID_HLW.poiType -> TYPE_USECASE_ID_HLW.tts
+ TYPE_USECASE_ID_IVS.poiType -> TYPE_USECASE_ID_IVS.tts
+ TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.tts
+ TYPE_USECASE_ID_IVP.poiType -> TYPE_USECASE_ID_IVP.tts
+ TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.tts
+ TYPE_USECASE_ID_COC.poiType -> TYPE_USECASE_ID_COC.tts
+ TYPE_USECASE_ID_ROAD_TRAMCAR.poiType -> TYPE_USECASE_ID_ROAD_TRAMCAR.tts
+ TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.tts
+ TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.tts
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.tts
+ TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts
+ TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.tts
+ TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiType -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.tts
+ TYPE_USECASE_ID_ROAD_TEST_SECTION.poiType -> TYPE_USECASE_ID_ROAD_TEST_SECTION.tts
+ TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.tts
+ TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts
+ TYPE_USECASE_ID_ROAD_GIVE_WAY.poiType -> TYPE_USECASE_ID_ROAD_GIVE_WAY.tts
+ TYPE_ERROR.poiType -> TYPE_ERROR.tts
+ else -> TYPE_USECASE_ID_AVW.tts
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt
deleted file mode 100644
index 967f6d5d51..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt
+++ /dev/null
@@ -1,392 +0,0 @@
-package com.mogo.module.common.enums
-
-import com.mogo.module.common.R
-import com.zhidao.support.obu.constants.ObuConstants
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date : 2020-01-1514:47
- * desc : 预警类型枚举
- * version: 1.0
- */
-enum class WarningTypeEnum(
- var useCaseId: Int,
- var desc: String,
- var warningContent: String,
- var warningTts: String,
- var warningIconId: Int
-) {
-
-
- TYPE_USECASE_ID_EBW(
- ObuConstants.USE_CASE_ID.EBW,
- "紧急制动预警",
- "前车急刹车",
- "前车急刹车",
- R.drawable.icon_warning_v2x_emergency_brake
- ),
- TYPE_USECASE_ID_FCW(
- ObuConstants.USE_CASE_ID.FCW,
- "前向碰撞预警",
- "前车碰撞预警",
- "小心前车",
- R.drawable.icon_warning_v2x_collision_warning
- ),
- TYPE_USECASE_ID_ICW(
- ObuConstants.USE_CASE_ID.ICW,
- "交叉路口碰撞预警",
- "交叉路口碰撞预警",
- "注意交叉路口车辆",
- R.drawable.icon_warning_v2x_collision_warning
- ),
- TYPE_USECASE_ID_CLW(
- ObuConstants.USE_CASE_ID.CLW,
- "车辆失控预警",
- "%s失控预警",
- "小心%s失控车辆",
- R.drawable.icon_warning_v2x_vehicle_control
- ),
- TYPE_USECASE_ID_DNPW(
- ObuConstants.USE_CASE_ID.DNPW,
- "逆向超车预警",
- "逆向超车预警",
- "注意对向来车",
- R.drawable.icon_warning_v2x_reverse_overtaking
- ),
- TYPE_USECASE_ID_AVW(
- ObuConstants.USE_CASE_ID.AVW,
- "异常车辆提醒",
- "%s车异常",
- "小心%s异常车辆",
- R.drawable.icon_warning_v2x_abnormal_vehicle
- ),
- TYPE_USECASE_ID_BSW(
- ObuConstants.USE_CASE_ID.BSW,
- "盲区预警",
- "%s后盲区预警",
- "注意%s后车辆",
- R.drawable.icon_warning_v2x_blind_area_collision
- ),
- TYPE_USECASE_ID_LCW(
- ObuConstants.USE_CASE_ID.LCW,
- "变道预警",
- "%s向变道预警",
- "注意%s后车辆",
- R.drawable.icon_warning_v2x_reverse_overtaking
- ),//注意左后车辆/注意右后车辆
- TYPE_USECASE_ID_EVW(
- ObuConstants.USE_CASE_ID.EVW,
- "紧急车辆提醒",
- "请避让特种车辆",
- "后方特种车辆请避让",
- R.drawable.icon_warning_v2x_special_vehicle_access
- ),
- TYPE_USECASE_ID_VRUCW_PERSON(
- 0X2B0201,
- "弱势交通参与者碰撞预警",
- "行人碰撞预警",
- "行人碰撞预警",
- R.drawable.icon_warning_v2x_pedestrian_crossing
- ),//行人/摩托车碰撞预警
- TYPE_USECASE_ID_VRUCW_MOTORBIKE(
- 0X2B0202,
- "弱势交通参与者碰撞预警",
- "摩托车碰撞预警",
- "摩托车碰撞预警",
- R.drawable.icon_warning_v2x_motorcycle_collision
- ),//摩托车碰撞预警
- TYPE_USECASE_ID_SLW(
- ObuConstants.USE_CASE_ID.SLW,
- "限速预警",
- "已超速",
- "",
- R.drawable.icon_warning_v2x_over_speed
- ),
- TYPE_USECASE_ID_LTA(
- ObuConstants.USE_CASE_ID.LTA,
- "左转辅助",
- "左转碰撞预警",
- "注意%s后车辆",
- R.drawable.icon_warning_v2x_collision_warning
- ),
- TYPE_USECASE_ID_HLW(
- ObuConstants.USE_CASE_ID.HLW,
- "道路危险情况预警",
- "道路危险情况预警",
- "前方路况危险，小心行驶",
- R.drawable.icon_warning_v2x_road_dangerous
- ),//（如果能给出具体的类别，则播报具体危险类别）
- TYPE_USECASE_ID_IVS(
- ObuConstants.USE_CASE_ID.IVS,
- "车内标牌",
- "前方施工",
- "",
- R.drawable.icon_warning_v2x_road_construction
- ),
- TYPE_USECASE_ID_TJW(
- ObuConstants.USE_CASE_ID.TJW,
- "前方拥堵提醒",
- "前方道路拥堵",
- "前方%d米道路拥堵，请减速慢行",
- R.drawable.icon_warning_v2x_congestion
- ),
- TYPE_USECASE_ID_IVP(
- ObuConstants.USE_CASE_ID.IVP,
- "闯红灯预警",
- "路口红灯，禁止通行",
- "路口红灯，禁止通行",
- R.drawable.icon_warning_v2x_traffic_lights_red
- ),
- TYPE_USECASE_ID_IVP_GREEN(
- 0x2B091,
- "绿波通行",
- "绿波通行 %s km/h",
- "前方路口建议车速 %s 公里每小时",
- R.drawable.icon_warning_v2x_traffic_lights_green
- ),
- TYPE_USECASE_ID_COC(
- ObuConstants.USE_CASE_ID.COC,
- "预留",
- "路况预警",
- "路况预警",
- R.drawable.icon_warning_v2x_abnormal_vehicle
- ),
- TYPE_USECASE_ID_ROAD_TRAMCAR(
- 0x2C01,
- "前方有轨电车提醒",
- "前方有轨电车提醒",
- "前方有轨电车经过，请注意行驶安全",
- R.drawable.icon_warning_v2x_tramcar
- ),
- TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP(
- 0x2C02,
- "前方左转急弯",
- "前方左转急弯",
- "前方路口左转急弯，请减速慢行",
- R.drawable.icon_warning_v2x_turn_left_sharp
- ),
- TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP(
- 0x2C03,
- "前方右转急弯",
- "前方右转急弯",
- "前方路口右转急弯，请减速慢行",
- R.drawable.icon_warning_v2x_turn_right_sharp
- ),
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING(
- 0x2C04,
- "人行横道",
- "前方人行横道",
- "前方人行横道",
- R.drawable.icon_warning_v2x_pedestrian_crossing
- ),
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL(
- 0x2C05,
- "学校",
- "前方学校，减速慢行",
- "前方人行横道，请减速慢行",
- R.drawable.icon_warning_v2x_school
- ),
- TYPE_USECASE_ID_ROAD_COLLISION_WARNING(
- 0x2C06,
- "事故易发路段",
- "当前路段事故多发",
- "当前路段事故多发，请谨慎行驶",
- R.drawable.icon_warning_v2x_collision_warning
- ),
- TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG(
- 0x2C07,
- "环岛行驶",
- "前方驶入环岛",
- "前方驶入环岛，请谨慎行驶",
- R.drawable.icon_warning_v2x_roundaboutpng
- ),
- TYPE_USECASE_ID_ROAD_TEST_SECTION(
- 0x2C08,
- "驾校考试路段",
- "前方考试路段",
- "前方考试路段，减速慢行",
- R.drawable.icon_warning_v2x_test_section
- ),
- TYPE_USECASE_ID_ROAD_HUMP_BRIDGE(
- 0x2C09,
- "驼峰桥",
- "前方驼峰桥",
- "即将驶入桥梁，请减速慢行",
- R.drawable.icon_warning_v2x_hump_bridge
- ),
- TYPE_USECASE_ID_ROAD_NO_PARKING(
- 0x2C10,
- "禁止停车",
- "当前路段禁止停车",
- "当前路段，禁止停车",
- R.drawable.icon_warning_v2x_no_parking
- ),
- TYPE_USECASE_ID_ROAD_GIVE_WAY(
- 0x2C11,
- "减速慢行",
- "有车出入，减速慢行",
- "有车出入，减速慢行",
- R.drawable.icon_warning_v2x_give_way
- ),
- TYPE_ERROR(
- ObuConstants.USE_CASE_ID.ERROR,
- "未知/错误/异常",
- "",
- "",
- R.drawable.icon_warning_v2x_abnormal_vehicle
- );
-
-
- companion object {
- fun getWarningType(useCaseId: Int): WarningTypeEnum {
- return when (useCaseId) {
- ObuConstants.USE_CASE_ID.EBW -> TYPE_USECASE_ID_EBW
- ObuConstants.USE_CASE_ID.FCW -> TYPE_USECASE_ID_FCW
- ObuConstants.USE_CASE_ID.ICW -> TYPE_USECASE_ID_ICW
- ObuConstants.USE_CASE_ID.CLW -> TYPE_USECASE_ID_CLW
- ObuConstants.USE_CASE_ID.DNPW -> TYPE_USECASE_ID_DNPW
- ObuConstants.USE_CASE_ID.AVW -> TYPE_USECASE_ID_AVW
- ObuConstants.USE_CASE_ID.BSW -> TYPE_USECASE_ID_BSW
- ObuConstants.USE_CASE_ID.LCW -> TYPE_USECASE_ID_LCW
- ObuConstants.USE_CASE_ID.EVW -> TYPE_USECASE_ID_EVW
- TYPE_USECASE_ID_VRUCW_PERSON.useCaseId -> TYPE_USECASE_ID_VRUCW_PERSON
- TYPE_USECASE_ID_VRUCW_MOTORBIKE.useCaseId -> TYPE_USECASE_ID_VRUCW_MOTORBIKE
- ObuConstants.USE_CASE_ID.SLW -> TYPE_USECASE_ID_SLW
- ObuConstants.USE_CASE_ID.LTA -> TYPE_USECASE_ID_LTA
- ObuConstants.USE_CASE_ID.HLW -> TYPE_USECASE_ID_HLW
- ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS
- ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW
- ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP
- TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN
- ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC
- TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR
- TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP
- TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL
- TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING
- TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG
- TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION
- TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE
- TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING
- TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY
- ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR
- else -> TYPE_USECASE_ID_AVW
- }
- }
-
-
- fun getWarningIcon(useCaseId: Int): Int {
- return when (useCaseId) {
- ObuConstants.USE_CASE_ID.EBW -> TYPE_USECASE_ID_EBW.warningIconId
- ObuConstants.USE_CASE_ID.FCW -> TYPE_USECASE_ID_FCW.warningIconId
- ObuConstants.USE_CASE_ID.ICW -> TYPE_USECASE_ID_ICW.warningIconId
- ObuConstants.USE_CASE_ID.CLW -> TYPE_USECASE_ID_CLW.warningIconId
- ObuConstants.USE_CASE_ID.DNPW -> TYPE_USECASE_ID_DNPW.warningIconId
- ObuConstants.USE_CASE_ID.AVW -> TYPE_USECASE_ID_AVW.warningIconId
- ObuConstants.USE_CASE_ID.BSW -> TYPE_USECASE_ID_BSW.warningIconId
- ObuConstants.USE_CASE_ID.LCW -> TYPE_USECASE_ID_LCW.warningIconId
- ObuConstants.USE_CASE_ID.EVW -> TYPE_USECASE_ID_EVW.warningIconId
- TYPE_USECASE_ID_VRUCW_PERSON.useCaseId -> TYPE_USECASE_ID_VRUCW_PERSON.warningIconId
- TYPE_USECASE_ID_VRUCW_MOTORBIKE.useCaseId -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.warningIconId
- ObuConstants.USE_CASE_ID.SLW -> TYPE_USECASE_ID_SLW.warningIconId
- ObuConstants.USE_CASE_ID.LTA -> TYPE_USECASE_ID_LTA.warningIconId
- ObuConstants.USE_CASE_ID.HLW -> TYPE_USECASE_ID_HLW.warningIconId
- ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS.warningIconId
- ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW.warningIconId
- ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP.warningIconId
- TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN.warningIconId
- ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC.warningIconId
- TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningIconId
- TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningIconId
- TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningIconId
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningIconId
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningIconId
- TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningIconId
- TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningIconId
- TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningIconId
- TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningIconId
- TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningIconId
- TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningIconId
- ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR.warningIconId
- else -> TYPE_USECASE_ID_AVW.warningIconId
- }
- }
-
- fun getWarningContent(useCaseId: Int): String {
- return when (useCaseId) {
- ObuConstants.USE_CASE_ID.EBW -> TYPE_USECASE_ID_EBW.warningContent
- ObuConstants.USE_CASE_ID.FCW -> TYPE_USECASE_ID_FCW.warningContent
- ObuConstants.USE_CASE_ID.ICW -> TYPE_USECASE_ID_ICW.warningContent
- ObuConstants.USE_CASE_ID.CLW -> TYPE_USECASE_ID_CLW.warningContent
- ObuConstants.USE_CASE_ID.DNPW -> TYPE_USECASE_ID_DNPW.warningContent
- ObuConstants.USE_CASE_ID.AVW -> TYPE_USECASE_ID_AVW.warningContent
- ObuConstants.USE_CASE_ID.BSW -> TYPE_USECASE_ID_BSW.warningContent
- ObuConstants.USE_CASE_ID.LCW -> TYPE_USECASE_ID_LCW.warningContent
- ObuConstants.USE_CASE_ID.EVW -> TYPE_USECASE_ID_EVW.warningContent
- TYPE_USECASE_ID_VRUCW_PERSON.useCaseId -> TYPE_USECASE_ID_VRUCW_PERSON.warningContent
- TYPE_USECASE_ID_VRUCW_MOTORBIKE.useCaseId -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.warningContent
- ObuConstants.USE_CASE_ID.SLW -> TYPE_USECASE_ID_SLW.warningContent
- ObuConstants.USE_CASE_ID.LTA -> TYPE_USECASE_ID_LTA.warningContent
- ObuConstants.USE_CASE_ID.HLW -> TYPE_USECASE_ID_HLW.warningContent
- ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS.warningContent
- ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW.warningContent
- ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP.warningContent
- TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN.warningContent
- ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC.warningContent
- TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningContent
- TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningContent
- TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningContent
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningContent
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningContent
- TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningContent
- TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningContent
- TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningContent
- TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningContent
- TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningContent
- TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningContent
- ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR.warningContent
- else -> TYPE_USECASE_ID_AVW.warningContent
- }
- }
-
- fun getWarningTts(useCaseId: Int): String {
- return when (useCaseId) {
- ObuConstants.USE_CASE_ID.EBW -> TYPE_USECASE_ID_EBW.warningTts
- ObuConstants.USE_CASE_ID.FCW -> TYPE_USECASE_ID_FCW.warningTts
- ObuConstants.USE_CASE_ID.ICW -> TYPE_USECASE_ID_ICW.warningTts
- ObuConstants.USE_CASE_ID.CLW -> TYPE_USECASE_ID_CLW.warningTts
- ObuConstants.USE_CASE_ID.DNPW -> TYPE_USECASE_ID_DNPW.warningTts
- ObuConstants.USE_CASE_ID.AVW -> TYPE_USECASE_ID_AVW.warningTts
- ObuConstants.USE_CASE_ID.BSW -> TYPE_USECASE_ID_BSW.warningTts
- ObuConstants.USE_CASE_ID.LCW -> TYPE_USECASE_ID_LCW.warningTts
- ObuConstants.USE_CASE_ID.EVW -> TYPE_USECASE_ID_EVW.warningTts
- TYPE_USECASE_ID_VRUCW_PERSON.useCaseId -> TYPE_USECASE_ID_VRUCW_PERSON.warningTts
- TYPE_USECASE_ID_VRUCW_MOTORBIKE.useCaseId -> TYPE_USECASE_ID_VRUCW_MOTORBIKE.warningTts
- ObuConstants.USE_CASE_ID.SLW -> TYPE_USECASE_ID_SLW.warningTts
- ObuConstants.USE_CASE_ID.LTA -> TYPE_USECASE_ID_LTA.warningTts
- ObuConstants.USE_CASE_ID.HLW -> TYPE_USECASE_ID_HLW.warningTts
- ObuConstants.USE_CASE_ID.IVS -> TYPE_USECASE_ID_IVS.warningTts
- ObuConstants.USE_CASE_ID.TJW -> TYPE_USECASE_ID_TJW.warningTts
- ObuConstants.USE_CASE_ID.IVP -> TYPE_USECASE_ID_IVP.warningTts
- TYPE_USECASE_ID_IVP_GREEN.useCaseId -> TYPE_USECASE_ID_IVP_GREEN.warningTts
- ObuConstants.USE_CASE_ID.COC -> TYPE_USECASE_ID_COC.warningTts
- TYPE_USECASE_ID_ROAD_TRAMCAR.useCaseId -> TYPE_USECASE_ID_ROAD_TRAMCAR.warningTts
- TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.warningTts
- TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId -> TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.warningTts
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.warningTts
- TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.warningTts
- TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId -> TYPE_USECASE_ID_ROAD_COLLISION_WARNING.warningTts
- TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.useCaseId -> TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.warningTts
- TYPE_USECASE_ID_ROAD_TEST_SECTION.useCaseId -> TYPE_USECASE_ID_ROAD_TEST_SECTION.warningTts
- TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId -> TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.warningTts
- TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId -> TYPE_USECASE_ID_ROAD_NO_PARKING.warningTts
- TYPE_USECASE_ID_ROAD_GIVE_WAY.useCaseId -> TYPE_USECASE_ID_ROAD_GIVE_WAY.warningTts
- ObuConstants.USE_CASE_ID.ERROR -> TYPE_ERROR.warningTts
- else -> TYPE_USECASE_ID_AVW.warningTts
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
index a67b8a791f..8dd242489b 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
@@ -4,7 +4,7 @@ import android.content.Context;
import android.util.ArrayMap;
import com.mogo.module.common.R;
-import com.mogo.module.common.entity.MarkerPoiTypeEnum;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.common.marker.PoiWrapper;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.utils.GsonUtil;
@@ -37,47 +37,47 @@ public class CloudPoiManager {
public void generateDefault() {
if (poiWrapper.isEmpty()) {
- poiWrapper.put(MarkerPoiTypeEnum.GAS_STATION, new PoiWrapper(MarkerPoiTypeEnum.GAS_STATION, R.drawable.module_common_icon_map_marker_refuel,
+ poiWrapper.put(EventTypeEnum.GAS_STATION.getPoiType(), new PoiWrapper(EventTypeEnum.GAS_STATION.getPoiType(), R.drawable.module_common_icon_map_marker_refuel,
R.drawable.module_common_icon_map_marker_refuel, "加油站"));
- poiWrapper.put(MarkerPoiTypeEnum.TRAFFIC_CHECK, new PoiWrapper(MarkerPoiTypeEnum.TRAFFIC_CHECK,
+ poiWrapper.put(EventTypeEnum.TRAFFIC_CHECK.getPoiType(), new PoiWrapper(EventTypeEnum.TRAFFIC_CHECK.getPoiType(),
R.drawable.module_common_icon_map_marker_road_check2, R.drawable.module_common_icon_map_marker_road_check2_white, "交通检查"));
- poiWrapper.put(MarkerPoiTypeEnum.ROAD_CLOSED, new PoiWrapper(MarkerPoiTypeEnum.ROAD_CLOSED,
+ poiWrapper.put(EventTypeEnum.ROAD_CLOSED.getPoiType(), new PoiWrapper(EventTypeEnum.ROAD_CLOSED.getPoiType(),
R.drawable.module_common_icon_map_marker_road_block_off2, R.drawable.module_common_icon_map_marker_road_block_off2_white, "封路"));
- poiWrapper.put(MarkerPoiTypeEnum.SHOP_DISCOUNT, new PoiWrapper(MarkerPoiTypeEnum.SHOP_DISCOUNT,
+ poiWrapper.put(EventTypeEnum.SHOP_DISCOUNT.getPoiType(), new PoiWrapper(EventTypeEnum.SHOP_DISCOUNT.getPoiType(),
R.drawable.module_common_icon_map_marker_shop_discount, R.drawable.module_common_icon_map_marker_shop_discount, "商场打折"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_4S, new PoiWrapper(MarkerPoiTypeEnum.FOURS_4S,
+ poiWrapper.put(EventTypeEnum.FOURS_4S.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_4S.getPoiType(),
R.drawable.module_common_icon_map_marker_4s, R.drawable.module_common_icon_map_marker_4s, "4S店"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ROAD_WORK, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ROAD_WORK,
+ poiWrapper.put(EventTypeEnum.FOURS_ROAD_WORK.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ROAD_WORK.getPoiType(),
R.drawable.module_common_icon_map_marker_road_work2, R.drawable.module_common_icon_map_marker_road_work2_white, "施工"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_BLOCK_UP, new PoiWrapper(MarkerPoiTypeEnum.FOURS_BLOCK_UP,
+ poiWrapper.put(EventTypeEnum.FOURS_BLOCK_UP.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_BLOCK_UP.getPoiType(),
R.drawable.module_common_icon_map_marker_road_block_up2, R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_PONDING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PONDING,
+ poiWrapper.put(EventTypeEnum.FOURS_PONDING.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_PONDING.getPoiType(),
R.drawable.module_common_icon_map_marker_pondingl2, R.drawable.module_common_icon_map_marker_pondingl2_white, "积水"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_SHOP_FREE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_SHOP_FREE,
+ poiWrapper.put(EventTypeEnum.FOURS_SHOP_FREE.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_SHOP_FREE.getPoiType(),
R.drawable.module_common_icon_map_marker_shop, R.drawable.module_common_icon_map_marker_shop, "超时打折"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_FOG, new PoiWrapper(MarkerPoiTypeEnum.FOURS_FOG,
+ poiWrapper.put(EventTypeEnum.FOURS_FOG.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_FOG.getPoiType(),
R.drawable.module_common_ic_rc_dark_frog2, R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ICE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ICE,
+ poiWrapper.put(EventTypeEnum.FOURS_ICE.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ICE.getPoiType(),
R.drawable.module_common_ic_rc_freeze2, R.drawable.module_common_ic_rc_freeze2_white, "结冰"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_PARKING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PARKING,
+ poiWrapper.put(EventTypeEnum.FOURS_PARKING.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_PARKING.getPoiType(),
R.drawable.module_common_ic_rc_parking2, R.drawable.module_common_ic_rc_parking2, "停车场"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT,
+ poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT.getPoiType(),
R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "事故"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_01, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_01,
+ poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_01.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_01.getPoiType(),
R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "重大事故"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_02, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_02,
+ poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_02.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_02.getPoiType(),
R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "特大事故"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_03, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_03,
+ poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_03.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_03.getPoiType(),
R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "较大事故"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_04, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_04,
+ poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_04.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_04.getPoiType(),
R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "一般事故"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT_05, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT_05,
+ poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_05.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_05.getPoiType(),
R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "轻微事故"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_NEALY, new PoiWrapper(MarkerPoiTypeEnum.FOURS_NEALY,
+ poiWrapper.put(EventTypeEnum.FOURS_NEALY.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_NEALY.getPoiType(),
R.drawable.module_common_icon_map_marker_shear_news, R.drawable.module_common_icon_map_marker_shear_news, "身边"));
- poiWrapper.put(MarkerPoiTypeEnum.FOURS_LIVING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_LIVING,
+ poiWrapper.put(EventTypeEnum.FOURS_LIVING.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_LIVING.getPoiType(),
R.drawable.module_common_icon_map_marker_living, R.drawable.module_common_icon_map_marker_living_white, "实时路况"));
- poiWrapper.put(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING, new PoiWrapper(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING,
+ poiWrapper.put(EventTypeEnum.ILLEGAL_PARK_LIVING.getPoiType(), new PoiWrapper(EventTypeEnum.ILLEGAL_PARK_LIVING.getPoiType(),
R.drawable.module_common_ic_rc_illegal_park, R.drawable.module_common_ic_rc_illegal_park_white, "违章停车"));
// 分享里用到的故障求助
poiWrapper.put("9999", new PoiWrapper("9999",
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java
index ff10114899..b8dd429bd2 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Const.java
@@ -7,4 +7,37 @@ public class Const {
public static final String BROADCAST_SCENE_HANDLER_ACTION = "com.v2x.scene_handler_broadcast";
public static final String BROADCAST_SCENE_EXTRA_KEY = "V2XMessageEntity";
+ /**
+ * 用户UGC反馈免唤醒词语
+ */
+ // 拥堵
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP_WORDS = {"拥堵", "很堵", "堵死了", "有点堵", "确定"};
+
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP_WORDS = {"没注意", "不堵", "很畅通", "取消", "关闭"};
+
+
+ // 封路
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP_WORDS = {"封路了", "封了", "封路", "有封路", "确定"};
+
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP_WORDS = {"不封路", "没注意", "没看到", "没有", "没封路", "无封路", "取消", "关闭"};
+
+
+ // 事故
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP_WORDS = {"有事故", "存在交通事故", "确定"};
+
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP_WORDS = {"没注意", "没有事故", "无事故", "没看到", "没有", "取消", "关闭"};
+
+
+ // 道路施工
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP_WORDS = {"有", "在施工", "有施工", "确定"};
+
+ public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP";
+ public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP_WORDS = {"没注意", "没看到", "没有施工", "无施工", "很正常", "取消", "关闭"};
}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/ImageViewClipBounds.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/ImageViewClipBounds.java
new file mode 100644
index 0000000000..9d5ee41f38
--- /dev/null
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/ImageViewClipBounds.java
@@ -0,0 +1,55 @@
+package com.mogo.module.common.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+/**
+ * @author donghongyu
+ * @date 2019-08-22
+ */
+public class ImageViewClipBounds extends AppCompatImageView {
+ Rect mClipBounds = null;
+
+ public ImageViewClipBounds(Context context) {
+ this(context, null);
+ }
+
+ public ImageViewClipBounds(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public ImageViewClipBounds(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ if (mClipBounds != null) {
+ // clip bounds ignore scroll
+ canvas.clipRect(mClipBounds);
+ }
+ super.onDraw(canvas);
+ }
+
+ public void setClip(Rect clipBounds) {
+ if (clipBounds == mClipBounds || (clipBounds != null && clipBounds.equals(mClipBounds))) {
+ return;
+ }
+ if (clipBounds != null) {
+ if (mClipBounds == null) {
+ mClipBounds = new Rect(clipBounds);
+ } else {
+ mClipBounds.set(clipBounds);
+ }
+ } else {
+ mClipBounds = null;
+ }
+ invalidate();
+ }
+}
+
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java
similarity index 64%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java
rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java
index 408255e1bc..5029ba62a0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XLinearLayoutManager.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/LinearLayoutCommonManager.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.fragment;
+package com.mogo.module.common.view;
import android.content.Context;
import android.util.AttributeSet;
@@ -7,16 +7,16 @@ import android.util.Log;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-class V2XLinearLayoutManager extends LinearLayoutManager {
- public V2XLinearLayoutManager(Context context) {
+public class LinearLayoutCommonManager extends LinearLayoutManager {
+ public LinearLayoutCommonManager(Context context) {
super(context);
}
- public V2XLinearLayoutManager(Context context, int orientation, boolean reverseLayout) {
+ public LinearLayoutCommonManager(Context context, int orientation, boolean reverseLayout) {
super(context, orientation, reverseLayout);
}
- public V2XLinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ public LinearLayoutCommonManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/SpacesItemDecoration.java
similarity index 93%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/view/SpacesItemDecoration.java
index f0e2739521..909ec058dd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/SpacesItemDecoration.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x;
+package com.mogo.module.common.view;
import android.graphics.Rect;
import android.view.View;
diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png
deleted file mode 100644
index ffb5e8600b..0000000000
Binary files a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_accident_prone_road_section.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png
deleted file mode 100644
index 58d3ac8909..0000000000
Binary files a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_avoid_special_vehicles.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_ban_astern.png b/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_ban_astern.png
deleted file mode 100644
index cb8f9396aa..0000000000
Binary files a/modules/mogo-module-common/src/main/res-warning/drawable-xxhdpi/icon_warning_v2x_ban_astern.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_red.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/icon_car_red.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_red.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/icon_car_red.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_accident_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_accident_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_jishui_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_1.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_1.png
new file mode 100644
index 0000000000..174477c2fc
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_1.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_11.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_11.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_11.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_11.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_16.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_16.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_16.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_16.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_2.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_2.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_2.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_2.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_3.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_3.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_3.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_3.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_5.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_5.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_5.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_5.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_6.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_6.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_6.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_6.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_7.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_7.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_7.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_7.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_8.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_8.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_8.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_8.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_9.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_9.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_9.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_express.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_express.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_express.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_express.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png
rename to modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_marker_taxi.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png
new file mode 100644
index 0000000000..51038d26f4
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-ldpi/v_to_x_warning_car_red.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/icon_car_red.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_accident_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_accident_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_accident_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_accident_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_daolushigong_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_daolushigong_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_daolushigong_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_daolushigong_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_fenglu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_fenglu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_fenglu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_fenglu_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiaotongjiancha_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiaotongjiancha_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiaotongjiancha_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiebing_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiebing_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiebing_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jiebing_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jishui_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jishui_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jishui_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_jishui_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_nongwu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_nongwu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_nongwu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_nongwu_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_shishilukuang_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_shishilukuang_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_shishilukuang_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_shishilukuang_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_yongdu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_yongdu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_yongdu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/mogo_image_yongdu_small.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png
new file mode 100644
index 0000000000..8ac13e867f
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_11.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_16.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_2.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_3.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_5.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_6.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_7.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_8.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_9.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_express.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_taxi.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png
new file mode 100644
index 0000000000..ed1542ea36
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png
new file mode 100644
index 0000000000..31ea64f0ea
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_ahead_car_brake.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png
new file mode 100644
index 0000000000..e7709ff347
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_car_collide_warning.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_daolushigong_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongjiancha_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_jiaotongshigu_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_nongwu_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi-2560x1440/v2x_icon_yongdu_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_car_red.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_car_red.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_car_red.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_car_red.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_common_heart_animation_vr01.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_common_heart_animation_vr01.png
deleted file mode 100644
index 5246d61ccc..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_common_heart_animation_vr01.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_4s.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_4s.png
deleted file mode 100644
index 11c5c6ea7b..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_4s.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png
deleted file mode 100644
index 1b87f0ce86..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png
deleted file mode 100644
index fc3ff86372..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png
deleted file mode 100755
index 700226f150..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png
deleted file mode 100644
index bac7ee2e40..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png
deleted file mode 100755
index 2fb4ef553e..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png
deleted file mode 100755
index 9b424494ee..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png
deleted file mode 100755
index 0ac89f4dec..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png
deleted file mode 100644
index 7f8f80be69..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png
deleted file mode 100755
index 001974ba87..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png
deleted file mode 100755
index 5baea2a41b..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png
deleted file mode 100644
index 0b0d4bbab5..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png
deleted file mode 100755
index c11e911f15..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png
deleted file mode 100755
index 7875086c3e..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png
deleted file mode 100644
index f446cba155..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shop.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shop.png
deleted file mode 100644
index d8be56fd47..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shop.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png
deleted file mode 100644
index 97e8a4967b..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_accident_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_accident_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png
new file mode 100644
index 0000000000..5480b6d165
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_fenglu.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_fenglu.png
new file mode 100644
index 0000000000..b3328eba18
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_fenglu.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigu.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigu.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigu.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigu.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_event_ugc_yongdu.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_1.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_1.png
new file mode 100644
index 0000000000..8ac13e867f
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_1.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_11.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_11.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_11.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_11.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_16.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_16.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_16.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_16.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_2.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_2.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_2.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_3.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_3.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_3.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_3.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_5.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_5.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_5.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_5.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_6.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_6.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_6.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_6.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_7.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_7.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_7.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_7.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_8.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_8.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_8.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_8.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_9.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_9.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_9.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_9.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_express.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_express.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_express.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_express.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_taxi.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_taxi.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_taxi.png
rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_taxi.png
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png
new file mode 100644
index 0000000000..ed1542ea36
Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_cancel_help.xml
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml
rename to modules/mogo-module-common/src/main/res/drawable/bg_v2x_cancel_help.xml
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_title_bg.xml b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_blue.xml
similarity index 51%
rename from modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_title_bg.xml
rename to modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_blue.xml
index 259f27ee21..d04f7b325b 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_title_bg.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_blue.xml
@@ -1,11 +1,8 @@
-
+
+ android:endColor="#ff5cc1ff"
+ android:startColor="#ff256bff"/>
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bgg_v2x_event_eva.xml b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange.xml
similarity index 61%
rename from modules/mogo-module-v2x/src/main/res/drawable/bgg_v2x_event_eva.xml
rename to modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange.xml
index 23864b875c..68e4fa978f 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bgg_v2x_event_eva.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange.xml
@@ -1,9 +1,8 @@
-
-
+
-
+ android:angle="180"
+ android:endColor="#FFA757"
+ android:startColor="#D48721" />
+
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml
new file mode 100644
index 0000000000..86fe790833
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_surrounding_road_type.xml b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_read.xml
similarity index 83%
rename from modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_surrounding_road_type.xml
rename to modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_read.xml
index e789d681a3..43b446e4c6 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_surrounding_road_type.xml
+++ b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_read.xml
@@ -4,5 +4,5 @@
android:angle="180"
android:endColor="#FF4944"
android:startColor="#C23632" />
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_red_vr.xml b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_red_vr.xml
new file mode 100644
index 0000000000..ead9ee25ff
--- /dev/null
+++ b/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_red_vr.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/drawable/blue.png b/modules/mogo-module-common/src/main/res/drawable/blue.png
deleted file mode 100644
index a2357a6be6..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable/blue.png and /dev/null differ
diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_bg_vr.9.png b/modules/mogo-module-common/src/main/res/drawable/module_common_bg_vr.9.png
deleted file mode 100644
index 6df098b217..0000000000
Binary files a/modules/mogo-module-common/src/main/res/drawable/module_common_bg_vr.9.png and /dev/null differ
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index dbc577319b..c396be0232 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -7,12 +7,14 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
import android.text.TextUtils;
+import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.CheckedTextView;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageButton;
@@ -33,6 +35,7 @@ import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.commons.voice.AIAssist;
import com.mogo.map.MogoLatLng;
+import com.mogo.map.check.IMogoCheckListener;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.marker.IMogoMarkerManager;
@@ -65,8 +68,11 @@ import com.mogo.module.extensions.utils.EntranceViewHolder;
import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper;
import com.mogo.module.extensions.utils.TopViewAnimHelper;
import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper;
+import com.mogo.module.service.receiver.MogoReceiver;
import com.mogo.module.share.manager.ServiceApisManager;
import com.mogo.service.IMogoServiceApis;
+import com.mogo.service.adas.IMogoAdasOCHCallback;
+import com.mogo.service.adas.entity.AdasOCHData;
import com.mogo.service.analytics.IMogoAnalytics;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.entrance.ButtonIndex;
@@ -89,6 +95,8 @@ import com.mogo.utils.logger.Logger;
import com.mogo.utils.storage.SharedPrefsMgr;
import com.zhidao.manager.ts.TsThreshold;
+import org.w3c.dom.Text;
+
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -122,6 +130,9 @@ public class EntranceFragment extends MvpFragment {
+ ctvAutopilotStatus.setChecked(isInAutopilot);
+ });
+ }
+
+ private void autopilotStatusClick() {
+ EntranceViewHolder.getInstance().entranceAutopilotStatusClick();
}
private int debugPanelClickCount = 0;
@@ -389,7 +443,8 @@ public class EntranceFragment extends MvpFragment sButtons = new HashMap<>();
+ private static final Map< ButtonIndex, TextView > sButtons = new HashMap<>();
public static void save( ButtonIndex index, TextView btn ) {
sButtons.put( index, btn );
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
index 4d1de4513d..eb64124d8f 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java
@@ -1,5 +1,7 @@
package com.mogo.module.extensions.utils;
+import static com.mogo.service.entrance.IMogoEntranceButtonController.NOTICE_TYPE_SEEK_HELP;
+
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -10,6 +12,7 @@ import android.widget.TextView;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.extensions.R;
import com.mogo.module.extensions.bean.BottomLayerViewWrapper;
+import com.mogo.service.entrance.IMogoEntranceAutopilotStatusClickListener;
import com.mogo.service.windowview.IMogoEntranceViewListener;
import com.mogo.utils.logger.Logger;
@@ -17,20 +20,20 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import static com.mogo.service.entrance.IMogoEntranceButtonController.NOTICE_TYPE_SEEK_HELP;
-
/**
* 入口页view管理
+ *
* @author tongchenfei
*/
public class EntranceViewHolder {
private static final String TAG = "EntranceViewHolder";
- private List preAddView = new ArrayList<>();
- private List leftFeaturePreAddView = new ArrayList<>();
- private View preAddLeftNoticeView = null;
- private EntranceViewHolder(){}
+
+ private EntranceViewHolder() {
+ }
+
private volatile static EntranceViewHolder instance = null;
- public static EntranceViewHolder getInstance(){
+
+ public static EntranceViewHolder getInstance() {
if (instance == null) {
synchronized (EntranceViewHolder.class) {
if (instance == null) {
@@ -40,13 +43,18 @@ public class EntranceViewHolder {
}
return instance;
}
+
+ private final List preAddView = new ArrayList<>();
+ private final List leftFeaturePreAddView = new ArrayList<>();
+ private View preAddLeftNoticeView = null;
+
private ViewGroup rootViewGroup = null;
private ViewGroup featureViewGroup = null;
private ViewGroup leftNoticeContainer = null;
public void initRootViewGroup(View rootView) {
Logger.i(TAG, "initRootViewGroup==");
- if(rootView instanceof ViewGroup) {
+ if (rootView instanceof ViewGroup) {
Logger.d(TAG, "initRootViewGroup 赋值");
rootViewGroup = (ViewGroup) rootView.getParent();
leftNoticeContainer =
@@ -82,12 +90,12 @@ public class EntranceViewHolder {
Logger.d(TAG, "addBottomLayerView, rootViewGroup is null: " + (rootViewGroup == null) +
"\n x: " + x + ", y: " + y);
BottomLayerViewWrapper wrapper = new BottomLayerViewWrapper(view, x, y);
- if(rootViewGroup == null) {
- if(!preAddView.contains(wrapper)) {
+ if (rootViewGroup == null) {
+ if (!preAddView.contains(wrapper)) {
preAddView.add(wrapper);
}
- }else{
- if(!containView(view)) {
+ } else {
+ if (!containView(view)) {
realAddView(wrapper);
}
}
@@ -96,7 +104,7 @@ public class EntranceViewHolder {
private boolean containView(View view) {
int count = rootViewGroup.getChildCount();
for (int i = 0; i < count; i++) {
- if(rootViewGroup.getChildAt(i).equals(view)){
+ if (rootViewGroup.getChildAt(i).equals(view)) {
return true;
}
}
@@ -106,7 +114,7 @@ public class EntranceViewHolder {
private boolean containFeatureView(View view) {
int count = featureViewGroup.getChildCount();
for (int i = 0; i < count; i++) {
- if(featureViewGroup.getChildAt(i).equals(view)){
+ if (featureViewGroup.getChildAt(i).equals(view)) {
return true;
}
}
@@ -116,7 +124,7 @@ public class EntranceViewHolder {
/**
* 使用的时候需要预先判断rootViewGroup是否为空，本方法默认rootViewGroup不为空
*/
- private void realAddView(BottomLayerViewWrapper wrapper){
+ private void realAddView(BottomLayerViewWrapper wrapper) {
FrameLayout.LayoutParams params =
new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
FrameLayout.LayoutParams.WRAP_CONTENT);
@@ -145,10 +153,10 @@ public class EntranceViewHolder {
Logger.d(TAG, "addLeftFeatureView==" + view);
if (featureViewGroup == null) {
// 先缓存起来，等待时机加载
- if(!leftFeaturePreAddView.contains(view)) {
+ if (!leftFeaturePreAddView.contains(view)) {
leftFeaturePreAddView.add(view);
}
- }else{
+ } else {
// 直接加载
if (!containFeatureView(view)) {
featureViewGroup.addView(view);
@@ -171,7 +179,7 @@ public class EntranceViewHolder {
public void showLeftNoticeView(View view) {
- if(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+ if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
if (leftNoticeContainer != null) {
realShowLeftNoticeView(view);
} else {
@@ -181,7 +189,7 @@ public class EntranceViewHolder {
}
public void hideLeftNoticeView(View view) {
- if(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+ if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
if (preAddLeftNoticeView != null && preAddLeftNoticeView == view) {
preAddLeftNoticeView = null;
}
@@ -191,7 +199,7 @@ public class EntranceViewHolder {
}
}
- public void forceHideNoticeView(){
+ public void forceHideNoticeView() {
for (IMogoEntranceViewListener listener : listeners) {
listener.onViewRemoved(currentShowNoticeType);
}
@@ -203,8 +211,9 @@ public class EntranceViewHolder {
}
private int currentShowNoticeType = 0;
- public void showLeftNoticeByType(int noticeType, int iconRes, String content){
- if(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+
+ public void showLeftNoticeByType(int noticeType, int iconRes, String content) {
+ if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
if (currentShowNoticeType != noticeType && currentShowNoticeType != 0) {
for (IMogoEntranceViewListener listener : listeners) {
listener.onViewRemoved(currentShowNoticeType);
@@ -221,21 +230,21 @@ public class EntranceViewHolder {
}
public void hideLeftNoticeByType(int noticeType) {
- if(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+ if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
if (currentShowNoticeType == noticeType) {
forceHideNoticeView();
}
}
}
- private View generateNoticeViewByType(int noticeType,int iconRes, String content) {
+ private View generateNoticeViewByType(int noticeType, int iconRes, String content) {
View view =
LayoutInflater.from(leftNoticeContainer.getContext()).inflate(R.layout.item_vr_left_notice, leftNoticeContainer, false);
ImageView icon = view.findViewById(R.id.module_ext_iv_left_notice_icon);
if (noticeType == NOTICE_TYPE_SEEK_HELP) {
// 自车求助，是橘色的背景
icon.setBackgroundResource(R.drawable.module_ext_left_notice_icon_orange_bg);
- }else{
+ } else {
// 其他是红色背景
icon.setBackgroundResource(R.drawable.module_ext_left_notice_icon_red_bg);
}
@@ -245,7 +254,7 @@ public class EntranceViewHolder {
return view;
}
- private void realShowLeftNoticeView(View view){
+ private void realShowLeftNoticeView(View view) {
leftNoticeContainer.setVisibility(View.VISIBLE);
leftNoticeContainer.removeAllViews();
leftNoticeContainer.addView(view);
@@ -260,7 +269,8 @@ public class EntranceViewHolder {
leftNoticeContainer.setVisibility(View.GONE);
}
- private List listeners = new ArrayList<>();
+ private final List listeners = new ArrayList<>();
+ private final List btnClickListeners = new ArrayList<>();
public void addEntranceViewListener(IMogoEntranceViewListener listener) {
listeners.add(listener);
@@ -270,7 +280,21 @@ public class EntranceViewHolder {
listeners.remove(listener);
}
- public void release(){
+ public void addEntranceAutopilotStatusClickListener(IMogoEntranceAutopilotStatusClickListener listener) {
+ btnClickListeners.add(listener);
+ }
+
+ public void removeEntranceAutopilotStatusClickListener(IMogoEntranceAutopilotStatusClickListener listener) {
+ btnClickListeners.remove(listener);
+ }
+
+ public void entranceAutopilotStatusClick() {
+ for (IMogoEntranceAutopilotStatusClickListener listener : btnClickListeners) {
+ listener.click();
+ }
+ }
+
+ public void release() {
rootViewGroup = null;
featureViewGroup = null;
leftNoticeContainer = null;
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_autopilot.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_autopilot.png
new file mode 100644
index 0000000000..be978145dc
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_autopilot.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/check_error_image.png b/modules/mogo-module-extensions/src/main/res/drawable/check_error_image.png
new file mode 100644
index 0000000000..c6dddfe6ee
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable/check_error_image.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_check.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_check.xml
new file mode 100644
index 0000000000..1272a64f7b
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_check.xml
@@ -0,0 +1,14 @@
+
+
+
+ //填充
+
+ //描边
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_mogo_autopilot_status_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_mogo_autopilot_status_bg.xml
new file mode 100644
index 0000000000..b5596fad13
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_mogo_autopilot_status_bg.xml
@@ -0,0 +1,16 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 9e5f2ceb3e..9a38cf8999 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -6,6 +6,27 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
+ android:textColor="@color/module_ext_color_voice_text"
+ android:textSize="@dimen/module_switch_text_size" />
@@ -319,6 +340,29 @@
android:textStyle="bold" />
+
+
+
+
+
36px
50px
60px
+
+ 460px
+ 140px
+ 20px
+ 530px
+ 92px
+ 44px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index eeb585d868..55739ccfca 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -251,4 +251,11 @@
35px
38px
+ 300px
+ 100px
+ 20px
+ 345px
+ 20px
+ 30px
+
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/ids.xml b/modules/mogo-module-extensions/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..7eb07447bc
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+
+
+
- * 持有服务接口实例
- */
-public class ServiceMediaHandler {
-
- private static MogoServiceApis mApis;
- private static IMogoMapService mMapService;
- private static IMogoLocationClient mLocationClient;
- private static IMogoMarkerManager mMarkerManager;
- private static IMogoMapUIController mMapUIController;
- private static IMogoImageloader mImageloader;
- private static IMogoNetwork mMogoNetWorkService;
- private static IMogoWindowManager mMogoWindowManager;
- private static IMogoCardManager mMogoCardManager;
- private static IMogoAnalytics mMogoAnalytis;
- private static IMogoRegisterCenter mMogoRegisterCenter;
- private static IMogoIntentManager mMogoVoiceManager;
- private static IMogoStatusManager mIMogoStatusManager;
- private static IMogoNavi mMogoNavi;
- private static IMogoDataManager mMogoDataManager;
- private static IMogoActionManager mMogoActionManager;
- private static IMogoADASController mMogoADASController;
- private static IMogoAuthorizeModuleManager mMogoAuthorizeModuleManager;
- private static IMogoMarkerService sMarkerService;
-
- private static ICarsChattingProvider sCarsChattingProvider;
-
- public static void init(Context context) {
- mApis = (MogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
- mMapService = mApis.getMapServiceApi();
- mImageloader = mApis.getImageLoaderApi();
- mLocationClient = mMapService.getLocationClient(context);
- mMarkerManager = mMapService.getMarkerManager(context);
- mMapUIController = mMapService.getMapUIController();//zoomTo
- mMogoNetWorkService = mApis.getNetworkApi();
- mMogoWindowManager = mApis.getWindowManagerApi();
- mMogoCardManager = mApis.getCardManagerApi();
- mMogoAnalytis = mApis.getAnalyticsApi();
- mMogoRegisterCenter = mApis.getRegisterCenterApi();
- mMogoVoiceManager = mApis.getIntentManagerApi();
- mIMogoStatusManager = mApis.getStatusManagerApi();
- mMogoNavi = mMapService.getNavi( context );
- mMogoDataManager = mApis.getDataManagerApi();
- mMogoActionManager = mApis.getActionManagerApi();
- mMogoADASController = mApis.getAdasControllerApi();
- mMogoAuthorizeModuleManager = (IMogoAuthorizeModuleManager) ARouter.getInstance().build(AuthorizeConstant.PROVIDER_MODULE).navigation(context);
- sMarkerService = mApis.getMarkerService();
-
- sCarsChattingProvider = ARouter.getInstance().navigation( ICarsChattingProvider.class );
- }
-
- public static IMogoADASController getMogoADASController(){
- isApisNull(mMogoADASController);
- return mMogoADASController;
- }
-
- public static IMogoMapService getMapService() {
- isApisNull(mMapService);
- return mMapService;
- }
-
- public static IMogoLocationClient getLocationClient() {
- isApisNull(mLocationClient);
- return mLocationClient;
- }
-
- public static IMogoMarkerManager getMarkerManager() {
- isApisNull(mMarkerManager);
- return mMarkerManager;
- }
-
- public static IMogoMapUIController getMapUIController() {
- isApisNull(mMapUIController);
- return mMapUIController;
- }
-
- public static IMogoImageloader getImageloader() {
- isApisNull(mImageloader);
- return mImageloader;
- }
-
- public static IMogoNetwork getMogoNetWorkService(){
- isApisNull(mMogoNetWorkService);
- return mMogoNetWorkService;
- }
-
- public static IMogoWindowManager getMogoWindowManager() {
- isApisNull(mMogoWindowManager);
- return mMogoWindowManager;
- }
-
- public static IMogoCardManager getMogoCardManager() {
- isApisNull(mMogoCardManager);
- return mMogoCardManager;
- }
-
- public static IMogoAnalytics getMogoAnalytis() {
- isApisNull(mMogoAnalytis);
- return mMogoAnalytis;
- }
-
- /**
- * 1 2 3 dev qa release
- * @return
- */
- public static int getCurrentEvent(){
- return DebugConfig.getNetMode();
- }
-
- public static IMogoRegisterCenter getMogoRegisterCenter(){
- isApisNull(mMogoRegisterCenter);
- return mMogoRegisterCenter;
- }
-
- public static IMogoIntentManager getMogoVoiceManager(){
- isApisNull(mMogoVoiceManager);
- return mMogoVoiceManager;
- }
-
- public static IMogoStatusManager getIMogoStatusManager(){
- isApisNull(mIMogoStatusManager);
- return mIMogoStatusManager;
- }
-
- public static IMogoNavi getMogoNavi(){
- isApisNull(mMogoNavi);
- return mMogoNavi;}
-
- public static IMogoDataManager getMogoDataManager(){
- isApisNull(mMogoDataManager);
- return mMogoDataManager;
- }
-
- public static MogoServiceApis getApis() {
- return mApis;
- }
-
- /**
- * 这个注册的第一个参数是模块名称，目的是只给当前显示的卡片分发事件
- * @return
- */
- public static IMogoActionManager getMogoctionManager(){
- isApisNull(mMogoActionManager);
- return mMogoActionManager;
- }
-
- public static IMogoAuthorizeModuleManager getMogoAuthorizeModuleManager(){
- isApisNull(mMogoAuthorizeModuleManager);
- return mMogoAuthorizeModuleManager;
- }
-
- public static boolean isObjStaticNull(Object object){
- if (mApis == null || object == null){
- return true;
- }
- return false;
- }
-
- public static IMogoMarkerService getMarkerService() {
- isApisNull(sMarkerService);
- return sMarkerService;
- }
-
- public static ICarsChattingProvider getCarsChattingApis() {
- isApisNull( sCarsChattingProvider );
- return sCarsChattingProvider;
- }
-
- public static void isApisNull( Object object){
- if (isObjStaticNull(object)){
- init(AbsMogoApplication.getApp());
- }
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/api/MediaDztService.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/api/MediaDztService.java
deleted file mode 100644
index 0adfc59051..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/api/MediaDztService.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.mogo.module.media.api;
-
-import com.mogo.commons.data.BaseData;
-import com.mogo.module.common.entity.MarkerResponse;
-import com.mogo.module.media.model.ShareLikeData;
-import com.mogo.module.media.model.ShareMediaMarkerInfoData;
-import com.mogo.module.media.model.ShareSuccessResult;
-import com.mogo.module.media.model.ShowShareData;
-
-import java.util.Map;
-
-import io.reactivex.Observable;
-import okhttp3.RequestBody;
-import retrofit2.http.Body;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Headers;
-import retrofit2.http.POST;
-import retrofit2.http.QueryMap;
-import retrofit2.http.Url;
-
-public interface MediaDztService {
-
- /**
- * 查询音频分享信息
- */
- @GET("/sunflower/os/music/car/v1/selectByPrimaryKey")
- Observable selectByPrimaryKey(@QueryMap Map params);
-
- /**
- * 分享音乐
- */
- @Headers({"Content-type:application/json;charset=UTF-8"})
- @POST
- Observable shareMusic(@Url String url, @Body RequestBody body);
-
- /**
- * 好友分享的歌
- */
- @GET("/sunflower/os/music/car/v1/getFriendsMusic")
- Observable getFriendShareMusic(@QueryMap Map params);
-
- /**
- * 是否需要触发分享
- */
- @GET("/sunflower/os/music/car/v1/checkShare")
- Observable getShouldPushShare(@QueryMap Map params);
-
- /**
- * 开始音乐
- */
- @FormUrlEncoded
- @POST("/yycp-launcherSnapshot/mediaShare/mediaStart")
- Observable startedMusic(@FieldMap Map params );
-
- /**
- * 停止音乐
- */
- @FormUrlEncoded
- @POST("/yycp-launcherSnapshot/mediaShare/mediaPause")
- Observable stopMusic(@FieldMap Map params );
-
- /**
- * 点赞分享
- */
- @Headers({"Content-type:application/json;charset=UTF-8"})
- @POST
- Observable likeShare(@Url String url, @Body RequestBody body);
-
- /**
- * 获取附近分享的歌，传入一个type，单独拉取模块的markerdata
- */
- @FormUrlEncoded
- @POST("/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync")
- Observable getNearShareMusic(@FieldMap Map params );
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java
deleted file mode 100644
index 42f21c56a1..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/BaseUrlConstants.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mogo.module.media.constants;
-
-public interface BaseUrlConstants {
- String DEV_BASE_URL = "http://dzt-dev.zhidaohulian.com";
- String QA_BASE_URL = "http://dzt-test.zhidaozhixing.com";
- String SHOW_BASE_URL = "http://dzt-show.zhidaozhixing.com";
- String RELEASE_BASE_URL = "http://dzt.zhidaohulian.com";
-
-
- String SHARE_MUSIC_URL = "/sunflower/os/music/car/v1/osMusiceShare";
- String SHARE_MUSIC_LIKE_URL = "/sunflower/os/music/car/v1/likedShareMusic";
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/Constants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/Constants.java
deleted file mode 100644
index 28eb9095d5..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/Constants.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mogo.module.media.constants;
-
-public interface Constants {
-
- int ONE_KB = 1024;
- int ONE_MB = ONE_KB * 1024;
-
- int SIZE_DEFAULT = 2048;
- int SIZE_LIMIT = 2048;
-
- String IMAGE_COMPRESS_PATH = "image/compress/";
-
- //storage
- String SHOW_SHARE_PUSH_TIME = "show_share_push_time";
- //his music
- String LAST_TIME_LISTEN_MEDIA_MUSIC = "last_time_listen_media_music";
- String MEDIA_UNIQUE_NAME = "media_unique_name";
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/EventConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/EventConstants.java
deleted file mode 100644
index 46cfaef99a..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/EventConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mogo.module.media.constants;
-
-public interface EventConstants {
- String EVENT_QQ_OPEN_SHARE_DIALOG_SHOW = "card_QQMusic_pop";//打开分享弹窗 type 1、click，2、小智语音
- String EVENT_QQ_SHARE_DIALOG_OK = "card_QQMusic_affirm";//弹窗内选择“确认”
- String EVENT_QQ_SHARE_DIALOG_CANCLE = "card_QQMusic_close";//弹窗内选择“取消”
- String EVENT_QQ_MUSIC_START = "QQMusicBegin";// 音乐开始 type 1、click，2、小智语音，3、卡片
- String EVENT_QQ_MUSIC_PAUSE = "QQMusicSuspend";// 音乐暂停 type 1、click，2、小智语音，3、卡片
- String EVENT_QQ_LAST_PLAY = "QQMusicTheLast";//qq音乐上一章 type 1、click，2、小智语音，3、卡片
- String EVENT_QQ_Next_PLAY = "QQMusicNext";//qq音乐下一章 type 1、click，2、小智语音，3、卡片
-
- String EVENT_BOOK_OPEN_SHARE_DIALOG_SHOW = "card_Book_pop";//打开分享弹窗 type 1、click，2、小智语音
- String EVENT_BOOK_SHARE_DIALOG_OK = "card_Book_affirm";//弹窗内选择“确认”
- String EVENT_BOOK_SHARE_DIALOG_CANCLE = "card_Book_close";//弹窗内选择“取消”
- String EVENT_BOOK_MUSIC_START = "BookBegin";// 书开始 type 1、click，2、小智语音，3、卡片
- String EVENT_BOOK_MUSIC_PAUSE = "BookSuspend";// 书暂停 type 1、click，2、小智语音，3、卡片
- String EVENT_BOOK_LAST_PLAY = "BookTheLast";//懒人听书上一章 type 1、click，2、小智语音，3、卡片
- String EVENT_BOOK_Next_PLAY = "BookNext";//懒人听书下一章 type 1、click，2、小智语音，3、卡片
-
- String EVENT_NEWS_OPEN_SHARE_DIALOG_SHOW = "card_News_pop";//打开分享弹窗 type 1、click，2、小智语音
- String EVENT_NEWS_SHARE_DIALOG_OK = "card_News_affirm";//弹窗内选择“确认”
- String EVENT_NEWS_SHARE_DIALOG_CANCLE = "card_News_close";//弹窗内选择“取消”
- String EVENT_NEWS_MUSIC_START = "NewsBegin";// 新闻开始 type 1、click，2、小智语音，3、卡片
- String EVENT_NEWS_MUSIC_PAUSE = "NewsSuspend";// 新闻暂停 type 1、click，2、小智语音，3、卡片
- String EVENT_NEWS_LAST_PLAY = "NewsTheLast";//新闻上一章 type 1、click，2、小智语音，3、卡片
- String EVENT_NEWS_Next_PLAY = "NewsNext";//新闻下一章 type 1、click，2、小智语音，3、卡片
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/LeTingFieldConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/LeTingFieldConstants.java
deleted file mode 100644
index 68ecba4a7e..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/LeTingFieldConstants.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mogo.module.media.constants;
-
-public interface LeTingFieldConstants {
- String curTime = "curTime";//当前播放时长
- String maxTime = "maxTime";//书籍总时长
- String type = "type";//2 为书籍听书，3 为新闻 1 qq音乐
- String mediaName = "mediaName";//新书标题，新闻标题
- String artist = "artist";//新书来源，新闻来源
- String cover = "cover";//作者封面，封面
- String bookName = "bookName";//书籍名
- String playState = "playState";//1 播放 2 缓冲 0 暂停/停止 -1 播放错误
- String bookInfo = "bookInfo";//书本实例
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/MusicConstant.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/MusicConstant.java
deleted file mode 100644
index e26222ae1f..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/MusicConstant.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mogo.module.media.constants;
-
-/**
- * 音频相关常量
- *
- * @author tongchenfei
- */
-public class MusicConstant {
- public static final int PLAY_STATE_PLAYING = 1;
- public static final int PLAY_STATE_BUFF = 2;
- public static final int PLAY_STATE_PAUSE_OR_STOP = 0;
- public static final int PLAY_STATE_ERROR = -1;
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/QQMusicFieldConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/QQMusicFieldConstants.java
deleted file mode 100644
index 8c6c8915ef..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/QQMusicFieldConstants.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mogo.module.media.constants;
-
-public interface QQMusicFieldConstants {
- String curTime = "curTime";//当前播放时长
- String maxTime = "maxTime";//书籍总时长
- String type = "type";//2 为书籍听书，3 为新闻,1 为qq音乐
- String mediaName = "mediaName";//歌曲名
- String playState = "playState";//1 播放 2 缓冲 0 暂停/停止 -1 播放错误
- String mediaUrl = "mediaUrl";//音乐url
- String mediaSinger = "mediaSinger";//歌手名
- String mediaImgUrl = "mediaImgUrl";//封面
- String mediaType = "mediaType";//歌曲类别
- String mediaMid = "mediaMid";//song mid
- String isLocalMedia = "isLocalMedia";//是否是本地歌曲
- String mediaPlayMode = "mediaPlayMode";//播放模式
- String mediaAlbumName = "mediaAlbumName";//专辑名
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/VoiceConstants.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/VoiceConstants.java
deleted file mode 100644
index ee00d72ce0..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/constants/VoiceConstants.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.mogo.module.media.constants;
-
-public interface VoiceConstants {
- String SHARE_QQ_MUSIC = "确认分享该歌曲,你可对我说确认或取消";
- String SHARE_LANREN_MUSIC = "确认分享本书,你可对我说确认或取消";
- String SHARE_LETINGNES_MUSIC = "确认分享新闻,你可对我说确认或取消";
- String COMMAND_SHARE_MUSIC_PUSH_MESSAGE ="可把歌曲,书籍,新闻分享给附近的车友，语音回复分享即可分享";
- String[] COMMAND_SHARE_MUSIC_PUSH_MESSAGE_OK = {"分享"};
- String[] COMMAND_SHARE_MUSIC_PUSH_MESSAGE_CANCEL = { "不分享"};
-
- String[] COMMAND_NO_WAKEUP_MUSIC_SHARE = {"分享歌曲","分享音乐","分享这首歌","帮我分享一下这个歌","把这首歌分享一下"};
- String COMMAND_NO_WAKEUP_SHARE_MUSIC_CMD = "media_card_music_no_wake_share";
-
- String[] COMMAND_NO_WAKEUP_BOOK_SHARE = {"分享书","分享这本书","帮我分享一下这本书","把这本书分享一下"};
- String COMMAND_NO_WAKEUP_SHARE_BOOK_CMD = "media_card_book_no_wake_share";
-
- String[] COMMAND_NO_WAKEUP_NEWS_SHARE = {"分享新闻","分享这条新闻","把这条新闻分享一下","帮我分享一下这条新闻"};
- String COMMAND_NO_WAKEUP_SHARE_NEWS_CMD = "media_card_news_no_wake_share";
-
- String[] COMMAND_NO_WAKEUP_BOOK_MUSIC_SHARE = {"分享"};
- String COMMAND_NO_WAKEUP_SHARE_BOOK_MUSIC_CMD = "media_card_book_music_no_wake_share";
-
- String[] COMMAND_SHARE_MUSIC_OK = {"确认", "是","分享"};
- String[] COMMAND_NO_SHARE_MUSIC_CANCEL = {"取消", "不分享"};
-
- String[] COMMAND_OPEN_MUSIC = {"**打开**音乐**","打开音乐","帮我打开一下音乐好不好","打开一下音乐好不好","帮我打开音乐","打开音乐谢谢"};
- String COMMAND_OPEN_MUSIC_CMD = "media_card_open_music";
-
- String[] COMMAND_CLOSE_MUSIC = {"**关闭**音乐**","关闭音乐","退出音乐","帮我关闭一下音乐好不好","关闭一下音乐好不好","帮我关闭音乐","关闭那个音乐","关闭音乐谢谢"};
- String COMMAND_CLOSE_MUSIC_CMD = "media_card_close_music";
-
- String[] COMMAND_NEAR_MUSIC = {"附近的歌","附近的人听的歌","附近的人听的音乐","周围的人听的歌","周围的人听的音乐"};
- String COMMAND_NEAR_MUSIC_CMD = "media_card_near_music";
-
- String[] COMMAND_FRIEND_MUSIC = {"好友听的歌","好友听的音乐","播放好友的歌","放好友的歌","听好友的歌","播放好友的音乐","放好友的音乐","听好友的音乐"};
- String COMMAND_FRIEND_MUSIC_CMD = "media_card_friend_music";
-
- String[] COMMAND_QUERY_MUSIC_NAME = {"这歌是什么","这歌叫啥","这首歌叫什么名字","歌名是什么","这首歌的名字","这首音乐叫什么","这个歌是啥"};
- String COMMAND_QUERY_MUSIC_NAME_CMD = "media_card_query_music_name";
-
- String[] COMMAND_QUERY_MUSIC_SINGER = {"这首歌是谁唱的","这歌谁唱的","这首歌的歌手","这首歌的歌手是谁","查一下这首歌的歌手"};
- String COMMAND_QUERY_MUSIC_SINGERME_CMD = "media_card_query_music_singer";
-
- String[] COMMAND_SHARE_DIALOG_TIMEOUT_CLOSE = {"关闭","取消","关闭分享","取消分享","关闭弹窗","取消弹窗","不分享"};
- String COMMAND_SHARE_DIALOG_TIMEOUT_CLOSE_COMMAND = "share_dialog_timeout_close_command";
-
- String[] COMMAND_SHARE_DIALOG_TIMEOUT_OK = {"确认","确定","分享","确认分享","确定分享"};
- String COMMAND_SHARE_DIALOG_TIMEOUT_OK_COMMAND = "share_dialog_timeout_confirm_command";
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/BaseDialogFragment.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/BaseDialogFragment.java
deleted file mode 100644
index f899862699..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/BaseDialogFragment.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.mogo.module.media.dialog;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-
-import com.mogo.utils.TipToast;
-
-
-public abstract class BaseDialogFragment extends DialogFragment {
- protected Bundle mBundle;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- mBundle = savedInstanceState == null ? getArguments() : savedInstanceState;
- if (mBundle == null) {
- mBundle = new Bundle();
- }
- }
-
- @Override
- public void onActivityCreated(@Nullable Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- if (mBundle != null) {
- outState.putAll(mBundle);
- }
- super.onSaveInstanceState(outState);
- }
-
- public void openActivity(Class cls) {
- openActivity(cls, null);
- }
-
- public void openActivity(Class cls, Bundle bundle) {
- Intent intent = new Intent();
- if (bundle != null) {
- intent.putExtras(bundle);
- }
- intent.setClass(getActivity(), cls);
- startActivity(intent);
- }
-
- public void openActivity(String url, Bundle bundle) {
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
- if (bundle != null) {
- intent.putExtras(bundle);
- }
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
- startActivity(intent);
- }
-
- public void openActivityForResult(Class cls, Bundle bundle, int requestCode) {
- Intent intent = new Intent();
- if (bundle != null) {
- intent.putExtras(bundle);
- }
- intent.setClass(getActivity(), cls);
- startActivityForResult(intent, requestCode);
- }
-
- public void backForResult(int resultCode, Bundle bundle) {
- Intent intent = new Intent();
- if (bundle != null) {
- intent.putExtras(bundle);
- }
- getActivity().setResult(resultCode, intent);
- getActivity().finish();
- }
-
- public void backToActivity(Class cls, Bundle bundle) {
- Intent intent = new Intent();
- if (bundle != null) {
- intent.putExtras(bundle);
- }
- intent.setClass(getActivity(), cls);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
- startActivity(intent);
- }
-
- @Override
- public Context getContext() {
- return super.getContext();
- }
-
- public boolean isVisibleToUser() {
- return isResumed();
- }
-
-
- public void showToast(CharSequence toast) {
- TipToast.shortTip(toast.toString());
- }
- public void showInputMethod(View view) {
- if (getContext() == null) return;
- InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
- if (imm != null) {
- imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
- }
- }
-
- public void hideInputMethod(View view) {
- if (getContext() == null) return;
- InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
- if (imm != null) {
- imm.hideSoftInputFromWindow(view.getWindowToken(),InputMethodManager.HIDE_NOT_ALWAYS);
- }
- }
-}
-
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/CustomDialog.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/CustomDialog.java
deleted file mode 100644
index 2e11fbdbe2..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/CustomDialog.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package com.mogo.module.media.dialog;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-
-import com.mogo.module.media.R;
-
-public class CustomDialog extends Dialog {
- TextView txtOk;
- TextView txtCancel;
- TextView txtTitle;
- TextView txtContent;
- TextView txtSubContent;
-
- private int mContentSize = 0;
- private int mContentColor = 0;
- private int mBtnSize = 0;
-
- private int mSubContentSize = 0;
- private int mContentLeftPadding = 0;
-
- private View.OnClickListener onOkListener, onCancelListener;
-
- private String title, subContent, okText, cancelText;
- private CharSequence content;
- private boolean isAutoDismissDialog = true;
-
- private int contentGravity = Gravity.CENTER;
- private int subContentGravity = Gravity.LEFT;
-
- private boolean isContentClickSpanEnable = false;
-
- public CustomDialog(@NonNull Context context) {
- super(context);
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.module_media_dialog_cutom_layout);
-
- initView();
-
- if (TextUtils.isEmpty(title)) {
- txtTitle.setVisibility(View.GONE);
- } else {
- txtTitle.setText(title);
- txtTitle.setVisibility(View.VISIBLE);
- }
-
- if (mContentSize > 0){
- txtContent.setTextSize(TypedValue.COMPLEX_UNIT_PX,mContentSize);
- }
-
- if (mSubContentSize > 0){
- txtSubContent.setTextSize(TypedValue.COMPLEX_UNIT_PX,mSubContentSize);
- }
-
- if (mContentColor > 0){
- txtContent.setTextColor(mContentColor);
- }
-
- if (mContentLeftPadding > 0){
- txtContent.setPadding(mContentLeftPadding,0,mContentLeftPadding,0);
- }
-
- if ( content instanceof String) {
- content = ( (String) content ).replace( "\\n", "\n" );
- }
-
- txtContent.setText(content);
- if (TextUtils.isEmpty(subContent)) {
- txtSubContent.setVisibility(View.GONE);
- } else {
- txtSubContent.setVisibility(View.VISIBLE);
- txtSubContent.setText(subContent);
- }
-
- txtSubContent.setGravity(subContentGravity);
-
- if (mBtnSize > 0){
- txtOk.setTextSize(TypedValue.COMPLEX_UNIT_PX,mBtnSize);
- txtCancel.setTextSize(TypedValue.COMPLEX_UNIT_PX,mBtnSize);
- }
-
- if (!TextUtils.isEmpty(okText)) {
- txtOk.setVisibility(View.VISIBLE);
- txtOk.setText(okText);
- } else {
- txtOk.setVisibility(View.GONE);
- }
- if (!TextUtils.isEmpty(cancelText)) {
- txtCancel.setVisibility(View.VISIBLE);
- txtCancel.setText(cancelText);
- } else {
- txtCancel.setVisibility(View.GONE);
- }
-
- txtOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (isAutoDismissDialog) {
- dismiss();
- }
- if (onOkListener != null) {
- onOkListener.onClick(v);
- }
- }
- });
- txtCancel.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (isAutoDismissDialog) {
- dismiss();
- }
- if (onCancelListener != null) {
- onCancelListener.onClick(v);
- }
- }
- });
-
- txtContent.setGravity( contentGravity );
-
- if ( isContentClickSpanEnable ) {
- txtContent.setMovementMethod( LinkMovementMethod.getInstance() );
- }
-
- }
-
- private void initView() {
- txtOk = findViewById(R.id.txt_ok);
- txtCancel = findViewById(R.id.txt_cancel);
- txtTitle = findViewById(R.id.txt_title);
- txtContent = findViewById(R.id.txt_content);
- txtSubContent = findViewById(R.id.txt_sub_content);
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public void setContent(CharSequence content) {
- this.content = content;
- }
-
- public void setSubContent(String subContent) {
- this.subContent = subContent;
- }
-
- public void setContentGravity(int gravity) {
- contentGravity = gravity;
- }
-
- public void hiddenBtnCancel() {
- txtCancel.setVisibility(View.GONE);
- }
-
- public void setOnOkClickListener(String okText, View.OnClickListener onOkClickListener) {
- this.okText = okText;
- this.onOkListener = onOkClickListener;
- }
-
- public void setOnOkClickListener(View.OnClickListener onOkClickListener) {
- setOnOkClickListener("确定", onOkClickListener);
- }
-
- public void setOnCancelListener(String cancelText, View.OnClickListener onCancelListener) {
- this.cancelText = cancelText;
- this.onCancelListener = onCancelListener;
- }
-
- public void setOnCancelListener(View.OnClickListener onCancelListener) {
- setOnCancelListener("取消", onCancelListener);
- }
-
- public void setAutoDismissDialog(boolean autoDismissDialog) {
- isAutoDismissDialog = autoDismissDialog;
- }
-
- public void setBtnTextSize(int size){
- mBtnSize = size;
- }
-
- public void setContentTextSize(int size){
- mContentSize = size;
- }
-
- public void setSubContentTextSize(int size){
- mSubContentSize = size;
- }
-
- public void setContentColor(int color){
- mContentColor = color;
- }
-
- public int getContentGravity() {
- return contentGravity;
- }
-
- public int getSubContentGravity() {
- return subContentGravity;
- }
-
- public void setSubContentGravity(int subContentGravity) {
- this.subContentGravity = subContentGravity;
- }
-
- public void setContentClickSpanEnable(boolean contentClickSpanEnable ) {
- isContentClickSpanEnable = contentClickSpanEnable;
- }
-
- public int getContentLeftPadding() {
- return mContentLeftPadding;
- }
-
- public void setContentLeftPadding(int mContentLeftPadding) {
- this.mContentLeftPadding = mContentLeftPadding;
- }
-}
-
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/MediaShareDialogFragment.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/MediaShareDialogFragment.java
deleted file mode 100644
index 9dbfd499fe..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/dialog/MediaShareDialogFragment.java
+++ /dev/null
@@ -1,445 +0,0 @@
-package com.mogo.module.media.dialog;
-
-import android.app.Dialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.ParamsUtil;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.voice.AIAssist;
-import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
-import com.mogo.map.location.MogoLocation;
-import com.mogo.module.common.entity.MarkerShareMusic;
-import com.mogo.module.media.MediaConstants;
-import com.mogo.module.media.R;
-import com.mogo.module.media.ServiceMediaHandler;
-import com.mogo.module.media.api.MediaDztService;
-import com.mogo.module.media.constants.BaseUrlConstants;
-import com.mogo.module.media.constants.EventConstants;
-import com.mogo.module.media.constants.VoiceConstants;
-import com.mogo.module.media.listener.MogoVoiceCmdCallBackImp;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.model.ShareSuccessResult;
-import com.mogo.module.media.utils.BaseUrlManager;
-import com.mogo.module.media.utils.MediaAnalyticsUtils;
-import com.mogo.module.media.utils.ToastHelper;
-import com.mogo.module.media.widget.RoundedImageView;
-import com.mogo.utils.TipToast;
-import com.mogo.utils.glide.GlideApp;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * media 分享dialog
- */
-public class MediaShareDialogFragment extends BaseDialogFragment {
-
- private Disposable mDisposable;
- private Context context;
- private Callback callback;
- private RoundedImageView mMediaImg;
- private TextView mMediaName;
- private TextView mMediaSinger;
- private TextView mOk;
- private TextView mCancel;
- private TextView mDialogContent;
- private MediaInfoData mMediaInfoData;
- private VoiceCallBack voiceCallBack = new VoiceCallBack();
- private boolean shareSuccess = false;
- private MarkerShareMusic markerShareMusic;
- private boolean navi = false;
- private ShareOkReceiver mShareOkReceiver;
-
- public interface Callback {
- void onShareDialogShow();
-
- void onShareDialogDismiss(boolean success,MarkerShareMusic markerShareMusic);
- }
-
- public static final String TAG = "MediaShareDialogFragment";
-
- public static MediaShareDialogFragment newInstance(MediaInfoData data,boolean navi) {
- Bundle args = new Bundle();
- args.putSerializable("data", data);
- args.putBoolean("navi",navi);
- MediaShareDialogFragment fragment = new MediaShareDialogFragment();
- fragment.setArguments(args);
- return fragment;
- }
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- this.context = context;
- if (getParentFragment() instanceof Callback) {
- callback = ((Callback) getParentFragment());
- } else if (context instanceof Callback) {
- callback = ((Callback) context);
- }
- }
-
- @Nullable
- @Override
- public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- final Dialog dialog = getDialog();
- if (dialog != null) {
- dialog.setCanceledOnTouchOutside(false);
- dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
- if (dialog.getWindow() != null) {
- dialog.getWindow().setBackgroundDrawable(new ColorDrawable(0));
- }
- }
-
- return inflater.inflate(R.layout.module_media_share_fragment_view, null);
- }
-
- @Override
- public void onActivityCreated(@Nullable Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
- if (callback != null) {
- callback.onShareDialogShow();
- }
- try {
- mMediaInfoData = (MediaInfoData) getArguments().getSerializable("data");
- navi = getArguments().getBoolean("navi");
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- initViews();
- registerMediaReceiver();
- registerCloseNoWakeUp();
- }
-
- private class VoiceCallBack implements IMogoVoiceCmdCallBack {
- @Override
- public void onCmdSelected(String cmd) {
-
- }
-
- @Override
- public void onCmdAction(String speakText) {
- //确认
- shareMusic(mMediaInfoData,false);
- Logger.d("MediaShareDialogFragment","qa onCmdAction"+speakText);
- }
-
- @Override
- public void onCmdCancel(String speakText) {
- //取消
- dissMisDialog(false);
- Logger.d("MediaShareDialogFragment","qa onCmdCancel");
- }
-
- @Override
- public void onSpeakEnd(String speakText) {
- Logger.d("MediaShareDialogFragment","qa onSpeakEnd");
- }
-
- @Override
- public void onSpeakSelectTimeOut(String speakText) {
- if (!navi) registerCloseNoWakeUp();
- Logger.d("MediaShareDialogFragment","qa onSpeakSelectTimeOut");
- }
- }
-
- private void registerMediaReceiver() {
- mShareOkReceiver = new ShareOkReceiver();
- IntentFilter filterone = new IntentFilter();
- filterone.addAction("com.zhidao.speech.awake.notify");
- getContext().registerReceiver(mShareOkReceiver, filterone);
- }
-
- private void unRegisterMediaReceiver() {
- try {
- getContext().unregisterReceiver(mShareOkReceiver);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private class ShareOkReceiver extends BroadcastReceiver {
-
- @Override
- public void onReceive(Context context, Intent intent) {
- try {
- if (intent != null){
- String cmdStr = intent.getStringExtra("command");
- if(cmdStr.equals("com.zhidao.multiMedia.share.comfirm")){
- shareMusic(mMediaInfoData,false);
- }else if (cmdStr.equals("com.zhidao.multiMedia.share.cancel")){
- dissMisDialog(false);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- private void registerCloseNoWakeUp() {
- AIAssist.getInstance(getActivity()).registerUnWakeupCommand(VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_CLOSE_COMMAND
- , VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_CLOSE
- ,new MogoVoiceCmdCallBackImp(){
- @Override
- public void onCmdSelected(String cmd) {
- super.onCmdSelected(cmd);
- if (cmd.equals(VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_CLOSE_COMMAND)){
- dismissAllowingStateLoss();
- }
- Logger.d("MediaShareDialogFragment","registerUnWakeupCommand onCmdSelected");
- }
-
- @Override
- public void onSpeakEnd(String speakText) {
- super.onSpeakEnd(speakText);
- Logger.d("MediaShareDialogFragment","registerUnWakeupCommand onSpeakEnd"+speakText);
- }
-
- @Override
- public void onSpeakSelectTimeOut(String speakText) {
- super.onSpeakSelectTimeOut(speakText);
- Logger.d("MediaShareDialogFragment","registerUnWakeupCommand onSpeakSelectTimeOut");
- }
- });
-
- AIAssist.getInstance(getActivity()).registerUnWakeupCommand(VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_OK_COMMAND
- , VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_OK
- ,new MogoVoiceCmdCallBackImp(){
- @Override
- public void onCmdSelected(String cmd) {
- super.onCmdSelected(cmd);
- if (cmd.equals(VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_OK_COMMAND)){
- shareMusic(mMediaInfoData,false);
- }
- }
-
- @Override
- public void onSpeakEnd(String speakText) {
- super.onSpeakEnd(speakText);
- }
-
- @Override
- public void onSpeakSelectTimeOut(String speakText) {
- super.onSpeakSelectTimeOut(speakText);
- }
- });
-
-
- }
-
- private void initViews() {
- mMediaImg = getView().findViewById(R.id.media_img);
- mMediaName = getView().findViewById(R.id.media_name);
- mMediaSinger = getView().findViewById(R.id.media_singer);
- mOk = getView().findViewById(R.id.txt_ok);
- mCancel = getView().findViewById(R.id.txt_cancle);
- mDialogContent = getView().findViewById(R.id.media_dialog_content);
- mCancel.setOnClickListener(view -> {
- dissMisDialog(true);
- });
-
- mOk.setOnClickListener(view -> {
- shareMusic(mMediaInfoData,true);
- });
-
- if (mMediaInfoData != null) {
- if (mMediaInfoData.getMediaImg() != null) {
- com.bumptech.glide.request.RequestOptions options = new com.bumptech.glide.request.RequestOptions()
- .placeholder(R.drawable.module_media_share_default_rect_icon);
- GlideApp.with(getActivity()).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mMediaImg);
- }
-
- if (mMediaInfoData.getMediaName() != null) {
- mMediaName.setText(mMediaInfoData.getMediaName());
- }
-
- if (mMediaInfoData.getMediaSinger() != null) {
- mMediaSinger.setText(mMediaInfoData.getMediaSinger());
- }
-
- if (mMediaInfoData.getType() == 1) {
- mDialogContent.setText(context.getResources().getString(R.string.module_media_share_qq_music));
- } else if (mMediaInfoData.getType() == 2){
- mDialogContent.setText(context.getResources().getString(R.string.module_media_share_lan_ren));
- } else if (mMediaInfoData.getType() == 3){
- mDialogContent.setText(context.getResources().getString(R.string.module_media_share_le_ting_news));
- }
- }
- }
-
- private void dissMisDialog(boolean click) {
- dismissAllowingStateLoss();
- try {
- if (mMediaInfoData != null){
- HashMap hashMap = new HashMap<>();
- hashMap.put("type",click ?1:2);
- String trackId = "";
- if (mMediaInfoData.getType() == 1){
- trackId = EventConstants.EVENT_QQ_SHARE_DIALOG_CANCLE;
- }else if (mMediaInfoData.getType() == 2){
- trackId = EventConstants.EVENT_BOOK_SHARE_DIALOG_CANCLE;
- }else if (mMediaInfoData.getType() == 3){
- trackId = EventConstants.EVENT_NEWS_SHARE_DIALOG_CANCLE;
- }
- MediaAnalyticsUtils.track(trackId ,hashMap);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void onDismiss(DialogInterface dialog) {
- super.onDismiss(dialog);
- try {
-
- unRegisterMediaReceiver();
-
- AIAssist.getInstance(getActivity()).unregisterUnWakeupCommand(VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_CLOSE_COMMAND);
- AIAssist.getInstance(getActivity()).unregisterUnWakeupCommand(VoiceConstants.COMMAND_SHARE_DIALOG_TIMEOUT_OK_COMMAND);
-
- if (mDisposable != null && !mDisposable.isDisposed()) {
- mDisposable.dispose();
- }
- if (callback != null) {
- callback.onShareDialogDismiss(shareSuccess,markerShareMusic);
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void shareMusic(MediaInfoData mCurrentMusic,boolean click) {
- if (mCurrentMusic == null) return;
- markerShareMusic = new MarkerShareMusic();
- try {
- if (mMediaInfoData != null){
- HashMap hashMap = new HashMap<>();
- hashMap.put("type",click ? 1:2);
- String trackId = "";
- if (mMediaInfoData.getType() == 1){
- trackId = EventConstants.EVENT_QQ_SHARE_DIALOG_OK;
- }else if (mMediaInfoData.getType() == 2){
- trackId = EventConstants.EVENT_BOOK_SHARE_DIALOG_OK;
- }else if (mMediaInfoData.getType() == 3){
- trackId = EventConstants.EVENT_NEWS_SHARE_DIALOG_OK;
- }
- MediaAnalyticsUtils.track(trackId ,hashMap);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- final Map businessParams = new HashMap<>();
- final MogoLocation location = ServiceMediaHandler.getLocationClient().getLastKnowLocation();
- if (location != null) {
- businessParams.put("address", location.getAddress());
- }
-
- businessParams.put("bookInfo", mCurrentMusic.getBookInfo());
- businessParams.put("mediaDuration", mCurrentMusic.getMaxTime() + "");
- businessParams.put("mediaId", mCurrentMusic.getMediaId());
- businessParams.put("mediaImg", mCurrentMusic.getMediaImg());
- businessParams.put("mediaName", mCurrentMusic.getMediaName());
- businessParams.put("mediaSinger", mCurrentMusic.getMediaSinger());
- businessParams.put("mediaType", mCurrentMusic.getMediaType());
- businessParams.put("mediaUrl", mCurrentMusic.getMediaUrl());
- businessParams.put("shareType", mCurrentMusic.getType());
-
- ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- if (location != null) {
- builder.append("lat", location.getLatitude());
- builder.append("lng", location.getLongitude());
- }else{
- TipToast.shortTip("分享失败，定位出错请重试！");
- shareSuccess = false;
- dismissAllowingStateLoss();
- return;
- }
- final Map params = builder
- .append(businessParams)
- .build();
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().create(MediaDztService.class, BaseUrlManager.getDztBaseUrl())
- .shareMusic(ParamsUtil.toQueryUrl(BaseUrlManager.getDztBaseUrl() + BaseUrlConstants.SHARE_MUSIC_URL, params, businessParams), ParamsUtil.convert(businessParams));
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- mDisposable = d;
- }
-
- @Override
- public void onSuccess(ShareSuccessResult resultData) {
- try {
- ToastHelper.showShortSuccess(getContext(), getContext().getResources().getString(R.string.module_media_share_success));
- if (!navi) AIAssist.getInstance(getActivity()).speakTTSVoice(getContext().getResources().getString(R.string.module_media_share_success),null);
- shareSuccess = true;
- if (resultData != null && resultData.result != null){
- markerShareMusic = resultData.result;
- markerShareMusic.setType(MediaConstants.MODULE_TYPE);
- }
- dismissAllowingStateLoss();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
- try {
- ToastHelper.showShortError(getContext(), getContext().getResources().getString(R.string.module_media_share_fail));
- TipToast.shortTip("分享失败");
- if (!navi)AIAssist.getInstance(getActivity()).speakTTSVoice(getContext().getResources().getString(R.string.module_media_share_fail),null);
- dismissAllowingStateLoss();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
- try {
- ToastHelper.showShortError(getContext(), getContext().getResources().getString(R.string.module_media_share_fail));
- TipToast.shortTip(!TextUtils.isEmpty(message)?message:"分享失败");
- if (!navi)AIAssist.getInstance(getActivity()).speakTTSVoice(!TextUtils.isEmpty(message)?message:"分享失败",null);
- dismissAllowingStateLoss();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- );
-
- }
-
-}
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/MogoVoiceCmdCallBackImp.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/MogoVoiceCmdCallBackImp.java
deleted file mode 100644
index 958debea23..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/MogoVoiceCmdCallBackImp.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mogo.module.media.listener;
-
-import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
-
-public abstract class MogoVoiceCmdCallBackImp implements IMogoVoiceCmdCallBack {
- @Override
- public void onCmdSelected(String cmd) {
-
- }
-
- @Override
- public void onCmdAction(String speakText) {
-
- }
-
- @Override
- public void onCmdCancel(String speakText) {
-
- }
-
- @Override
- public void onSpeakEnd(String speakText) {
-
- }
-
- @Override
- public void onSpeakSelectTimeOut(String speakText) {
-
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/NoDoubleClickListener.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/NoDoubleClickListener.java
deleted file mode 100644
index 006165855c..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/NoDoubleClickListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mogo.module.media.listener;
-
-import android.view.View;
-
-public abstract class NoDoubleClickListener implements View.OnClickListener {
-
- public static final int MIN_CLICK_DELAY_TIME = 700;
-
- private long lastClickTime = 0;
-
- @Override
-
- public void onClick(View v) {
- long currentTime = System.currentTimeMillis();
- if ((currentTime - lastClickTime) > MIN_CLICK_DELAY_TIME) {
- lastClickTime = currentTime;
- onClicks(v);
- }
-
- }
-
- public abstract void onClicks(View view);
-}
-
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/LanRenInsertData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/LanRenInsertData.java
deleted file mode 100644
index 507bcf0754..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/LanRenInsertData.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.mogo.module.media.model;
-
-import java.io.Serializable;
-
-public class LanRenInsertData implements Serializable {
-
- /**
- * announcer : 动之以情
- * auth : 耗子扛大刀
- * bookId : 28862
- * cover : http://bookpic.lrts.me/b8d33429fa0840578207c1685e8fa22a_180x254.jpg
- * desc : 传说中的兵之王者，神秘莫测的杀手之王，带着仇恨与疑惑进入都市寻找仇敌！
- * isCollect : false
- * name : 特种军医在都市
- * sections : 447
- * typeName : 都市传说
- */
-
- private String announcer;
- private String auth;
- private int bookId;
- private String cover;
- private String desc;
- private boolean isCollect;
- private String name;
- private int sections;
- private String typeName;
-
- public String getAnnouncer() {
- return announcer;
- }
-
- public void setAnnouncer(String announcer) {
- this.announcer = announcer;
- }
-
- public String getAuth() {
- return auth;
- }
-
- public void setAuth(String auth) {
- this.auth = auth;
- }
-
- public int getBookId() {
- return bookId;
- }
-
- public void setBookId(int bookId) {
- this.bookId = bookId;
- }
-
- public String getCover() {
- return cover;
- }
-
- public void setCover(String cover) {
- this.cover = cover;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public boolean isIsCollect() {
- return isCollect;
- }
-
- public void setIsCollect(boolean isCollect) {
- this.isCollect = isCollect;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getSections() {
- return sections;
- }
-
- public void setSections(int sections) {
- this.sections = sections;
- }
-
- public String getTypeName() {
- return typeName;
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/LeTingNewsData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/LeTingNewsData.java
deleted file mode 100644
index 68bc3046ba..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/LeTingNewsData.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.mogo.module.media.model;
-
-import java.io.Serializable;
-
-public class LeTingNewsData implements Serializable {
-
- /**
- * catalog_id : channel_recommend
- * catalog_name : 推荐
- * title : 内蒙古：妈妈去武汉打“怪兽”
- * hms : 02:20
- * image : https://image.leting.io/a066db4d5c615605e79c3235d9f54669.jpg
- * sid : Pfzgptk29ZG86N0JStE5l-1srtNmDnAwBBLMCm-2l7QvQAP7vq0G_Jlm6YM8z9kHb97sJVd5mJ_2zW5EWtahbQ==
- * source : 北京您早
- * source_icon : https://image.leting.io/a77d7b23030e49007c148a563c386dbe.jpg
- * pub_time : 0
- * updated_at : 0
- * duration : 140
- * hot : 0
- */
-
- private String catalog_id;
- private String catalog_name;
- private String title;
- private String hms;
- private String image;
- private String sid;
- private String source;
- private String source_icon;
- private int pub_time;
- private int updated_at;
- private int duration;
- private int hot;
-
- public String getCatalog_id() {
- return catalog_id;
- }
-
- public void setCatalog_id(String catalog_id) {
- this.catalog_id = catalog_id;
- }
-
- public String getCatalog_name() {
- return catalog_name;
- }
-
- public void setCatalog_name(String catalog_name) {
- this.catalog_name = catalog_name;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getHms() {
- return hms;
- }
-
- public void setHms(String hms) {
- this.hms = hms;
- }
-
- public String getImage() {
- return image;
- }
-
- public void setImage(String image) {
- this.image = image;
- }
-
- public String getSid() {
- return sid;
- }
-
- public void setSid(String sid) {
- this.sid = sid;
- }
-
- public String getSource() {
- return source;
- }
-
- public void setSource(String source) {
- this.source = source;
- }
-
- public String getSource_icon() {
- return source_icon;
- }
-
- public void setSource_icon(String source_icon) {
- this.source_icon = source_icon;
- }
-
- public int getPub_time() {
- return pub_time;
- }
-
- public void setPub_time(int pub_time) {
- this.pub_time = pub_time;
- }
-
- public int getUpdated_at() {
- return updated_at;
- }
-
- public void setUpdated_at(int updated_at) {
- this.updated_at = updated_at;
- }
-
- public int getDuration() {
- return duration;
- }
-
- public void setDuration(int duration) {
- this.duration = duration;
- }
-
- public int getHot() {
- return hot;
- }
-
- public void setHot(int hot) {
- this.hot = hot;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java
deleted file mode 100644
index a0ddf0f210..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.mogo.module.media.model;
-
-import com.mogo.module.media.constants.MusicConstant;
-
-import java.io.Serializable;
-
-public class MediaInfoData implements Serializable {
-
- //QQ音乐，懒人听书，乐听头条 2 为书籍听书，3 为新闻,1 为qq音乐
- private int type;
-
- private String mediaId;//qq音乐id，书的bookId
- //qq音乐url 懒人听书为“”
- private String mediaUrl;
-
- //歌曲名 ，当前播放书名，新闻标题内容
- private String mediaName;
-
- //演唱歌手,当前章节,新闻来源
- private String mediaSinger;
-
- //歌曲封面,书籍封面,新闻预览图
- private String mediaImg;
-
- //音乐类别，类似经典 ，流行只有qq特有
- private String mediaType;
-
- private int maxTime;//音频总时长
-
- private String bookInfo;//懒人听书json串
-
- //当前播放时长，可以不加，播放进度单独独立出来
- private int curTime;
-
- //是否是本地音频，只有qq音乐
- private boolean isLocalMedia;//本地
-
- //播放模式，顺序，单曲循环，随机
- private int mediaPlayMode;
-
- //1 播放 2 缓冲 0 暂停/停止 -1 播放错误
- private int playState;
-
- public String getMediaId() {
- return mediaId;
- }
-
- public void setMediaId(String mediaId) {
- this.mediaId = mediaId;
- }
-
- public String getMediaUrl() {
- return mediaUrl;
- }
-
- public void setMediaUrl(String mediaUrl) {
- this.mediaUrl = mediaUrl;
- }
-
- public int getType() {
- return type;
- }
-
- public void setType(int type) {
- this.type = type;
- }
-
- public int getPlayState() {
- return playState;
- }
-
- public void setPlayState(int playState) {
- this.playState = playState;
- }
-
- public String getMediaName() {
- return mediaName;
- }
-
- public void setMediaName(String mediaName) {
- this.mediaName = mediaName;
- }
-
- public String getMediaSinger() {
- return mediaSinger;
- }
-
- public void setMediaSinger(String mediaSinger) {
- this.mediaSinger = mediaSinger;
- }
-
- public String getMediaImg() {
- return mediaImg;
- }
-
- public void setMediaImg(String mediaImg) {
- this.mediaImg = mediaImg;
- }
-
- public int getMaxTime() {
- return maxTime;
- }
-
- public void setMaxTime(int maxTime) {
- this.maxTime = maxTime;
- }
-
- public int getCurTime() {
- return curTime;
- }
-
- public void setCurTime(int curTime) {
- this.curTime = curTime;
- }
-
- public String getMediaType() {
- return mediaType;
- }
-
- public void setMediaType(String mediaType) {
- this.mediaType = mediaType;
- }
-
- public boolean isLocalMedia() {
- return isLocalMedia;
- }
-
- public void setLocalMedia(boolean localMedia) {
- isLocalMedia = localMedia;
- }
-
- public int getMediaPlayMode() {
- return mediaPlayMode;
- }
-
- public void setMediaPlayMode(int mediaPlayMode) {
- this.mediaPlayMode = mediaPlayMode;
- }
-
- public String getBookInfo() {
- return bookInfo;
- }
-
- public void setBookInfo(String bookInfo) {
- this.bookInfo = bookInfo;
- }
-
- @Override
- public String toString() {
- return "MediaInfoData{" +
- "mediaName='" + mediaName + '\'' +
- ", mediaImg='" + mediaImg + '\'' +
- ", playState=" + playState +
- '}';
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoDataEvent.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoDataEvent.java
deleted file mode 100644
index 3849d03d76..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoDataEvent.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mogo.module.media.model;
-
-import java.io.Serializable;
-
-public class MediaInfoDataEvent implements Serializable {
- public MediaInfoData data;
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaProcessEvent.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaProcessEvent.java
deleted file mode 100644
index 64c3419e97..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaProcessEvent.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.mogo.module.media.model;
-
-import java.io.Serializable;
-
-public class MediaProcessEvent implements Serializable {
- public int process;
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/NearShareRequestParameter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/NearShareRequestParameter.java
deleted file mode 100644
index 18c7a6767c..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/NearShareRequestParameter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.mogo.module.media.model;
-
-import java.util.List;
-
-public class NearShareRequestParameter {
-
- /**
- * location : {"lat":31,"lon":116}
- * radius : 1000
- * dataType : ["CARD_TYPE_CARS_CHATTING","CARD_TYPE_ROAD_CODITION"]
- * limit : 100
- */
-
- private LocationBean location;
- private int radius;
- private int limit;
- private List dataType;
-
- public LocationBean getLocation() {
- return location;
- }
-
- public void setLocation(LocationBean location) {
- this.location = location;
- }
-
- public int getRadius() {
- return radius;
- }
-
- public void setRadius(int radius) {
- this.radius = radius;
- }
-
- public int getLimit() {
- return limit;
- }
-
- public void setLimit(int limit) {
- this.limit = limit;
- }
-
- public List getDataType() {
- return dataType;
- }
-
- public void setDataType(List dataType) {
- this.dataType = dataType;
- }
-
- public static class LocationBean {
- /**
- * lat : 31.0
- * lon : 116.0
- */
-
- private double lat;
- private double lon;
-
- public double getLat() {
- return lat;
- }
-
- public void setLat(double lat) {
- this.lat = lat;
- }
-
- public double getLon() {
- return lon;
- }
-
- public void setLon(double lon) {
- this.lon = lon;
- }
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/QQMediaListData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/QQMediaListData.java
deleted file mode 100644
index 916ba6da1e..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/QQMediaListData.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mogo.module.media.model;
-
-import java.io.Serializable;
-
-public class QQMediaListData implements Serializable {
- //唯一区分歌曲
- private String mediaUrl;
-
- //歌曲名 ，当前播放书名，新闻标题内容
- private String mediaName;
-
- //演唱歌手,当前章节,新闻来源
- private String mediaSinger;
-
- private String mediaImgUrl;
-
- private String mediaMid;
-
- public String getMediaMid() {
- return mediaMid;
- }
-
- public void setMediaMid(String mediaMid) {
- this.mediaMid = mediaMid;
- }
-
- public String getMediaUrl() {
- return mediaUrl;
- }
-
- public void setMediaUrl(String mediaUrl) {
- this.mediaUrl = mediaUrl;
- }
-
- public String getMediaName() {
- return mediaName;
- }
-
- public void setMediaName(String mediaName) {
- this.mediaName = mediaName;
- }
-
- public String getMediaSinger() {
- return mediaSinger;
- }
-
- public void setMediaSinger(String mediaSinger) {
- this.mediaSinger = mediaSinger;
- }
-
- public String getMediaImgUrl() {
- return mediaImgUrl;
- }
-
- public void setMediaImgUrl(String mediaImgUrl) {
- this.mediaImgUrl = mediaImgUrl;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareLikeData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareLikeData.java
deleted file mode 100644
index f6018c6241..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareLikeData.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mogo.module.media.model;
-
-import com.mogo.commons.data.BaseData;
-
-public class ShareLikeData extends BaseData {
-
- public ShareLikeDataResult result;
-
- public static class ShareLikeDataResult{
-
- public boolean checkLiked;
- public int likedCount;
- public String mediaId;
- public String mediaUrl;
- public int type; //1真是数据 2虚拟数据
- public long userId;
- public String userImg;
- public String userName;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareMediaJsonData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareMediaJsonData.java
deleted file mode 100644
index 3f70002032..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareMediaJsonData.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mogo.module.media.model;
-
-import java.io.Serializable;
-
-public class ShareMediaJsonData implements Serializable {
- public String type;
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareMediaMarkerInfoData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareMediaMarkerInfoData.java
deleted file mode 100644
index 68351b20a4..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareMediaMarkerInfoData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mogo.module.media.model;
-
-import com.mogo.commons.data.BaseData;
-import com.mogo.module.common.entity.MarkerShareMusic;
-
-import java.util.ArrayList;
-
-/**
- MarkerShareMusic 结构说明：
- * bookInfo : 懒人听书实体json串
- * id : 100
- * likeNumber : 99
- * location : {"address":"北京市朝阳区三里屯街道108号","angle":"36.5","lat":"39.989368","lon":"116.480888"}
- * mediaId : 音乐id
- * mediaImg : 歌曲封面img url
- * mediaName : 歌曲名
- * mediaSinger : 歌手名
- * mediaUrl : 歌曲url
- * shareContentText : 分享的文字
- * shareType : 1
- * type : 卡片类型
- * userInfo : {"age":"00后","gender":"男｜女｜无（也可以0｜1｜2根据实际库存返回即可）","sn":"018209312809312","userHead":"https://www.baidu.com/img/baidu_jgylogo3.png","userId":1,"userName":"用户昵称"}
- */
-public class ShareMediaMarkerInfoData extends BaseData {
-
- public ShareMediaMarkerInfoDataResult result;
-
- public ShareMediaMarkerInfoDataResult getResult() {
- return result;
- }
-
- public void setResult(ShareMediaMarkerInfoDataResult result) {
- this.result = result;
- }
-
- public static class ShareMediaMarkerInfoDataResult{
- public ArrayList shareMusic;
-
- public ArrayList getShareMusic() {
- return shareMusic;
- }
-
- public void setShareMusic(ArrayList shareMusic) {
- this.shareMusic = shareMusic;
- }
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareSuccessResult.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareSuccessResult.java
deleted file mode 100644
index 9ad4338644..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShareSuccessResult.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mogo.module.media.model;
-
-import com.mogo.commons.data.BaseData;
-import com.mogo.module.common.entity.MarkerShareMusic;
-
-public class ShareSuccessResult extends BaseData {
- public MarkerShareMusic result;
-
- public MarkerShareMusic getResult() {
- return result;
- }
-
- public void setResult(MarkerShareMusic result) {
- this.result = result;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShowShareData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShowShareData.java
deleted file mode 100644
index 675299d556..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/ShowShareData.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mogo.module.media.model;
-
-import com.mogo.commons.data.BaseData;
-
-public class ShowShareData extends BaseData {
- public ShowShareResult result;
-
- public ShowShareResult getResult() {
- return result;
- }
-
- public void setResult(ShowShareResult result) {
- this.result = result;
- }
-
- public static class ShowShareResult{
- public boolean check;
-
- public boolean isCheck() {
- return check;
- }
-
- public void setCheck(boolean check) {
- this.check = check;
- }
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/url/UrlData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/url/UrlData.java
deleted file mode 100644
index 1143beba8a..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/url/UrlData.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.mogo.module.media.model.url;
-
-import java.io.Serializable;
-
-public class UrlData implements Serializable {
- private String dztUrl;
- private String apiUrl;
-
- public UrlData(String dztUrl, String apiUrl) {
- this.dztUrl = dztUrl;
- this.apiUrl = apiUrl;
- }
-
- public String getDztUrl() {
- return dztUrl;
- }
-
- public void setDztUrl(String dztUrl) {
- this.dztUrl = dztUrl;
- }
-
- public String getApiUrl() {
- return apiUrl;
- }
-
- public void setApiUrl(String apiUrl) {
- this.apiUrl = apiUrl;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/BaseMediaPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/BaseMediaPresenter.java
deleted file mode 100644
index 9816d684a2..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/BaseMediaPresenter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mogo.module.media.presenter;
-
-import android.content.Context;
-
-import com.mogo.commons.mvp.IView;
-import com.mogo.commons.mvp.Presenter;
-import com.mogo.module.media.model.MediaInfoData;
-
-/**
- * 媒体播放presenter基类，目前没有整合到原MediaPresenter中，原来的qq音乐，喜马拉雅和懒人听书下掉了
- *
- * @author tongchenfei
- */
-public abstract class BaseMediaPresenter extends Presenter {
- public BaseMediaPresenter(V view) {
- super(view);
- }
-
- /**
- * 初始化
- *
- * @param context 上下文
- */
- public abstract void init(Context context);
-
- /**
- * 播放音乐
- * @param mediaInfoData 待播放音乐信息
- */
- public abstract void play(MediaInfoData mediaInfoData);
-
- /**
- * 暂停播放
- * @param mediaInfoData 待暂停音乐信息
- */
- public abstract void pause(MediaInfoData mediaInfoData);
-
- /**
- * 停止播放
- * @param mediaInfoData 待停止播放音乐信息
- */
- public abstract void stop(MediaInfoData mediaInfoData);
-
- /**
- * 上一首
- */
- public abstract void pre();
-
- /**
- * 下一首
- */
- public abstract void next();
-
- /**
- * 打开对应的应用
- */
- public abstract void openApp();
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
deleted file mode 100644
index 6d40bafb55..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package com.mogo.module.media.presenter;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.media.MediaConstants;
-import com.mogo.module.media.constants.MusicConstant;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.view.IMusicView;
-import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
-
-import cn.kuwo.autosdk.api.KWAPI;
-import cn.kuwo.autosdk.api.OnGetSongImgUrlListener;
-import cn.kuwo.autosdk.api.PlayState;
-import cn.kuwo.autosdk.api.PlayerStatus;
-import cn.kuwo.base.bean.Music;
-
-/**
- * 适配酷我的presenter
- *
- * @author tongchenfei
- */
-public class KwPresenter extends BaseMediaPresenter {
- private static final String TAG = "KwPresenter";
- private KWAPI kwapi;
- private boolean isBind = false;
-
- private MediaInfoData currentMedia = new MediaInfoData();
-
- public KwPresenter(IMusicView view) {
- super(view);
- }
-
- @Override
- public void init(Context context) {
- kwapi = KWAPI.createKWAPI(context, "auto");
-
- kwapi.registerConnectedListener(b -> {
- Log.d(TAG, "onConnected: " + b);
- Log.d(TAG, "onConnected: " + b);
- isBind = b;
- if (!isBind) {
- mView.onMusicStopped();
- }else{
- PlayerStatus currentState = kwapi.getPlayerStatus();
- Log.d(TAG, "check current status: " + currentState);
- Log.d(TAG, "check current status: " + currentState);
- if(currentState == PlayerStatus.BUFFERING||currentState == PlayerStatus.PLAYING){
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING);
- kwapi.getSongPicUrl(kwapi.getNowPlayingMusic(), onGetSongImgUrlListener);
- startTrackTrackProgress();
- mView.onMusicPlaying();
- }
- }
- });
-
- kwapi.registerExitListener(() -> {
- Log.d(TAG, "onExit===");
- Log.d(TAG, "onExit===");
- mView.onAppExit();
- });
-
- kwapi.registerPlayerStatusListener((playerStatus, music) -> {
- if ( music == null ) {
- return;
- }
- Log.d(TAG, "onPlayerStatusListener: " + playerStatus + " music: " + music.name);
- switch (playerStatus) {
- case BUFFERING:
- if (currentMedia.getMediaName() == null || !currentMedia.getMediaName().equals(music.name)) {
- // 说明是切了新歌，需要及时同步一下状态
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING);
- currentMedia.setMediaName(music.name);
- currentMedia.setMediaImg("");
- mView.onMediaInfoChanged(currentMedia);
- mView.onMusicPlaying();
- }
- kwapi.getSongPicUrl(music, onGetSongImgUrlListener);
- break;
- case PLAYING:
- if (currentMedia.getMediaName() == null || !currentMedia.getMediaName().equals(music.name)) {
- // 说明是切了新歌，需要及时同步一下状态
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING);
- currentMedia.setMediaName(music.name);
- currentMedia.setMediaImg("");
- mView.onMediaInfoChanged(currentMedia);
- }
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING);
- kwapi.getSongPicUrl(music, onGetSongImgUrlListener);
- startTrackTrackProgress();
- mView.onMusicPlaying();
- break;
- case INIT:
- case PAUSE:
- case STOP:
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP);
- stopTrackTrackProgress();
- mView.onMusicPause();
- break;
- default:
- break;
- }
- });
-
- IMogoServiceApis serviceApis = MogoApisHandler.getInstance().getApis();
-
- serviceApis.getStatusManagerApi().registerStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
- @Override
- public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
- if (isTrue) {
- Log.d(TAG, "onResume, isBind: " + isBind);
- Log.d(TAG, "onResume, isBind: " + isBind);
- // 需要在resume时候判断绑定关系是否正常
- if (!isBind) {
- // 未绑定，需要重新绑定，同时第一次绑定初始化也是在此处
- kwapi.bindAutoSdkService();
- }else if(kwapi.isKuwoRunning()){
- Music currentMusic = kwapi.getNowPlayingMusic();
- if (currentMedia.getMediaName() == null && currentMusic != null) {
- // 当前处于绑定状态，且有音乐信息，需判断是否正在播放，进行界面刷新
- Log.d(TAG, "step1==" + currentMusic.name);
- if (kwapi.getPlayerStatus() == PlayerStatus.BUFFERING || kwapi.getPlayerStatus() == PlayerStatus.PLAYING) {
- Log.d(TAG, "当前可能正在播放音乐，需要更新=1=" + currentMusic.name);
- currentMedia.setMediaName(currentMusic.name);
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING);
- mView.onMediaInfoChanged(currentMedia);
- mView.onMusicPlaying();
- kwapi.getSongPicUrl(currentMusic, onGetSongImgUrlListener);
- } else if (kwapi.getPlayerStatus() == PlayerStatus.INIT) {
- Log.d(TAG, "当前可能正在播放音乐，需要更新=3=" + currentMusic.name);
- currentMedia.setMediaName(currentMusic.name);
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP);
- mView.onMediaInfoChanged(currentMedia);
- mView.onMusicStopped();
- }
- } else if (currentMedia.getMediaName() != null && currentMusic != null && !currentMedia.getMediaName().equals(currentMusic.name)) {
- Log.d(TAG, "step2==media: " + currentMedia.getMediaName() + " " +
- "musicName: " + currentMusic.name + " status: " + kwapi.getPlayerStatus());
- if (kwapi.getPlayerStatus() == PlayerStatus.BUFFERING || kwapi.getPlayerStatus() == PlayerStatus.PLAYING) {
- Log.d(TAG, "当前可能正在播放音乐，需要更新=2=" + currentMusic.name);
- currentMedia.setMediaName(currentMusic.name);
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING);
- mView.onMediaInfoChanged(currentMedia);
- mView.onMusicPlaying();
- kwapi.getSongPicUrl(currentMusic, onGetSongImgUrlListener);
- }else if (kwapi.getPlayerStatus() == PlayerStatus.INIT) {
- Log.d(TAG, "当前可能正在播放音乐，需要更新=4=" + currentMusic.name);
- currentMedia.setMediaName(currentMusic.name);
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP);
- mView.onMediaInfoChanged(currentMedia);
- mView.onMusicStopped();
- }
- }
- }
- }
- }
- });
-
- kwapi.bindAutoSdkService();
- }
-
- @Override
- public void play(MediaInfoData mediaInfoData) {
- if (kwapi.isKuwoRunning()) {
- kwapi.setPlayState(PlayState.STATE_PLAY);
- } else {
- kwapi.startAPP(true);
- }
- }
-
- @Override
- public void pause(MediaInfoData mediaInfoData) {
- if (kwapi.isKuwoRunning()) {
- kwapi.setPlayState(PlayState.STATE_PAUSE);
- }else{
- kwapi.startAPP(true);
- }
- }
-
- @Override
- public void stop(MediaInfoData mediaInfoData) {
-
- }
-
- @Override
- public void pre() {
- if (kwapi.isKuwoRunning()) {
- kwapi.setPlayState(PlayState.STATE_PRE);
- }
- }
-
- @Override
- public void next() {
- if (kwapi.isKuwoRunning()) {
- kwapi.setPlayState(PlayState.STATE_NEXT);
- }else{
- kwapi.startAPP(true);
- }
- }
-
- private Handler.Callback callback = new Handler.Callback() {
- @Override
- public boolean handleMessage(Message msg) {
- if (isTrackingProgress) {
- mView.onMusicProgress(kwapi.getCurrentPos(), kwapi.getCurrentMusicDuration());
- msg.getTarget().sendEmptyMessageDelayed(MSG_TRACK_PROGRESS,
- MSG_TRACK_PROGRESS_DELAY);
- }
- return false;
- }
- };
- private Handler handler = new Handler(callback);
- private static final int MSG_TRACK_PROGRESS = 1001;
- private static final long MSG_TRACK_PROGRESS_DELAY = 1000;
-
- private boolean isTrackingProgress = false;
-
- private void startTrackTrackProgress() {
- if(!isTrackingProgress) {
- isTrackingProgress = true;
- handler.sendEmptyMessageDelayed(MSG_TRACK_PROGRESS, MSG_TRACK_PROGRESS_DELAY);
- }
- }
-
- private void stopTrackTrackProgress() {
- if(isTrackingProgress) {
- isTrackingProgress = false;
- handler.removeMessages(MSG_TRACK_PROGRESS);
- }
- }
-
- private OnGetSongImgUrlListener onGetSongImgUrlListener = new OnGetSongImgUrlListener() {
- @Override
- public void onGetSongImgUrlSucessed(Music music, String s) {
- if(currentMedia.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) {
- currentMedia.setMediaName(music.name);
- currentMedia.setMediaImg(s);
- Log.d(TAG,
- "onGetSongImgUrlSucessed: " + currentMedia);
- handler.post(() -> mView.onMediaInfoChanged(currentMedia));
- }
- }
-
- @Override
- public void onGetSongImgUrlFailed(Music music, int i) {
- Log.e(TAG, "onGetSongImgUrlFailed: " + i);
- }
- };
-
- @Override
- public void openApp(){
- kwapi.startAPP(true);
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/MediaPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/MediaPresenter.java
deleted file mode 100644
index 292d9e1b0c..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/MediaPresenter.java
+++ /dev/null
@@ -1,532 +0,0 @@
-package com.mogo.module.media.presenter;
-
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LifecycleOwner;
-
-import com.mogo.commons.data.BaseData;
-import com.mogo.commons.mvp.Presenter;
-import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.ParamsUtil;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.location.MogoLocation;
-import com.mogo.module.common.entity.MarkerResponse;
-import com.mogo.module.common.entity.MarkerShareMusic;
-import com.mogo.module.media.MediaConstants;
-import com.mogo.module.media.R;
-import com.mogo.module.media.ServiceMediaHandler;
-import com.mogo.module.media.api.MediaDztService;
-import com.mogo.module.media.constants.BaseUrlConstants;
-import com.mogo.module.media.constants.EventConstants;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.model.NearShareRequestParameter;
-import com.mogo.module.media.model.ShareLikeData;
-import com.mogo.module.media.model.ShareMediaMarkerInfoData;
-import com.mogo.module.media.model.ShareSuccessResult;
-import com.mogo.module.media.model.ShowShareData;
-import com.mogo.module.media.utils.BaseUrlManager;
-import com.mogo.module.media.utils.MediaAnalyticsUtils;
-import com.mogo.module.media.utils.StorageManager;
-import com.mogo.module.media.utils.ToastHelper;
-import com.mogo.module.media.view.MediaView;
-import com.mogo.utils.TipToast;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
-
-public class MediaPresenter extends Presenter {
-
- private static final String TAG = "MediaPresenter";
- private ArrayList mDisPosables;
-
- public MediaPresenter(MediaView view) {
- super(view);
- }
-
- @Override
- public void onCreate(@NonNull LifecycleOwner owner) {
- super.onCreate(owner);
- }
-
- public void getFriendMusic() {
- final ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- final MogoLocation location = ServiceMediaHandler.getLocationClient().getLastKnowLocation();
- if (location != null) {
- builder.append("address", location.getAddress());
- builder.append("lat", location.getLatitude());
- builder.append("lng", location.getLongitude());
- }
-
- Map parameters = builder.build();
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().
- create(MediaDztService.class, BaseUrlManager.getDztBaseUrl()).getFriendShareMusic(parameters);
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- addDispose(d);
- }
-
- @Override
- public void onSuccess(ShareMediaMarkerInfoData resultData) {
- if (resultData != null && resultData.getResult() != null
- && resultData.getResult().getShareMusic() != null
- && resultData.getResult().getShareMusic().size() > 0){
- mView.loadFriendShareMusicSuccess(resultData.getResult().getShareMusic());
- }else{
- TipToast.shortTip("您的好友未分享过歌曲");
- AIAssist.getInstance(mView.getContext()).speakTTSVoice("您的好友未分享过歌曲",null);
- }
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
- TipToast.shortTip("获取好友的歌失败");
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
- TipToast.shortTip("获取好友的歌失败");
-
- }
- }
- );
-
- }
-
- /**
- * 开始音乐播放的接口
- * @param mCurrentMusic
- */
- public void startedMusic(MediaInfoData mCurrentMusic) {
- if (mCurrentMusic == null)return;
- final ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- HashMap hashMap = new HashMap<>();
- hashMap.put("mediaType", mCurrentMusic.getType());
- hashMap.put("shareData", mCurrentMusic);
- builder.append("data", GsonUtil.jsonFromObject(hashMap));
- Map parameters = builder.build();
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().
- create(MediaDztService.class, BaseUrlManager.getDztBaseUrl()).startedMusic(parameters);
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- addDispose(d);
- }
-
- @Override
- public void onSuccess(BaseData resultData) {
-
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
-
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
-
- }
- }
- );
-
- }
-
-
- /**
- * 请求附近的
- */
- public void getNearShareMusic() {
- final ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- NearShareRequestParameter nearData = new NearShareRequestParameter();
- NearShareRequestParameter.LocationBean locationBean = new NearShareRequestParameter.LocationBean();
- final MogoLocation location = ServiceMediaHandler.getLocationClient().getLastKnowLocation();
- if ( location != null ) {
- locationBean.setLat(locationBean.getLat());
- locationBean.setLon(locationBean.getLon());
- }
- nearData.setLocation(locationBean);
- nearData.setLimit(10);
- nearData.setRadius(2000);
- ArrayList list = new ArrayList<>();
- list.add(MediaConstants.MODULE_TYPE);
- nearData.setDataType(list);
- builder.append("data", GsonUtil.jsonFromObject(nearData));
- Map parameters = builder.build();
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().
- create(MediaDztService.class, BaseUrlManager.getDztBaseUrl()).getNearShareMusic(parameters);
- Disposable disposable = observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(
- new Consumer() {
- @Override
- public void accept(MarkerResponse markerResponse) throws Exception {
- if (markerResponse != null && markerResponse.getCode() == 0
- && markerResponse.getResult() != null
- && markerResponse.getResult().getShareMusic() != null
- && markerResponse.getResult().getShareMusic().size() > 0){
- mView.loadNearShareMusicSuccess(markerResponse.getResult().getShareMusic());
- }else{
- AIAssist.getInstance(mView.getContext()).speakTTSVoice("当前暂无分享的歌曲",null);
- }
- }
- },
- new Consumer() {
- @Override
- public void accept(Throwable throwable) throws Exception {
- TipToast.shortTip("获取附近的歌失败");
- }
- }
- );
-
- addDispose(disposable);
- }
-
- /**
- * 停止音乐播放的接口
- */
- public void stopMusic() {
- final ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- Map parameters = builder.build();
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().
- create(MediaDztService.class, BaseUrlManager.getDztBaseUrl()).stopMusic(parameters);
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- addDispose(d);
- }
-
- @Override
- public void onSuccess(BaseData resultData) {
-
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
-
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
-
- }
- }
- );
-
- }
-
- public void getShouldShare() {
- final ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- Map parameters = builder.build();
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().
- create(MediaDztService.class, BaseUrlManager.getDztBaseUrl()).getShouldPushShare(parameters);
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- addDispose(d);
- }
-
- @Override
- public void onSuccess(ShowShareData resultData) {
- //存储请求了触发分享的接口，每次accon一次
- StorageManager.setShowPushShareTime(System.currentTimeMillis()+"");
- if (resultData != null && resultData.result != null){
- mView.showSharePush(resultData.result.check);
- }
-
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
-
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
-
- }
- }
- );
-
- }
-
- public void selectByPrimaryKey(int id,String mediaId){
- final ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- builder.append("id",id);
- Map parameters = builder.build();
-
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().
- create(MediaDztService.class, BaseUrlManager.getDztBaseUrl()).selectByPrimaryKey(parameters);
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- addDispose(d);
- }
-
- @Override
- public void onSuccess(ShareLikeData resultData) {
- //存储请求了触发分享的接口，每次accon一次
- if (resultData == null){
- return;
- }
- if (resultData.result == null){
- return;
- }
- mView.loadShareLikeDataResultSuccess(resultData.result,mediaId);
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
- TipToast.shortTip("加载点赞信息失败，请重试");
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
- TipToast.shortTip("加载点赞信息失败，请重试");
- }
- }
- );
-
- }
-
- public void likeShare(ShareLikeData.ShareLikeDataResult likeDataResult){
-
- final Map businessParams = new HashMap<>();
- final MogoLocation location = ServiceMediaHandler.getLocationClient().getLastKnowLocation();
-
- businessParams.put("musicId", likeDataResult.mediaId);
- businessParams.put("musicUrl", likeDataResult.mediaUrl);
- businessParams.put("userId", likeDataResult.userId);
- businessParams.put("userType", likeDataResult.type);
-
- ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- if (location != null) {
- builder.append("lat", location.getLatitude());
- builder.append("lng", location.getLongitude());
- }
- final Map params = builder
- .append(businessParams)
- .build();
-
-
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().create(MediaDztService.class, BaseUrlManager.getDztBaseUrl())
- .likeShare(ParamsUtil.toQueryUrl(BaseUrlManager.getDztBaseUrl() + BaseUrlConstants.SHARE_MUSIC_LIKE_URL, params, businessParams), ParamsUtil.convert(businessParams));
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- addDispose(d);
- }
-
- @Override
- public void onSuccess(BaseData resultData) {
- mView.likeShareSuccess();
- TipToast.shortTip("点赞成功");
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
- TipToast.shortTip("点赞失败，请重试");
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
- TipToast.shortTip(message != null ?message:"点赞失败，请重试");
- }
- }
- );
-
-
- }
-
- public void addDispose(Disposable subscription){
- if (subscription != null){
- if (mDisPosables == null) mDisPosables = new ArrayList<>();
- mDisPosables.add(subscription);
- }
- }
-
- public String getPackageName(MediaInfoData mMediaInfoData){
- if (mMediaInfoData == null) return "";
- if (mMediaInfoData.getType() == 1){
- return "com.pvetec.musics";
- }else if (mMediaInfoData.getType() == 2){
- return "com.zhidao.lrts";
- }else if (mMediaInfoData.getType() == 3){
- return "com.zhidao.ltnews";
- }else{
- return "";
- }
- }
-
- public String getAppName(MediaInfoData mMediaInfoData){
- if (mMediaInfoData == null) return "";
- if (mMediaInfoData.getType() == 1){
- return "QQ音乐";
- }else if (mMediaInfoData.getType() == 2){
- return "懒人听书";
- }else if (mMediaInfoData.getType() == 3){
- return "乐听头条";
- }else{
- return "";
- }
- }
-
- public void shareMusic(MediaInfoData mCurrentMusic,boolean click) {
- if (mCurrentMusic == null) return;
- try {
- if (mCurrentMusic != null){
- HashMap hashMap = new HashMap<>();
- hashMap.put("type",click ? 1:2);
- String trackId = "";
- if (mCurrentMusic.getType() == 1){
- trackId = EventConstants.EVENT_QQ_SHARE_DIALOG_OK;
- }else if (mCurrentMusic.getType() == 2){
- trackId = EventConstants.EVENT_BOOK_SHARE_DIALOG_OK;
- }else if (mCurrentMusic.getType() == 3){
- trackId = EventConstants.EVENT_NEWS_SHARE_DIALOG_OK;
- }
- MediaAnalyticsUtils.track(trackId ,hashMap);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- final Map businessParams = new HashMap<>();
- final MogoLocation location = ServiceMediaHandler.getLocationClient().getLastKnowLocation();
- if (location != null) {
- businessParams.put("address", location.getAddress());
- }
-
- businessParams.put("bookInfo", mCurrentMusic.getBookInfo());
- businessParams.put("mediaDuration", mCurrentMusic.getMaxTime() + "");
- businessParams.put("mediaId", mCurrentMusic.getMediaId());
- businessParams.put("mediaImg", mCurrentMusic.getMediaImg());
- businessParams.put("mediaName", mCurrentMusic.getMediaName());
- businessParams.put("mediaSinger", mCurrentMusic.getMediaSinger());
- businessParams.put("mediaType", mCurrentMusic.getMediaType());
- businessParams.put("mediaUrl", mCurrentMusic.getMediaUrl());
- businessParams.put("shareType", mCurrentMusic.getType());
-
- ParamsProvider.Builder builder = new ParamsProvider.Builder(getContext());
- if (location != null) {
- builder.append("lat", location.getLatitude());
- builder.append("lng", location.getLongitude());
- }else{
- TipToast.shortTip("分享失败，定位出错请重试！");
- return;
- }
- final Map params = builder
- .append(businessParams)
- .build();
- Observable observable = ServiceMediaHandler.getMogoNetWorkService().create(MediaDztService.class, BaseUrlManager.getDztBaseUrl())
- .shareMusic(ParamsUtil.toQueryUrl(BaseUrlManager.getDztBaseUrl() + BaseUrlConstants.SHARE_MUSIC_URL, params, businessParams), ParamsUtil.convert(businessParams));
- observable
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new SubscribeImpl(com.mogo.utils.network.RequestOptions.create(getContext())) {
- @Override
- public void onSubscribe(Disposable d) {
- super.onSubscribe(d);
- addDispose(d);
- }
-
- @Override
- public void onSuccess(ShareSuccessResult resultData) {
- try {
- ToastHelper.showShortSuccess(getContext(), getContext().getResources().getString(R.string.module_media_share_success));
- AIAssist.getInstance(getContext()).speakTTSVoice(getContext().getResources().getString(R.string.module_media_share_success),null);
- if (resultData != null && resultData.result != null){
- MarkerShareMusic markerShareMusic = resultData.result;
- markerShareMusic.setType(MediaConstants.MODULE_TYPE);
- mView.shareSuccessResult(true,markerShareMusic);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void onError(Throwable e) {
- super.onError(e);
- try {
- ToastHelper.showShortError(getContext(), getContext().getResources().getString(R.string.module_media_share_fail));
- TipToast.shortTip("分享失败");
- AIAssist.getInstance(getContext()).speakTTSVoice(getContext().getResources().getString(R.string.module_media_share_fail),null);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- @Override
- public void onError(String message, int code) {
- super.onError(message, code);
- try {
- ToastHelper.showShortError(getContext(), getContext().getResources().getString(R.string.module_media_share_fail));
- TipToast.shortTip(!TextUtils.isEmpty(message)?message:"分享失败");
- AIAssist.getInstance(getContext()).speakTTSVoice(!TextUtils.isEmpty(message)?message:"分享失败",null);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- );
-
- }
-
- @Override
- public void onDestroy(@NonNull LifecycleOwner owner) {
- super.onDestroy(owner);
- if (mDisPosables != null && !mDisPosables.isEmpty()) {
- for (Disposable subscription : mDisPosables) {
- if (subscription == null || subscription.isDisposed()) {
- continue;
- }
- subscription.dispose();
- }
- mDisPosables.clear();
- mDisPosables = null;
- }
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/NoopPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/NoopPresenter.java
deleted file mode 100644
index 4270a87d06..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/NoopPresenter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.mogo.module.media.presenter;
-
-import android.content.Context;
-
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.view.IMusicView;
-
-/**
- * 空presenter实现，为了减少各种空判断
- *
- * @author tongchenfei
- */
-public class NoopPresenter extends BaseMediaPresenter {
- public NoopPresenter(IMusicView view) {
- super(view);
- }
-
- @Override
- public void init(Context context) {
-
- }
-
- @Override
- public void play(MediaInfoData mediaInfoData) {
-
- }
-
- @Override
- public void pause(MediaInfoData mediaInfoData) {
-
- }
-
- @Override
- public void stop(MediaInfoData mediaInfoData) {
-
- }
-
- @Override
- public void pre() {
-
- }
-
- @Override
- public void next() {
-
- }
-
- @Override
- public void openApp() {
-
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/PresenterFactory.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/PresenterFactory.java
deleted file mode 100644
index c5661387b7..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/PresenterFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mogo.module.media.presenter;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-import com.mogo.module.media.view.IMusicView;
-
-import java.util.List;
-
-/**
- * Presenter简单工厂，根据包名判断选择哪个presenter
- *
- * @author tongchenfei
- */
-public class PresenterFactory {
- private static final String KW_PKG_NAME = "cn.kuwo.kwmusiccar";
- private static final String WE_CAR_FLOW_PKG_NAME = "com.tencent.wecarflow";
-
- /**
- * 获取泛型是IMusicView的BaseMediaPresenter
- *
- * @param context 上下文，用来遍历机器上的包名
- * @param view IMusicView，用来做view展示
- * @return presenter
- */
- public static BaseMediaPresenter createMusicViewPresenter(Context context,
- IMusicView view) {
- BaseMediaPresenter result = null;
- PackageManager pkm = context.getPackageManager();
- List pkgInfoList = pkm.getInstalledPackages(0);
- // 只做了两级优先级判断，比较简单
- for (PackageInfo pkgInfo : pkgInfoList) {
- if (pkgInfo.packageName.equals(KW_PKG_NAME)) {
- result = new KwPresenter(view);
- } else if (pkgInfo.packageName.equals(WE_CAR_FLOW_PKG_NAME) && result == null) {
- result = new WeCarFlowPresenter(view);
- }
- }
- if (result == null) {
- result = new NoopPresenter(view);
- }
- return result;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java
deleted file mode 100644
index 570964a4b2..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.mogo.module.media.presenter;
-
-import android.content.Context;
-
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.media.MediaConstants;
-import com.mogo.module.media.constants.MusicConstant;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.view.IMusicView;
-import com.mogo.service.IMogoServiceApis;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.logger.Logger;
-import com.tencent.wecarflow.flowoutside.sdk.BindListener;
-import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
-import com.tencent.wecarflow.flowoutside.sdk.MediaChangeListener;
-import com.tencent.wecarflow.flowoutside.sdk.MediaInfo;
-import com.tencent.wecarflow.flowoutside.sdk.PlayStateListener;
-import com.tencent.wecarflow.flowoutside.sdk.QueryCallback;
-
-/**
- * 爱趣听presenter
- *
- * @author tongchenfei
- */
-public class WeCarFlowPresenter extends BaseMediaPresenter {
- private static final String TAG = "WeCarFlowPresenter";
- public WeCarFlowPresenter(IMusicView view) {
- super(view);
- }
-
- private Context context;
-
- private MediaInfoData currentMedia;
-
- private boolean isBind = true;
- private IMogoServiceApis serviceApis;
-
- private QueryCallback isPlayingCallback = new QueryCallback() {
- @Override
- public void onError(int i) {
-
- }
-
- @Override
- public void onSuccess(Boolean aBoolean) {
- currentMedia.setPlayState(aBoolean ? MusicConstant.PLAY_STATE_PLAYING :
- MusicConstant.PLAY_STATE_PAUSE_OR_STOP);
- if (mView != null) {
- mView.onMediaInfoChanged(currentMedia);
- }
- }
- };
-
- private QueryCallback currentCallback = new QueryCallback() {
- @Override
- public void onError(int i) {
-
- }
-
- @Override
- public void onSuccess(MediaInfo mediaInfo) {
- currentMedia.setMediaName(mediaInfo.getMediaName());
- currentMedia.setMediaImg(mediaInfo.getMediaImage());
- if (mView != null) {
- mView.onMediaInfoChanged(currentMedia);
- }
- }
- };
-
- @Override
- public void init(Context context) {
- this.context = context;
- currentMedia = new MediaInfoData();
-
- serviceApis = MogoApisHandler.getInstance().getApis();
-
- serviceApis.getStatusManagerApi().registerStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
- @Override
- public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
- if (isTrue) {
- Logger.d(TAG, "onResume, isBind: " + isBind);
- // 需要在resume时候判断绑定关系是否正常
- if (!isBind) {
- // 未绑定，需要重新绑定，同时第一次绑定初始化也是在此处
- FlowPlayControl.getInstance().bindPlayService(context);
- }
- }
- }
- });
-
- FlowPlayControl.getInstance().addBindListener(new BindListener() {
- @Override
- public void onServiceConnected() {
- Logger.d(TAG, "onServiceConnected===");
- isBind = true;
- FlowPlayControl.getInstance().queryPlaying(isPlayingCallback);
- FlowPlayControl.getInstance().queryCurrent(currentCallback);
- }
-
- @Override
- public void onServiceDisconnected() {
- Logger.e(TAG, "onServiceDisconnected===");
- isBind = false;
- }
-
- @Override
- public void onBindDied() {
- Logger.e(TAG, "onBindDied===");
- isBind = false;
- }
- });
-
- FlowPlayControl.getInstance().addMediaChangeListener(new MediaChangeListener() {
- @Override
- public void onMediaChange(MediaInfo mediaInfo) {
- Logger.d(TAG, "onMediaChange: " + mediaInfo);
- Logger.d(TAG, "onMediaChange, img: " + mediaInfo.getMediaImage());
- currentMedia.setMediaName(mediaInfo.getMediaName());
- currentMedia.setMediaImg(mediaInfo.getMediaImage());
- mView.onMediaInfoChanged(currentMedia);
- }
-
- @Override
- public void onFavorChange(boolean b) {
-
- }
- });
-
- FlowPlayControl.getInstance().addPlayStateListener(new PlayStateListener() {
- @Override
- public void onStart() {
- if (mView != null && currentMedia != null) {
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING);
- mView.onMusicPlaying();
- mView.onMediaInfoChanged(currentMedia);
- }
- }
-
- @Override
- public void onPause() {
- if (mView != null && currentMedia != null) {
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP);
- mView.onMusicPause();
- mView.onMediaInfoChanged(currentMedia);
- }
- }
-
- @Override
- public void onStop() {
- if (mView != null && currentMedia != null) {
- currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP);
- mView.onMusicStopped();
- mView.onMediaInfoChanged(currentMedia);
- }
- }
-
- @Override
- public void onProgress(String s, long current, long total) {
- if (mView != null) {
- mView.onMusicProgress(current, total);
- }
- }
- });
-
- FlowPlayControl.getInstance().bindPlayService(context);
- }
-
- @Override
- public void play(MediaInfoData mediaInfoData) {
- FlowPlayControl.getInstance().doPlay();
- }
-
- @Override
- public void pause(MediaInfoData mediaInfoData) {
- FlowPlayControl.getInstance().doPause();
- }
-
- @Override
- public void stop(MediaInfoData mediaInfoData) {
- FlowPlayControl.getInstance().doStop();
- }
-
- @Override
- public void pre() {
- FlowPlayControl.getInstance().doPre();
- }
-
- @Override
- public void next() {
- FlowPlayControl.getInstance().doNext();
- }
-
- @Override
- public void openApp() {
- FlowPlayControl.getInstance().startPlayActivity(context);
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaProcessReceiver.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaProcessReceiver.java
deleted file mode 100644
index d6202fe0d9..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaProcessReceiver.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mogo.module.media.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.mogo.module.media.model.MediaProcessEvent;
-
-public class MediaProcessReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- {
- if (intent != null) {
- int curTime = intent.getIntExtra("curTime", -1);
- MediaProcessEvent event = new MediaProcessEvent();
- event.process = curTime;
- // EventBus.getDefault().post(event);
- }
- }
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaSpeechReceiver.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaSpeechReceiver.java
deleted file mode 100644
index fd35cc5bb6..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaSpeechReceiver.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.mogo.module.media.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.mogo.module.media.MediaCardViewFragment;
-import com.mogo.module.media.utils.MusicControlBroadCast;
-import com.mogo.utils.ActivityLifecycleManager;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
-import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
-
-import io.reactivex.processors.FlowableProcessor;
-
-/**
- * 我要听{歌手/歌名}：
- * 语音通知桌面广播： com.speech.adapter.send 参数：music_model
- * 桌面通过该action转发给QQ音乐：com.txznet.adapter.send 参数 ：music_model
- *
- * 播放音乐：
- * 语音通知桌面广播：com.zhidao.speech.awake.notify 参数：command == com.ileja.music.playapp
- *
- * 懒人听书：我要听书、听书 com.zhidao.speech.awake.notify 参数：command：com.zhidao.book.play
- * 乐听头条：播放新闻、我要听新闻、我要听{类型}新闻、听新闻action：com.zhidao.mediacenter.voiceltnews 参数：category
- */
-public class MediaSpeechReceiver extends BroadcastReceiver {
- public static String mCategoryStr = "";
- @Override
- public void onReceive(Context context, Intent intent) {
- {
- if (intent != null) {
- String cmdAction = intent.getAction();
- boolean appActive = ActivityLifecycleManager.getInstance().isAppActive();
- appActive = MediaCardViewFragment.isMediaResume;
- Logger.d("MediaSpeechReceiver"," "+cmdAction+" "+appActive);
- if (cmdAction.equals("com.speech.adapter.send")){
- //我要听{歌手/歌名}
- Logger.d("MediaSpeechReceiver"," "+"type qq ");
- String musicModel = intent.getStringExtra("music_model");
- FlowPlayControl.getInstance().semanticSearch(context, "launcher", musicModel);
-// if (appActive){
-// MusicControlBroadCast.playSomeBodyMusic(musicModel);
-// MusicControlBroadCast.mediaCenterBroadcast();
-// }else {
-// MusicControlBroadCast.playSomeBodyMusic(musicModel);
-// UiThreadHandler.postDelayed(new Runnable() {
-// @Override
-// public void run() {
-// MusicControlBroadCast.qqOpenQQMusic();
-// }
-// },300);
-// }
- }else if (cmdAction.equals("com.zhidao.speech.awake.notify")){
- //播放音乐
- String musicCmd = intent.getStringExtra("command");
- Logger.d("MediaSpeechReceiver"," "+"qq book"+musicCmd==null?"":musicCmd);
- if (musicCmd.equals("com.ileja.music.playapp")){
- //QQ音乐
- FlowPlayControl.getInstance().doPlay();
-// if (appActive){
-// MusicControlBroadCast.qqPlayQQMusic();
-// MusicControlBroadCast.mediaCenterBroadcast();
-// }else{
-// MusicControlBroadCast.qqOpenQQMusic();
-// }
- }else if (musicCmd.equals("com.zhidao.book.play")){
- //懒人听书
- if (appActive){
- MusicControlBroadCast.controlLanRenPlayBack();
- MusicControlBroadCast.mediaCenterBroadcast();
- }else{
- MusicControlBroadCast.openMediaApp(2);
- }
- }
- }else if (cmdAction.equals("com.zhidao.mediacenter.voiceltnews")){
- //新闻
- try {
- String category = intent.getStringExtra("category");
- Logger.d("MediaSpeechReceiver"," "+"news "+category==null?"":category);
- mCategoryStr = category;
- MusicControlBroadCast.getNewsPayInfoState();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- }
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaStateReceiver.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaStateReceiver.java
deleted file mode 100644
index 6d6bad8f7f..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/receiver/MediaStateReceiver.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.mogo.module.media.receiver;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.text.TextUtils;
-import android.view.View;
-
-import com.mogo.module.media.constants.LeTingFieldConstants;
-import com.mogo.module.media.constants.QQMusicFieldConstants;
-import com.mogo.module.media.model.LanRenInsertData;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.model.MediaInfoDataEvent;
-import com.mogo.module.media.utils.StorageManager;
-import com.mogo.module.media.utils.Utils;
-import com.mogo.utils.DateTimeUtils;
-import com.mogo.utils.ThreadPoolService;
-import com.mogo.utils.network.utils.GsonUtil;
-
-public class MediaStateReceiver extends BroadcastReceiver {
- //action：com.zhidao.action.MEDIA_LRTS
- //action：com.zhidao.action.MEDIA_LT_NEWS
- //action：com.qq.music.status.change
- @Override
- public void onReceive(Context context, Intent intent) {
- {
- MediaInfoData mMediaInfoData = new MediaInfoData();
- if (intent != null) {
- int type = intent.getIntExtra("type", -1);
- int playState = intent.getIntExtra(QQMusicFieldConstants.playState, 0);
-
- if (type == 1) {//qq音乐
-
- int maxTime = intent.getIntExtra(QQMusicFieldConstants.maxTime, 0);
- int curTime = intent.getIntExtra(QQMusicFieldConstants.curTime, 0);
- String mediaName = intent.getStringExtra(QQMusicFieldConstants.mediaName);
- String mediaUrl = intent.getStringExtra(QQMusicFieldConstants.mediaUrl);
- String mediaSinger = intent.getStringExtra(QQMusicFieldConstants.mediaSinger);
- String mediaImgUrl = intent.getStringExtra(QQMusicFieldConstants.mediaImgUrl);
- String mediaType = intent.getStringExtra(QQMusicFieldConstants.mediaType);
- String mediaMid = intent.getStringExtra(QQMusicFieldConstants.mediaMid);
- int mediaPLayMode = intent.getIntExtra(QQMusicFieldConstants.mediaPlayMode, -1);
- boolean isLocalMedia = intent.getBooleanExtra(QQMusicFieldConstants.isLocalMedia, false);
-
- mMediaInfoData.setType(type);
- mMediaInfoData.setPlayState(playState);
- mMediaInfoData.setMaxTime(maxTime * 1000);
- mMediaInfoData.setCurTime(curTime * 1000);
- mMediaInfoData.setMediaName(mediaName);
- mMediaInfoData.setMediaUrl(mediaUrl);
- mMediaInfoData.setMediaId(mediaMid);
- mMediaInfoData.setMediaImg(mediaImgUrl);
- mMediaInfoData.setMediaSinger(mediaSinger);
- mMediaInfoData.setMediaPlayMode(mediaPLayMode);
- mMediaInfoData.setLocalMedia(isLocalMedia);
- mMediaInfoData.setMediaType(mediaType);
-
- } else if (type == 2) {//懒人听书
- int maxTime = intent.getIntExtra(LeTingFieldConstants.maxTime, 0);
- int curTime = intent.getIntExtra(LeTingFieldConstants.curTime, 0);
-
- String mediaName = intent.getStringExtra(LeTingFieldConstants.mediaName);//章节数
- String bookInfoStr = intent.getStringExtra(LeTingFieldConstants.bookInfo);
- LanRenInsertData lanRenInsertData = GsonUtil.objectFromJson(bookInfoStr, LanRenInsertData.class);
-
- String bookName = ""; // 书名 需要从bookinfo里面取
- String cover = ""; //封面 bookinfo中取
- String bookid = "";
-
- try {
- if (lanRenInsertData != null) {
- bookName = lanRenInsertData.getName(); // 书名 需要从bookinfo里面取
- cover = lanRenInsertData.getCover(); //封面 bookinfo中取
- bookid = lanRenInsertData.getBookId() + "";
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- mMediaInfoData.setType(type);
- mMediaInfoData.setPlayState(playState);
- mMediaInfoData.setMaxTime(maxTime);
- mMediaInfoData.setCurTime(curTime);
- mMediaInfoData.setMediaName(bookName); //bookName 或者mediaName
- mMediaInfoData.setMediaSinger(mediaName); //章节数
- mMediaInfoData.setMediaImg(cover); //书籍封面
- mMediaInfoData.setMediaId(bookid);//书籍的bookid int
- mMediaInfoData.setBookInfo(bookInfoStr);
- mMediaInfoData.setMediaUrl("");
- mMediaInfoData.setLocalMedia(false);
- mMediaInfoData.setMediaType("");
-
- } else if (type == 3) {//乐听头条
- int maxTime = intent.getIntExtra(LeTingFieldConstants.maxTime, 0);
- int curTime = intent.getIntExtra(LeTingFieldConstants.curTime, 0);
- String mediaName = intent.getStringExtra(LeTingFieldConstants.mediaName); //新闻title
- String artist = intent.getStringExtra(LeTingFieldConstants.artist); //新闻来源，赋值给singer mediaSinger
- String cover = intent.getStringExtra(LeTingFieldConstants.cover); //封面
-
- mMediaInfoData.setType(type);
- mMediaInfoData.setPlayState(playState);
- mMediaInfoData.setMaxTime(maxTime);
- mMediaInfoData.setCurTime(curTime);
- mMediaInfoData.setMediaName(mediaName); //新闻标题
- mMediaInfoData.setMediaSinger(artist); //新闻来源
- mMediaInfoData.setMediaImg(cover); //新闻封面
-
- mMediaInfoData.setMediaId("");//书籍的bookid int
- mMediaInfoData.setBookInfo("");
- mMediaInfoData.setMediaUrl("");
- mMediaInfoData.setLocalMedia(true);
- mMediaInfoData.setMediaType("");
- }
-
- MediaInfoDataEvent event = new MediaInfoDataEvent();
- event.data = mMediaInfoData;
- // EventBus.getDefault().post(event);
-
- /* try {
- if (mMediaInfoData != null) {
- ThreadPoolService.execute(new Runnable() {
- @Override
- public void run() {
- StorageManager.setLastListenMediaMusic(GsonUtil.jsonFromObject(mMediaInfoData));
- }
- });
- }
- } catch (Exception e) {
- e.printStackTrace();
- }*/
- }
- }
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BaseUrlManager.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BaseUrlManager.java
deleted file mode 100644
index c4a87c9c4f..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BaseUrlManager.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.mogo.module.media.utils;
-
-import com.mogo.module.media.ServiceMediaHandler;
-import com.mogo.module.media.constants.BaseUrlConstants;
-import com.mogo.module.media.model.url.UrlData;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BaseUrlManager {
-
- private static final List urlEntityList = new ArrayList<>();
-
- static {
- urlEntityList.add( getDevEntity() );
- urlEntityList.add( getQaEntity() );
- urlEntityList.add( getReleaseEntity() );
- urlEntityList.add( getShowEntity() );
- }
-
- private static UrlData getShowEntity() {
- return new UrlData(BaseUrlConstants.SHOW_BASE_URL,BaseUrlConstants.SHOW_BASE_URL);
- }
-
- private static UrlData getQaEntity() {
- return new UrlData(BaseUrlConstants.QA_BASE_URL,BaseUrlConstants.QA_BASE_URL);
- }
-
- private static UrlData getDevEntity() {
- return new UrlData(BaseUrlConstants.DEV_BASE_URL,BaseUrlConstants.DEV_BASE_URL);
- }
-
- private static UrlData getReleaseEntity() {
- return new UrlData(BaseUrlConstants.RELEASE_BASE_URL,BaseUrlConstants.RELEASE_BASE_URL);
- }
-
- public static String getDztBaseUrl(){
- return urlEntityList.get(ServiceMediaHandler.getCurrentEvent() - 1).getDztUrl();
- }
-
- public static String getApiBaseUrl(){
- return urlEntityList.get(ServiceMediaHandler.getCurrentEvent() - 1).getApiUrl();
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BitmapHelper.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BitmapHelper.java
deleted file mode 100644
index 89fd0ee6c0..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BitmapHelper.java
+++ /dev/null
@@ -1,982 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.annotation.SuppressLint;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.RectF;
-import android.media.ExifInterface;
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-import android.opengl.GLES10;
-import android.os.Build;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.text.TextUtils;
-import android.util.Base64;
-import android.util.TypedValue;
-import android.view.View;
-import com.mogo.module.media.constants.Constants;
-import com.mogo.utils.logger.Logger;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-
-public class BitmapHelper {
- private static final String TAG = "BitmapHelper";
-
- /**
- * 根据原图添加圆角
- *
- * @param source
- * @return
- */
- public static Bitmap createRoundCornerImage(Bitmap source, float corner) {
- final Paint paint = new Paint();
- paint.setAntiAlias(true);
- Bitmap target = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
- Canvas canvas = new Canvas(target);
- RectF rect = new RectF(0, 0, source.getWidth(), source.getHeight());
- canvas.drawRoundRect(rect, corner, corner, paint);
- paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
- canvas.drawBitmap(source, 0, 0, paint);
- return target;
- }
-
- public static byte[] bitmapToBytes(Bitmap bitmap) {
- if (bitmap == null) {
- return null;
- }
-
- ByteArrayOutputStream bos = null;
- byte[] result = null;
-
- try {
- bos = new ByteArrayOutputStream();
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, bos);
- result = bos.toByteArray();
- } catch (Exception e) {
- e.printStackTrace();
- result = null;
- } finally {
- IOUtils.closeSilently(bos);
- }
-
- return result;
- }
-
- /**
- * Use quality compression to compress bitmap's size to be smaller than a max size, and convert it to bytes thereafter.
- * Note that this method will not report compressing ratio related data.
- *
- * @param bitmap data source
- * @param maxSize unit in kb
- * @return bytes after compressing bitmap to a size smaller than a specific max size.
- */
- public static byte[] bitmapToBytes(Bitmap bitmap, int maxSize) {
- final long start = System.currentTimeMillis();
-
- if (bitmap == null) {
- return null;
- }
-
- final int maxSizeOfBytes = maxSize * Constants.ONE_KB;
- ByteArrayOutputStream bos = null;
- byte[] result = null;
-
- try {
- bos = new ByteArrayOutputStream();
- int quality = 100;
- int fullSize = 0;
-
- do {
- bos.reset();
- bitmap.compress(Bitmap.CompressFormat.JPEG, quality, bos);
- if (quality == 100) {
- fullSize = bos.size();
- }
- Logger.i(TAG, "quality<---->size, " + quality + "<---->" + bos.size() / 1024);
- }
- while (bos.size() > maxSizeOfBytes && (quality -= (fullSize > Constants.ONE_MB) ? 10 : 5) >= 0);
-
- result = bos.toByteArray();
-
- final long end = System.currentTimeMillis();
- Logger.i(TAG,
- "bitmap to bytes costs " + (end - start) + "ms, \n" +
- "bitmap full size is " + (fullSize / 1024) + "kb, \n" +
- "bitmap final size is " + (bos.size() / 1024) + "kb, \n" +
- "bitmap quality is " + quality);
- } catch (Exception e) {
- e.printStackTrace();
- result = null;
- } finally {
- IOUtils.closeSilently(bos);
- }
-
- return result;
- }
-
- /**
- * Use quality compression to compress bitmap to be smaller than a specific max size.
- *
- * @param bitmap data source
- * @param maxSize a specific max size which's unit is kb.
- * @return a compressed bitmap smaller than the max size.
- */
- public static void compressBitmap(Bitmap bitmap, int maxSize, final BitmapHelper.OnCompressListener listener) {
- if (bitmap == null || bitmap.isRecycled() || listener == null) {
- return;
- }
- listener.onBeforeCompress();
- ByteArrayOutputStream bos = null;
- Bitmap target = null;
-
- try {
- bos = new ByteArrayOutputStream();
- int quality = 100;
- int step = 5;
- int fullSize = 0;
-
- do {
- bos.reset();
- bitmap.compress(Bitmap.CompressFormat.JPEG, quality, bos);
- if (quality == 100) {
- fullSize = bos.size();
- }
- if (quality <= 10) {
- step = 2;
- }
- }
- while (bos.size() / 1024 > maxSize && (quality -= (fullSize > Constants.ONE_MB) ? 10 : step) > 0);
-
- byte[] result = bos.toByteArray();
- //target = bytesToBitmap(result);
- listener.onCompressSuccess(result);
-
- } catch (Exception e) {
- e.printStackTrace();
-// target = null;
- listener.onCompressFailed("压缩失败");
-
- } finally {
- IOUtils.closeSilently(bos);
- }
-
- return;
- }
-
-
- public static Bitmap compressBitmap(Bitmap bitmap, int maxSize) {
- if (bitmap == null) {
- return null;
- }
-
- ByteArrayOutputStream bos = null;
- Bitmap target = null;
-
- try {
- bos = new ByteArrayOutputStream();
- int quality = 100;
-
- do {
- bos.reset();
- bitmap.compress(Bitmap.CompressFormat.JPEG, quality, bos);
- }
- while (bos.size() / 1024 > maxSize && (quality -= 5) >= 0);
-
- byte[] result = bos.toByteArray();
- target = bytesToBitmap(result);
- } catch (Exception e) {
- e.printStackTrace();
- target = null;
- } finally {
- IOUtils.closeSilently(bos);
- }
-
- return target;
- }
-
- public static byte[] compress(File bitmapFile, int maxSize) {
- if (bitmapFile == null || !bitmapFile.exists()) {
- return null;
- }
-
- Bitmap bitmap = BitmapFactory.decodeFile(bitmapFile.getAbsolutePath());
- int degree = readPictureDegree( bitmapFile.getAbsolutePath() );
- if ( degree != 0 ) {
- Matrix matrix = new Matrix();
- matrix.reset();
- matrix.setRotate( degree );
- bitmap = Bitmap.createBitmap(bitmap,0,0, bitmap.getWidth(), bitmap.getHeight(),matrix, true);
- }
-
- ByteArrayOutputStream bos = null;
- byte[] target = null;
-
- try {
- bos = new ByteArrayOutputStream();
- int quality = 100;
-
- do {
- bos.reset();
- bitmap.compress(Bitmap.CompressFormat.JPEG, quality, bos);
- }
- while (bos.size() / 1024 > maxSize && (quality -= 5) >= 0);
-
- target = bos.toByteArray();
- } catch (Exception e) {
- e.printStackTrace();
- target = null;
- } finally {
- IOUtils.closeSilently(bos);
- }
-
- return target;
- }
-
- /**
- * Decode an immutable bitmap from the specified byte array.
- *
- * @param b byte array of compressed image data
- * @return an immutable bitmap or null in case of exception.
- */
- public static Bitmap bytesToBitmap(byte[] b) {
- if (b != null && b.length != 0) {
- return BitmapFactory.decodeByteArray(b, 0, b.length);
- } else {
- return null;
- }
- }
-
- /**
- * Decode an immutable bitmap from the specified byte array.
- *
- * @param b byte array of compressed image data
- * @param options Options that control downsampling and whether the
- * image should be completely decoded, or just is size returned.
- * @return an immutable bitmap or null in case of exception.
- */
- public static Bitmap bytesToBitmap(byte[] b, BitmapFactory.Options options) {
- if (b.length != 0) {
- return BitmapFactory.decodeByteArray(b, 0, b.length, options);
- } else {
- return null;
- }
- }
-
- /**
- * Get max supported image size which will differ from different devices.
- *
- * @return max size related to the device.
- */
- public static int getMaxSupportedImageSize() {
- int textureLimit = getMaxTextureSize();
- if (textureLimit == 0) {
- return Constants.SIZE_DEFAULT;
- } else {
- return Math.min(textureLimit, Constants.SIZE_LIMIT);
- }
- }
-
- public static int getMaxTextureSize2() {
- // The OpenGL texture size is the maximum size that can be drawn in an ImageView
- int[] maxSize = new int[1];
- GLES10.glGetIntegerv(GLES10.GL_MAX_TEXTURE_SIZE, maxSize, 0);
- return maxSize[0];
- }
-
- /**
- * duplicated from
- */
- public static int computeSampleSize(InputStream is, boolean close) {
- // Just decode image size into options
- BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
-
- try {
- BitmapFactory.decodeStream(is, null, options);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (close) IOUtils.closeSilently(is);
- }
-
- int srcWidth = options.outWidth;
- int srcHeight = options.outHeight;
-
- srcWidth = srcWidth % 2 == 1 ? srcWidth + 1 : srcWidth;
- srcHeight = srcHeight % 2 == 1 ? srcHeight + 1 : srcHeight;
-
- int longSide = Math.max(srcWidth, srcHeight);
- int shortSide = Math.min(srcWidth, srcHeight);
-
- float scale = ((float) shortSide / longSide);
- if (scale <= 1 && scale > 0.5625) {
- if (longSide < 1664) {
- return 1;
- } else if (longSide < 4990) {
- return 2;
- } else if (longSide > 4990 && longSide < 10240) {
- return 4;
- } else {
- return longSide / 1280 == 0 ? 1 : longSide / 1280;
- }
- } else if (scale <= 0.5625 && scale > 0.5) {
- return longSide / 1280 == 0 ? 1 : longSide / 1280;
- } else {
- return (int) Math.ceil(longSide / (1280.0 / scale));
- }
- }
-
-
- /**
- * Decode a bitmap's input stream to find a proper inSampleSize according to device's max supported size.
- *
- * @param is bitmap's data source
- * @param close whether to close input stream after work is done.
- * @return a proper inSampleSize
- */
- public static int findProperInSampleSize(InputStream is, boolean close) {
- // Just decode image size into options
- BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
-
- try {
- BitmapFactory.decodeStream(is, null, options);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (close) IOUtils.closeSilently(is);
- }
-
- int maxSize = getMaxSupportedImageSize();
- int sampleSize = 1;
-
- while (options.outHeight / sampleSize > maxSize || options.outWidth / sampleSize > maxSize) {
- sampleSize = sampleSize << 1;
- }
-
- Logger.i(TAG, "sample size is " + sampleSize);
- return sampleSize;
- }
-
- /**
- * Read a picture's degree from a file.
- *
- * @param file data source of a picture
- * @return degrees range from 0 to 360
- */
- public static int readPictureDegree(File file) {
- return readPictureDegree(file.getAbsolutePath());
- }
-
- /**
- * Read a picture's degree from a file, we use {@link ExifInterface} instead of {@link android.media.ExifInterface}
- * to avoid some unexpected bugs.
- *
- * @param filePath file's absolute path which we can read data source of a picture from.
- * @return degrees range from 0 to 360
- */
- public static int readPictureDegree(String filePath) {
- int degree = 0;
-
- try {
- ExifInterface exifInterface = new ExifInterface(filePath);
- int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
- switch (orientation) {
- case ExifInterface.ORIENTATION_ROTATE_90:
- degree = 90;
- break;
- case ExifInterface.ORIENTATION_ROTATE_180:
- degree = 180;
- break;
- case ExifInterface.ORIENTATION_ROTATE_270:
- degree = 270;
- break;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- Logger.i(TAG, "ExifInterface, degree is " + degree);
-
- return degree;
- }
-
- /**
- * Rotate an bitmap to a specific angle.
- *
- * @param angle target angle
- * @param bitmap data source
- * @return Returns an immutable bitmap from subset of the source bitmap,
- * transformed by the optional matrix. The new bitmap may be the
- * same object as source, or a copy may have been made. It is
- * initialized with the same density as the original bitmap.
- *
- * If the source bitmap is immutable and the requested subset is the
- * same as the source bitmap itself, then the source bitmap is
- * returned and no new bitmap is created.
- */
- public static Bitmap rotateBitmap(int angle, Bitmap bitmap) {
- if (bitmap == null) {
- return null;
- }
-
- try {
- int width = bitmap.getWidth();
- int height = bitmap.getHeight();
- Matrix matrix = new Matrix();
- matrix.preRotate(angle);
- return Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true);
- } catch (Exception e) {
- e.printStackTrace();
- return bitmap;
- }
- }
-
- /**
- * Get picture's absolute path according to its uri.
- *
- * @param context context
- * @param uri picture's uri
- * @return absolute path of uri.
- */
- public static String getRealPathFromUri(Context context, Uri uri) {
- int sdkVersion = Build.VERSION.SDK_INT;
- if (sdkVersion >= 19) {
- return getRealPathFromUriAboveApi19(context, uri);
- } else {
- return getRealPathFromUriBelowAPI19(context, uri);
- }
- }
-
- /**
- * Create a default {@link BitmapFactory.Options} .
- * Note this options use rgb_565 and a proper inSampleSize in order to save memory.
- *
- * @param is data source of picture
- * @param close whether to close data source
- * @return options containing rgb_565 config and a proper inSampleSize.
- */
- public static BitmapFactory.Options newDefaultOptions(InputStream is, boolean close) {
- final BitmapFactory.Options options = new BitmapFactory.Options();
- options.inPreferredConfig = Bitmap.Config.RGB_565;
- options.inSampleSize = BitmapHelper.findProperInSampleSize(is, close);
-
- return options;
- }
-
- /**
- * Save picture to local file.
- *
- * @param bitmap data source
- * @param file local file to store picture.
- */
- public static void savePicture(Bitmap bitmap, File file) {
- final long start = System.currentTimeMillis();
-
- if (bitmap == null || file == null) {
- Logger.i(TAG, "保存失败, bitmap or file is null.");
- return;
- }
- if (file.getParentFile() != null && !file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
-
- try {
- final FileOutputStream fos = new FileOutputStream(file);
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
- fos.flush();
- fos.close();
-
- if (file.exists()) {
- Logger.i(TAG, "保存成功");
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- Logger.i(TAG, "saving picture costs " + (System.currentTimeMillis() - start) + "ms");
- }
-
- /**
- * 适配api19以下(不包括api19),根据uri获取图片的绝对路径
- *
- * @param context 上下文对象
- * @param uri 图片的Uri
- * @return 如果Uri对应的图片存在, 那么返回该图片的绝对路径, 否则返回null
- */
- private static String getRealPathFromUriBelowAPI19(Context context, Uri uri) {
- return getDataColumn(context, uri, null, null);
- }
-
- /**
- * 适配api19及以上,根据uri获取图片的绝对路径
- *
- * @param context 上下文对象
- * @param uri 图片的Uri
- * @return 如果Uri对应的图片存在, 那么返回该图片的绝对路径, 否则返回null
- */
- @SuppressLint("NewApi")
- private static String getRealPathFromUriAboveApi19(Context context, Uri uri) {
- String filePath = null;
-
- try {
- // 如果是document类型的 uri, 则通过document id来进行处理
- if (DocumentsContract.isDocumentUri(context, uri)) {
- String documentId = DocumentsContract.getDocumentId(uri);
- if (isMediaDocument(uri)) {
- // 使用':'分割
- String id = documentId.split(":")[1];
- String selection = MediaStore.Images.Media._ID + "=?";
- String[] selectionArgs = {id};
- filePath = getDataColumn(context, MediaStore.Images.Media.EXTERNAL_CONTENT_URI, selection, selectionArgs);
- } else if (isDownloadsDocument(uri)) {
- Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(documentId));
- filePath = getDataColumn(context, contentUri, null, null);
- }
- } else if ("content".equalsIgnoreCase(uri.getScheme())) {
- filePath = getDataColumn(context, uri, null, null);
- } else if ("file".equals(uri.getScheme())) {
- filePath = uri.getPath();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return filePath;
- }
-
- /**
- * 获取数据库表中的 _data 列，即返回Uri对应的文件路径
- */
- private static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
- String path = null;
- String[] projection = new String[]{MediaStore.Images.Media.DATA};
- Cursor cursor = null;
-
- try {
- cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
-
- if (cursor != null && cursor.moveToFirst()) {
- int columnIndex = cursor.getColumnIndexOrThrow(projection[0]);
- path = cursor.getString(columnIndex);
- }
- } catch (Exception e) {
- if (cursor != null) {
- cursor.close();
- cursor = null;
- }
- } finally {
- if (cursor != null) {
- cursor.close();
- cursor = null;
- }
- }
-
- return path;
- }
-
- /**
- * @param uri the Uri to check
- * @return Whether the Uri authority is MediaProvider
- */
- private static boolean isMediaDocument(Uri uri) {
- return "com.android.providers.media.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri the Uri to check
- * @return Whether the Uri authority is DownloadsProvider
- */
- private static boolean isDownloadsDocument(Uri uri) {
- return "com.android.providers.downloads.documents".equals(uri.getAuthority());
- }
-
- public static int getMaxTextureSize() {
- try {
- // Safe minimum default size
- final int IMAGE_MAX_BITMAP_DIMENSION = Constants.SIZE_DEFAULT;
-
- // Get EGL Display
- EGL10 egl = (EGL10) EGLContext.getEGL();
- EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-
- // Initialise
- int[] version = new int[2];
- egl.eglInitialize(display, version);
-
- // Query total number of configurations
- int[] totalConfigurations = new int[1];
- egl.eglGetConfigs(display, null, 0, totalConfigurations);
-
- // Query actual list configurations
- EGLConfig[] configurationsList = new EGLConfig[totalConfigurations[0]];
- egl.eglGetConfigs(display, configurationsList, totalConfigurations[0], totalConfigurations);
-
- int[] textureSize = new int[1];
- int maximumTextureSize = 0;
-
- // Iterate through all the configurations to located the maximum texture size
- for (int i = 0; i < totalConfigurations[0]; i++) {
- // Only need to check for width since opengl textures are always squared
- egl.eglGetConfigAttrib(display, configurationsList[i], EGL10.EGL_MAX_PBUFFER_WIDTH, textureSize);
-
- // Keep trackCustomEvent of the maximum texture size
- if (maximumTextureSize < textureSize[0])
- maximumTextureSize = textureSize[0];
- }
-
- // Release
- egl.eglTerminate(display);
-
- // Return largest texture size found, or default
- return Math.max(maximumTextureSize, IMAGE_MAX_BITMAP_DIMENSION);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return 0;
- }
-
- /**
- * 如需二次计算,请用 {@link #dip2pxF}
- */
- private static int dip2px(Context context, float dp) {
- return (int) (convertUnitToPixel(context, TypedValue.COMPLEX_UNIT_DIP, dp) + 0.5f);
- }
-
- /**
- * dip2px的返回float版
- *
- * @see #dip2px
- */
- private static float dip2pxF(Context context, float dp) {
- return convertUnitToPixel(context, TypedValue.COMPLEX_UNIT_DIP, dp);
- }
-
- private static float px2dip(Context context, float px) {
- final float scale = context.getResources().getDisplayMetrics().density;
- return px / scale;
- }
-
- private static int px(Context context, float dp) {
- return (int) (dip2px(context, dp) + 0.5f);
- }
-
- private static float convertUnitToPixel(Context context, int unit, float in) {
- return TypedValue.applyDimension(unit, in, context.getResources().getDisplayMetrics());
- }
-
- private static int getScreenWidth(Context context) {
- if (context == null) {
- return 0;
- }
- return context.getResources().getDisplayMetrics().widthPixels;
- }
-
- private static int getScreenHeight(Context context) {
- if (context == null) {
- return 0;
- }
- return context.getResources().getDisplayMetrics().heightPixels;
- }
-
- public static String bitmapToBase64(Bitmap bitmap) {
- String result = null;
- try {
- if (bitmap != null) {
- result = Base64.encodeToString(bitmapToBytes(bitmap), Base64.DEFAULT);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return result;
- }
-
- public static String bitmapArrayToBase64(byte[] data) {
- String result = null;
- try {
- if (data != null) {
- result = Base64.encodeToString(data, Base64.DEFAULT);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return result;
- }
-
- public static Bitmap base64ToBitmap(String base64Data) {
- byte[] bytes = Base64.decode(base64Data, Base64.DEFAULT);
- return BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
- }
-
- /**
- * 在系统返回的intent中获取图片信息，并转化为uri
- *
- * @param data
- * @return
- */
- public static Uri convertUri(Context context, Intent data) {
- if (data == null || data.getData() == null) {
- return null;
- }
- Uri localUri = data.getData();
- String scheme = localUri.getScheme();
- String imagePath = "";
- if ("content".equals(scheme)) {
- String[] filePathColumns = {MediaStore.Images.Media.DATA};
- Cursor c = context.getContentResolver().query(localUri, filePathColumns, null, null, null);
- if (c != null) {
- try {
- c.moveToFirst();
- int columnIndex = c.getColumnIndex(filePathColumns[0]);
- imagePath = c.getString(columnIndex);
- c.close();
- } catch (Exception e) {
- e.printStackTrace();
- c.close();
- imagePath = "";
- }
- }
- } else if ("file".equals(scheme)) {//小米4选择云相册中的图片是根据此方法获得路径
- imagePath = localUri.getPath();
- }
- if (TextUtils.isEmpty(imagePath)) {
- return localUri;
- }
- Uri uri = Uri.fromFile(new File(imagePath));
- return uri != null ? uri : localUri;
- }
-
- public static Bitmap colorToBitmap(Context context,int colorResId) {// drawable 转换成bitmap
- Bitmap.Config config = Bitmap.Config.ARGB_8888;// 取drawable的颜色格式
- Bitmap bitmap = Bitmap.createBitmap(1, 1, config);// 建立对应bitmap
- bitmap.eraseColor(context.getResources().getColor(colorResId));
- return bitmap;
- }
-
- public static String getAlphaHexValue(float alpha) {
- String color = Integer.toHexString((int) alpha * 255);
- return TextUtils.isEmpty(color) ? color : color.toUpperCase();
- }
-
- /**
- * 抓取本地视频缩略图（操作可能耗时，尽量异步进行）
- *
- * @param filePath
- * @return
- */
- public static Bitmap getVideoThumbnail(String filePath) {
- Bitmap b = null;
- MediaMetadataRetriever retriever = new MediaMetadataRetriever();
- try {
- retriever.setDataSource(filePath);
- b = retriever.getFrameAtTime();
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (RuntimeException e) {
- e.printStackTrace();
-
- } finally {
- try {
- retriever.release();
- } catch (RuntimeException e) {
- e.printStackTrace();
- }
- }
- return b;
- }
-
- public static BitmapFactory.Options getBitmapOptions(String path) {
- BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
- BitmapFactory.decodeFile(path, options);
- return options;
- }
-
- public static int calculateInSampleSize(BitmapFactory.Options options, int targetWidth, int targetHeight) {
- int height = options.outHeight;
- int width = options.outWidth;
- int size = 1;
- if (height > targetHeight || width > targetWidth) {
- int scaleHeight = Math.round((float) height / (float) targetHeight);
- int scaleWidth = Math.round((float) width / (float) targetWidth);
- size = scaleHeight > scaleWidth ? scaleHeight : scaleWidth;
- }
-
- return size;
- }
-
- public static Bitmap decodeScaleImage(String path, int targetWidth, int targetHeight) {
- BitmapFactory.Options options = getBitmapOptions(path);
- options.inSampleSize = calculateInSampleSize(options, targetWidth, targetHeight);
- options.inJustDecodeBounds = false;
- Bitmap bitmap = BitmapFactory.decodeFile(path, options);
- int degree = readPictureDegree(path);
- Bitmap rotateBitmap;
- if (bitmap != null && degree != 0) {
- rotateBitmap = rotateBitmap(degree, bitmap);
- bitmap.recycle();
- return rotateBitmap;
- } else {
- return bitmap;
- }
- }
-
- public static Bitmap getImage(String fileName) {
-
- FileInputStream stream = null;
- try {
- stream = new FileInputStream(fileName);
- FileDescriptor fd = stream.getFD();
- BitmapFactory.Options options = new BitmapFactory.Options();
- options.inSampleSize = 1;
- options.inJustDecodeBounds = true;
- BitmapFactory.decodeFileDescriptor(fd, null, options);
- if (options.mCancel || options.outWidth == -1
- || options.outHeight == -1) {
- return null;
- }
-
- // 1.换算合适的图片缩放值，以减少对JVM太多的内存请求。
- options.inSampleSize = calculateInSampleSize(options, options.outWidth,
- options.outHeight);
- options.inJustDecodeBounds = false;
-
- options.inDither = false;
- options.inPreferredConfig = Bitmap.Config.ARGB_8888;
-
- // 2. inPurgeable 设定为 true，可以让java系统, 在内存不足时先行回收部分的内存
- options.inPurgeable = true;
- // 与inPurgeable 一起使用
- options.inInputShareable = true;
-
- try {
- // 4. inNativeAlloc 属性设置为true，可以不把使用的内存算到VM里
- BitmapFactory.Options.class.getField("inNativeAlloc")
- .setBoolean(options, true);
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
- }
- // 5. 使用decodeStream 解码，则利用NDK层中，利用nativeDecodeAsset（）
- // 进行解码，不用CreateBitmap
- return BitmapFactory.decodeStream(stream, null, options);
-
- } catch (IOException ex) {
- Logger.e(TAG, "", ex);
- } catch (OutOfMemoryError oom) {
- Logger.e(TAG, "Unable to decode file " + fileName
- + ". OutOfMemoryError.", oom);
- } finally {
- try {
- if (stream != null) {
- stream.close();
- }
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
-
- return null;
- }
-
-
- public static Bitmap convertViewToBitmap(View view) {
- view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
- View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
- view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
-
- Bitmap bitmap = Bitmap.createBitmap(view.getMeasuredWidth(), view.getMeasuredHeight(), Bitmap.Config.ARGB_8888);
- Canvas c = new Canvas(bitmap);
- c.drawColor(Color.WHITE);
- view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
- view.draw(c);
- return bitmap;
- }
-
- public static boolean checkBitmapIsLegal(Bitmap bitmap) {
- return bitmap != null && bitmap.getByteCount() > 0 && bitmap.getWidth() > 0 && bitmap.getHeight() > 0;
- }
-
- public static File saveToTempFile(Context context,byte[] bytes) {
- if (bytes == null || bytes.length <= 0) {
- return null;
- }
- String compressPath = FileUtils.getCachePath(context);
- String md5 = Md5Utils.hexdigest(bytes);
- File tempFile = new File(compressPath, md5 + ".temp");
-
- if (!tempFile.exists()) {
- tempFile.getParentFile().mkdirs();
- } else if (tempFile.length() > 0) {
- return tempFile;
- }
- FileOutputStream fileOutputStream = null;
- try {
- fileOutputStream = new FileOutputStream(tempFile);
- fileOutputStream.write(bytes);
- fileOutputStream.flush();
- fileOutputStream.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- return tempFile;
- }
-
- /**
- * convert px to its equivalent sp
- *
- * 将px转换为sp
- */
- private static int px2sp(Context context, float pxValue) {
- final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
- return (int) (pxValue / fontScale + 0.5f);
- }
-
-
- /**
- * convert sp to its equivalent px
- *
- * 将sp转换为px
- */
- public static int sp2px(Context context, float spValue) {
- final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
- return (int) (spValue * fontScale + 0.5f);
- }
-
- public interface OnCompressListener {
-
- void onCompressSuccess( byte[] data );
-
- void onCompressFailed( String msg );
-
- void onBeforeCompress();
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BlurImageUtils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BlurImageUtils.java
deleted file mode 100644
index 8463ae5299..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/BlurImageUtils.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.renderscript.Allocation;
-import android.renderscript.Element;
-import android.renderscript.RenderScript;
-import android.renderscript.ScriptIntrinsicBlur;
-
-public class BlurImageUtils {
- public static Bitmap rsBlur(Context context, Bitmap source, int radius){
-
- Bitmap inputBmp = source;
- RenderScript renderScript = RenderScript.create(context);
-
- // Allocate memory for Renderscript to work with
- final Allocation input = Allocation.createFromBitmap(renderScript,inputBmp);
- final Allocation output = Allocation.createTyped(renderScript,input.getType());
- // Load up an instance of the specific script that we want to use.
- ScriptIntrinsicBlur scriptIntrinsicBlur = ScriptIntrinsicBlur.create(renderScript, Element.U8_4(renderScript));
- scriptIntrinsicBlur.setInput(input);
- // Set the blur radius
- scriptIntrinsicBlur.setRadius(radius);
- // Start the ScriptIntrinisicBlur
- scriptIntrinsicBlur.forEach(output);
- // Copy the output to the blurred bitmap
- output.copyTo(inputBmp);
- renderScript.destroy();
-
- return inputBmp;
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/FastBlurUtil.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/FastBlurUtil.java
deleted file mode 100644
index 5de68b6240..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/FastBlurUtil.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-/**
- * Created by jay on 11/7/15.
- */
-public class FastBlurUtil {
- /**
- * 根据imagepath获取bitmap
- */
- /**
- * 得到本地或者网络上的bitmap url - 网络或者本地图片的绝对路径,比如:
- * A.网络路径: url="http://blog.foreverlove.us/girl2.png" ;
- * B.本地路径:url="file://mnt/sdcard/photo/image.png";
- * C.支持的图片格式 ,png, jpg,bmp,gif等等
- * @param url
- * @return
- */
- public static int IO_BUFFER_SIZE = 2 * 1024;
-
- public static Bitmap GetUrlBitmap(String url, int scaleRatio) {
-
- int blurRadius = 8;//通常设置为8就行。
- if (scaleRatio <= 0) {
- scaleRatio = 10;
- }
-
-
- Bitmap originBitmap = null;
- InputStream in = null;
- BufferedOutputStream out = null;
- try {
- in = new BufferedInputStream(new URL(url).openStream(), IO_BUFFER_SIZE);
- final ByteArrayOutputStream dataStream = new ByteArrayOutputStream();
- out = new BufferedOutputStream(dataStream, IO_BUFFER_SIZE);
- copy(in, out);
- out.flush();
- byte[] data = dataStream.toByteArray();
- originBitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
-
- Bitmap scaledBitmap = Bitmap.createScaledBitmap(originBitmap,
- originBitmap.getWidth() / scaleRatio,
- originBitmap.getHeight() / scaleRatio,
- false);
- Bitmap blurBitmap = doBlur(scaledBitmap, blurRadius, true);
- return blurBitmap;
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- private static void copy(InputStream in, OutputStream out)
- throws IOException {
- byte[] b = new byte[IO_BUFFER_SIZE];
- int read;
- while ((read = in.read(b)) != -1) {
- out.write(b, 0, read);
- }
- }
-
-
- // 把本地图片毛玻璃化
- public static Bitmap toBlur(Bitmap originBitmap, int scaleRatio) {
- // int scaleRatio = 10;
- // 增大scaleRatio缩放比，使用一样更小的bitmap去虚化可以到更好的得模糊效果，而且有利于占用内存的减小；
- int blurRadius = 6;//通常设置为8就行。
- //增大blurRadius，可以得到更高程度的虚化，不过会导致CPU更加intensive
-
- /* 其中前三个参数很明显，其中宽高我们可以选择为原图尺寸的1/10；
- 第四个filter是指缩放的效果，filter为true则会得到一个边缘平滑的bitmap，
- 反之，则会得到边缘锯齿、pixelrelated的bitmap。
- 这里我们要对缩放的图片进行虚化，所以无所谓边缘效果，filter=false。*/
- if (scaleRatio <= 0) {
- scaleRatio = 10;
- }
- Bitmap scaledBitmap = Bitmap.createScaledBitmap(originBitmap,
- originBitmap.getWidth() / scaleRatio,
- originBitmap.getHeight() / scaleRatio,
- false);
- Bitmap blurBitmap = doBlur(scaledBitmap, blurRadius, true);
- return blurBitmap;
- }
-
- public static Bitmap doBlur(Bitmap sentBitmap, int radius, boolean canReuseInBitmap) {
-
- // Stack Blur v1.0 from
- // http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html
- //
- // Java Author: Mario Klingemann
- // http://incubator.quasimondo.com
- // created Feburary 29, 2004
- // Android port : Yahel Bouaziz
- // http://www.kayenko.com
- // ported april 5th, 2012
-
- // This is a compromise between Gaussian Blur and Box blur
- // It creates much better looking blurs than Box Blur, but is
- // 7x faster than my Gaussian Blur implementation.
- //
- // I called it Stack Blur because this describes best how this
- // filter works internally: it creates a kind of moving stack
- // of colors whilst scanning through the image. Thereby it
- // just has to add one new block of color to the right side
- // of the stack and remove the leftmost color. The remaining
- // colors on the topmost layer of the stack are either added on
- // or reduced by one, depending on if they are on the right or
- // on the left side of the stack.
- //
- // If you are using this algorithm in your code please add
- // the following line:
- //
- // Stack Blur Algorithm by Mario Klingemann
-
- Bitmap bitmap;
- if (canReuseInBitmap) {
- bitmap = sentBitmap;
- } else {
- bitmap = sentBitmap.copy(sentBitmap.getConfig(), true);
- }
-
- if (radius < 1) {
- return (null);
- }
-
- int w = bitmap.getWidth();
- int h = bitmap.getHeight();
-
- int[] pix = new int[w * h];
- bitmap.getPixels(pix, 0, w, 0, 0, w, h);
-
- int wm = w - 1;
- int hm = h - 1;
- int wh = w * h;
- int div = radius + radius + 1;
-
- int r[] = new int[wh];
- int g[] = new int[wh];
- int b[] = new int[wh];
- int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
- int vmin[] = new int[Math.max(w, h)];
-
- int divsum = (div + 1) >> 1;
- divsum *= divsum;
- int dv[] = new int[256 * divsum];
- for (i = 0; i < 256 * divsum; i++) {
- dv[i] = (i / divsum);
- }
-
- yw = yi = 0;
-
- int[][] stack = new int[div][3];
- int stackpointer;
- int stackstart;
- int[] sir;
- int rbs;
- int r1 = radius + 1;
- int routsum, goutsum, boutsum;
- int rinsum, ginsum, binsum;
-
- for (y = 0; y < h; y++) {
- rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
- for (i = -radius; i <= radius; i++) {
- p = pix[yi + Math.min(wm, Math.max(i, 0))];
- sir = stack[i + radius];
- sir[0] = (p & 0xff0000) >> 16;
- sir[1] = (p & 0x00ff00) >> 8;
- sir[2] = (p & 0x0000ff);
- rbs = r1 - Math.abs(i);
- rsum += sir[0] * rbs;
- gsum += sir[1] * rbs;
- bsum += sir[2] * rbs;
- if (i > 0) {
- rinsum += sir[0];
- ginsum += sir[1];
- binsum += sir[2];
- } else {
- routsum += sir[0];
- goutsum += sir[1];
- boutsum += sir[2];
- }
- }
- stackpointer = radius;
-
- for (x = 0; x < w; x++) {
-
- r[yi] = dv[rsum];
- g[yi] = dv[gsum];
- b[yi] = dv[bsum];
-
- rsum -= routsum;
- gsum -= goutsum;
- bsum -= boutsum;
-
- stackstart = stackpointer - radius + div;
- sir = stack[stackstart % div];
-
- routsum -= sir[0];
- goutsum -= sir[1];
- boutsum -= sir[2];
-
- if (y == 0) {
- vmin[x] = Math.min(x + radius + 1, wm);
- }
- p = pix[yw + vmin[x]];
-
- sir[0] = (p & 0xff0000) >> 16;
- sir[1] = (p & 0x00ff00) >> 8;
- sir[2] = (p & 0x0000ff);
-
- rinsum += sir[0];
- ginsum += sir[1];
- binsum += sir[2];
-
- rsum += rinsum;
- gsum += ginsum;
- bsum += binsum;
-
- stackpointer = (stackpointer + 1) % div;
- sir = stack[(stackpointer) % div];
-
- routsum += sir[0];
- goutsum += sir[1];
- boutsum += sir[2];
-
- rinsum -= sir[0];
- ginsum -= sir[1];
- binsum -= sir[2];
-
- yi++;
- }
- yw += w;
- }
- for (x = 0; x < w; x++) {
- rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
- yp = -radius * w;
- for (i = -radius; i <= radius; i++) {
- yi = Math.max(0, yp) + x;
-
- sir = stack[i + radius];
-
- sir[0] = r[yi];
- sir[1] = g[yi];
- sir[2] = b[yi];
-
- rbs = r1 - Math.abs(i);
-
- rsum += r[yi] * rbs;
- gsum += g[yi] * rbs;
- bsum += b[yi] * rbs;
-
- if (i > 0) {
- rinsum += sir[0];
- ginsum += sir[1];
- binsum += sir[2];
- } else {
- routsum += sir[0];
- goutsum += sir[1];
- boutsum += sir[2];
- }
-
- if (i < hm) {
- yp += w;
- }
- }
- yi = x;
- stackpointer = radius;
- for (y = 0; y < h; y++) {
- // Preserve alpha channel: ( 0xff000000 & pix[yi] )
- pix[yi] = (0xff000000 & pix[yi]) | (dv[rsum] << 16) | (dv[gsum] << 8) | dv[bsum];
-
- rsum -= routsum;
- gsum -= goutsum;
- bsum -= boutsum;
-
- stackstart = stackpointer - radius + div;
- sir = stack[stackstart % div];
-
- routsum -= sir[0];
- goutsum -= sir[1];
- boutsum -= sir[2];
-
- if (x == 0) {
- vmin[y] = Math.min(y + r1, hm) * w;
- }
- p = x + vmin[y];
-
- sir[0] = r[p];
- sir[1] = g[p];
- sir[2] = b[p];
-
- rinsum += sir[0];
- ginsum += sir[1];
- binsum += sir[2];
-
- rsum += rinsum;
- gsum += ginsum;
- bsum += binsum;
-
- stackpointer = (stackpointer + 1) % div;
- sir = stack[stackpointer];
-
- routsum += sir[0];
- goutsum += sir[1];
- boutsum += sir[2];
-
- rinsum -= sir[0];
- ginsum -= sir[1];
- binsum -= sir[2];
-
- yi += w;
- }
- }
-
- bitmap.setPixels(pix, 0, w, 0, 0, w, h);
-
- return (bitmap);
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/FileUtils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/FileUtils.java
deleted file mode 100644
index 8a06848283..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/FileUtils.java
+++ /dev/null
@@ -1,474 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.util.Base64;
-
-import androidx.annotation.IntRange;
-import androidx.core.content.FileProvider;
-
-import com.mogo.module.media.constants.Constants;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.text.DecimalFormat;
-import java.util.Arrays;
-
-public class FileUtils {
- private static final String[] IMAGE_SUPPORT_EXTS = {"png", "jpg", "jpeg", "bmp"};
- private static final String[] VIDEO_SUPPORT_EXTS = {"mp4"};
-
- public static String fileToBase64(File file) {
- String base64 = null;
- InputStream in = null;
- try {
- in = new FileInputStream(file);
- byte[] bytes = new byte[in.available()];
- int length = in.read(bytes);
- base64 = Base64.encodeToString(bytes, 0, length, Base64.DEFAULT);
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- IOUtils.closeSilently(in);
- }
- return base64;
- }
-
-
- /**
- * 创建一个用于拍照图片输出路径的Uri (FileProvider)
- */
- public static Uri getUriForFile(Context context, File file) {
- return FileProvider.getUriForFile(context, getFileProviderName(context), file);
- }
-
- public static String getFileProviderName(Context context) {
- return context.getPackageName() + ".fileprovider";
- }
-
- /**
- * 把Uri 解析出文件绝对路径
- */
- public static String parseOwnUri(Context context, Uri uri) {
- if (uri == null || uri.getPath() == null) return null;
- String path;
- if (TextUtils.equals(uri.getAuthority(), getFileProviderName(context))) {
- path = new File(uri.getPath()).getAbsolutePath();
- } else {
- path = uri.getPath();
- }
- return path;
- }
-
- public static void copy(final String from, final String to, final FileCopyListener listener) {
-
- new Thread(new Runnable() {
- @Override
- public void run() {
-
- File file = null;
- try {
- file = new File(from);
- } catch (Exception e) {
- if (listener != null) {
- listener.onFail(e);
- }
- return;
- }
- if (!file.isFile()) {
- if (listener != null) {
- listener.onFail(new Exception(String.format("%s is not a file", from)));
- return;
- }
- }
- if (!file.exists()) {
- if (listener != null) {
- listener.onFail(new FileNotFoundException(String.format("%s is not exists.", from)));
- return;
- }
- }
-
- if (listener != null) {
- listener.onStart();
- }
-
- long fileSize = file.length();
- long process = 0;
-
- try {
- FileInputStream fis = new FileInputStream(file);
-
- byte[] buff = new byte[1024];
- int rc = 0;
-
- File toFile = new File(to);
- if (!toFile.getParentFile().exists()) {
- toFile.getParentFile().mkdirs();
- }
-
- FileOutputStream fos = new FileOutputStream(toFile);
-
- while ((rc = fis.read(buff, 0, 1024)) > 0) {
- process += rc;
- fos.write(buff, 0, rc);
- if (listener != null) {
- listener.onProcess(((int) (((float) process) * 100 / fileSize)));
- }
- }
-
- fos.flush();
- fos.close();
- fis.close();
-
- } catch (Exception e) {
- if (listener != null) {
- listener.onFail(e);
- return;
- }
- }
-
- if (listener != null) {
- listener.onFinish(to);
- }
- }
- }).start();
- }
-
- public static void copy(final InputStream is, final String to, final FileCopyListener listener) {
-
- new Thread(new Runnable() {
- @Override
- public void run() {
-
- if (listener != null) {
- listener.onStart();
- }
-
- try {
-
- long fileSize = is.available();
- long process = 0;
-
- byte[] buff = new byte[1024];
- int rc = 0;
-
- File toFile = new File(to);
- if (!toFile.getParentFile().exists()) {
- toFile.getParentFile().mkdirs();
- }
-
- FileOutputStream fos = new FileOutputStream(toFile);
-
- while ((rc = is.read(buff, 0, 1024)) > 0) {
- process += rc;
- fos.write(buff, 0, rc);
- if (listener != null) {
- listener.onProcess(((int) (((float) process) * 100 / fileSize)));
- }
- }
-
- fos.flush();
- fos.close();
- is.close();
-
- } catch (Exception e) {
- if (listener != null) {
- listener.onFail(e);
- return;
- }
- }
-
- if (listener != null) {
- listener.onFinish(to);
- }
- }
- }).start();
- }
-
- public interface FileCopyListener {
- void onStart();
-
- void onFail(Exception e);
-
- void onProcess(@IntRange(from = 0, to = 100) int process);
-
- void onFinish(String toPath);
- }
-
- public static void createPath(String file) {
- File f = new File(file);
- if (f.exists()) {
- return;
- }
- if (!f.getParentFile().exists()) {
- f.getParentFile().mkdirs();
- }
- }
-
- public static byte[] read(String file) {
-
- File f = new File(file);
- if (!f.exists() || f.length() == 0) {
- return null;
- }
-
- try {
- FileInputStream fis = new FileInputStream(f);
- byte[] buffer = new byte[((int) f.length())];
- fis.read(buffer);
- IOUtils.closeSilently(fis);
- return buffer;
- } catch (Exception e) {
- return null;
- }
- }
-
- public static String toBase64(byte[] buffer) {
- if (buffer == null || buffer.length == 0) {
- return null;
- }
- try {
- return Base64.encodeToString(buffer, Base64.DEFAULT);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * 获取不带扩展名的文件名
- *
- * @param filePath
- * @return
- */
- public static String getFileNameNoEx(String filePath) {
- try {
- if ((filePath != null) && (filePath.length() > 0)) {
- int index = filePath.lastIndexOf("/") + 1;
- int dot = filePath.lastIndexOf(".");
- if ((dot > -1) && (dot < (filePath.length()))) {
- if (index != -1 && index < filePath.length()) {
- return filePath.substring(index, dot);
- }
- }
- }
- return filePath;
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return filePath;
- }
-
- public static boolean isVideo(String path) {
- String extName = FileUtils.getExtensionName(path);
- if (TextUtils.isEmpty(extName)) {
- return false;
- }
- return Arrays.asList(VIDEO_SUPPORT_EXTS).contains(extName.toLowerCase());
- }
-
- public static boolean isImage(String filePath) {
- String extName = FileUtils.getExtensionName(filePath);
- if (TextUtils.isEmpty(extName)) {
- return false;
- }
- return Arrays.asList(IMAGE_SUPPORT_EXTS).contains(extName.toLowerCase());
- }
-
- public static boolean isExist(String path) {
- if (TextUtils.isEmpty(path)) {
- return false;
- }
- try {
- File file = new File(path);
- return file.exists() && file.isFile() && getFileSize(path) != 0;
- } catch (Exception e) {
- return false;
- }
-
- }
-
- public static boolean isExist(File file) {
- if (file == null) {
- return false;
- }
- try {
- return file.exists();
- } catch (Exception e) {
- return false;
- }
-
- }
-
- public static boolean deleteFile(String path) {
- try {
- if (TextUtils.isEmpty(path)) {
- return false;
- }
- File file = new File(path);
- if (file.exists()) {
- return file.delete();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- public static long getFileSize(String path) {
- if (TextUtils.isEmpty(path)) {
- return 0;
- }
- try {
- return new File(path).length();
- } catch (Exception e) {
- e.printStackTrace();
- }
- return 0;
- }
-
- public static Uri getFileProviderUri(Context context, File file) {
- Uri data;
- // 判断版本大于等于7.0
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- data = FileProvider.getUriForFile(context, context.getPackageName() + ".fileprovider", file);
- } else {
- data = Uri.fromFile(file);
- }
- return data;
- }
-
- public static void saveBitmapToCache(Bitmap bitmap, String path, OnBitmapToLocalListener onBitmapToLocalListener) {
- File file = new File(path);
- if (!file.exists()) {
- file.getParentFile().mkdirs();
- }
- FileOutputStream fileOutputStream = null;
- try {
- fileOutputStream = new FileOutputStream(path);
- bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fileOutputStream);
- fileOutputStream.close();
- if (onBitmapToLocalListener != null) {
- onBitmapToLocalListener.saveSuccess(path);
- }
- } catch (Exception e) {
- if (onBitmapToLocalListener != null) {
- onBitmapToLocalListener.saveFailed();
- }
- e.printStackTrace();
- }
- }
-
- public static File getDiskCacheDir(Context context, String uniqueName) {
- String cachePath;
- if (Environment.MEDIA_MOUNTED.equals(Environment
- .getExternalStorageState()) && context.getExternalCacheDir() != null) {
- cachePath = context.getExternalCacheDir().getPath();
- } else {
- cachePath = context.getCacheDir().getPath();
- }
- return new File(cachePath + File.separator + uniqueName);
- }
-
- public static String getCachePath(Context context) {
- File targetFile = getDiskCacheDir(context, Constants.IMAGE_COMPRESS_PATH);
- if (!targetFile.exists()) {
- targetFile.mkdirs();
- }
- return targetFile.getAbsolutePath();
- }
-
- public static String formatFileSize(long size) {
- DecimalFormat formatter = new DecimalFormat("####.00");
- if (size < 1024) {
- return size + "B";
- } else if (size < 1024 * 1024L) {
- float kbSize = size / 1024f;
- return formatter.format(kbSize) + "KB";
- } else if (size < 1024 * 1024 * 1024L) {
- float mbSize = size / 1024f / 1024f;
- return formatter.format(mbSize) + "MB";
- } else if (size < 1024 * 1024 * 1024 * 1024L) {
- float gbSize = size / 1024f / 1024f / 1024f;
- return formatter.format(gbSize) + "GB";
- } else {
- return "0KB";
- }
- }
-
- public static String getFileWithEx(String filePath) {
- if (TextUtils.isEmpty(filePath)) {
- return "";
- }
- int index = filePath.lastIndexOf("/");
- try {
- return filePath.substring(index + 1, filePath.length());
- } catch (Exception e) {
- e.printStackTrace();
- }
- return "";
- }
-
- public static void writeToFile(String content, String logPath) {
-
- if (TextUtils.isEmpty(logPath)) {
- return;
- }
-
- String fileName = logPath + "/location.txt";//log日志名，使用时间命名，保证不重复
- //如果父路径不存在
- File file = new File(logPath);
- if (!file.exists()) {
- file.mkdirs();//创建父路径
- }
-
- FileOutputStream fos;//FileOutputStream会自动调用底层的close()方法，不用关闭
- BufferedWriter bw = null;
- try {
- fos = new FileOutputStream(fileName, true);//这里的第二个参数代表追加还是覆盖，true为追加，flase为覆盖
- bw = new BufferedWriter(new OutputStreamWriter(fos));
- bw.write(content + "\n");
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- if (bw != null) {
- bw.close();//关闭缓冲流
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- }
-
- /**
- * 获取文件扩展名
- *
- * @param filePath
- * @return
- */
- public static String getExtensionName(String filePath) {
- if ((filePath != null) && (filePath.length() > 0)) {
- int dot = filePath.lastIndexOf('.');
- if ((dot > -1) && (dot < (filePath.length() - 1))) {
- return filePath.substring(dot + 1);
- }
- }
- return filePath;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/IOUtils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/IOUtils.java
deleted file mode 100644
index 4d7a17a7c2..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/IOUtils.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.mogo.module.media.utils;
-
-import androidx.annotation.Nullable;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.InputStream;
-
-public class IOUtils {
-
- public static byte[] inputToBytes(InputStream is) {
- if(is == null){
- return null;
- }
-
- ByteArrayOutputStream bos = null;
- byte[] result = null;
-
- try{
- bos = new ByteArrayOutputStream();
- byte[] buff = new byte[100];
- int rc = 0;
- while ((rc = is.read(buff, 0, 100)) > 0) {
- bos.write(buff, 0, rc);
- }
-
- result = bos.toByteArray();
- }catch (Exception e){
- e.printStackTrace();
- result = null;
- }finally {
- closeSilently(bos);
- }
-
- return result;
- }
-
- public static void closeSilently(@Nullable Closeable c) {
- if (c == null) return;
- try {
- c.close();
- c = null;
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/Md5Utils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/Md5Utils.java
deleted file mode 100644
index 9bfe577832..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/Md5Utils.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.mogo.module.media.utils;
-
-import java.security.MessageDigest;
-
-public class Md5Utils {
-
- private static final char[] hexDigits = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
- public static String hexdigest(String string) {
- String s = null;
-
- try {
- s = hexdigest(string.getBytes());
- } catch (Exception var3) {
- var3.printStackTrace();
- }
-
- return s;
- }
-
- public static String hexdigest(byte[] bytes) {
- String s = null;
-
- try {
- MessageDigest md = MessageDigest.getInstance("MD5");
- md.update(bytes);
- byte[] tmp = md.digest();
- char[] str = new char[32];
- int k = 0;
-
- for(int i = 0; i < 16; ++i) {
- byte byte0 = tmp[i];
- str[k++] = hexDigits[byte0 >>> 4 & 15];
- str[k++] = hexDigits[byte0 & 15];
- }
-
- s = new String(str);
- } catch (Exception var8) {
- var8.printStackTrace();
- }
-
- return s;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/MediaAnalyticsUtils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/MediaAnalyticsUtils.java
deleted file mode 100644
index 25d6da3336..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/MediaAnalyticsUtils.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mogo.module.media.utils;
-
-import com.mogo.module.media.ServiceMediaHandler;
-import com.mogo.utils.logger.Logger;
-
-import java.util.HashMap;
-
-public class MediaAnalyticsUtils {
- /**
- * 统一管理打点
- */
- public static void track(String id, HashMap map){
- Logger.d("MediaAnalyticsUtils","addLogger "+id);
- ServiceMediaHandler.getMogoAnalytis().track(id,map);
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/MusicControlBroadCast.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/MusicControlBroadCast.java
deleted file mode 100644
index 6ec22f102e..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/MusicControlBroadCast.java
+++ /dev/null
@@ -1,515 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.text.TextUtils;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.common.entity.MarkerShareMusic;
-import com.mogo.module.media.ServiceMediaHandler;
-import com.mogo.module.media.model.LanRenInsertData;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.model.QQMediaListData;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import java.util.ArrayList;
-
-public class MusicControlBroadCast {
-
- public static final String TAG = "MusicControlBroadCast";
- public static boolean OPEN = false;
- /**
- *
- * @param actionValue
- */
- public static void sendQQMusicControl(String actionValue) {
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- Intent intent = new Intent("com.txznet.adapter.send");
- intent.putExtra("action", actionValue);
- intent.putExtra("source", "com.mogo.launcher");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- Logger.d(TAG,"sendQQMusicControl "+actionValue);
- }
-
- /**
- * 打开qq音乐
- */
- public static void qqOpenQQMusic() {
- sendQQMusicControl("music_open");
- }
-
- /**
- * 关闭qq音乐
- */
- public static void qqCloseQQMusic() {
- sendQQMusicControl("music_exit");
- }
-
- /**
- * 暂停播放音乐
- */
- public static void qqPlayPauseQQMusic() {
- sendQQMusicControl("music_play_or_pause");
- }
-
- /**
- * 播放音乐
- */
-
- public static void qqPlayQQMusic() {
- sendQQMusicControl("music_play");
- }
- /**
- * 暂停音乐
- */
- public static void qqPauseQQMusic() {
- sendQQMusicControl("music_pause");
- }
-
- /**
- * 上一首音乐
- */
- public static void qqPreQQMusic() {
- sendQQMusicControl("music_prev");
- }
-
- /**
- * 下一首音乐
- */
- public static void qqNextQQMusic() {
- sendQQMusicControl("music_next");
- }
-
- /**
- * "music_sequential";//顺序播放
- * "music_random";//随机播放
- * "music_loopone";//单曲循环
- * "music_loopall";//列表循环
- * 修改qq 音乐播放模式
- */
- public static void qqChangePlayModeQQMusic(String playMode) {
- sendQQMusicControl(playMode);
- }
-
- //乐听新闻 actionValue 101 102
- public static void sendLeTingControl(int actionValue) {
- Intent intent = new Intent("com.zhidao.ltnews.sendplayaudio");
- intent.putExtra("controlstate", actionValue);
- intent.putExtra("source", "com.mogo.launcher");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- Logger.d(TAG,"sendLeTingControl "+actionValue);
- }
-
- /**
- * 关闭乐听头条
- */
- public static void newsCloseLeTing() {
- sendLeTingControl(200);
- }
-
- /**
- * 暂停播放乐听头条
- */
- public static void newsPlayPauseLeTing() {
- sendLeTingControl(101);
- }
-
- /**
- * 播放音乐乐听头条
- */
- public static void newsPlayLeTing() {
- sendLeTingControl(100);
- }
-
- /**
- * 暂停音乐乐听头条
- */
- public static void newsPauseLeTing() {
- sendLeTingControl(101);
- }
-
- /**
- * 上一首音乐乐听头条
- */
- public static void newsPreLeTing() {
- sendLeTingControl(103);
- }
-
- /**
- * 下一首音乐乐听头条
- */
- public static void newsNextLeTing() {
- sendLeTingControl(102);
- }
-
-
- //懒人听书
- public static void sendLanRenControl(int actionValue) {
- Intent intent = new Intent("com.zhidao.lrts.sendplayaudio");
- intent.putExtra("controlstate", actionValue);
- intent.putExtra("source", "com.mogo.launcher");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- Logger.d(TAG,"sendLanRenControl "+actionValue);
-
- }
-
- /**
- * 关闭懒人听书
- */
- public static void newsCloseLanRen() {
- sendLanRenControl(200);
- }
-
- /**
- * 暂停播放懒人听书
- */
- public static void newsPlayPauseLanRen() {
- sendLanRenControl(101);
- }
-
- /**
- * 播放音乐懒人听书
- */
- public static void newsPlayLanRen() {
- sendLanRenControl(101);
- }
-
- /**
- * 暂停音乐懒人听书
- */
- public static void newsPauseLanRen() {
- sendLanRenControl(101);
- }
-
- /**
- * 上一首音乐懒人听书
- */
- public static void newsPreLanRen() {
- sendLanRenControl(103);
- }
-
- /**
- * 下一首音乐懒人听书
- */
- public static void newsNextLanRen() {
- sendLanRenControl(102);
- }
-
-
- /**
- * qq 音乐添加进播放列表
- */
- public static void addQQMusicPlayList(ArrayList list) {
- Intent intent = new Intent("com.txznet.adapter.send");
- intent.putExtra("musicAddList", GsonUtil.jsonFromObject(list));
- intent.putExtra("action","share_list");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- Logger.d(TAG,"addQQMusicPlayList ");
- }
-
- /**
- * qq 音乐添加进播放列表
- */
- public static void addQQMusicShareListPlayList(ArrayList shareList) {
- ArrayList list = new ArrayList<>();
- for (MarkerShareMusic shareMusic:shareList){
- if (shareMusic == null || shareMusic.getShareType() != 1)continue;
- QQMediaListData data = new QQMediaListData();
- data.setMediaImgUrl(shareMusic.getMediaImg() != null ? shareMusic.getMediaImg():"");
- data.setMediaMid(shareMusic.getMediaId() != null ? shareMusic.getMediaId():"");
- data.setMediaSinger(shareMusic.getMediaSinger() != null ? shareMusic.getMediaSinger():"");
- data.setMediaName(shareMusic.getMediaName() != null ? shareMusic.getMediaName():"");
- data.setMediaUrl(shareMusic.getMediaUrl() != null ? shareMusic.getMediaUrl() :"");
- list.add(data);
- }
- String jsonaddList = "";
- try {
- jsonaddList = GsonUtil.jsonFromObject(list);
- Intent intent = new Intent("com.txznet.adapter.send");
- intent.putExtra("musicAddList", jsonaddList);
- intent.putExtra("action","share_list");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- Logger.d(TAG,"addQQMusicShareListPlayList "+(list != null ?list.size():"null")+" "+jsonaddList);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 懒人听书进播放列表
- */
- public static void controlLanRenPlay(LanRenInsertData data) {
- // Intent intent = new Intent("com.zhidao.lrts.sendplayaudio");
- Intent intent = new Intent("com.zhidao.mediacenter.lrts");
- intent.putExtra("bookinfo", GsonUtil.jsonFromObject(data));
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
- /**
- * 懒人听书添加列表
- * @param jsonStr
- */
- public static void controlLanRenPlay(String jsonStr){
- Logger.d(TAG,"controlLanRenPlay "+jsonStr);
- if (TextUtils.isEmpty(jsonStr))return;
- //Intent intent = new Intent("com.zhidao.lrts.sendplayaudio");
- Intent intent = new Intent("com.zhidao.mediacenter.lrts");
- intent.putExtra("bookinfo", jsonStr);
- intent.putExtra("acceptType", 1000);
- AbsMogoApplication.getApp().sendBroadcast(intent);
-
- }
-
- /**
- * 懒人听书后台播放
- * @param
- */
- public static void controlLanRenPlayBack(){
- Intent intent = new Intent("com.zhidao.mediacenter.lrts");
- intent.putExtra("acceptType", 1001);
- intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
- /**
- * 播放新闻,不需要打开app
- * @param
- */
- public static void sendPlayNews(String jsonStr){
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- Logger.d(TAG,"sendPlayNews "+jsonStr);
- if (TextUtils.isEmpty(jsonStr))return;
- Intent intent = new Intent("com.zhidao.mediacenter.ltnews");
- intent.putExtra("news", jsonStr);
- intent.putExtra("insertType", 1000);
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
- /**
- * 获取付费情况
- */
- public static void getNewsPayInfoState(){
- Intent intent = new Intent("com.zhidao.mediacenter.ltnews");
- intent.putExtra("insertType", 1002);
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
- /**
- * 播放类型新闻,不需要打开app
- * @param
- */
- public static void sendPlayTypeNews(String category){
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- Logger.d(TAG,"sendPlayNews "+category);
- if (TextUtils.isEmpty(category))return;
- Intent intent = new Intent("com.zhidao.mediacenter.ltnews");
- intent.putExtra("category", category.replace("新闻",""));
- intent.putExtra("insertType", 1001);
- intent.setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
- /**
- * 播放类型新闻,需要打开app
- * @param
- */
- public static void sendPlayTypeNewsOpenApp(String type){
- if (TextUtils.isEmpty(type))return;
- Logger.d(TAG,"sendPlayNews2 "+type);
- Intent intent = new Intent();
- intent.setAction("android.intent.action.VIEW");
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setData(Uri.parse("letingschema://playNews?category="+type.replace("新闻","")));
- AbsMogoApplication.getApp().startActivity(intent);
- }
-
- //2 为书籍听书，3 为新闻,1 为qq音乐
- public static void clickMarkerSendData(MarkerShareMusic markerShareMusic){
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- if (markerShareMusic != null){
- if (markerShareMusic.getShareType() == 1){
- ArrayList list = new ArrayList<>();
- QQMediaListData data = new QQMediaListData();
- data.setMediaUrl(markerShareMusic.getMediaUrl());
- data.setMediaName(markerShareMusic.getMediaName());
- data.setMediaSinger(markerShareMusic.getMediaSinger());
- data.setMediaMid(markerShareMusic.getMediaId());
- data.setMediaImgUrl(markerShareMusic.getMediaImg());
- list.add(data);
- addQQMusicPlayList(list);
- }else if (markerShareMusic.getShareType() == 2){
- String bookJson = markerShareMusic.getBookInfo();
- controlLanRenPlay(bookJson);
- }else if (markerShareMusic.getShareType() == 3){
- String bookJson = markerShareMusic.getBookInfo();
- sendPlayNews(bookJson);
- }
-
- UiThreadHandler.postDelayed(new Runnable() {
- @Override
- public void run() {
- sendGetMusicPlayStateBroadcast();
- }
- }, 2000);
-
- }
- }
-
- //2 为书籍听书，3 为新闻,1 为qq音乐
- public static void listeningSendData(MediaInfoData markerShareMusic){
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- if (markerShareMusic != null){
- if (markerShareMusic.getType() == 1){
- ArrayList list = new ArrayList<>();
- QQMediaListData data = new QQMediaListData();
- data.setMediaUrl(markerShareMusic.getMediaUrl());
- data.setMediaName(markerShareMusic.getMediaName());
- data.setMediaSinger(markerShareMusic.getMediaSinger());
- data.setMediaMid(markerShareMusic.getMediaId());
- data.setMediaImgUrl(markerShareMusic.getMediaImg());
- list.add(data);
- addQQMusicPlayList(list);
- }else if (markerShareMusic.getType() == 2){
- String bookJson = markerShareMusic.getBookInfo();
- controlLanRenPlay(bookJson);
- }else if (markerShareMusic.getType() == 3){
- String newsJson = markerShareMusic.getBookInfo();
- sendPlayNews(newsJson);
- }
-
- UiThreadHandler.postDelayed(new Runnable() {
- @Override
- public void run() {
- sendGetMusicPlayStateBroadcast();
- }
- }, 2000);
- }
- }
-
- public static void commandPre(int type) {
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- if (type == 1) {
- qqPreQQMusic();
- } else if (type == 2) {
- newsPreLanRen();
- } else if (type == 3) {
- newsPreLeTing();
- }
- }
-
- public static void commandNext(int type) {
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- if (type == 1) {
- qqNextQQMusic();
- } else if (type == 2) {
- newsNextLanRen();
- } else if (type == 3) {
- newsNextLeTing();
- }
- }
-
- public static void commandPlayPause(int type,int play) {
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- if (type == 1) {
- if (play == 1){
- qqPauseQQMusic();
- }else{
- qqPlayQQMusic();
- }
- } else if (type == 2) {
- newsPlayPauseLanRen();
- } else if (type == 3) {
- newsPlayPauseLeTing();
- }
- }
-
- public static void openMediaApp(int type) {
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- if (type == 1) {
- SkipToAppUtils.SkipToQQMusic();
- } else if (type == 2) {
- SkipToAppUtils.SkipToLrListen();
- } else if (type == 3) {
- SkipToAppUtils.SkipToLtNews();
- }
- }
-
- public static void qqMusicSearch(){
- Intent intent = new Intent("com.txznet.adapter.send");
- intent.putExtra("music_model","{\"field\":1,\"text\":\"我要听周杰伦的歌\",\"title\":\"\",\"keywords\":[],\"artist\":[\"周杰伦\"],\"album\":\"\"}");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
- public static void sendGetMusicPlayStateBroadcast(){
- if (OPEN && ServiceMediaHandler.getMogoNavi().isNaviing())return;
- Intent intent = new Intent("com.zhidao.mediacenter.getaudioinfo");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- Logger.d("MusicControlBroadCast===","sendGetMusicPlayStateBroadcast");
- }
-
- public static MediaInfoData getHisMedia() {
- String lastMediaInfo = StorageManager.getLastListenMediaMusic();
- if (!TextUtils.isEmpty(lastMediaInfo)){
- MediaInfoData sMediaInfoData = GsonUtil.objectFromJson(lastMediaInfo, MediaInfoData.class);
- if (sMediaInfoData != null){
- sMediaInfoData.setPlayState(0);
- return sMediaInfoData;
- }
- }
-
- return null;
-
- // 测试代码吧？
-// MediaInfoData mediaInfoData = new MediaInfoData();
-// mediaInfoData.setMediaId("001jiOrk2g389Y");
-// mediaInfoData.setBookInfo("");
-// mediaInfoData.setType(1);
-// mediaInfoData.setMediaName("恭喜发财 (广场舞)");
-// mediaInfoData.setMediaSinger("刘德华");
-// mediaInfoData.setMediaType("物流派");
-// mediaInfoData.setPlayState(0);
-// mediaInfoData.setLocalMedia(false);
-// mediaInfoData.setCurTime(0);
-// mediaInfoData.setMaxTime(410*1000);
-// mediaInfoData.setMediaUrl("http://isure.stream.qqmusic.qq.com/C200000s2wCd3pzdnA.m4a?guid=2000001271&vkey=8CE1A876F5079A6E4E9BCB8306252EF152F3D4F237B3BF4C1450B50BA7E065D3D55A0735FD2E957B129E83FF7D7D5D398479D53FE2171DF0&uin=&fromtag=50");
-// mediaInfoData.setMediaImg("http://music.qq.com/musicbox/img/uccpic_error.jpg");
-// return mediaInfoData;//刘德华的恭喜发财
- }
-
- /**
- * 控制QQ音乐播放某人的歌
- */
- public static void playSomeBodyMusic(String musicModel){
- Intent intent = new Intent("com.txznet.adapter.send");
- intent.putExtra("music_model", musicModel);
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
- public static void mediaCenterBroadcast(){
- Intent intent = new Intent("com.mogo.launcher.media.card.center");
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-
-
- /**
- * 发送是否可以分享
- * @param canshare 是否可以分享 true 可以分享 false 不可分享
- * @param auth 是否授权 1:已授权 0：未授权 isShare 1:有可分享数据， 0：无可分享数据
- * @param notType 不能分享的类型 1 2 3
- * @param notWhy 不能分享的原因 1 没有可以分享的音频 2 媒体卡片不再C位 3 未授权
- */
- public static void ifCanShare(boolean canshare,boolean auth,int notType,String notWhy){
- Logger.d(TAG,"ifCanShare "+canshare);
- Intent intent = new Intent("com.mogo.launcher.media.canshare");
- intent.putExtra("isShare", canshare?"1":"0");
- intent.putExtra("authResult", auth?"1":"0");
- if (!canshare){
- intent.putExtra("notType", notType);
- intent.putExtra("notWhy", notWhy);
- }
-
- AbsMogoApplication.getApp().sendBroadcast(intent);
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/OnBitmapToLocalListener.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/OnBitmapToLocalListener.java
deleted file mode 100644
index 9d72f24c1b..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/OnBitmapToLocalListener.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mogo.module.media.utils;
-
-public interface OnBitmapToLocalListener {
- void saveSuccess(String path);
- void saveFailed();
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/OnCompressListener.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/OnCompressListener.java
deleted file mode 100644
index a9a8842e83..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/OnCompressListener.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mogo.module.media.utils;
-
-public interface OnCompressListener {
- void onCompressSuccess(byte[] data);
-
- void onCompressFailed(String msg);
-
- void onBeforeCompress();
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/SkipToAppUtils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/SkipToAppUtils.java
deleted file mode 100644
index b709983534..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/SkipToAppUtils.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.content.ComponentName;
-import android.content.Intent;
-
-import com.mogo.commons.AbsMogoApplication;
-
-public class SkipToAppUtils {
- /**
- * 跳转到懒人听书
- */
- public static void SkipToLrListen() {
- if (Utils.isActivityExits("com.zhidao.lrts",
- "com.zhidao.lrts.main.MainActivity")){
- try {
- Intent intent = new Intent();
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- ComponentName comp = new ComponentName("com.zhidao.lrts",
- "com.zhidao.lrts.main.MainActivity");
- intent.setComponent(comp);
- AbsMogoApplication.getApp().startActivity(intent);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- }
-
- /**
- * 跳转到乐听新闻
- */
- public static void SkipToLtNews() {
- if (Utils.isActivityExits("com.zhidao.ltnews",
- "com.zhidao.ltnews.main.MainActivity")){
- try {
- Intent intent = new Intent();
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- ComponentName comp = new ComponentName("com.zhidao.ltnews",
- "com.zhidao.ltnews.main.MainActivity");
- intent.setComponent(comp);
- AbsMogoApplication.getApp().startActivity(intent);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- }
-
- /**
- * 跳转到QQ音乐
- */
- public static void SkipToQQMusic() {
- if (Utils.isActivityExits("com.pvetec.musics",
- "com.pvetec.musics.activity.MainActivity")){
- try {
- Intent intent = new Intent();
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- ComponentName comp = new ComponentName("com.pvetec.musics",
- "com.pvetec.musics.activity.MainActivity");
- intent.setComponent(comp);
- AbsMogoApplication.getApp().startActivity(intent);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/StorageManager.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/StorageManager.java
deleted file mode 100644
index d6626621bf..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/StorageManager.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mogo.module.media.utils;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.media.constants.Constants;
-import com.mogo.utils.storage.SharedPrefsMgr;
-import com.mogo.utils.storage.lrucache.DiskCacheManager;
-
-public class StorageManager {
-
- public static void setShowPushShareTime(String time){
- SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).putString(Constants.SHOW_SHARE_PUSH_TIME,time);
- }
-
- public static String getShowPushShareTime(){
- return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( Constants.SHOW_SHARE_PUSH_TIME);
- }
-
- public static String getLastListenMediaMusic(){
- return new DiskCacheManager(AbsMogoApplication.getApp(), Constants.MEDIA_UNIQUE_NAME).getString(Constants.LAST_TIME_LISTEN_MEDIA_MUSIC);
- }
-
- public static void setLastListenMediaMusic(String json){
- new DiskCacheManager(AbsMogoApplication.getApp(), Constants.MEDIA_UNIQUE_NAME).put(Constants.LAST_TIME_LISTEN_MEDIA_MUSIC, json);
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/TimeUtils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/TimeUtils.java
deleted file mode 100644
index 9c5e0817f5..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/TimeUtils.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.text.TextUtils;
-
-import com.mogo.utils.DateTimeUtils;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * Created by congtaowang on 2018/10/19.
- */
-public class TimeUtils {
-
- public static String parseYMD(long timestamp ) {
- return parse( DateTimeUtils.yyyyMMdd, timestamp );
- }
-
- public static String parse(String pattern, long timestamp ) {
- if ( TextUtils.isEmpty( pattern ) ) {
- pattern = DateTimeUtils.yyyyMMdd;
- }
- try {
- return new SimpleDateFormat( pattern ).format( new Date( timestamp ) );
- } catch ( Exception e ) {
- return "";
- }
- }
-
- //两个时间戳是否是同一天
- public static boolean isSameData(String currentTime, String lastTime) {
- if (TextUtils.isEmpty(currentTime)) currentTime = "0";
- if (TextUtils.isEmpty(lastTime)) lastTime = "0";
- try {
- Calendar nowCal = Calendar.getInstance();
- Calendar dataCal = Calendar.getInstance();
- SimpleDateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Long nowLong = new Long(currentTime);
- Long dataLong = new Long(lastTime);
- String data1 = df1.format(nowLong);
- String data2 = df2.format(dataLong);
- java.util.Date now = df1.parse(data1);
- java.util.Date date = df2.parse(data2);
- nowCal.setTime(now);
- dataCal.setTime(date);
- return isSameDay(nowCal, dataCal);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- public static boolean isSameDay(Calendar cal1, Calendar cal2) {
- if(cal1 != null && cal2 != null) {
- return cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA)
- && cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR)
- && cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR);
- } else {
- return false;
- }
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/ToastHelper.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/ToastHelper.java
deleted file mode 100644
index 301b76de57..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/ToastHelper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-
-package com.mogo.module.media.utils;
-
-import android.content.Context;
-import android.os.Handler;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.IdRes;
-import androidx.annotation.LayoutRes;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.media.R;
-import com.mogo.utils.WindowUtils;
-
-public class ToastHelper {
- private static View toastView;
- private static ImageView imageView;
- private static TextView textView;
- private static Toast toast;
-
- private ToastHelper() {
- }
-
- private static void createToast(Context context) {
- toastView = LayoutInflater.from(context).inflate(R.layout.module_media_share_toast_view, (ViewGroup) null);
- FrameLayout frameLayout = toastView.findViewById(R.id.module_media_toast_inner);
- FrameLayout.LayoutParams vlp = new FrameLayout.LayoutParams(WindowUtils.getScreenWidth(context), WindowUtils.getScreenHeight(context));
- frameLayout.setLayoutParams(vlp);
- frameLayout.setPadding(0,0,0,WindowUtils.getStatusBarHeight(context));
- imageView = (ImageView) toastView.findViewById(R.id.imgViewIcon);
- textView = (TextView) toastView.findViewById(R.id.txtViewContent);
- toast = new Toast(context);
- toast.setView(toastView);
- toast.setGravity(1, 0, 0);
- }
-
- public static void showShortSuccess(Context context, String msg) {
- context = context.getApplicationContext();
- if (toast == null) {
- createToast(context);
- }
-
- imageView.setImageResource(R.drawable.module_media_share_success);
- textView.setText(msg);
- toast.setDuration(Toast.LENGTH_SHORT);
- toast.show();
- }
-
- public static void showShortError(Context context, String msg) {
- context = context.getApplicationContext();
- if (toast == null) {
- createToast(context);
- }
-
- imageView.setImageResource(R.drawable.module_media_share_fail);
- textView.setText(msg);
- toast.setDuration(Toast.LENGTH_SHORT);
- toast.show();
- }
-
- public static void cancel() {
- if (toast != null) {
- if (AbsMogoApplication.getApp() != null) {
- new Handler(AbsMogoApplication.getApp().getMainLooper()).post(new Runnable() {
- @Override
- public void run() {
- if (toast != null)
- toast.cancel();
- }
- });
- }
- }
- }
-
- public static Toast customToast(Context context,
- @LayoutRes int layout,
- @IdRes int msgTextViewId,
- int duration,
- CharSequence message) {
- Toast toast = new Toast(context);
- final View view = LayoutInflater.from(context).inflate(layout, null);
- TextView msgView = view.findViewById(msgTextViewId);
- if (msgView != null) {
- msgView.setText(message);
- }
- toast.setView(view);
- toast.setDuration(duration);
- toast.setGravity(Gravity.CENTER, 0, 0);
- return toast;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/Utils.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/Utils.java
deleted file mode 100644
index 6918d3fa10..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/utils/Utils.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.mogo.module.media.utils;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.media.R;
-import com.mogo.module.media.constants.Constants;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.List;
-
-public class Utils {
-
- /**
- * 将px值转换为dip或dp值，保证尺寸大小不变
- */
- public static int px2dip(Context context, float pxValue) {
- final float scale = context.getResources().getDisplayMetrics().density;
- return (int) (pxValue / scale + 0.5f);
- }
-
- /**
- * 将dip或dp值转换为px值，保证尺寸大小不变
- */
- public static int dip2px(Context context, float dipValue) {
- final float scale = context.getResources().getDisplayMetrics().density;
- return (int) (dipValue * scale + 0.5f);
- }
-
- /**
- * 将px值转换为sp值，保证文字大小不变
- */
- public static int px2sp(Context context, float pxValue) {
- final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
- return (int) (pxValue / fontScale + 0.5f);
- }
-
- /**
- * 将sp值转换为px值，保证文字大小不变
- */
- public static int sp2px(Context context, float spValue) {
- final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
- return (int) (spValue * fontScale + 0.5f);
- }
-
- /**
- * 验证手机格式
- */
- public static boolean isMobilePhone( String mobiles ) {
- String telRegex = "[1]\\d{10}";
- if ( TextUtils.isEmpty( mobiles ) ) return false;
- else return mobiles.matches( telRegex );
- }
-
- public static boolean isVerifyCodeRight( String code ) {
- if ( !TextUtils.isEmpty( code ) && code.trim().length() == 4 ) {
- return true;
- }
- return false;
- }
-
- // 格式化用于拨打的电话号码
- public static String formatPhoneNumber(String phoneNumber ) {
- String StrTmp = "tel:" + phoneNumber.replace( "-", "" ).replace( " ", "" );
- StrTmp = StrTmp.replace( "转", "p" );
- return StrTmp;
- }
-
- /**
- * 当前点击点是否在视图中
- */
- public static boolean isInsideView(MotionEvent event, View view ) {
- if ( view != null && event != null ) {
- float eventX = event.getRawX();
- float eventY = event.getRawY();
-
- int[] contentArray = new int[2];
-
- Rect contentRect = new Rect();
- view.getLocationOnScreen( contentArray );
- view.getDrawingRect( contentRect );
- contentRect.offsetTo( contentArray[0], contentArray[1] );
-
- return contentRect.contains( ( int ) eventX, ( int ) eventY );
- }
-
- return false;
- }
-
- public static String getChannel(Context appContext ) {
- String channel = "";
- try {
- final ApplicationInfo appInfo = appContext.getPackageManager().getApplicationInfo( appContext.getPackageName(), PackageManager.GET_META_DATA );
- Bundle configBundle = appInfo.metaData;
- if ( null != configBundle ) {
- channel = configBundle.getString( "com.elegant.analytics.AnalyticsConfig.Channel", "" );
- }
- } catch ( final PackageManager.NameNotFoundException e ) {
- e.printStackTrace();
- }
- return channel;
- }
-
- public static File getDiskCacheDir(Context context, String uniqueName ) {
- String cachePath;
- if ( Environment.MEDIA_MOUNTED.equals( Environment
- .getExternalStorageState() ) && context.getExternalCacheDir() != null ) {
- cachePath = context.getExternalCacheDir().getPath();
- } else {
- cachePath = context.getCacheDir().getPath();
- }
- return new File( cachePath + File.separator + uniqueName );
- }
-
- public static File saveBitmap(Bitmap source, String targetPath ) {
- File file = new File( targetPath, System.currentTimeMillis() + ".jpg" );
- if ( !file.getParentFile().exists() ) {
- file.mkdirs();
- }
- try {
- FileOutputStream fos = new FileOutputStream( file );
- source.compress( Bitmap.CompressFormat.JPEG, 100, fos );
- fos.flush();
- fos.close();
- } catch ( Exception e ) {
- return null;
- }
- return file;
- }
-
- public static void showKeyBoard( Context context ) {
- try {
- InputMethodManager imm = (InputMethodManager) context.getSystemService( Context.INPUT_METHOD_SERVICE );
- if ( imm != null ) {
- imm.toggleSoftInput( 0, InputMethodManager.HIDE_NOT_ALWAYS );
- }
- } catch ( Exception e ) {
- e.printStackTrace();
- }
- }
-
- public static void hiddenKeyBoard(Context context, EditText editText ) {
- try {
- InputMethodManager imm = (InputMethodManager) context.getSystemService( Context.INPUT_METHOD_SERVICE );
- if ( imm != null ) {
- imm.hideSoftInputFromWindow( editText.getWindowToken(), 0 );
- }
- } catch ( Exception e ) {
- e.printStackTrace();
- }
- }
-
- /**
- * 判断微信是否已安装
- *
- * @param context
- * @return
- */
- public static boolean isWeichatAvailable( Context context ) {
- final PackageManager packageManager = context.getPackageManager();// 获取packagemanager
- List pinfo = packageManager.getInstalledPackages( 0 );// 获取所有已安装程序的包信息
- if ( pinfo != null ) {
- for ( int i = 0; i < pinfo.size(); i++ ) {
- String pn = pinfo.get( i ).packageName;
- if ( pn.equals( "com.tencent.mm" ) ) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * 判断qq是否已安装
- *
- * @param context
- * @return
- */
- public static boolean isQQAvailable( Context context ) {
- final PackageManager packageManager = context.getPackageManager();
- List pinfo = packageManager.getInstalledPackages( 0 );
- if ( pinfo != null ) {
- for ( int i = 0; i < pinfo.size(); i++ ) {
- String pn = pinfo.get( i ).packageName;
- if ( pn.equals( "com.tencent.mobileqq" ) ) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static String getVersionName(Context context, String packageName ) {
- try {
- PackageManager packageManager = context.getPackageManager();
- PackageInfo packInfo = packageManager.getPackageInfo( packageName, 0 );
- return packInfo.versionName;
- } catch ( Exception e ) {
- return "";
- }
- }
-
- public static int getVersionCode(Context context, String packageName ) {
- try {
- PackageManager packageManager = context.getPackageManager();
- PackageInfo packInfo = packageManager.getPackageInfo( packageName, 0 );
- return packInfo.versionCode;
- } catch ( Exception e ) {
- return 0;
- }
- }
-
- public static boolean isActivityExits(String packageName,String classStr){
- Intent intent = new Intent();
- intent.setClassName(packageName, classStr);
- ResolveInfo resolveInfo = AbsMogoApplication.getApp().getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
- if(resolveInfo != null) {
- return true;
- }else{
- return false;
- }
- }
-
-
- //计算播放时间
- public static String calculateTime(int duration) {
- try {
- String time = "";
- long minute = duration / 60000;
- long seconds = duration % 60000;
- long second = Math.round((float) seconds / 1000);
- if (minute < 10) {
- time += "0";
- }
- time += minute + ":";
- if (second < 10) {
- time += "0";
- }
- time += second;
- return time;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return "0:00";
- }
-
- public static Integer[] getIconArray(){
- Integer[] iconArr = {
- R.drawable.module_media_music_animal_icon1
- ,R.drawable.module_media_music_animal_icon2
- ,R.drawable.module_media_music_animal_icon3
- ,R.drawable.module_media_music_animal_icon5
- ,R.drawable.module_media_music_animal_icon4
- ,R.drawable.module_media_music_animal_icon6
- ,R.drawable.module_media_music_animal_icon7
- ,R.drawable.module_media_music_animal_icon8
- ,R.drawable.module_media_music_animal_icon9
- ,R.drawable.module_media_music_animal_icon10
- ,R.drawable.module_media_music_animal_icon11
- ,R.drawable.module_media_music_animal_icon12
- ,R.drawable.module_media_music_animal_icon13
- ,R.drawable.module_media_music_animal_icon14
- ,R.drawable.module_media_music_animal_icon15
- ,R.drawable.module_media_music_animal_icon16
- ,R.drawable.module_media_music_animal_icon17
- ,R.drawable.module_media_music_animal_icon18
- ,R.drawable.module_media_music_animal_icon19
- ,R.drawable.module_media_music_animal_icon20
- ,R.drawable.module_media_music_animal_icon21
- ,R.drawable.module_media_music_animal_icon22
- ,R.drawable.module_media_music_animal_icon23
- ,R.drawable.module_media_music_animal_icon24
- ,R.drawable.module_media_music_animal_icon25
- ,R.drawable.module_media_music_animal_icon26
- ,R.drawable.module_media_music_animal_icon27
- ,R.drawable.module_media_music_animal_icon28
- ,R.drawable.module_media_music_animal_icon29
- ,R.drawable.module_media_music_animal_icon30
- ,R.drawable.module_media_music_animal_icon31
- ,R.drawable.module_media_music_animal_icon32
- ,R.drawable.module_media_music_animal_icon33
- ,R.drawable.module_media_music_animal_icon34
- ,R.drawable.module_media_music_animal_icon35
- ,R.drawable.module_media_music_animal_icon36
- ,R.drawable.module_media_music_animal_icon37
- ,R.drawable.module_media_music_animal_icon38
- ,R.drawable.module_media_music_animal_icon39
- ,R.drawable.module_media_music_animal_icon40
- ,R.drawable.module_media_music_animal_icon41
- ,R.drawable.module_media_music_animal_icon42
- ,R.drawable.module_media_music_animal_icon43
- ,R.drawable.module_media_music_animal_icon44
- ,R.drawable.module_media_music_animal_icon45
- ,R.drawable.module_media_music_animal_icon46
- ,R.drawable.module_media_music_animal_icon47
- ,R.drawable.module_media_music_animal_icon48
- ,R.drawable.module_media_music_animal_icon49
- ,R.drawable.module_media_music_animal_icon50
- ,R.drawable.module_media_music_animal_icon51
- ,R.drawable.module_media_music_animal_icon52
- ,R.drawable.module_media_music_animal_icon53
- ,R.drawable.module_media_music_animal_icon54
- ,R.drawable.module_media_music_animal_icon55
- ,R.drawable.module_media_music_animal_icon56
- ,R.drawable.module_media_music_animal_icon57
- ,R.drawable.module_media_music_animal_icon58
- ,R.drawable.module_media_music_animal_icon59
- ,R.drawable.module_media_music_animal_icon60
- ,R.drawable.module_media_music_animal_icon61
- ,R.drawable.module_media_music_animal_icon62
- ,R.drawable.module_media_music_animal_icon63
- ,R.drawable.module_media_music_animal_icon64
- ,R.drawable.module_media_music_animal_icon65
- ,R.drawable.module_media_music_animal_icon66
- ,R.drawable.module_media_music_animal_icon67
- ,R.drawable.module_media_music_animal_icon68
- ,R.drawable.module_media_music_animal_icon69
- ,R.drawable.module_media_music_animal_icon70
- ,R.drawable.module_media_music_animal_icon71
- ,R.drawable.module_media_music_animal_icon72
- ,R.drawable.module_media_music_animal_icon73
- ,R.drawable.module_media_music_animal_icon74
- ,R.drawable.module_media_music_animal_icon75
- };
- return iconArr;
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/view/IMusicView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/view/IMusicView.java
deleted file mode 100644
index bf6eee1611..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/view/IMusicView.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mogo.module.media.view;
-
-import com.mogo.commons.mvp.IView;
-import com.mogo.module.media.model.MediaInfoData;
-
-/**
- * 音频显示类的接口
- *
- * @author tongchenfei
- */
-public interface IMusicView extends IView {
- void onMediaInfoChanged(MediaInfoData mediaInfoData);
-
- void onMusicPlaying();
-
- void onMusicPause();
-
- void onMusicStopped();
-
- void onMusicProgress(long current,long total);
-
- void onAppExit();
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/view/MediaView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/view/MediaView.java
deleted file mode 100644
index 17e35c5dff..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/view/MediaView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mogo.module.media.view;
-
-import com.mogo.commons.mvp.IView;
-import com.mogo.module.common.entity.MarkerShareMusic;
-import com.mogo.module.media.model.ShareLikeData;
-
-import java.util.List;
-
-public interface MediaView extends IView {
- void showSharePush(boolean show);
-
- void loadNearShareMusicSuccess(List list);
-
- void loadFriendShareMusicSuccess(List list);
-
- void loadShareLikeDataResultSuccess(ShareLikeData.ShareLikeDataResult likeDataResult, String mediaId);
-
- void likeShareSuccess();
-
- void shareSuccessResult(boolean success, MarkerShareMusic markerShareMusic);
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
deleted file mode 100644
index 2cf0db96d9..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.NinePatchDrawable;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.widget.ImageView;
-
-import com.mogo.module.common.utils.CarSeries;
-import com.mogo.skin.support.IMogoSkinCompatSupportable;
-import com.mogo.skin.support.helper.MogoSkinCompatHelperDelegate;
-import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate;
-
-@SuppressLint("AppCompatCustomView")
-public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSupportable {
- Drawable mDrawbleSrc;
- Context context;
- Bitmap mBitmapOut;
- Bitmap output;
- int defaultWidth;
- int defaultHeight;
- int diameter;
- int radius;
- PaintFlagsDrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG);
- Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
-
- MogoSkinCompatImageHelperDelegate imageHelper;
-
- int currentDegree;
- int savedDegree;
- boolean isRotateEnable;
- boolean isRotating;
-// private int delayMilliseconds = 450;
- private int delayMilliseconds = 2000;
- private int mRotateAngleStep = 3;
-
- public AnimCircleImageView(Context context) {
- this(context, null);
- }
-
- public AnimCircleImageView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public AnimCircleImageView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- imageHelper = new MogoSkinCompatImageHelperDelegate(this);
- this.context = context;
- init();
- }
-
- private void init() {
- mDrawbleSrc = getDrawable();
- isRotateEnable = false;
- isRotating = false;
- delayMilliseconds = CarSeries.isF8xxSeries() ? 10 : 450;
- mRotateAngleStep = CarSeries.isF8xxSeries() ? 1 : 3;
- }
-
- @Override
- public void setImageBitmap(Bitmap bm) {
- super.setImageBitmap(bm);
- mDrawbleSrc = getDrawable();
- output = null;
- }
-
- @Override
- public void setImageDrawable(Drawable drawable) {
- super.setImageDrawable(drawable);
- mDrawbleSrc = getDrawable();
- output = null;
- }
-
- @Override
- public void setImageResource(int resId) {
- super.setImageResource(resId);
-// Log.d("AnimCircle", "setImageResource: " + MogoSkinCompatHelperDelegate.isSupport());
- imageHelper.setImageResource(resId);
- mDrawbleSrc = getDrawable();
- output = null;
- }
-
- public void startAnim() {
- Log.d("AnimCircle", "startAnim====" + isRotating);
- if (isRotating){
- return;
- }
- isRotateEnable = true;
- isRotating = true;
- currentDegree = savedDegree;
- invalidate();
- Log.d("AnimCircle", "invalidate==");
- }
-
- public void stopAnim() {
- Log.d("AnimCircle", "stopAnim===");
- removeCallbacks(loopInvalidate);
- isRotating = false;
- isRotateEnable = false;
- savedDegree = currentDegree;
- }
-
- public boolean isRotationing(){
- return isRotating;
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
-// Log.d("AnimCircle", "onDraw====");
- try {
- if (mDrawbleSrc == null) {
- return;
- }
-
- if (getWidth() == 0 || getHeight() == 0) {
- return;
- }
-
- if (mDrawbleSrc.getClass() == NinePatchDrawable.class) {
- return;
- }
-
- if (output == null) {
- defaultHeight = getHeight();
- defaultWidth = getWidth();
- diameter = (defaultHeight > defaultWidth ? defaultWidth : defaultHeight);
- radius = diameter / 2;
-// mBitmapOut = getCuttedPicture(mDrawbleSrc);
- mBitmapOut = ((BitmapDrawable) mDrawbleSrc).getBitmap();
-
- Paint paint = new Paint();
- Rect rect = new Rect(0, 0, mBitmapOut.getWidth(),
- mBitmapOut.getHeight());
-
- paint.setAntiAlias(true);
- paint.setFilterBitmap(true);
- paint.setDither(true);
-
- output = Bitmap.createBitmap(mBitmapOut.getWidth(),
- mBitmapOut.getHeight(), Bitmap.Config.ARGB_8888);
- Canvas mTempCanvas = new Canvas(output);
- mTempCanvas.drawARGB(0, 0, 0, 0);
- mTempCanvas.drawCircle(mBitmapOut.getWidth() / 2,
- mBitmapOut.getHeight() / 2, mBitmapOut.getWidth() / 2,
- paint);
- paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
- mTempCanvas.drawBitmap(mBitmapOut, rect, rect, paint);
-
- }
-
- if (isRotateEnable) {
- currentDegree = (currentDegree + mRotateAngleStep) % 360;
- canvas.save();
- canvas.setDrawFilter(drawFilter);
- canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
- canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
- canvas.restore();
- if (isRotateEnable) {
- removeCallbacks(loopInvalidate);
- postDelayed(loopInvalidate, delayMilliseconds);
-// postInvalidateDelayed(delayMilliseconds);
- }
- } else {
- canvas.save();
- canvas.setDrawFilter(drawFilter);
- canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
- canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
- canvas.restore();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- private Runnable loopInvalidate = this::invalidate;
-
- private Bitmap getCuttedPicture(Drawable DrawbleSrc) {
- Bitmap mBitmapOrigin = ((BitmapDrawable) DrawbleSrc).getBitmap();
- int mWidth = mBitmapOrigin.getWidth();
- int mHeight = mBitmapOrigin.getHeight();
-
-
- float scale = Math.min((float) mWidth / (float) defaultWidth, (float) mHeight / (float) defaultHeight);
- Bitmap mBitmapScaled = Bitmap.createScaledBitmap(mBitmapOrigin, (int) (mWidth / scale), (int) (mHeight / scale), false);
- int x;
- int y;
-
- x = mBitmapScaled.getWidth() / 2 - radius;
- y = mBitmapScaled.getHeight() / 2 - radius;
-
- if (x < 0) {
- x = 0;
- }
- if (y < 0) {
- y = 0;
- }
- Bitmap mBitmapCropped = Bitmap.createBitmap(mBitmapScaled, x, y, diameter, diameter);
- return mBitmapCropped;
- }
-
- public int getDelayMilliseconds() {
- return delayMilliseconds;
- }
-
- public void setDelayMilliseconds(int delayMilliseconds) {
- this.delayMilliseconds = delayMilliseconds;
- }
-
- @Override
- public void applySkin() {
- imageHelper.applySkin();
- }
-}
-
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimalJSurfaceView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimalJSurfaceView.java
deleted file mode 100644
index 50af224904..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimalJSurfaceView.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-import com.mogo.utils.ThreadPoolService;
-
-public class AnimalJSurfaceView extends SurfaceView implements Runnable, SurfaceHolder.Callback {
-
- private SurfaceHolder mHolder;
-
- /**
- * 动画是否执行中
- */
- private boolean bRunning = false;
- /**
- * 当前执行的第几帧
- */
- private int mCurrentPos;
- /**
- * 动画集合
- */
- private int[] mFrames;
-
- public AnimalJSurfaceView(Context context) {
- super(context);
- init();
- }
-
- public AnimalJSurfaceView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public AnimalJSurfaceView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- private void init() {
- mHolder = getHolder();
- mHolder.addCallback(this);
- setZOrderOnTop(true);
- mHolder.setFormat(PixelFormat.TRANSLUCENT);
- }
-
- public void setFrames(int[] frames) {
- mFrames = frames;
- }
-
- public void startAnim() {
- if (bRunning) {
- return;
- }
- ThreadPoolService.execute(this);
- bRunning = true;
- }
-
- public void stop() {
- bRunning = false;
- }
-
- @Override
- public void run() {
- while (bRunning) {
- drawBitmap();
- mCurrentPos++;
- try {
- Thread.sleep(400);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
-
- private void drawBitmap() {
- //获取画布并锁定
- Canvas mCanvas = mHolder.lockCanvas();
- if (mCanvas == null) {
- return;
- }else{
- mCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
- }
- //绘制透明色
- mCanvas.drawColor(Color.parseColor("#00000000"));
- Bitmap mBitmap = BitmapFactory.decodeResource(getResources(), mFrames[mCurrentPos % mFrames.length]);
-
- Paint paint = new Paint();
- paint.setAlpha(70);
- Rect mSrcRect = new Rect(0,
- 0,
- mBitmap.getWidth(),
- mBitmap.getHeight()); // 图片绘制
- Rect mDestRect = new Rect(0,
- 0,
- getWidth(),
- getHeight());// 图片绘制位置
-
- mCanvas.drawBitmap(mBitmap, mSrcRect, mDestRect, paint);
- //解锁画布，并展示bitmap到surface
- mHolder.unlockCanvasAndPost(mCanvas);
- mBitmap.recycle();
- }
-
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
- }
-
- @Override
- public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-
- }
-
- @Override
- public void surfaceDestroyed(SurfaceHolder holder) {
-
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleImageView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleImageView.java
deleted file mode 100644
index bbbe5316c4..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleImageView.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.RectF;
-import android.graphics.Xfermode;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-import androidx.annotation.NonNull;
-
-@SuppressLint("AppCompatCustomView")
-public class CircleImageView extends ImageView {
-
- private Paint mPaint;
-
- private Xfermode mXfermode;
-
- private boolean onceLoad = false;
-
- private int mWidth;
-
- private int mHeight;
-
- private Bitmap mBitmap;
-
- public CircleImageView(Context context) {
- this(context, null);
- }
-
- public CircleImageView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public CircleImageView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
- if (changed && !onceLoad) {
- mPaint = new Paint();
- mXfermode = new PorterDuffXfermode(PorterDuff.Mode.DST_IN);
- mPaint.setFilterBitmap(true);
- mPaint.setXfermode(mXfermode);
- mPaint.setAntiAlias(true);
- mWidth = getWidth();
- mHeight = getHeight();
- if(mWidth <= 0 || mHeight <= 0){
- return;
- }
- mBitmap = Bitmap.createBitmap(mWidth, mHeight, Bitmap.Config.ARGB_8888);
- Canvas canvas = new Canvas(mBitmap);
- RectF oval = new RectF(0, 0, mWidth, mHeight);
- Paint paint = new Paint();
- paint.setAntiAlias(true);
- canvas.drawOval(oval, paint);
- onceLoad = true;
- }
-
- }
-
- @Override
- protected void onDraw(@NonNull Canvas canvas) {
-
- Drawable image = getDrawable();
- if(image==null || mWidth<=0 || mHeight<=0){
- return;
- }
- int level = canvas.saveLayer(0, 0, mWidth, mHeight, null, Canvas.ALL_SAVE_FLAG);
- image.setBounds(0, 0, mWidth, mHeight);
- image.draw(canvas);
- canvas.drawBitmap(mBitmap, 0, 0, mPaint);
- canvas.restoreToCount(level);
- //super.onDraw(canvas);
-
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleImageView2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleImageView2.java
deleted file mode 100644
index dffbcfad90..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleImageView2.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
-
-import com.mogo.module.media.R;
-
-@SuppressLint("AppCompatCustomView")
-public class CircleImageView2 extends ImageView {
-
- private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP;
-
- private static final Bitmap.Config BITMAP_CONFIG = Bitmap.Config.ARGB_8888;
- private static final int COLORDRAWABLE_DIMENSION = 2;
-
- private static final int DEFAULT_BORDER_WIDTH = 0;
- private static final int DEFAULT_BORDER_COLOR = Color.BLACK;
- private static final int DEFAULT_FILL_COLOR = Color.TRANSPARENT;
- private static final boolean DEFAULT_BORDER_OVERLAY = false;
-
- private final RectF mDrawableRect = new RectF();
- private final RectF mBorderRect = new RectF();
-
- private final Matrix mShaderMatrix = new Matrix();
- private final Paint mBitmapPaint = new Paint();
- private final Paint mBorderPaint = new Paint();
- private final Paint mFillPaint = new Paint();
-
- private int mBorderColor = DEFAULT_BORDER_COLOR;
- private int mBorderWidth = DEFAULT_BORDER_WIDTH;
- private int mFillColor = DEFAULT_FILL_COLOR;
-
- private Bitmap mBitmap;
- private BitmapShader mBitmapShader;
- private int mBitmapWidth;
- private int mBitmapHeight;
-
- private float mDrawableRadius;
- private float mBorderRadius;
-
- private ColorFilter mColorFilter;
-
- private boolean mReady;
- private boolean mSetupPending;
- private boolean mBorderOverlay;
-
- public CircleImageView2(Context context) {
- super(context);
-
- init();
- }
-
- public CircleImageView2(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public CircleImageView2(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.MediaCircleImageView2, defStyle, 0);
-
- mBorderWidth = a.getDimensionPixelSize(R.styleable.MediaCircleImageView2_civ_border_width, DEFAULT_BORDER_WIDTH);
- mBorderColor = a.getColor(R.styleable.MediaCircleImageView2_civ_border_color, DEFAULT_BORDER_COLOR);
- mBorderOverlay = a.getBoolean(R.styleable.MediaCircleImageView2_civ_border_overlay, DEFAULT_BORDER_OVERLAY);
- mFillColor = a.getColor(R.styleable.MediaCircleImageView2_civ_fill_color, DEFAULT_FILL_COLOR);
-
- a.recycle();
-
- init();
- }
-
- private void init() {
- super.setScaleType(SCALE_TYPE);
- mReady = true;
-
- if (mSetupPending) {
- setup();
- mSetupPending = false;
- }
- }
-
- @Override
- public ScaleType getScaleType() {
- return SCALE_TYPE;
- }
-
- @Override
- public void setScaleType(ScaleType scaleType) {
- if (scaleType != SCALE_TYPE) {
- throw new IllegalArgumentException(String.format("ScaleType %s not supported.", scaleType));
- }
- }
-
- @Override
- public void setAdjustViewBounds(boolean adjustViewBounds) {
- if (adjustViewBounds) {
- throw new IllegalArgumentException("adjustViewBounds not supported.");
- }
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- if (mBitmap == null) {
- return;
- }
-
- if (mFillColor != Color.TRANSPARENT) {
- canvas.drawCircle(getWidth() / 2.0f, getHeight() / 2.0f, mDrawableRadius, mFillPaint);
- }
- canvas.drawCircle(getWidth() / 2.0f, getHeight() / 2.0f, mDrawableRadius, mBitmapPaint);
- if (mBorderWidth != 0) {
- canvas.drawCircle(getWidth() / 2.0f, getHeight() / 2.0f, mBorderRadius, mBorderPaint);
- }
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
- setup();
- }
-
- public int getBorderColor() {
- return mBorderColor;
- }
-
- public void setBorderColor(@ColorInt int borderColor) {
- if (borderColor == mBorderColor) {
- return;
- }
-
- mBorderColor = borderColor;
- mBorderPaint.setColor(mBorderColor);
- invalidate();
- }
-
- public void setBorderColorResource(@ColorRes int borderColorRes) {
- setBorderColor(getContext().getResources().getColor(borderColorRes));
- }
-
- public int getFillColor() {
- return mFillColor;
- }
-
- public void setFillColor(@ColorInt int fillColor) {
- if (fillColor == mFillColor) {
- return;
- }
-
- mFillColor = fillColor;
- mFillPaint.setColor(fillColor);
- invalidate();
- }
-
- public void setFillColorResource(@ColorRes int fillColorRes) {
- setFillColor(getContext().getResources().getColor(fillColorRes));
- }
-
- public int getBorderWidth() {
- return mBorderWidth;
- }
-
- public void setBorderWidth(int borderWidth) {
- if (borderWidth == mBorderWidth) {
- return;
- }
-
- mBorderWidth = borderWidth;
- setup();
- }
-
- public boolean isBorderOverlay() {
- return mBorderOverlay;
- }
-
- public void setBorderOverlay(boolean borderOverlay) {
- if (borderOverlay == mBorderOverlay) {
- return;
- }
-
- mBorderOverlay = borderOverlay;
- setup();
- }
-
- @Override
- public void setImageBitmap(Bitmap bm) {
- super.setImageBitmap(bm);
- mBitmap = bm;
- setup();
- }
-
- @Override
- public void setImageDrawable(Drawable drawable) {
- super.setImageDrawable(drawable);
- mBitmap = getBitmapFromDrawable(drawable);
- setup();
- }
-
- @Override
- public void setImageResource(@DrawableRes int resId) {
- super.setImageResource(resId);
- mBitmap = getBitmapFromDrawable(getDrawable());
- setup();
- }
-
- @Override
- public void setImageURI(Uri uri) {
- super.setImageURI(uri);
- mBitmap = uri != null ? getBitmapFromDrawable(getDrawable()) : null;
- setup();
- }
-
- @Override
- public void setColorFilter(ColorFilter cf) {
- if (cf == mColorFilter) {
- return;
- }
-
- mColorFilter = cf;
- mBitmapPaint.setColorFilter(mColorFilter);
- invalidate();
- }
-
- private Bitmap getBitmapFromDrawable(Drawable drawable) {
- if (drawable == null) {
- return null;
- }
-
- if (drawable instanceof BitmapDrawable) {
- return ((BitmapDrawable) drawable).getBitmap();
- }
-
- try {
- Bitmap bitmap;
-
- if (drawable instanceof ColorDrawable) {
- bitmap = Bitmap.createBitmap(COLORDRAWABLE_DIMENSION, COLORDRAWABLE_DIMENSION, BITMAP_CONFIG);
- } else {
- bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), BITMAP_CONFIG);
- }
-
- Canvas canvas = new Canvas(bitmap);
- drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
- drawable.draw(canvas);
- return bitmap;
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- private void setup() {
- if (!mReady) {
- mSetupPending = true;
- return;
- }
-
- if (getWidth() == 0 && getHeight() == 0) {
- return;
- }
-
- if (mBitmap == null) {
- invalidate();
- return;
- }
-
- mBitmapShader = new BitmapShader(mBitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
-
- mBitmapPaint.setAntiAlias(true);
- mBitmapPaint.setShader(mBitmapShader);
-
- mBorderPaint.setStyle(Paint.Style.STROKE);
- mBorderPaint.setAntiAlias(true);
- mBorderPaint.setColor(mBorderColor);
- mBorderPaint.setStrokeWidth(mBorderWidth);
-
- mFillPaint.setStyle(Paint.Style.FILL);
- mFillPaint.setAntiAlias(true);
- mFillPaint.setColor(mFillColor);
-
- mBitmapHeight = mBitmap.getHeight();
- mBitmapWidth = mBitmap.getWidth();
-
- mBorderRect.set(0, 0, getWidth(), getHeight());
- mBorderRadius = Math.min((mBorderRect.height() - mBorderWidth) / 2.0f, (mBorderRect.width() - mBorderWidth) / 2.0f);
-
- mDrawableRect.set(mBorderRect);
- if (!mBorderOverlay) {
- mDrawableRect.inset(mBorderWidth, mBorderWidth);
- }
- mDrawableRadius = Math.min(mDrawableRect.height() / 2.0f, mDrawableRect.width() / 2.0f);
-
- updateShaderMatrix();
- invalidate();
- }
-
- private void updateShaderMatrix() {
- float scale;
- float dx = 0;
- float dy = 0;
-
- mShaderMatrix.set(null);
-
- if (mBitmapWidth * mDrawableRect.height() > mDrawableRect.width() * mBitmapHeight) {
- scale = mDrawableRect.height() / (float) mBitmapHeight;
- dx = (mDrawableRect.width() - mBitmapWidth * scale) * 0.5f;
- } else {
- scale = mDrawableRect.width() / (float) mBitmapWidth;
- dy = (mDrawableRect.height() - mBitmapHeight * scale) * 0.5f;
- }
-
- mShaderMatrix.setScale(scale, scale);
- mShaderMatrix.postTranslate((int) (dx + 0.5f) + mDrawableRect.left, (int) (dy + 0.5f) + mDrawableRect.top);
-
- mBitmapShader.setLocalMatrix(mShaderMatrix);
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java
deleted file mode 100644
index bfda00bc62..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/CircleNumberProgress.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.SweepGradient;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.mogo.module.media.R;
-import com.mogo.module.media.utils.Utils;
-
-/**
- * @author lixiaopeng
- * @description
- * @since 2020/12/15
- */
-public class CircleNumberProgress extends View {
- /** 进度条画笔的宽度（dp） */
- private int paintProgressWidth = 4;
-
- /** 文字百分比的字体大小（sp） */
- private int paintTextSize = 20;
-
- /** 未完成进度条的颜色 */
-// private int paintUndoneColor = 0xffaaaaaa;
- private int paintUndoneColor;
-
- /** 已完成进度条的颜色 */
-// private int paintDoneColor = 0xff67aae4;
- private int paintDoneColor;
-
- /** 百分比文字的颜色 */
- private int paintTextColor = 0xffff0077;
-
- /** 设置进度条画笔的宽度(px) */
- private int paintProgressWidthPx;
-
- /** 文字画笔的尺寸(px) */
- private int paintTextSizePx;
- /** Context上下文环境 */
- private Context context;
-
- /** 调用者设置的进程 0 - 100 */
- private int progress;
-
- /** 画未完成进度圆弧的画笔 */
- private Paint paintUndone = new Paint();
-
- /** 画已经完成进度条的画笔 */
- private Paint paintDone = new Paint();
-
- /** 画文字的画笔 */
-// private Paint paintText = new Paint();
-
- /** 包围进度条圆弧的矩形 */
- private RectF rectF = new RectF();
-
- /** 包围文字所在路径圆弧的矩形，比上一个矩形略小 */
- private RectF rectF2 = new RectF();
-
- /** 进度文字所在的路径 */
- private Path path = new Path();
-
- /** 文字所在路径圆弧的半径 */
- private int radiusText;
-
- /** 是否进行过了测量 */
- private boolean isMeasured = false;
-
- public CircleNumberProgress(Context context, AttributeSet attrs) {
- super(context, attrs);
- this.context = context;
- TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.PercentageRing);
- //中间圆的背景颜色 默认为浅紫色
- paintUndoneColor = typedArray.getColor(R.styleable.PercentageRing_circleBackground, 0xffafb4db);
- //外圆环的颜色 默认为深紫色
-// paintDoneColor = typedArray.getColor(R.styleable.PercentageRing_ringColor, Color.parseColor("#e6fffff"));
-
- // 构造器中初始化数据
- initData();
- }
-
- /** 初始化数据 */
- private void initData() {
-
- // 设置进度条画笔的宽度
- paintProgressWidthPx = Utils.dip2px(context, paintProgressWidth);
-
- // 设置文字画笔的尺寸(px)
- paintTextSizePx = Utils.sp2px(context, paintTextSize);
-
- // 未完成进度圆环的画笔的属性
- paintUndone.setColor(paintUndoneColor);
- paintUndone.setStrokeWidth(paintProgressWidthPx);
- paintUndone.setAntiAlias(true);
- paintUndone.setStyle(Paint.Style.STROKE);
-
- // 已经完成进度条的画笔的属性
-// paintDone.setColor(paintDoneColor);
- paintDone.setStrokeWidth(paintProgressWidthPx);
- paintDone.setAntiAlias(true);
- paintDone.setStyle(Paint.Style.STROKE);
-
- float[] pos = {0f, 0.5f, 1.0f};
- SweepGradient linearGradient = new SweepGradient((getMeasuredWidth() - 40)/2,(getMeasuredHeight() - 40)/2,
- new int[]{Color.parseColor("#ffffff"), Color.parseColor("#B3ffffff"), Color.parseColor("#ffffff")}, pos);
-
-// SweepGradient linearGradient = new SweepGradient((getMeasuredWidth() -40)/2,(getMeasuredHeight() - 40)/2,new int[]{Color.GREEN, Color.RED, Color.YELLOW, Color.WHITE, Color.BLUE}, pos);
- Matrix matrix = new Matrix();
- matrix.setRotate(180, getMeasuredWidth()/2, getMeasuredHeight()/2);
- linearGradient.setLocalMatrix(matrix);
- paintDone.setShader(linearGradient);
-
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- if (!isMeasured) {
- getWidthAndHeight();
- isMeasured = true;
- }
- }
-
- /** 得到视图等的高度宽度尺寸数据 */
- private void getWidthAndHeight() {
- // 得到自定义视图的高度
- int viewHeight;
-
- // 得到自定义视图的宽度
- int viewWidth;
-
- // 得到自定义视图的X轴中心点
- int viewCenterX;
-
- // 得到自定义视图的Y轴中心点
- int viewCenterY;
-
- viewHeight = getMeasuredHeight();
- viewWidth = getMeasuredWidth();
- viewCenterX = viewWidth / 2;
- viewCenterY = viewHeight / 2;
-
- // 取本View长宽较小者的一半为整个圆环部分（包括圆环和文字）最外侧的半径
- int minLenth = viewHeight > viewWidth ? viewWidth / 2 : viewHeight / 2;
-
- // 比较文字高度和圆环宽度，如果文字高度较大，那么文字将突破圆环，否则，圆环会把文字包裹在内部
- Rect rect = new Rect();
- int textHeight = rect.height();
-
- // 得到圆环的中间半径（外径和内径平均值）
- int radiusArc = minLenth - (paintProgressWidthPx > textHeight ? paintProgressWidthPx / 2 : textHeight / 2);
- rectF.left = viewCenterX - radiusArc;
- rectF.top = viewCenterY - radiusArc;
- rectF.right = viewCenterX + radiusArc;
- rectF.bottom = viewCenterY + radiusArc;
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
-
- // 画未完成进度的圆环
- canvas.drawArc(rectF, 0, 360, false, paintUndone);
-
- // 画已经完成进度的圆弧 从-90度开始，即从圆环顶部开始
- canvas.drawArc(rectF, -90, progress / 100.0f * 360, false, paintDone);
-
- }
-
- /**
- * @param progress 外部传进来的当前进度,强制重绘
- */
- public void setProgress(int progress) {
- this.progress = progress;
- invalidate();
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/Corner.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/Corner.java
deleted file mode 100644
index ef7115fa65..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/Corner.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mogo.module.media.widget;
-import androidx.annotation.IntDef;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.SOURCE)
-@IntDef({
- Corner.TOP_LEFT, Corner.TOP_RIGHT,
- Corner.BOTTOM_LEFT, Corner.BOTTOM_RIGHT
-})
-public @interface Corner {
- int TOP_LEFT = 0;
- int TOP_RIGHT = 1;
- int BOTTOM_RIGHT = 2;
- int BOTTOM_LEFT = 3;
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/NoScrollSeekBar.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/NoScrollSeekBar.java
deleted file mode 100644
index d8f9186fbf..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/NoScrollSeekBar.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.widget.SeekBar;
-
-@SuppressLint("AppCompatCustomView")
-public class NoScrollSeekBar extends SeekBar {
-
- public NoScrollSeekBar(Context context) {
- super(context);
- }
-
- public NoScrollSeekBar(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public NoScrollSeekBar(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
- /**
- * onTouchEvent 是在 SeekBar 继承的抽象类 AbsSeekBar 里
- * 你可以看下他们的继承关系
- */
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- //原来是要将TouchEvent传递下去的,我们不让它传递下去就行了
- //return super.onTouchEvent(event);
-
- return false ;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/PercentageRingView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/PercentageRingView.java
deleted file mode 100755
index e21c7b9420..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/PercentageRingView.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.content.Context;
-import android.graphics.BlurMaskFilter;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.EmbossMaskFilter;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.SweepGradient;
-import android.util.AttributeSet;
-import android.view.View;
-
-
-/**
- * 环形进度条
- */
-public class PercentageRingView extends View {
-
- private Paint pathPaint;
- private Paint fillArcPaint;
- // 设置光源的方向
- private float[] direction = new float[]{1, 1, 1};
- /**
- * 透明
- */
- public static final int TRANSPARENT = 0x00000000;
-
- /**
- * 红色
- */
- public static final int RED = 0xffff0000;
-
- // 设置环境光亮度
- private float light = 0.4f;
- //渐变数组
- private int[] arcColors = new int[]{RED, TRANSPARENT};
-
- // 选择要应用的反射等级
- private float specular = 6;
- private EmbossMaskFilter emboss;
- private RectF oval;
- private BlurMaskFilter mBlur;
- // view重绘的标记
- private boolean reset = false;
- // 向 mask应用一定级别的模糊
- private float blur = 3.5f;
- private int arcradus = 30;
- //初始化进度
- private int progress = 0;
- //设置进度最大值
- private int max = 100;
-
-
- public PercentageRingView(Context context, AttributeSet attrs) {
- super(context, attrs);
- initPaint();
- oval = new RectF();
- emboss = new EmbossMaskFilter(direction, light, specular, blur);
- mBlur = new BlurMaskFilter(20, BlurMaskFilter.Blur.NORMAL);
- }
-
- //初始化画笔操作
- private void initPaint() {
- //初始化画笔操作
- pathPaint = new Paint();
- // 设置是否抗锯齿
- pathPaint.setAntiAlias(true);
- // 帮助消除锯齿
- pathPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
- // 设置中空的样式
- pathPaint.setStyle(Paint.Style.STROKE);
- pathPaint.setDither(true);
- pathPaint.setStrokeJoin(Paint.Join.ROUND);
-
- fillArcPaint = new Paint();
- // 设置是否抗锯齿
- fillArcPaint.setAntiAlias(true);
- // 帮助消除锯齿
- fillArcPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
- // 设置中空的样式
- fillArcPaint.setStyle(Paint.Style.STROKE);
- fillArcPaint.setDither(true);
- fillArcPaint.setStrokeJoin(Paint.Join.ROUND);
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- if (reset) {
- canvas.drawColor(Color.TRANSPARENT);
- reset = false;
- }
- drawcircle(canvas);
-
- }
-
- private void drawcircle(Canvas canvas) {
- int height = getMeasuredWidth();
- int width = getMeasuredWidth();
- //半径 = 宽/2-圆环的宽度
- int radius = width / 2 - arcradus;
- int cx = width / 2;
- int cy = height / 2;
- pathPaint.setColor(Color.BLUE);
- //绘制大圆
- canvas.drawCircle(width / 2, height / 2, radius + arcradus
- / 2 + 0.5f, pathPaint);
- //绘制小圆
- canvas.drawCircle(width / 2, height / 2, radius - arcradus
- / 2 - 0.5f, pathPaint);
-
- // 环形颜色填充
- SweepGradient sweepGradient =
- new SweepGradient(width / 2, height / 2, arcColors, null);
- fillArcPaint.setShader(sweepGradient);
- // 设置画笔为白色
-
- // 模糊效果
- fillArcPaint.setMaskFilter(mBlur);
- // 设置线的类型,边是圆的
- fillArcPaint.setStrokeCap(Paint.Cap.ROUND);
-
- //设置圆弧的宽度
- fillArcPaint.setStrokeWidth(arcradus + 1);
- // 确定圆弧的绘制位置，也就是里面圆弧坐标和外面圆弧坐标
- oval.set(width / 2 - radius, height / 2 - radius, width
- / 2 + radius, height / 2 + radius);
- // 画圆弧，第二个参数为：起始角度，第三个为跨的角度，第四个为true的时候是实心，false的时候为空心
- canvas.drawArc(oval,
- 0,
- ((float) progress / max) * 360,
- false,
- fillArcPaint);
- }
-
- public int getProgress() {
- return progress;
- }
-
- public void setProgress(int progress) {
- this.progress = progress;
- this.invalidate();
- }
-
- public int getMax() {
- return max;
- }
-
- public void setMax(int max) {
- this.max = max;
- }
-
- public int[] getArcColors() {
- return arcColors;
- }
-
- public void setArcColors(int[] arcColors) {
- this.arcColors = arcColors;
-// this.invalidate();
- }
-
- /**
- * 描述：重置进度
- *
- * @throws
- */
- public void reset() {
- reset = true;
- this.progress = 0;
- this.invalidate();
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/RoundedDrawable.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/RoundedDrawable.java
deleted file mode 100644
index a7e8d6b780..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/RoundedDrawable.java
+++ /dev/null
@@ -1,618 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.content.res.ColorStateList;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.util.Log;
-import android.widget.ImageView.ScaleType;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@SuppressWarnings("UnusedDeclaration")
-public class RoundedDrawable extends Drawable {
-
- public static final String TAG = "RoundedDrawable";
- public static final int DEFAULT_BORDER_COLOR = Color.BLACK;
-
- private final RectF mBounds = new RectF();
- private final RectF mDrawableRect = new RectF();
- private final RectF mBitmapRect = new RectF();
- private final Bitmap mBitmap;
- private final Paint mBitmapPaint;
- private final int mBitmapWidth;
- private final int mBitmapHeight;
- private final RectF mBorderRect = new RectF();
- private final Paint mBorderPaint;
- private final Matrix mShaderMatrix = new Matrix();
- private final RectF mSquareCornersRect = new RectF();
-
- private Shader.TileMode mTileModeX = Shader.TileMode.CLAMP;
- private Shader.TileMode mTileModeY = Shader.TileMode.CLAMP;
- private boolean mRebuildShader = true;
-
- private float mCornerRadius = 0f;
- // [ topLeft, topRight, bottomLeft, bottomRight ]
- private final boolean[] mCornersRounded = new boolean[] { true, true, true, true };
-
- private boolean mOval = false;
- private float mBorderWidth = 0;
- private ColorStateList mBorderColor = ColorStateList.valueOf(DEFAULT_BORDER_COLOR);
- private ScaleType mScaleType = ScaleType.FIT_CENTER;
-
- public RoundedDrawable(Bitmap bitmap) {
- mBitmap = bitmap;
-
- mBitmapWidth = bitmap.getWidth();
- mBitmapHeight = bitmap.getHeight();
- mBitmapRect.set(0, 0, mBitmapWidth, mBitmapHeight);
-
- mBitmapPaint = new Paint();
- mBitmapPaint.setStyle(Paint.Style.FILL);
- mBitmapPaint.setAntiAlias(true);
-
- mBorderPaint = new Paint();
- mBorderPaint.setStyle(Paint.Style.STROKE);
- mBorderPaint.setAntiAlias(true);
- mBorderPaint.setColor(mBorderColor.getColorForState(getState(), DEFAULT_BORDER_COLOR));
- mBorderPaint.setStrokeWidth(mBorderWidth);
- }
-
- public static RoundedDrawable fromBitmap(Bitmap bitmap) {
- if (bitmap != null) {
- return new RoundedDrawable(bitmap);
- } else {
- return null;
- }
- }
-
- public static Drawable fromDrawable(Drawable drawable) {
- if (drawable != null) {
- if (drawable instanceof RoundedDrawable) {
- // just return if it's already a RoundedDrawable
- return drawable;
- } else if (drawable instanceof LayerDrawable) {
- LayerDrawable ld = (LayerDrawable) drawable;
- int num = ld.getNumberOfLayers();
-
- // loop through layers to and change to RoundedDrawables if possible
- for (int i = 0; i < num; i++) {
- Drawable d = ld.getDrawable(i);
- ld.setDrawableByLayerId(ld.getId(i), fromDrawable(d));
- }
- return ld;
- }
-
- // try to get a bitmap from the drawable and
- Bitmap bm = drawableToBitmap(drawable);
- if (bm != null) {
- return new RoundedDrawable(bm);
- }
- }
- return drawable;
- }
-
- public static Bitmap drawableToBitmap(Drawable drawable) {
- if (drawable instanceof BitmapDrawable) {
- return ((BitmapDrawable) drawable).getBitmap();
- }
-
- Bitmap bitmap;
- int width = Math.max(drawable.getIntrinsicWidth(), 2);
- int height = Math.max(drawable.getIntrinsicHeight(), 2);
- try {
- bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
- Canvas canvas = new Canvas(bitmap);
- drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
- drawable.draw(canvas);
- } catch (Throwable e) {
- e.printStackTrace();
- Log.w(TAG, "Failed to create bitmap from drawable!");
- bitmap = null;
- }
-
- return bitmap;
- }
-
- public Bitmap getSourceBitmap() {
- return mBitmap;
- }
-
- @Override
- public boolean isStateful() {
- return mBorderColor.isStateful();
- }
-
- @Override
- protected boolean onStateChange(int[] state) {
- int newColor = mBorderColor.getColorForState(state, 0);
- if (mBorderPaint.getColor() != newColor) {
- mBorderPaint.setColor(newColor);
- return true;
- } else {
- return super.onStateChange(state);
- }
- }
-
- private void updateShaderMatrix() {
- float scale;
- float dx;
- float dy;
-
- switch (mScaleType) {
- case CENTER:
- mBorderRect.set(mBounds);
- mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
-
- mShaderMatrix.reset();
- mShaderMatrix.setTranslate((int) ((mBorderRect.width() - mBitmapWidth) * 0.5f + 0.5f),
- (int) ((mBorderRect.height() - mBitmapHeight) * 0.5f + 0.5f));
- break;
-
- case CENTER_CROP:
- mBorderRect.set(mBounds);
- mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
-
- mShaderMatrix.reset();
-
- dx = 0;
- dy = 0;
-
- if (mBitmapWidth * mBorderRect.height() > mBorderRect.width() * mBitmapHeight) {
- scale = mBorderRect.height() / (float) mBitmapHeight;
- dx = (mBorderRect.width() - mBitmapWidth * scale) * 0.5f;
- } else {
- scale = mBorderRect.width() / (float) mBitmapWidth;
- dy = (mBorderRect.height() - mBitmapHeight * scale) * 0.5f;
- }
-
- mShaderMatrix.setScale(scale, scale);
- mShaderMatrix.postTranslate((int) (dx + 0.5f) + mBorderWidth / 2,
- (int) (dy + 0.5f) + mBorderWidth / 2);
- break;
-
- case CENTER_INSIDE:
- mShaderMatrix.reset();
-
- if (mBitmapWidth <= mBounds.width() && mBitmapHeight <= mBounds.height()) {
- scale = 1.0f;
- } else {
- scale = Math.min(mBounds.width() / (float) mBitmapWidth,
- mBounds.height() / (float) mBitmapHeight);
- }
-
- dx = (int) ((mBounds.width() - mBitmapWidth * scale) * 0.5f + 0.5f);
- dy = (int) ((mBounds.height() - mBitmapHeight * scale) * 0.5f + 0.5f);
-
- mShaderMatrix.setScale(scale, scale);
- mShaderMatrix.postTranslate(dx, dy);
-
- mBorderRect.set(mBitmapRect);
- mShaderMatrix.mapRect(mBorderRect);
- mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
- mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
- break;
-
- default:
- case FIT_CENTER:
- mBorderRect.set(mBitmapRect);
- mShaderMatrix.setRectToRect(mBitmapRect, mBounds, Matrix.ScaleToFit.CENTER);
- mShaderMatrix.mapRect(mBorderRect);
- mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
- mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
- break;
-
- case FIT_END:
- mBorderRect.set(mBitmapRect);
- mShaderMatrix.setRectToRect(mBitmapRect, mBounds, Matrix.ScaleToFit.END);
- mShaderMatrix.mapRect(mBorderRect);
- mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
- mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
- break;
-
- case FIT_START:
- mBorderRect.set(mBitmapRect);
- mShaderMatrix.setRectToRect(mBitmapRect, mBounds, Matrix.ScaleToFit.START);
- mShaderMatrix.mapRect(mBorderRect);
- mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
- mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
- break;
-
- case FIT_XY:
- mBorderRect.set(mBounds);
- mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
- mShaderMatrix.reset();
- mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
- break;
- }
-
- mDrawableRect.set(mBorderRect);
- mRebuildShader = true;
- }
-
- @Override
- protected void onBoundsChange(@NonNull Rect bounds) {
- super.onBoundsChange(bounds);
-
- mBounds.set(bounds);
-
- updateShaderMatrix();
- }
-
- @Override
- public void draw(@NonNull Canvas canvas) {
- if (mRebuildShader) {
- BitmapShader bitmapShader = new BitmapShader(mBitmap, mTileModeX, mTileModeY);
- if (mTileModeX == Shader.TileMode.CLAMP && mTileModeY == Shader.TileMode.CLAMP) {
- bitmapShader.setLocalMatrix(mShaderMatrix);
- }
- mBitmapPaint.setShader(bitmapShader);
- mRebuildShader = false;
- }
-
- if (mOval) {
- if (mBorderWidth > 0) {
- canvas.drawOval(mDrawableRect, mBitmapPaint);
- canvas.drawOval(mBorderRect, mBorderPaint);
- } else {
- canvas.drawOval(mDrawableRect, mBitmapPaint);
- }
- } else {
- if (any(mCornersRounded)) {
- float radius = mCornerRadius;
- if (mBorderWidth > 0) {
- canvas.drawRoundRect(mDrawableRect, radius, radius, mBitmapPaint);
- canvas.drawRoundRect(mBorderRect, radius, radius, mBorderPaint);
- redrawBitmapForSquareCorners(canvas);
- redrawBorderForSquareCorners(canvas);
- } else {
- canvas.drawRoundRect(mDrawableRect, radius, radius, mBitmapPaint);
- redrawBitmapForSquareCorners(canvas);
- }
- } else {
- canvas.drawRect(mDrawableRect, mBitmapPaint);
- if (mBorderWidth > 0) {
- canvas.drawRect(mBorderRect, mBorderPaint);
- }
- }
- }
- }
-
- private void redrawBitmapForSquareCorners(Canvas canvas) {
- if (all(mCornersRounded)) {
- // no square corners
- return;
- }
-
- if (mCornerRadius == 0) {
- return; // no round corners
- }
-
- float left = mDrawableRect.left;
- float top = mDrawableRect.top;
- float right = left + mDrawableRect.width();
- float bottom = top + mDrawableRect.height();
- float radius = mCornerRadius;
-
- if (!mCornersRounded[Corner.TOP_LEFT]) {
- mSquareCornersRect.set(left, top, left + radius, top + radius);
- canvas.drawRect(mSquareCornersRect, mBitmapPaint);
- }
-
- if (!mCornersRounded[Corner.TOP_RIGHT]) {
- mSquareCornersRect.set(right - radius, top, right, radius);
- canvas.drawRect(mSquareCornersRect, mBitmapPaint);
- }
-
- if (!mCornersRounded[Corner.BOTTOM_RIGHT]) {
- mSquareCornersRect.set(right - radius, bottom - radius, right, bottom);
- canvas.drawRect(mSquareCornersRect, mBitmapPaint);
- }
-
- if (!mCornersRounded[Corner.BOTTOM_LEFT]) {
- mSquareCornersRect.set(left, bottom - radius, left + radius, bottom);
- canvas.drawRect(mSquareCornersRect, mBitmapPaint);
- }
- }
-
- private void redrawBorderForSquareCorners(Canvas canvas) {
- if (all(mCornersRounded)) {
- // no square corners
- return;
- }
-
- if (mCornerRadius == 0) {
- return; // no round corners
- }
-
- float left = mDrawableRect.left;
- float top = mDrawableRect.top;
- float right = left + mDrawableRect.width();
- float bottom = top + mDrawableRect.height();
- float radius = mCornerRadius;
- float offset = mBorderWidth / 2;
-
- if (!mCornersRounded[Corner.TOP_LEFT]) {
- canvas.drawLine(left - offset, top, left + radius, top, mBorderPaint);
- canvas.drawLine(left, top - offset, left, top + radius, mBorderPaint);
- }
-
- if (!mCornersRounded[Corner.TOP_RIGHT]) {
- canvas.drawLine(right - radius - offset, top, right, top, mBorderPaint);
- canvas.drawLine(right, top - offset, right, top + radius, mBorderPaint);
- }
-
- if (!mCornersRounded[Corner.BOTTOM_RIGHT]) {
- canvas.drawLine(right - radius - offset, bottom, right + offset, bottom, mBorderPaint);
- canvas.drawLine(right, bottom - radius, right, bottom, mBorderPaint);
- }
-
- if (!mCornersRounded[Corner.BOTTOM_LEFT]) {
- canvas.drawLine(left - offset, bottom, left + radius, bottom, mBorderPaint);
- canvas.drawLine(left, bottom - radius, left, bottom, mBorderPaint);
- }
- }
-
- @Override
- public int getOpacity() {
- return PixelFormat.TRANSLUCENT;
- }
-
- @Override
- public int getAlpha() {
- return mBitmapPaint.getAlpha();
- }
-
- @Override
- public void setAlpha(int alpha) {
- mBitmapPaint.setAlpha(alpha);
- invalidateSelf();
- }
-
- @Override
- public ColorFilter getColorFilter() {
- return mBitmapPaint.getColorFilter();
- }
-
- @Override
- public void setColorFilter(ColorFilter cf) {
- mBitmapPaint.setColorFilter(cf);
- invalidateSelf();
- }
-
- @Override
- public void setDither(boolean dither) {
- mBitmapPaint.setDither(dither);
- invalidateSelf();
- }
-
- @Override
- public void setFilterBitmap(boolean filter) {
- mBitmapPaint.setFilterBitmap(filter);
- invalidateSelf();
- }
-
- @Override
- public int getIntrinsicWidth() {
- return mBitmapWidth;
- }
-
- @Override
- public int getIntrinsicHeight() {
- return mBitmapHeight;
- }
-
- /**
- * @return the corner radius.
- */
- public float getCornerRadius() {
- return mCornerRadius;
- }
-
- /**
- * @param corner the specific corner to get radius of.
- * @return the corner radius of the specified corner.
- */
- public float getCornerRadius(@Corner int corner) {
- return mCornersRounded[corner] ? mCornerRadius : 0f;
- }
-
- /**
- * Sets all corners to the specified radius.
- *
- * @param radius the radius.
- * @return the {@link RoundedDrawable} for chaining.
- */
- public RoundedDrawable setCornerRadius(float radius) {
- setCornerRadius(radius, radius, radius, radius);
- return this;
- }
-
- /**
- * Sets the corner radius of one specific corner.
- *
- * @param corner the corner.
- * @param radius the radius.
- * @return the {@link RoundedDrawable} for chaining.
- */
- public RoundedDrawable setCornerRadius(@Corner int corner, float radius) {
- if (radius != 0 && mCornerRadius != 0 && mCornerRadius != radius) {
- throw new IllegalArgumentException("Multiple nonzero corner radii not yet supported.");
- }
-
- if (radius == 0) {
- if (only(corner, mCornersRounded)) {
- mCornerRadius = 0;
- }
- mCornersRounded[corner] = false;
- } else {
- if (mCornerRadius == 0) {
- mCornerRadius = radius;
- }
- mCornersRounded[corner] = true;
- }
-
- return this;
- }
-
- /**
- * Sets the corner radii of all the corners.
- *
- * @param topLeft top left corner radius.
- * @param topRight top right corner radius
- * @param bottomRight bototm right corner radius.
- * @param bottomLeft bottom left corner radius.
- * @return the {@link RoundedDrawable} for chaining.
- */
- public RoundedDrawable setCornerRadius(float topLeft, float topRight, float bottomRight,
- float bottomLeft) {
- Set radiusSet = new HashSet<>(4);
- radiusSet.add(topLeft);
- radiusSet.add(topRight);
- radiusSet.add(bottomRight);
- radiusSet.add(bottomLeft);
-
- radiusSet.remove(0f);
-
- if (radiusSet.size() > 1) {
- throw new IllegalArgumentException("Multiple nonzero corner radii not yet supported.");
- }
-
- if (!radiusSet.isEmpty()) {
- float radius = radiusSet.iterator().next();
- if (Float.isInfinite(radius) || Float.isNaN(radius) || radius < 0) {
- throw new IllegalArgumentException("Invalid radius value: " + radius);
- }
- mCornerRadius = radius;
- } else {
- mCornerRadius = 0f;
- }
-
- mCornersRounded[Corner.TOP_LEFT] = topLeft > 0;
- mCornersRounded[Corner.TOP_RIGHT] = topRight > 0;
- mCornersRounded[Corner.BOTTOM_RIGHT] = bottomRight > 0;
- mCornersRounded[Corner.BOTTOM_LEFT] = bottomLeft > 0;
- return this;
- }
-
- public float getBorderWidth() {
- return mBorderWidth;
- }
-
- public RoundedDrawable setBorderWidth(float width) {
- mBorderWidth = width;
- mBorderPaint.setStrokeWidth(mBorderWidth);
- return this;
- }
-
- public int getBorderColor() {
- return mBorderColor.getDefaultColor();
- }
-
- public RoundedDrawable setBorderColor(@ColorInt int color) {
- return setBorderColor(ColorStateList.valueOf(color));
- }
-
- public ColorStateList getBorderColors() {
- return mBorderColor;
- }
-
- public RoundedDrawable setBorderColor(ColorStateList colors) {
- mBorderColor = colors != null ? colors : ColorStateList.valueOf(0);
- mBorderPaint.setColor(mBorderColor.getColorForState(getState(), DEFAULT_BORDER_COLOR));
- return this;
- }
-
- public boolean isOval() {
- return mOval;
- }
-
- public RoundedDrawable setOval(boolean oval) {
- mOval = oval;
- return this;
- }
-
- public ScaleType getScaleType() {
- return mScaleType;
- }
-
- public RoundedDrawable setScaleType(ScaleType scaleType) {
- if (scaleType == null) {
- scaleType = ScaleType.FIT_CENTER;
- }
- if (mScaleType != scaleType) {
- mScaleType = scaleType;
- updateShaderMatrix();
- }
- return this;
- }
-
- public Shader.TileMode getTileModeX() {
- return mTileModeX;
- }
-
- public RoundedDrawable setTileModeX(Shader.TileMode tileModeX) {
- if (mTileModeX != tileModeX) {
- mTileModeX = tileModeX;
- mRebuildShader = true;
- invalidateSelf();
- }
- return this;
- }
-
- public Shader.TileMode getTileModeY() {
- return mTileModeY;
- }
-
- public RoundedDrawable setTileModeY(Shader.TileMode tileModeY) {
- if (mTileModeY != tileModeY) {
- mTileModeY = tileModeY;
- mRebuildShader = true;
- invalidateSelf();
- }
- return this;
- }
-
- private static boolean only(int index, boolean[] booleans) {
- for (int i = 0, len = booleans.length; i < len; i++) {
- if (booleans[i] != (i == index)) {
- return false;
- }
- }
- return true;
- }
-
- private static boolean any(boolean[] booleans) {
- for (boolean b : booleans) {
- if (b) { return true; }
- }
- return false;
- }
-
- private static boolean all(boolean[] booleans) {
- for (boolean b : booleans) {
- if (b) { return false; }
- }
- return true;
- }
-
- public Bitmap toBitmap() {
- return drawableToBitmap(this);
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/RoundedImageView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/RoundedImageView.java
deleted file mode 100644
index b552bea0bb..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/RoundedImageView.java
+++ /dev/null
@@ -1,595 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.ColorFilter;
-import android.graphics.Shader;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.net.Uri;
-
-import android.util.AttributeSet;
-import android.util.Log;
-import android.widget.ImageView;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.DimenRes;
-import androidx.annotation.DrawableRes;
-
-import com.mogo.module.media.R;
-
-@SuppressLint("AppCompatCustomView")
-public class RoundedImageView extends ImageView {
-
- // Constants for tile mode attributes
- private static final int TILE_MODE_UNDEFINED = -2;
- private static final int TILE_MODE_CLAMP = 0;
- private static final int TILE_MODE_REPEAT = 1;
- private static final int TILE_MODE_MIRROR = 2;
-
- public static final String TAG = "RoundedImageView";
- public static final float DEFAULT_RADIUS = 0f;
- public static final float DEFAULT_BORDER_WIDTH = 0f;
- public static final Shader.TileMode DEFAULT_TILE_MODE = Shader.TileMode.CLAMP;
- private static final ImageView.ScaleType[] SCALE_TYPES = {
- ImageView.ScaleType.MATRIX,
- ImageView.ScaleType.FIT_XY,
- ImageView.ScaleType.FIT_START,
- ImageView.ScaleType.FIT_CENTER,
- ImageView.ScaleType.FIT_END,
- ImageView.ScaleType.CENTER,
- ImageView.ScaleType.CENTER_CROP,
- ImageView.ScaleType.CENTER_INSIDE
- };
-
- private final float[] mCornerRadii =
- new float[] { DEFAULT_RADIUS, DEFAULT_RADIUS, DEFAULT_RADIUS, DEFAULT_RADIUS };
-
- private Drawable mBackgroundDrawable;
- private ColorStateList mBorderColor =
- ColorStateList.valueOf(RoundedDrawable.DEFAULT_BORDER_COLOR);
- private float mBorderWidth = DEFAULT_BORDER_WIDTH;
- private ColorFilter mColorFilter = null;
- private boolean mColorMod = false;
- private Drawable mDrawable;
- private boolean mHasColorFilter = false;
- private boolean mIsOval = false;
- private boolean mMutateBackground = false;
- private int mResource;
- private int mBackgroundResource;
- private ImageView.ScaleType mScaleType;
- private Shader.TileMode mTileModeX = DEFAULT_TILE_MODE;
- private Shader.TileMode mTileModeY = DEFAULT_TILE_MODE;
-
- public RoundedImageView(Context context) {
- super(context);
- }
-
- public RoundedImageView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public RoundedImageView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.MediaRoundedImageView, defStyle, 0);
-
- int index = a.getInt(R.styleable.MediaRoundedImageView_android_scaleType, -1);
- if (index >= 0) {
- setScaleType(SCALE_TYPES[index]);
- } else {
- // default scaletype to FIT_CENTER
- setScaleType(ImageView.ScaleType.FIT_CENTER);
- }
-
- float cornerRadiusOverride =
- a.getDimensionPixelSize(R.styleable.MediaRoundedImageView_riv_corner_radius, -1);
-
- mCornerRadii[Corner.TOP_LEFT] =
- a.getDimensionPixelSize(R.styleable.MediaRoundedImageView_riv_corner_radius_top_left, -1);
- mCornerRadii[Corner.TOP_RIGHT] =
- a.getDimensionPixelSize(R.styleable.MediaRoundedImageView_riv_corner_radius_top_right, -1);
- mCornerRadii[Corner.BOTTOM_RIGHT] =
- a.getDimensionPixelSize(R.styleable.MediaRoundedImageView_riv_corner_radius_bottom_right, -1);
- mCornerRadii[Corner.BOTTOM_LEFT] =
- a.getDimensionPixelSize(R.styleable.MediaRoundedImageView_riv_corner_radius_bottom_left, -1);
-
- boolean any = false;
- for (int i = 0, len = mCornerRadii.length; i < len; i++) {
- if (mCornerRadii[i] < 0) {
- mCornerRadii[i] = 0f;
- } else {
- any = true;
- }
- }
-
- if (!any) {
- if (cornerRadiusOverride < 0) {
- cornerRadiusOverride = DEFAULT_RADIUS;
- }
- for (int i = 0, len = mCornerRadii.length; i < len; i++) {
- mCornerRadii[i] = cornerRadiusOverride;
- }
- }
-
- mBorderWidth = a.getDimensionPixelSize(R.styleable.MediaRoundedImageView_riv_border_width, -1);
- if (mBorderWidth < 0) {
- mBorderWidth = DEFAULT_BORDER_WIDTH;
- }
-
- mBorderColor = a.getColorStateList(R.styleable.MediaRoundedImageView_riv_border_color);
- if (mBorderColor == null) {
- mBorderColor = ColorStateList.valueOf(RoundedDrawable.DEFAULT_BORDER_COLOR);
- }
-
- mMutateBackground = a.getBoolean(R.styleable.MediaRoundedImageView_riv_mutate_background, false);
- mIsOval = a.getBoolean(R.styleable.MediaRoundedImageView_riv_oval, false);
-
- final int tileMode = a.getInt(R.styleable.MediaRoundedImageView_riv_tile_mode, TILE_MODE_UNDEFINED);
- if (tileMode != TILE_MODE_UNDEFINED) {
- setTileModeX(parseTileMode(tileMode));
- setTileModeY(parseTileMode(tileMode));
- }
-
- final int tileModeX =
- a.getInt(R.styleable.MediaRoundedImageView_riv_tile_mode_x, TILE_MODE_UNDEFINED);
- if (tileModeX != TILE_MODE_UNDEFINED) {
- setTileModeX(parseTileMode(tileModeX));
- }
-
- final int tileModeY =
- a.getInt(R.styleable.MediaRoundedImageView_riv_tile_mode_y, TILE_MODE_UNDEFINED);
- if (tileModeY != TILE_MODE_UNDEFINED) {
- setTileModeY(parseTileMode(tileModeY));
- }
-
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(true);
-
- if (mMutateBackground) {
- //noinspection deprecation
- super.setBackgroundDrawable(mBackgroundDrawable);
- }
-
- a.recycle();
- }
-
- private static Shader.TileMode parseTileMode(int tileMode) {
- switch (tileMode) {
- case TILE_MODE_CLAMP:
- return Shader.TileMode.CLAMP;
- case TILE_MODE_REPEAT:
- return Shader.TileMode.REPEAT;
- case TILE_MODE_MIRROR:
- return Shader.TileMode.MIRROR;
- default:
- return null;
- }
- }
-
- @Override
- protected void drawableStateChanged() {
- super.drawableStateChanged();
- invalidate();
- }
-
- @Override
- public ImageView.ScaleType getScaleType() {
- return mScaleType;
- }
-
- @Override
- public void setScaleType(ImageView.ScaleType scaleType) {
- assert scaleType != null;
-
- if (mScaleType != scaleType) {
- mScaleType = scaleType;
-
- switch (scaleType) {
- case CENTER:
- case CENTER_CROP:
- case CENTER_INSIDE:
- case FIT_CENTER:
- case FIT_START:
- case FIT_END:
- case FIT_XY:
- super.setScaleType(ImageView.ScaleType.FIT_XY);
- break;
- default:
- super.setScaleType(scaleType);
- break;
- }
-
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- invalidate();
- }
- }
-
- @Override
- public void setImageDrawable(Drawable drawable) {
- mResource = 0;
- mDrawable = RoundedDrawable.fromDrawable(drawable);
- updateDrawableAttrs();
- super.setImageDrawable(mDrawable);
- }
-
- @Override
- public void setImageBitmap(Bitmap bm) {
- mResource = 0;
- mDrawable = RoundedDrawable.fromBitmap(bm);
- updateDrawableAttrs();
- super.setImageDrawable(mDrawable);
- }
-
- @Override
- public void setImageResource(@DrawableRes int resId) {
- if (mResource != resId) {
- mResource = resId;
- mDrawable = resolveResource();
- updateDrawableAttrs();
- super.setImageDrawable(mDrawable);
- }
- }
-
- @Override
- public void setImageURI(Uri uri) {
- super.setImageURI(uri);
- setImageDrawable(getDrawable());
- }
-
- private Drawable resolveResource() {
- Resources rsrc = getResources();
- if (rsrc == null) { return null; }
-
- Drawable d = null;
-
- if (mResource != 0) {
- try {
- d = rsrc.getDrawable(mResource);
- } catch (Exception e) {
- Log.w(TAG, "Unable to find resource: " + mResource, e);
- // Don't try again.
- mResource = 0;
- }
- }
- return RoundedDrawable.fromDrawable(d);
- }
-
- @Override
- public void setBackground(Drawable background) {
- setBackgroundDrawable(background);
- }
-
- @Override
- public void setBackgroundResource(@DrawableRes int resId) {
- if (mBackgroundResource != resId) {
- mBackgroundResource = resId;
- mBackgroundDrawable = resolveBackgroundResource();
- setBackgroundDrawable(mBackgroundDrawable);
- }
- }
-
- @Override
- public void setBackgroundColor(int color) {
- mBackgroundDrawable = new ColorDrawable(color);
- setBackgroundDrawable(mBackgroundDrawable);
- }
-
- private Drawable resolveBackgroundResource() {
- Resources rsrc = getResources();
- if (rsrc == null) { return null; }
-
- Drawable d = null;
-
- if (mBackgroundResource != 0) {
- try {
- d = rsrc.getDrawable(mBackgroundResource);
- } catch (Exception e) {
- Log.w(TAG, "Unable to find resource: " + mBackgroundResource, e);
- // Don't try again.
- mBackgroundResource = 0;
- }
- }
- return RoundedDrawable.fromDrawable(d);
- }
-
- private void updateDrawableAttrs() {
- updateAttrs(mDrawable, mScaleType);
- }
-
- private void updateBackgroundDrawableAttrs(boolean convert) {
- if (mMutateBackground) {
- if (convert) {
- mBackgroundDrawable = RoundedDrawable.fromDrawable(mBackgroundDrawable);
- }
- updateAttrs(mBackgroundDrawable, ImageView.ScaleType.FIT_XY);
- }
- }
-
- @Override
- public void setColorFilter(ColorFilter cf) {
- if (mColorFilter != cf) {
- mColorFilter = cf;
- mHasColorFilter = true;
- mColorMod = true;
- applyColorMod();
- invalidate();
- }
- }
-
- private void applyColorMod() {
- // Only mutate and apply when modifications have occurred. This should
- // not reset the mColorMod flag, since these filters need to be
- // re-applied if the Drawable is changed.
- if (mDrawable != null && mColorMod) {
- mDrawable = mDrawable.mutate();
- if (mHasColorFilter) {
- mDrawable.setColorFilter(mColorFilter);
- }
- // TODO: support, eventually...
- //mDrawable.setXfermode(mXfermode);
- //mDrawable.setAlpha(mAlpha * mViewAlphaScale >> 8);
- }
- }
-
- private void updateAttrs(Drawable drawable, ImageView.ScaleType scaleType) {
- if (drawable == null) { return; }
-
- if (drawable instanceof RoundedDrawable) {
- ((RoundedDrawable) drawable)
- .setScaleType(scaleType)
- .setBorderWidth(mBorderWidth)
- .setBorderColor(mBorderColor)
- .setOval(mIsOval)
- .setTileModeX(mTileModeX)
- .setTileModeY(mTileModeY);
-
- if (mCornerRadii != null) {
- ((RoundedDrawable) drawable).setCornerRadius(
- mCornerRadii[Corner.TOP_LEFT],
- mCornerRadii[Corner.TOP_RIGHT],
- mCornerRadii[Corner.BOTTOM_RIGHT],
- mCornerRadii[Corner.BOTTOM_LEFT]);
- }
-
- applyColorMod();
- } else if (drawable instanceof LayerDrawable) {
- // loop through layers to and set drawable attrs
- LayerDrawable ld = ((LayerDrawable) drawable);
- for (int i = 0, layers = ld.getNumberOfLayers(); i < layers; i++) {
- updateAttrs(ld.getDrawable(i), scaleType);
- }
- }
- }
-
- @Override
- @Deprecated
- public void setBackgroundDrawable(Drawable background) {
- mBackgroundDrawable = background;
- updateBackgroundDrawableAttrs(true);
- //noinspection deprecation
- super.setBackgroundDrawable(mBackgroundDrawable);
- }
-
- /**
- * @return the largest corner radius.
- */
- public float getCornerRadius() {
- return getMaxCornerRadius();
- }
-
- /**
- * @return the largest corner radius.
- */
- public float getMaxCornerRadius() {
- float maxRadius = 0;
- for (float r : mCornerRadii) {
- maxRadius = Math.max(r, maxRadius);
- }
- return maxRadius;
- }
-
- /**
- * Get the corner radius of a specified corner.
- *
- * @param corner the corner.
- * @return the radius.
- */
- public float getCornerRadius(@Corner int corner) {
- return mCornerRadii[corner];
- }
-
- /**
- * Set all the corner radii from a dimension resource id.
- *
- * @param resId dimension resource id of radii.
- */
- public void setCornerRadiusDimen(@DimenRes int resId) {
- float radius = getResources().getDimension(resId);
- setCornerRadius(radius, radius, radius, radius);
- }
-
- /**
- * Set the corner radius of a specific corner from a dimension resource id.
- *
- * @param corner the corner to set.
- * @param resId the dimension resource id of the corner radius.
- */
- public void setCornerRadiusDimen(@Corner int corner, @DimenRes int resId) {
- setCornerRadius(corner, getResources().getDimensionPixelSize(resId));
- }
-
- /**
- * Set the corner radii of all corners in px.
- *
- * @param radius the radius to set.
- */
- public void setCornerRadius(float radius) {
- setCornerRadius(radius, radius, radius, radius);
- }
-
- /**
- * Set the corner radius of a specific corner in px.
- *
- * @param corner the corner to set.
- * @param radius the corner radius to set in px.
- */
- public void setCornerRadius(@Corner int corner, float radius) {
- if (mCornerRadii[corner] == radius) {
- return;
- }
- mCornerRadii[corner] = radius;
-
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- invalidate();
- }
-
- /**
- * Set the corner radii of each corner individually. Currently only one unique nonzero value is
- * supported.
- *
- * @param topLeft radius of the top left corner in px.
- * @param topRight radius of the top right corner in px.
- * @param bottomRight radius of the bottom right corner in px.
- * @param bottomLeft radius of the bottom left corner in px.
- */
- public void setCornerRadius(float topLeft, float topRight, float bottomLeft, float bottomRight) {
- if (mCornerRadii[Corner.TOP_LEFT] == topLeft
- && mCornerRadii[Corner.TOP_RIGHT] == topRight
- && mCornerRadii[Corner.BOTTOM_RIGHT] == bottomRight
- && mCornerRadii[Corner.BOTTOM_LEFT] == bottomLeft) {
- return;
- }
-
- mCornerRadii[Corner.TOP_LEFT] = topLeft;
- mCornerRadii[Corner.TOP_RIGHT] = topRight;
- mCornerRadii[Corner.BOTTOM_LEFT] = bottomLeft;
- mCornerRadii[Corner.BOTTOM_RIGHT] = bottomRight;
-
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- invalidate();
- }
-
- public float getBorderWidth() {
- return mBorderWidth;
- }
-
- public void setBorderWidth(@DimenRes int resId) {
- setBorderWidth(getResources().getDimension(resId));
- }
-
- public void setBorderWidth(float width) {
- if (mBorderWidth == width) { return; }
-
- mBorderWidth = width;
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- invalidate();
- }
-
- @ColorInt
- public int getBorderColor() {
- return mBorderColor.getDefaultColor();
- }
-
- public void setBorderColor(@ColorInt int color) {
- setBorderColor(ColorStateList.valueOf(color));
- }
-
- public ColorStateList getBorderColors() {
- return mBorderColor;
- }
-
- public void setBorderColor(ColorStateList colors) {
- if (mBorderColor.equals(colors)) { return; }
-
- mBorderColor =
- (colors != null) ? colors : ColorStateList.valueOf(RoundedDrawable.DEFAULT_BORDER_COLOR);
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- if (mBorderWidth > 0) {
- invalidate();
- }
- }
-
- /**
- * Return true if this view should be oval and always set corner radii to half the height or
- * width.
- *
- * @return if this {@link RoundedImageView} is set to oval.
- */
- public boolean isOval() {
- return mIsOval;
- }
-
- /**
- * Set if the drawable should ignore the corner radii set and always round the source to
- * exactly half the height or width.
- *
- * @param oval if this {@link RoundedImageView} should be oval.
- */
- public void setOval(boolean oval) {
- mIsOval = oval;
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- invalidate();
- }
-
- public Shader.TileMode getTileModeX() {
- return mTileModeX;
- }
-
- public void setTileModeX(Shader.TileMode tileModeX) {
- if (this.mTileModeX == tileModeX) { return; }
-
- this.mTileModeX = tileModeX;
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- invalidate();
- }
-
- public Shader.TileMode getTileModeY() {
- return mTileModeY;
- }
-
- public void setTileModeY(Shader.TileMode tileModeY) {
- if (this.mTileModeY == tileModeY) { return; }
-
- this.mTileModeY = tileModeY;
- updateDrawableAttrs();
- updateBackgroundDrawableAttrs(false);
- invalidate();
- }
-
- /**
- * If {@code true}, we will also round the background drawable according to the settings on this
- * ImageView.
- *
- * @return whether the background is mutated.
- */
- public boolean mutatesBackground() {
- return mMutateBackground;
- }
-
- /**
- * Set whether the {@link RoundedImageView} should round the background drawable according to
- * the settings in addition to the source drawable.
- *
- * @param mutate true if this view should mutate the background drawable.
- */
- public void mutateBackground(boolean mutate) {
- if (mMutateBackground == mutate) { return; }
-
- mMutateBackground = mutate;
- updateBackgroundDrawableAttrs(true);
- invalidate();
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/ScrollingTextView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/ScrollingTextView.java
deleted file mode 100644
index 0ab1abb4fc..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/ScrollingTextView.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.mogo.module.media.widget;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-
-import androidx.appcompat.widget.AppCompatTextView;
-
-public class ScrollingTextView extends AppCompatTextView {
- public ScrollingTextView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- public ScrollingTextView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public ScrollingTextView(Context context) {
- super(context);
- }
-
- @Override
- protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
- if (focused)
- super.onFocusChanged(focused, direction, previouslyFocusedRect);
- }
-
- @Override
- public void onWindowFocusChanged(boolean focused) {
- if (focused)
- super.onWindowFocusChanged(focused);
- }
-
- @Override
- public boolean isFocused() {
- return true;
- }
-}
-
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/BaseSurfaceView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/BaseSurfaceView.java
deleted file mode 100644
index fd9ddfd6f1..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/BaseSurfaceView.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.PixelFormat;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-public abstract class BaseSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
- public static final int DEFAULT_FRAME_DURATION_MILLISECOND = 50;
-
- private HandlerThread handlerThread;
- private SurfaceViewHandler handler;
- protected int frameDuration = DEFAULT_FRAME_DURATION_MILLISECOND;
- private Canvas canvas;
- private boolean isAlive;
- public boolean pause = false;
-
- public BaseSurfaceView(Context context) {
- super(context);
- init();
- }
-
- public BaseSurfaceView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public BaseSurfaceView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- protected int getFrameDuration() {
- return frameDuration;
- }
-
- protected void setFrameDuration(int frameDuration) {
- this.frameDuration = frameDuration;
- }
-
- protected void init() {
- getHolder().addCallback(this);
- setBackgroundTransparent();
- }
-
- private void setBackgroundTransparent() {
- setZOrderOnTop(false);
- setZOrderMediaOverlay(true);
- getHolder().setFormat(PixelFormat.TRANSLUCENT);
- }
-
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
- isAlive = true;
- startDrawThread();
- }
-
- @Override
- public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-
- }
-
- @Override
- public void surfaceDestroyed(SurfaceHolder holder) {
- stopDrawThread();
- isAlive = false;
- }
-
- public void stopDrawThread() {
- handlerThread.quit();
- handler.removeCallbacksAndMessages(null);
- handler = null;
- }
-
- public void startDrawThread() {
- handlerThread = new HandlerThread("SurfaceViewThread");
- handlerThread.start();
- handler = new SurfaceViewHandler(handlerThread.getLooper());
- handler.post(new DrawRunnable());
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- int widthMode = MeasureSpec.getMode(widthMeasureSpec);
- int heightMode = MeasureSpec.getMode(heightMeasureSpec);
- int originWidth = getMeasuredWidth();
- int originHeight = getMeasuredHeight();
- int width = widthMode == MeasureSpec.AT_MOST ? getDefaultWidth() : originWidth;
- int height = heightMode == MeasureSpec.AT_MOST ? getDefaultHeight() : originHeight;
- setMeasuredDimension(width, height);
- Log.v("ttaylor", "BaseSurfaceView.onMeasure()" + " default Width=" + getDefaultWidth() + " default height=" + getDefaultHeight());
- }
-
- /**
- * the width is used when wrap_content is set to layout_width
- * the child knows how big it should be
- *
- * @return
- */
- protected abstract int getDefaultWidth();
-
- /**
- * the height is used when wrap_content is set to layout_height
- * the child knows how big it should be
- *
- * @return
- */
- protected abstract int getDefaultHeight();
-
-
- private class SurfaceViewHandler extends Handler {
-
- public SurfaceViewHandler(Looper looper) {
- super(looper);
- }
-
- @Override
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- }
- }
-
- private class DrawRunnable implements Runnable {
-
- @Override
- public void run() {
- if (!isAlive) {
- return;
- }
- try {
- canvas = getHolder().lockCanvas();
- onFrameDraw(canvas);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- getHolder().unlockCanvasAndPost(canvas);
- onFrameDrawFinish();
- }
-
- // TODO: 2019-05-08 stop the drawing thread
- if (handler != null && !pause){
- handler.postDelayed(this, frameDuration);
- }
-
- }
- }
-
- public void setPause(boolean pause){
- this.pause = pause;
- }
-
- public boolean getPause(){
- return this.pause;
- }
-
- public void reStartDrawRunnable(){
- if (handler != null){
- handler.post(new DrawRunnable());
- }
- }
-
- /**
- * it is will be invoked after one frame is drawn
- */
- protected abstract void onFrameDrawFinish();
-
- /**
- * draw one frame to the surface by canvas
- *
- * @param canvas
- */
- protected abstract void onFrameDraw(Canvas canvas);
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/BaseTextureView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/BaseTextureView.java
deleted file mode 100644
index 2a722748a8..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/BaseTextureView.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.SurfaceTexture;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.TextureView;
-
-public abstract class BaseTextureView extends TextureView implements TextureView.SurfaceTextureListener {
- public static final int DEFAULT_FRAME_DURATION_MILLISECOND = 50;
-
- private HandlerThread handlerThread;
- private SurfaceViewHandler handler;
- protected int frameDuration = DEFAULT_FRAME_DURATION_MILLISECOND;
- private Canvas canvas;
- private boolean isAlive;
- public boolean pause = false;
-
- public BaseTextureView(Context context) {
- super(context);
- init();
- }
-
- public BaseTextureView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public BaseTextureView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- protected int getFrameDuration() {
- return frameDuration;
- }
-
- protected void setFrameDuration(int frameDuration) {
- this.frameDuration = frameDuration;
- }
-
- protected void init() {
- setOpaque(false);//设置背景透明，记住这里是[是否不透明]
- setSurfaceTextureListener(this);//设置监听
- }
-
- @Override
- public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
- //当TextureView初始化时调用
- isAlive = true;
- startDrawThread();
- }
-
- @Override
- public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
- //当TextureView的大小改变时调用
- }
-
- @Override
- public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
- //当TextureView被销毁时调用
- stopDrawThread();
- isAlive = false;
- return true;
- }
-
- @Override
- public void onSurfaceTextureUpdated(SurfaceTexture surface) {
- //当TextureView更新时调用，也就是当我们调用unlockCanvasAndPost方法时
- }
-
- public void stopDrawThread() {
- handlerThread.quit();
- handler.removeCallbacksAndMessages(null);
- handler = null;
- }
-
- public void startDrawThread() {
- handlerThread = new HandlerThread("SurfaceViewThread");
- handlerThread.start();
- handler = new SurfaceViewHandler(handlerThread.getLooper());
- handler.post(new DrawRunnable());
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- int widthMode = MeasureSpec.getMode(widthMeasureSpec);
- int heightMode = MeasureSpec.getMode(heightMeasureSpec);
- int originWidth = getMeasuredWidth();
- int originHeight = getMeasuredHeight();
- int width = widthMode == MeasureSpec.AT_MOST ? getDefaultWidth() : originWidth;
- int height = heightMode == MeasureSpec.AT_MOST ? getDefaultHeight() : originHeight;
- setMeasuredDimension(width, height);
- Log.v("ttaylor", "BaseSurfaceView.onMeasure()" + " default Width=" + getDefaultWidth() + " default height=" + getDefaultHeight());
- }
-
- /**
- * the width is used when wrap_content is set to layout_width
- * the child knows how big it should be
- *
- * @return
- */
- protected abstract int getDefaultWidth();
-
- /**
- * the height is used when wrap_content is set to layout_height
- * the child knows how big it should be
- *
- * @return
- */
- protected abstract int getDefaultHeight();
-
-
- private class SurfaceViewHandler extends Handler {
-
- public SurfaceViewHandler(Looper looper) {
- super(looper);
- }
-
- @Override
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
- }
- }
-
- private class DrawRunnable implements Runnable {
-
- @Override
- public void run() {
- if (!isAlive) {
- return;
- }
- try {
- canvas = lockCanvas();
- onFrameDraw(canvas);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- unlockCanvasAndPost(canvas);
- onFrameDrawFinish();
- }
-
- if (handler != null && !pause){
- handler.postDelayed(this, frameDuration);
- }
-
- }
- }
-
- public void setPause(boolean pause){
- this.pause = pause;
- }
-
- public boolean getPause(){
- return this.pause;
- }
-
- public void reStartDrawRunnable(){
- pause = false;
- if (handler != null){
- handler.post(new DrawRunnable());
- }
- }
-
- /**
- * it is will be invoked after one frame is drawn
- */
- protected abstract void onFrameDrawFinish();
-
- /**
- * draw one frame to the surface by canvas
- *
- * @param canvas
- */
- protected abstract void onFrameDraw(Canvas canvas);
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/FrameSurfaceView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/FrameSurfaceView.java
deleted file mode 100644
index d2dc94e252..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/FrameSurfaceView.java
+++ /dev/null
@@ -1,396 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.AttributeSet;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * a SurfaceView which draws bitmaps one after another like frame animation
- */
-public class FrameSurfaceView extends BaseSurfaceView {
- public static final int INVALID_INDEX = Integer.MAX_VALUE;
- private int bufferSize = 3;
- public static final String DECODE_THREAD_NAME = "DecodingThread";
- public static final int INFINITE = -1;
- //-1 means repeat infinitely
- private int repeatTimes;
- private int repeatedCount;
-
- /**
- * the resources of frame animation
- */
- private List bitmapIds = new ArrayList<>();
- /**
- * the index of bitmap resource which is decoding
- */
- private int bitmapIdIndex;
- /**
- * the index of frame which is drawing
- */
- private int frameIndex = INVALID_INDEX;
- /**
- * decoded bitmaps stores in this queue
- * consumer is drawing thread, producer is decoding thread.
- */
- private LinkedBlockingQueue decodedBitmaps = new LinkedBlockingQueue(bufferSize);
- /**
- * bitmaps already drawn by canvas stores in this queue
- * consumer is decoding thread, producer is drawing thread.
- */
- private LinkedBlockingQueue drawnBitmaps = new LinkedBlockingQueue(bufferSize);
- /**
- * the thread for decoding bitmaps
- */
- private HandlerThread decodeThread;
- /**
- * the Runnable describes how to decode one bitmap
- */
- private DecodeRunnable decodeRunnable;
- /**
- * this handler helps to decode bitmap one after another
- */
- private Handler handler;
- private BitmapFactory.Options options;
- private Paint paint = new Paint();
- private Rect srcRect;
- private Rect dstRect = new Rect();
- private int defaultWidth;
- private int defaultHeight;
-
- public FrameSurfaceView(Context context) {
- super(context);
- }
-
- public FrameSurfaceView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public FrameSurfaceView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- public void setRepeatTimes(int repeatTimes) {
- this.repeatTimes = repeatTimes;
- }
-
- @Override
- protected void init() {
- super.init();
- options = new BitmapFactory.Options();
- options.inMutable = true;
- decodeThread = new HandlerThread(DECODE_THREAD_NAME);
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
- dstRect.set(0, 0, getWidth(), getHeight());
- }
-
- @Override
- protected int getDefaultWidth() {
- return defaultWidth;
- }
-
- @Override
- protected int getDefaultHeight() {
- return defaultHeight;
- }
-
- @Override
- protected void onFrameDrawFinish() {
- }
-
- /**
- * set the duration of frame animation
- *
- * @param duration time in milliseconds
- */
- public void setDuration(int duration) {
- int frameDuration = duration / bitmapIds.size();
- setFrameDuration(frameDuration);
- }
-
- /**
- * set the materials of frame animation which is an array of bitmap resource id
- *
- * @param bitmapIds an array of bitmap resource id
- */
- public void setBitmapIds(List bitmapIds) {
- if (bitmapIds == null || bitmapIds.size() == 0) {
- return;
- }
- this.bitmapIds = bitmapIds;
- //by default, take the first bitmap's dimension into consideration
- getBitmapDimension(bitmapIds.get(bitmapIdIndex));
- preloadFrames();
- decodeRunnable = new DecodeRunnable(bitmapIdIndex, bitmapIds, options);
- }
-
- private void getBitmapDimension(int bitmapId) {
- final BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
- BitmapFactory.decodeResource(this.getResources(), bitmapId, options);
- defaultWidth = options.outWidth;
- defaultHeight = options.outHeight;
- srcRect = new Rect(0, 0, defaultWidth, defaultHeight);
- //we have to re-measure to make defaultWidth in use in onMeasure()
- requestLayout();
- }
-
- /**
- * load the first several frames of animation before it is started
- */
- private void preloadFrames() {
- putDecodedBitmap(bitmapIds.get(bitmapIdIndex++), options, new LinkedBitmap());
- putDecodedBitmap(bitmapIds.get(bitmapIdIndex++), options, new LinkedBitmap());
- }
-
- /**
- * recycle the bitmap used by frame animation.
- * Usually it should be invoked when the ui of frame animation is no longer visible
- */
- public void destroy() {
- if (drawnBitmaps != null) {
- drawnBitmaps.clear();
- }
- if (decodeThread != null) {
- decodeThread.quit();
- decodeThread = null;
- }
- if (handler != null) {
- handler = null;
- }
- }
-
- @Override
- protected void onFrameDraw(Canvas canvas) {
- clearCanvas(canvas);
- if (!isStart()) {
- return;
- }
- if (!isFinish()) {
- drawOneFrame(canvas);
- } else {
- onFrameAnimationEnd();
- if (repeatTimes != 0 && repeatTimes == INFINITE) {
- start();
- } else if (repeatedCount < repeatTimes) {
- start();
- repeatedCount++;
- } else {
- repeatedCount = 0;
- }
- }
- }
-
- /**
- * draw a single frame which is a bitmap
- *
- * @param canvas
- */
- private void drawOneFrame(Canvas canvas) {
- try {
- LinkedBitmap linkedBitmap = getDecodedBitmap();
- if (linkedBitmap != null) {
- canvas.drawBitmap(linkedBitmap.bitmap, srcRect, dstRect, paint);
- }
- putDrawnBitmap(linkedBitmap);
- frameIndex++;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * invoked when frame animation is done
- */
- private void onFrameAnimationEnd() {
- reset();
- }
-
- /**
- * reset the index of frame, preparing for the next frame animation
- */
- private void reset() {
- frameIndex = INVALID_INDEX;
- }
-
- /**
- * whether frame animation is finished
- *
- * @return true: animation is finished, false: animation is doing
- */
- private boolean isFinish() {
- return frameIndex >= bitmapIds.size() - 1;
- }
-
- /**
- * whether frame animation is started
- *
- * @return true: animation is started, false: animation is not started
- */
- private boolean isStart() {
- return frameIndex != INVALID_INDEX;
- }
-
- /**
- * start frame animation from the first frame
- */
- public void start() {
- frameIndex = 0;
- if (decodeThread == null) {
- decodeThread = new HandlerThread(DECODE_THREAD_NAME);
- }
- if (!decodeThread.isAlive()) {
- decodeThread.start();
- }
- if (handler == null) {
- handler = new Handler(decodeThread.getLooper());
- }
- if (decodeRunnable != null) {
- decodeRunnable.setIndex(0);
- }
- handler.post(decodeRunnable);
- }
-
- public void pause(){
- setPause(true);
- }
-
- public void start(boolean restart){
- if (restart){
- if (frameIndex == INVALID_INDEX ){
- start();
- }else{
- if (getPause()){
- setPause(false);
- reStartDrawRunnable();
- }else{
- start();
- }
- }
- }else{
- start();
- }
- }
-
- /**
- * clear out the drawing on canvas,preparing for the next frame
- * * @param canvas
- */
- private void clearCanvas(Canvas canvas) {
- paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
- canvas.drawPaint(paint);
- paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC));
- }
-
- /**
- * decode bitmap by BitmapFactory.decodeStream(), it is about twice faster than BitmapFactory.decodeResource()
- *
- * @param resId the bitmap resource
- * @param options
- * @return
- */
- private Bitmap decodeBitmap(int resId, BitmapFactory.Options options) {
- options.inScaled = false;
- InputStream inputStream = getResources().openRawResource(resId);
- return BitmapFactory.decodeStream(inputStream, null, options);
- }
-
- private void putDecodedBitmapByReuse(int resId, BitmapFactory.Options options) {
- LinkedBitmap linkedBitmap = getDrawnBitmap();
- if (linkedBitmap == null) {
- linkedBitmap = new LinkedBitmap();
- }
- options.inBitmap = linkedBitmap.bitmap;
- putDecodedBitmap(resId, options, linkedBitmap);
- }
-
- private void putDecodedBitmap(int resId, BitmapFactory.Options options, LinkedBitmap linkedBitmap) {
- Bitmap bitmap = decodeBitmap(resId, options);
- linkedBitmap.bitmap = bitmap;
- try {
- decodedBitmaps.put(linkedBitmap);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- private void putDrawnBitmap(LinkedBitmap bitmap) {
- if (bitmap == null)return;
- drawnBitmaps.offer(bitmap);
- }
-
- /**
- * get bitmap which already drawn by canvas
- *
- * @return
- */
- private LinkedBitmap getDrawnBitmap() {
- LinkedBitmap bitmap = null;
- try {
- bitmap = drawnBitmaps.take();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return bitmap;
- }
-
- /**
- * get decoded bitmap in the decoded bitmap queue
- * it might block due to new bitmap is not ready
- *
- * @return
- */
- private LinkedBitmap getDecodedBitmap() {
- LinkedBitmap bitmap = null;
- try {
- bitmap = decodedBitmaps.take();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return bitmap;
- }
-
- private class DecodeRunnable implements Runnable {
-
- private int index;
- private List bitmapIds;
- private BitmapFactory.Options options;
-
- public DecodeRunnable(int index, List bitmapIds, BitmapFactory.Options options) {
- this.index = index;
- this.bitmapIds = bitmapIds;
- this.options = options;
- }
-
- public void setIndex(int index) {
- this.index = index;
- }
-
- @Override
- public void run() {
- putDecodedBitmapByReuse(bitmapIds.get(index), options);
- index++;
- if (index < bitmapIds.size()) {
- handler.post(this);
- } else {
- index = 0;
- }
- }
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/FrameTextureView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/FrameTextureView.java
deleted file mode 100644
index 9af3fda6fa..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/FrameTextureView.java
+++ /dev/null
@@ -1,386 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.AttributeSet;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * a SurfaceView which draws bitmaps one after another like frame animation
- */
-public class FrameTextureView extends BaseTextureView {
- public static final int INVALID_INDEX = Integer.MAX_VALUE;
- private int bufferSize = 3;
- public static final String DECODE_THREAD_NAME = "DecodingThread";
- public static final int INFINITE = -1;
- //-1 means repeat infinitely
- private int repeatTimes;
- private int repeatedCount;
-
- /**
- * the resources of frame animation
- */
- private List bitmapIds = new ArrayList<>();
- /**
- * the index of bitmap resource which is decoding
- */
- private int bitmapIdIndex;
- /**
- * the index of frame which is drawing
- */
- private int frameIndex = INVALID_INDEX;
- /**
- * decoded bitmaps stores in this queue
- * consumer is drawing thread, producer is decoding thread.
- */
- private LinkedBlockingQueue decodedBitmaps = new LinkedBlockingQueue(bufferSize);
- /**
- * bitmaps already drawn by canvas stores in this queue
- * consumer is decoding thread, producer is drawing thread.
- */
- private LinkedBlockingQueue drawnBitmaps = new LinkedBlockingQueue(bufferSize);
- /**
- * the thread for decoding bitmaps
- */
- private HandlerThread decodeThread;
- /**
- * the Runnable describes how to decode one bitmap
- */
- private DecodeRunnable decodeRunnable;
- /**
- * this handler helps to decode bitmap one after another
- */
- private Handler handler;
- private BitmapFactory.Options options;
- private Paint paint = new Paint();
- private Rect srcRect;
- private Rect dstRect = new Rect();
- private int defaultWidth;
- private int defaultHeight;
-
- public FrameTextureView(Context context) {
- super(context);
- }
-
- public FrameTextureView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public FrameTextureView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- }
-
- public void setRepeatTimes(int repeatTimes) {
- this.repeatTimes = repeatTimes;
- }
-
- @Override
- protected void init() {
- super.init();
- options = new BitmapFactory.Options();
- options.inMutable = true;
- decodeThread = new HandlerThread(DECODE_THREAD_NAME);
- }
-
- @Override
- protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
- dstRect.set(0, 0, getWidth(), getHeight());
- }
-
- @Override
- protected int getDefaultWidth() {
- return defaultWidth;
- }
-
- @Override
- protected int getDefaultHeight() {
- return defaultHeight;
- }
-
- @Override
- protected void onFrameDrawFinish() {
- }
-
- /**
- * set the duration of frame animation
- *
- * @param duration time in milliseconds
- */
- public void setDuration(int duration) {
- int frameDuration = duration / bitmapIds.size();
- setFrameDuration(frameDuration);
- }
-
- /**
- * set the materials of frame animation which is an array of bitmap resource id
- *
- * @param bitmapIds an array of bitmap resource id
- */
- public void setBitmapIds(List bitmapIds) {
- if (bitmapIds == null || bitmapIds.size() == 0) {
- return;
- }
- this.bitmapIds = bitmapIds;
- //by default, take the first bitmap's dimension into consideration
- getBitmapDimension(bitmapIds.get(bitmapIdIndex));
- preloadFrames();
- decodeRunnable = new DecodeRunnable(bitmapIdIndex, bitmapIds, options);
- }
-
- private void getBitmapDimension(int bitmapId) {
- final BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
- BitmapFactory.decodeResource(this.getResources(), bitmapId, options);
- defaultWidth = options.outWidth;
- defaultHeight = options.outHeight;
- srcRect = new Rect(0, 0, defaultWidth, defaultHeight);
- //we have to re-measure to make defaultWidth in use in onMeasure()
- requestLayout();
- }
-
- /**
- * load the first several frames of animation before it is started
- */
- private void preloadFrames() {
- putDecodedBitmap(bitmapIds.get(bitmapIdIndex++), options, new LinkedBitmap());
- putDecodedBitmap(bitmapIds.get(bitmapIdIndex++), options, new LinkedBitmap());
- }
-
- /**
- * recycle the bitmap used by frame animation.
- * Usually it should be invoked when the ui of frame animation is no longer visible
- */
- public void destroy() {
- if (drawnBitmaps != null) {
- drawnBitmaps.clear();
- }
- if (decodeThread != null) {
- decodeThread.quit();
- decodeThread = null;
- }
- if (handler != null) {
- handler = null;
- }
- }
-
- @Override
- protected void onFrameDraw(Canvas canvas) {
- clearCanvas(canvas);
- if (!isStart()) {
- return;
- }
- if (!isFinish()) {
- drawOneFrame(canvas);
- } else {
- onFrameAnimationEnd();
- if (repeatTimes != 0 && repeatTimes == INFINITE) {
- start();
- } else if (repeatedCount < repeatTimes) {
- start();
- repeatedCount++;
- } else {
- repeatedCount = 0;
- }
- }
- }
-
- /**
- * draw a single frame which is a bitmap
- *
- * @param canvas
- */
- private void drawOneFrame(Canvas canvas) {
- LinkedBitmap linkedBitmap = getDecodedBitmap();
- if (linkedBitmap != null) {
- canvas.drawBitmap(linkedBitmap.bitmap, srcRect, dstRect, paint);
- }
- putDrawnBitmap(linkedBitmap);
- frameIndex++;
- }
-
- /**
- * invoked when frame animation is done
- */
- private void onFrameAnimationEnd() {
- reset();
- }
-
- /**
- * reset the index of frame, preparing for the next frame animation
- */
- private void reset() {
- frameIndex = INVALID_INDEX;
- }
-
- /**
- * whether frame animation is finished
- *
- * @return true: animation is finished, false: animation is doing
- */
- private boolean isFinish() {
- return frameIndex >= bitmapIds.size() - 1;
- }
-
- /**
- * whether frame animation is started
- *
- * @return true: animation is started, false: animation is not started
- */
- private boolean isStart() {
- return frameIndex != INVALID_INDEX;
- }
-
- /**
- * start frame animation from the first frame
- */
- public void start() {
- pause = false;
- frameIndex = 0;
- if (decodeThread == null) {
- decodeThread = new HandlerThread(DECODE_THREAD_NAME);
- }
- if (!decodeThread.isAlive()) {
- decodeThread.start();
- }
- if (handler == null) {
- handler = new Handler(decodeThread.getLooper());
- }
- if (decodeRunnable != null) {
- decodeRunnable.setIndex(0);
- }
- handler.post(decodeRunnable);
- }
-
- public void pause(){
- setPause(true);
- }
-
- public void start(boolean restart){
- if (restart){
- if (!isStart() || !getPause()){
- start();
- }else{
- reStartDrawRunnable();
- }
- }else{
- start();
- }
- }
-
- /**
- * clear out the drawing on canvas,preparing for the next frame
- * * @param canvas
- */
- private void clearCanvas(Canvas canvas) {
- paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
- canvas.drawPaint(paint);
- paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC));
- }
-
- /**
- * decode bitmap by BitmapFactory.decodeStream(), it is about twice faster than BitmapFactory.decodeResource()
- *
- * @param resId the bitmap resource
- * @param options
- * @return
- */
- private Bitmap decodeBitmap(int resId, BitmapFactory.Options options) {
- options.inScaled = false;
- InputStream inputStream = getResources().openRawResource(resId);
- return BitmapFactory.decodeStream(inputStream, null, options);
- }
-
- private void putDecodedBitmapByReuse(int resId, BitmapFactory.Options options) {
- LinkedBitmap linkedBitmap = getDrawnBitmap();
- if (linkedBitmap == null) {
- linkedBitmap = new LinkedBitmap();
- }
- options.inBitmap = linkedBitmap.bitmap;
- putDecodedBitmap(resId, options, linkedBitmap);
- }
-
- private void putDecodedBitmap(int resId, BitmapFactory.Options options, LinkedBitmap linkedBitmap) {
- Bitmap bitmap = decodeBitmap(resId, options);
- linkedBitmap.bitmap = bitmap;
- try {
- decodedBitmaps.put(linkedBitmap);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- private void putDrawnBitmap(LinkedBitmap bitmap) {
- drawnBitmaps.offer(bitmap);
- }
-
- /**
- * get bitmap which already drawn by canvas
- *
- * @return
- */
- private LinkedBitmap getDrawnBitmap() {
- LinkedBitmap bitmap = null;
- try {
- bitmap = drawnBitmaps.take();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return bitmap;
- }
-
- /**
- * get decoded bitmap in the decoded bitmap queue
- * it might block due to new bitmap is not ready
- *
- * @return
- */
- private LinkedBitmap getDecodedBitmap() {
- LinkedBitmap bitmap = null;
- try {
- bitmap = decodedBitmaps.take();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return bitmap;
- }
-
- private class DecodeRunnable implements Runnable {
-
- private int index;
- private List bitmapIds;
- private BitmapFactory.Options options;
-
- public DecodeRunnable(int index, List bitmapIds, BitmapFactory.Options options) {
- this.index = index;
- this.bitmapIds = bitmapIds;
- this.options = options;
- }
-
- public void setIndex(int index) {
- this.index = index;
- }
-
- @Override
- public void run() {
- putDecodedBitmapByReuse(bitmapIds.get(index), options);
- index++;
- if (index < bitmapIds.size()) {
- handler.post(this);
- } else {
- index = 0;
- }
- }
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/LinkedBitmap.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/LinkedBitmap.java
deleted file mode 100644
index 0b0f4c4491..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/LinkedBitmap.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-
-import android.graphics.Bitmap;
-
-public class LinkedBitmap {
- public Bitmap bitmap;
- public LinkedBitmap next;
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/LinkedBlockingQueue.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/LinkedBlockingQueue.java
deleted file mode 100644
index dc8b26a1d1..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/LinkedBlockingQueue.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class LinkedBlockingQueue {
- /**
- * Current number of elements
- */
- private final AtomicInteger count = new AtomicInteger();
- /**
- * Lock held by take, poll, etc
- */
- private final ReentrantLock takeLock = new ReentrantLock();
-
- /**
- * Wait queue for waiting takes
- */
- private final Condition notEmpty = takeLock.newCondition();
-
- /**
- * Lock held by put, offer, etc
- */
- private final ReentrantLock putLock = new ReentrantLock();
-
- /**
- * Wait queue for waiting puts
- */
- private final Condition notFull = putLock.newCondition();
- /**
- * The capacity bound, or Integer.MAX_VALUE if none
- */
- private final int capacity;
- /**
- * the first element in the queue
- */
- private LinkedBitmap head;
- /**
- * the last element int the queue
- */
- private LinkedBitmap tail;
-
-
- public LinkedBlockingQueue(int capacity) {
- if (capacity <= 0) throw new IllegalArgumentException();
- this.capacity = capacity;
- }
-
- public void put(LinkedBitmap bitmap) throws InterruptedException {
- if (bitmap == null) throw new NullPointerException();
- // Note: convention in all put/take/etc is to preset local var
- // holding count negative to indicate failure unless set.
- int c = -1;
- final ReentrantLock putLock = this.putLock;
- final AtomicInteger count = this.count;
- putLock.lockInterruptibly();
- try {
- /*
- * Note that count is used in wait guard even though it is
- * not protected by lock. This works because count can
- * only decrease at this point (all other puts are shut
- * out by lock), and we (or some other waiting put) are
- * signalled if it ever changes from capacity. Similarly
- * for all other uses of count in other wait guards.
- */
- while (count.get() == capacity) {
- notFull.await();
- }
- enqueue(bitmap);
- c = count.getAndIncrement();
- if (c + 1 < capacity)
- notFull.signal();
- } finally {
- putLock.unlock();
- }
- if (c == 0)
- signalNotEmpty();
- }
-
- public boolean offer(LinkedBitmap bitmap) {
- if (bitmap == null) throw new NullPointerException();
- final AtomicInteger count = this.count;
- if (count.get() == capacity)
- return false;
- int c = -1;
- final ReentrantLock putLock = this.putLock;
- putLock.lock();
- try {
- if (count.get() < capacity) {
- enqueue(bitmap);
- c = count.getAndIncrement();
- if (c + 1 < capacity)
- notFull.signal();
- }
- } finally {
- putLock.unlock();
- }
- if (c == 0)
- signalNotEmpty();
- return c >= 0;
- }
-
- public LinkedBitmap take() throws InterruptedException {
- LinkedBitmap x;
- int c = -1;
- final AtomicInteger count = this.count;
- final ReentrantLock takeLock = this.takeLock;
- takeLock.lockInterruptibly();
- try {
- while (count.get() == 0) {
- notEmpty.await();
- }
- x = dequeue();
- c = count.getAndDecrement();
- if (c > 1)
- notEmpty.signal();
- } finally {
- takeLock.unlock();
- }
- if (c == capacity)
- signalNotFull();
- return x;
- }
-
- /**
- * insert element into the end of queue
- *
- * @param bitmap
- */
- private void enqueue(LinkedBitmap bitmap) {
- if (head == null) {
- head = bitmap;
- tail = bitmap;
- bitmap.next = null;
- } else {
- tail.next = bitmap;
- bitmap.next = null;
- }
- }
-
- /**
- * get and remove the first element of the queue
- *
- * @return
- */
- private LinkedBitmap dequeue() {
- LinkedBitmap p = head;
- if (p == null) {
- return null;
- } else {
- head = head.next;
- }
- return p;
- }
-
- /**
- * Signals a waiting take. Called only from put/offer (which do not
- * otherwise ordinarily lock takeLock.)
- */
- private void signalNotEmpty() {
- final ReentrantLock takeLock = this.takeLock;
- takeLock.lock();
- try {
- notEmpty.signal();
- } finally {
- takeLock.unlock();
- }
- }
-
- /**
- * Signals a waiting put. Called only from take/poll.
- */
- private void signalNotFull() {
- final ReentrantLock putLock = this.putLock;
- putLock.lock();
- try {
- notFull.signal();
- } finally {
- putLock.unlock();
- }
- }
-
- /**
- * recycle the bitmaps one by one
- */
- public void clear() {
- LinkedBitmap p = head;
- if (p == null) {
- return;
- }
- while (p != null) {
- if (p.bitmap != null) {
- p.bitmap.recycle();
- }
- p.bitmap = null;
- p = p.next;
- }
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/MethodUtil.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/MethodUtil.java
deleted file mode 100644
index 7ccb9dae6b..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/MethodUtil.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-
-import android.os.SystemClock;
-import android.util.Log;
-
-public class MethodUtil {
-
- /**
- * calculate the time consumed by runnable invocation, print log in millisecond
- *
- * @param runnable
- */
- public static long time(Runnable runnable) {
- long start = SystemClock.elapsedRealtime();
- runnable.run();
- long end = SystemClock.elapsedRealtime();
- long span = end - start;
- Log.v("ttaylor", "MethodUtil.time()" + " time span = " + span + " ms");
- return span;
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/NumberUtil.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/NumberUtil.java
deleted file mode 100644
index a4e8fc0b7d..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/surfaceview/NumberUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mogo.module.media.widget.surfaceview;
-
-import android.text.TextUtils;
-import android.util.Log;
-
-public class NumberUtil {
-
- private static long total;
- private static int times;
-
- private static String tag;
-
- /**
- * calculate the average of a series long number and print it
- * @param tag
- * @param l
- */
- public static void average(String tag, Long l) {
- if (!TextUtils.isEmpty(tag) && !tag.equals(NumberUtil.tag)) {
- reset();
- NumberUtil.tag = tag;
- }
- times++;
- total += l;
- Log.v("ttaylor", "Average.average() " + NumberUtil.tag + " average = " + (total / times));
- }
-
- private static void reset() {
- total = 0;
- times = 0;
- }
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow.java
deleted file mode 100644
index 2099f36f8f..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow.java
+++ /dev/null
@@ -1,662 +0,0 @@
-package com.mogo.module.media.window;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.module.common.entity.MarkerShareMusic;
-import com.mogo.module.common.entity.MarkerShowEntity;
-import com.mogo.module.media.MediaConstants;
-import com.mogo.module.media.R;
-import com.mogo.module.media.ServiceMediaHandler;
-import com.mogo.module.media.constants.LeTingFieldConstants;
-import com.mogo.module.media.constants.QQMusicFieldConstants;
-import com.mogo.module.media.listener.NoDoubleClickListener;
-import com.mogo.module.media.model.LanRenInsertData;
-import com.mogo.module.media.model.LeTingNewsData;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.model.ShareLikeData;
-import com.mogo.module.media.presenter.MediaPresenter;
-import com.mogo.module.media.receiver.MediaSpeechReceiver;
-import com.mogo.module.media.utils.MusicControlBroadCast;
-import com.mogo.module.media.utils.StorageManager;
-import com.mogo.module.media.utils.Utils;
-import com.mogo.module.media.view.MediaView;
-import com.mogo.module.media.widget.AnimCircleImageView;
-import com.mogo.utils.ActivityLifecycleManager;
-import com.mogo.utils.ThreadPoolService;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.glide.GlideApp;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import java.util.List;
-
-public class MediaWindow implements MediaView{
-
- public static final String TAG = MediaWindow.class.getName();
- private Context mContext;
- private MediaPresenter mPresenter;
-
- private MediaWindow.MediaStateReceiver mediaStateReceiver;
- private MediaWindow.MediaProcessReceiver mediaProcessReceiver;
- private MediaWindow.PlayingMusicReceiver playingMusicReceiver;
- private MediaWindow.MediaNewsPayInfo mediaNewsPayInfo;
- private MediaInfoData mMediaInfoData;
-
- private View mWindowView;
- private AnimCircleImageView mCircleImg;
- private TextView mScrollText;
- private ImageView mWindowPlayPause;
- private ImageView mWindowPlayNext;
- private TextView mWindowCurrTime;
- private TextView mWindowMaxTime;
- private SeekBar mWindowProgress;
-
- private boolean mHasAddWindow = false;
- private boolean mTwoChange = false;
- private boolean isFirstPlay = false;
-
- private Runnable mRunnable = MusicControlBroadCast::sendGetMusicPlayStateBroadcast;
-
- public void initMedia(Context context){
- mContext = context;
- mPresenter = new MediaPresenter(this);
- registerMediaReceiver();
-
- MediaInfoData sMediaInfoData = MusicControlBroadCast.getHisMedia();
- mMediaInfoData = sMediaInfoData;
-
- if (mMediaInfoData != null && !mHasAddWindow){
- addWindowView();
- }
-
- //发送消息 如果在播放就会返回状态进行更新
- UiThreadHandler.postDelayed(new Runnable() {
- @Override
- public void run() {
- MusicControlBroadCast.sendGetMusicPlayStateBroadcast();
- }
- },300);
-
- isFirstPlay = true;
-
- }
-
-
- private void addWindowView() {
- if (ServiceMediaHandler.getMogoWindowManager() == null){
- return ;
- }
-
- if (!mHasAddWindow) {
- mHasAddWindow = true;
- mWindowView = LayoutInflater.from(mContext).inflate(R.layout.module_media_music_window_alert_layout, null);
- mWindowView.setVisibility(View.VISIBLE);
- mCircleImg = mWindowView.findViewById(R.id.window_circle_img);
- mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
- mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
- mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
- mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
- mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
- mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
- if (mWindowPlayPause != null){
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause);
- }
- int yPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location);
- int xPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
- ServiceMediaHandler.getMogoWindowManager().addView( mWindowView, xPos, yPos, false);
- updateWindowUI(true);
- mWindowView.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- if (mMediaInfoData != null) {
- MusicControlBroadCast.openMediaApp(mMediaInfoData.getType());
- } else {
- MusicControlBroadCast.openMediaApp(1);
- }
- }
- });
-
- mWindowPlayPause.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- if (isFirstPlay){
- if (mMediaInfoData != null){
- MusicControlBroadCast.listeningSendData(mMediaInfoData);
- }
- }else{
- if (mMediaInfoData != null) {
- MusicControlBroadCast.commandPlayPause(mMediaInfoData.getType(),mMediaInfoData.getPlayState());
- }
- }
- }
- });
-
- mWindowPlayNext.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- if (mMediaInfoData != null) {
- MusicControlBroadCast.commandNext(mMediaInfoData.getType());
- }
- }
- });
- }
- }
-
- private void updateWindowUI(){
- updateWindowUI(false);
- }
-
- private void updateWindowUI(boolean first) {
- if (mWindowView == null || mMediaInfoData == null){
- return;
- }
- if (mMediaInfoData != null) {
- if (mMediaInfoData.getType() == 1 || mMediaInfoData.getType() == 2 || mMediaInfoData.getType() == 3) {
- mWindowView.setVisibility(View.VISIBLE);
- }
- } else {
- mWindowView.setVisibility(View.GONE);
- }
-
- if (mScrollText != null){
- mScrollText.setText(mMediaInfoData.getMediaName());
- }
-
- if (first || mMediaInfoData.getPlayState() == 1 || mMediaInfoData.getPlayState() == 2) {
- if (mWindowMaxTime != null){
- mWindowMaxTime.setText(Utils.calculateTime((int) mMediaInfoData.getMaxTime()));
- }
- if (mWindowCurrTime != null){
- mWindowCurrTime.setText(Utils.calculateTime((int) mMediaInfoData.getCurTime()));
- }
- }
-
- if (mCircleImg != null){
- com.bumptech.glide.request.RequestOptions options = new com.bumptech.glide.request.RequestOptions()
- .placeholder(R.drawable.module_media_share_default_icon);
- GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg);
- }
-
- }
-
- @Override
- public void showSharePush(boolean show) {
-
- }
-
- @Override
- public void loadNearShareMusicSuccess(List list) {
-
- }
-
- @Override
- public void loadFriendShareMusicSuccess(List list) {
-
- }
-
- @Override
- public void loadShareLikeDataResultSuccess(ShareLikeData.ShareLikeDataResult likeDataResult, String mediaId) {
-
- }
-
- @Override
- public void likeShareSuccess() {
-
- }
-
- @Override
- public void shareSuccessResult(boolean success, MarkerShareMusic markerShareMusic) {
-
- }
-
- @Override
- public Context getContext() {
- return mContext;
- }
-
-
- private class PlayingMusicReceiver extends BroadcastReceiver{
-
- @Override
- public void onReceive(Context context, Intent intent) {
- try {
- if (intent != null){
- String mediaStr = intent.getStringExtra("mediaData");
- if (!TextUtils.isEmpty(mediaStr)){
- MediaInfoData data = (MediaInfoData) GsonUtil.arrayFromJson(mediaStr, MediaInfoData.class);
- if (data != null){
- MusicControlBroadCast.listeningSendData(data);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * 音频播放状态改变广播监听
- */
- private class MediaStateReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- //用于请求点赞数
- boolean change = false;
- boolean cancleChoose = false;
- String ttMid = "";
- if (intent != null) {
- int type = intent.getIntExtra("type", -1);
- int playState = intent.getIntExtra(QQMusicFieldConstants.playState, 0);
- Logger.d("MediaStateReceiver", "===MediaStateReceiver==playState=="+playState+" type= "+type);
- if (playState == 1) {
- isFirstPlay = false;
-
- if (mWindowPlayPause != null){
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_play);
- }
-
- if (mCircleImg != null){
- mCircleImg.startAnim();
- }
-
- } else {
- if (mWindowPlayPause != null){
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause);
- }
-
-
- if (mCircleImg != null){
- mCircleImg.stopAnim();
- }
-
- if (type == 1 || type == 2 || type ==3){
- UiThreadHandler.removeCallbacks(mRunnable);
- UiThreadHandler.postDelayed(mRunnable,3000);
- }
-
- }
-
- if (playState == 1 || playState == 2){
- if (type == 1) {//qq音乐
-
- int maxTime = intent.getIntExtra(QQMusicFieldConstants.maxTime, 0);
- int curTime = intent.getIntExtra(QQMusicFieldConstants.curTime, 0);
- String mediaName = intent.getStringExtra(QQMusicFieldConstants.mediaName);
- String mediaUrl = intent.getStringExtra(QQMusicFieldConstants.mediaUrl);
- String mediaSinger = intent.getStringExtra(QQMusicFieldConstants.mediaSinger);
- String mediaImgUrl = intent.getStringExtra(QQMusicFieldConstants.mediaImgUrl);
- String mediaType = intent.getStringExtra(QQMusicFieldConstants.mediaType);
- String mediaMid = intent.getStringExtra(QQMusicFieldConstants.mediaMid);
- int mediaPLayMode = intent.getIntExtra(QQMusicFieldConstants.mediaPlayMode, -1);
- boolean isLocalMedia = intent.getBooleanExtra(QQMusicFieldConstants.isLocalMedia, false);
-
- if (playState == 1 || playState == 2) {
- if (playState == 1){
- if (mMediaInfoData == null){
- change = true;
- ttMid = "";
- }else{
- ttMid = mMediaInfoData.getMediaId();
- }
- if (mMediaInfoData != null && mMediaInfoData.getMediaId() != null && !mMediaInfoData.getMediaId().equals(mediaMid)) {
- change = true;
- }
- }
- }
-
- if (mMediaInfoData == null) {
- mMediaInfoData = new MediaInfoData();
- }
- mMediaInfoData.setType(type);
- mMediaInfoData.setPlayState(playState);
- mMediaInfoData.setMaxTime(maxTime * 1000);
- mMediaInfoData.setCurTime(curTime * 1000);
- mMediaInfoData.setMediaName(mediaName);
- mMediaInfoData.setMediaUrl(mediaUrl);
- mMediaInfoData.setMediaId(mediaMid);
- mMediaInfoData.setMediaImg(mediaImgUrl);
- mMediaInfoData.setMediaSinger(mediaSinger);
- mMediaInfoData.setMediaPlayMode(mediaPLayMode);
- mMediaInfoData.setLocalMedia(isLocalMedia);
- mMediaInfoData.setMediaType(mediaType);
- mMediaInfoData.setBookInfo("");
-
- } else if (type == 2) {//懒人听书
-
- int maxTime = intent.getIntExtra(LeTingFieldConstants.maxTime, 0);
- int curTime = intent.getIntExtra(LeTingFieldConstants.curTime, 0);
-
- String mediaName = intent.getStringExtra(LeTingFieldConstants.mediaName);//章节数
- String bookInfoStr = intent.getStringExtra(LeTingFieldConstants.bookInfo);
- LanRenInsertData lanRenInsertData = GsonUtil.objectFromJson(bookInfoStr, LanRenInsertData.class);
-
- String bookName = ""; // 书名 需要从bookinfo里面取
- String cover = ""; //封面 bookinfo中取
- String bookid = "";
-
- try {
- if (lanRenInsertData != null){
- bookName = lanRenInsertData.getName(); // 书名 需要从bookinfo里面取
- cover = lanRenInsertData.getCover(); //封面 bookinfo中取
- bookid = lanRenInsertData.getBookId() + "";
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-
- if (playState == 1 || playState == 2){
- if (playState == 1 || playState == 2){
- if (mMediaInfoData == null){
- change = true;
- ttMid = "";
- }else{
- ttMid = mMediaInfoData.getMediaId();
- }
- if (mMediaInfoData != null && mMediaInfoData.getMediaId() != null && !mMediaInfoData.getMediaId().equals(bookid)) {
- change = true;
- }
- }
-
- }
-
- if (mMediaInfoData == null) {
- mMediaInfoData = new MediaInfoData();
- }
- mMediaInfoData.setType(type);
- mMediaInfoData.setPlayState(playState);
- mMediaInfoData.setMaxTime(maxTime);
- mMediaInfoData.setCurTime(curTime);
- if (!TextUtils.isEmpty(bookName)){
- mMediaInfoData.setMediaName(bookName); //bookName 或者mediaName
- }else if (!TextUtils.isEmpty(mediaName)){
- mMediaInfoData.setMediaName(mediaName); //bookName 或者mediaName
- }
- mMediaInfoData.setMediaSinger(mediaName); //章节数
- mMediaInfoData.setMediaImg(cover); //书籍封面
- mMediaInfoData.setMediaId(bookid);//书籍的bookid int
- mMediaInfoData.setBookInfo(bookInfoStr);
- mMediaInfoData.setMediaUrl("");
- mMediaInfoData.setLocalMedia(false);
- mMediaInfoData.setMediaType("");
-
- } else if (type == 3) {//乐听头条
- int maxTime = intent.getIntExtra(LeTingFieldConstants.maxTime, 0);
- int curTime = intent.getIntExtra(LeTingFieldConstants.curTime, 0);
- String mediaName = intent.getStringExtra(LeTingFieldConstants.mediaName); //新闻title
- String artist = intent.getStringExtra(LeTingFieldConstants.artist); //新闻来源，赋值给singer mediaSinger
- String cover = intent.getStringExtra(LeTingFieldConstants.cover); //封面
- String bookInfo = intent.getStringExtra("news");//新闻实体
- String bookid = "";
- try {
- if (!TextUtils.isEmpty(bookInfo)){
- LeTingNewsData leTingNewsData = GsonUtil.objectFromJson(bookInfo, LeTingNewsData.class);
- if (leTingNewsData != null){
- mediaName = leTingNewsData.getTitle();
- artist = leTingNewsData.getSource();
- cover = leTingNewsData.getImage();
- bookid = leTingNewsData.getSid();
- }
-
- if (mediaName == null){
- mediaName = "";
- }
- if (artist == null){
- artist = "";
- }
- if (cover == null){
- cover = "";
- }
- if (bookid == null){
- bookid = "";
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-
- if (playState == 1 || playState == 2){
- if (mMediaInfoData == null){
- change = true;
- ttMid = "";
- }else{
- ttMid = mMediaInfoData.getMediaId();
- }
- if (mMediaInfoData != null && mMediaInfoData.getMediaId() != null && !mMediaInfoData.getMediaId().equals(bookid)) {
- change = true;
- }
- }
-
- mMediaInfoData.setType(type);
- mMediaInfoData.setPlayState(playState);
- mMediaInfoData.setMaxTime(maxTime);
- mMediaInfoData.setCurTime(curTime);
- mMediaInfoData.setMediaName(mediaName); //新闻标题
- mMediaInfoData.setMediaSinger(artist); //新闻来源
- mMediaInfoData.setMediaImg(cover); //新闻封面
-
- mMediaInfoData.setMediaId(bookid);//新闻的sid
- mMediaInfoData.setBookInfo(bookInfo);
- mMediaInfoData.setMediaUrl("");
- mMediaInfoData.setLocalMedia(false);
- mMediaInfoData.setMediaType("");
-
- }
-
- try {
- if (mMediaInfoData != null && (type == 1 || type == 2)){
- ThreadPoolService.execute(new Runnable() {
- @Override
- public void run() {
- String tmData = GsonUtil.jsonFromObject(mMediaInfoData);
- StorageManager.setLastListenMediaMusic(tmData);
- Logger.d(TAG,"save"+tmData != null ? tmData:"");
- }
- });
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //播放另外一个时去掉选中状态
- if (!ttMid.equals(mMediaInfoData.getMediaId())){
- cancleChoose = true;
- }
- if (cancleChoose && mMediaInfoData != null && (playState == 1 || playState == 2)){
- if (ServiceMediaHandler.getMarkerManager() != null){
- List< IMogoMarker > mogoMarkersList = ServiceMediaHandler.getMarkerManager().getMarkers(MediaConstants.MODULE_TYPE);
- try {
- if ( mogoMarkersList != null && mogoMarkersList.size() > 0){
- for (IMogoMarker mogoMarker : mogoMarkersList){
- if (mogoMarker != null && !mogoMarker.isDestroyed()){
- if (mogoMarker.getObject() != null && mogoMarker.getObject() instanceof MarkerShowEntity){
- MarkerShowEntity markerShowEntity = (MarkerShowEntity) mogoMarker.getObject();
- if (markerShowEntity.getBindObj() != null && markerShowEntity.getBindObj() instanceof MarkerShareMusic){
- MarkerShareMusic markerShareMusic = (MarkerShareMusic) markerShowEntity.getBindObj();
- if (markerShowEntity.isChecked() && !markerShareMusic.getMediaId().equals(mMediaInfoData.getMediaId())){
-// MapMarkerManager.getInstance().closeMarkerSelect(mogoMarker);
- break;
- }
- }
-
- }
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- if (playState == 1 || playState == 2){
- if (mTwoChange){
- change = true;
- mTwoChange = false;
- }
-
-
- Logger.d(TAG,"onreceive state change = "+change+" mediaid= "+mMediaInfoData.getMediaId());
-// ifNeedRefreshMediaCard(change);
- }
-
- //pop window 弹窗
- if (mMediaInfoData != null && !TextUtils.isEmpty(mMediaInfoData.getMediaName()) && !TextUtils.isEmpty(mMediaInfoData.getMediaSinger())){
-
- if (!mHasAddWindow){
- addWindowView();
- }else{
- if (playState == 1 || playState == 2){
- updateWindowUI();
- }
- }
- }
-
- }
-
- if (playState == 1) {
- mPresenter.startedMusic(mMediaInfoData);
- } else {
- if (mMediaInfoData != null){
- mMediaInfoData.setPlayState(playState);
- }
- mPresenter.stopMusic();
- }
-
- }
- }
-
- }
-
- /**
- * 音频进度改变广播接收者
- */
- private class MediaProcessReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent != null) {
- int curTime = intent.getIntExtra("curTime", -1);
- Logger.d("MediaProcessReceiver", "===MediaProcessReceiver===="+curTime);
- UiThreadHandler.post(new Runnable() {
- @Override
- public void run() {
- if (mMediaInfoData != null) {
- if (mWindowCurrTime != null) {
- mWindowCurrTime.setText(Utils.calculateTime(curTime));
- }
- try {
- int progress = (int) ((curTime * 1.0f * 100) / (mMediaInfoData.getMaxTime() * 1.0f));
- if (mWindowProgress != null) {
- mWindowProgress.setProgress(progress);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
- }
- });
- }
- }
-
- }
-
- /**
- * 获取新闻是否付费
- * com.zhidao.mediacenter.ltnewsPayInfo
- */
- private class MediaNewsPayInfo extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent != null) {
- boolean playinfo = intent.getBooleanExtra("payinfo", false);
- boolean appActive = ActivityLifecycleManager.getInstance().isAppActive();
- String category = MediaSpeechReceiver.mCategoryStr;
- MediaSpeechReceiver.mCategoryStr = "";
- Logger.d(TAG," MediaNewsPayInfo "+"news "+category == null?"":category+" "+appActive);
- if (playinfo){
- if (TextUtils.isEmpty(category)){
- //打开新闻
- //播放某一类型新闻
- if (appActive){
- MusicControlBroadCast.sendPlayTypeNews("推荐");
- }else{
- MusicControlBroadCast.sendPlayTypeNewsOpenApp("推荐");
- }
- }else{
- //播放某一类型新闻
- if (appActive){
- MusicControlBroadCast.sendPlayTypeNews(category);
- }else{
- MusicControlBroadCast.sendPlayTypeNewsOpenApp(category);
- }
- }
- }else{
- MusicControlBroadCast.openMediaApp(3);
- }
- }
- }
-
- }
-
- private void registerMediaReceiver() {
- mediaStateReceiver = new MediaWindow.MediaStateReceiver();
- IntentFilter filterone = new IntentFilter();
- filterone.addAction("com.zhidao.action.MEDIA_LRTS");
- filterone.addAction("com.zhidao.action.MEDIA_LT_NEWS");
- filterone.addAction("com.qq.music.status.change");
- getContext().registerReceiver(mediaStateReceiver, filterone);
-
- mediaProcessReceiver = new MediaWindow.MediaProcessReceiver();
- IntentFilter filtertwo = new IntentFilter();
- filtertwo.addAction("com.zhidao.action.MEDIA_PROGRESS");
- getContext().registerReceiver(mediaProcessReceiver, filtertwo);
-
- playingMusicReceiver = new PlayingMusicReceiver();
- IntentFilter filterthree = new IntentFilter();
- filterthree.addAction("com.mogo.launcher.media.listening");
- getContext().registerReceiver(playingMusicReceiver, filterthree);
-
- mediaNewsPayInfo = new MediaNewsPayInfo();
- IntentFilter filterFour = new IntentFilter();
- filterFour.addAction("com.zhidao.mediacenter.ltnewsPayInfo");
- getContext().registerReceiver(mediaNewsPayInfo, filterFour);
-
- }
-
- private void unRegisterMediaReceiver() {
- getContext().unregisterReceiver(mediaProcessReceiver);
- getContext().unregisterReceiver(mediaStateReceiver);
- getContext().unregisterReceiver(playingMusicReceiver);
- getContext().unregisterReceiver(mediaNewsPayInfo);
- }
-
- private void destroy(){
- try {
- UiThreadHandler.removeCallbacks(mRunnable);
- mRunnable = null;
- unRegisterMediaReceiver();
- if (mCircleImg != null && mCircleImg.isRotationing()) {
- mCircleImg.stopAnim();
- }
-
- if (ServiceMediaHandler.getMogoWindowManager() != null){
- ServiceMediaHandler.getMogoWindowManager().removeView(mWindowView);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
deleted file mode 100644
index 42f1aa3342..0000000000
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ /dev/null
@@ -1,508 +0,0 @@
-package com.mogo.module.media.window;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.voice.AIAssist;
-import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.glide.SkinAbleBitmapTarget;
-import com.mogo.module.media.MediaConstants;
-import com.mogo.module.media.R;
-import com.mogo.module.media.ServiceMediaHandler;
-import com.mogo.module.media.constants.MusicConstant;
-import com.mogo.module.media.listener.NoDoubleClickListener;
-import com.mogo.module.media.model.MediaInfoData;
-import com.mogo.module.media.presenter.BaseMediaPresenter;
-import com.mogo.module.media.presenter.KwPresenter;
-import com.mogo.module.media.presenter.PresenterFactory;
-import com.mogo.module.media.utils.Utils;
-import com.mogo.module.media.view.IMusicView;
-import com.mogo.module.media.widget.AnimCircleImageView;
-import com.mogo.module.media.widget.CircleNumberProgress;
-import com.mogo.module.media.widget.PercentageRingView;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.WindowUtils;
-import com.mogo.utils.glide.GlideApp;
-import com.mogo.utils.logger.Logger;
-import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
-import com.zhidao.carchattingprovider.ICallChatResponse;
-import com.zhidao.carchattingprovider.ICallProviderResponse;
-
-/**
- * 适配爱趣听和酷我的window，通过presenter区分
- * 爱趣听使用{@link com.mogo.module.media.presenter.WeCarFlowPresenter}
- * 酷我使用{@link KwPresenter}
- *
- * @author tongchenfei
- */
-public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
-
- public static final String TAG = MediaWindow2.class.getName();
- private Context mContext;
- private BaseMediaPresenter mPresenter;
-
- private MediaInfoData mMediaInfoData = new MediaInfoData();
-
- private View mWindowView;
- private AnimCircleImageView mCircleImg;
- private TextView mScrollText;
- private ImageView mWindowPlayPause;
- private ImageView mWindowPlayNext;
- private TextView mWindowCurrTime;
- private TextView mWindowMaxTime;
- private SeekBar mWindowProgress;
-
- private boolean mHasAddWindow = false;
- private boolean mTwoChange = false;
- private boolean isFirstPlay = false;
- private boolean mIsCallChatWindowVisible;
-
- private ICallProviderResponse mCallProviderResponse;
- private CircleNumberProgress mPercentageRingView;
-// private PercentageRingView mPercentageRingView;
- private ImageView mPauseImage;
- private AnimCircleImageView mAnimCircleImageView;
-
-
- public void initMedia(Context context) {
- mContext = context;
- mPresenter = PresenterFactory.createMusicViewPresenter(context, this);
- mPresenter.init(context);
-
- if(DebugConfig.isLauncher()) {
- AIAssist.getInstance(context).registerUnWakeupCommand("flow_we_car_stop", new String[]{"停止播放", "暂停播放"}, new IMogoVoiceCmdCallBack() {
- @Override
- public void onCmdSelected(String cmd) {
- // 简单添加暂停播放全局免唤醒词
- if ("flow_we_car_stop".equals(cmd)) {
- FlowPlayControl.getInstance().doPause();
- }
- }
- });
- }
-
- ServiceMediaHandler.getIMogoStatusManager().registerStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.ACC_STATUS, this);
- ServiceMediaHandler.getIMogoStatusManager().registerStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.VR_MODE, this);
-
- // 车聊聊才是王
- mCallProviderResponse = new ICallChatResponse(){
- @Override
- public void callWindowStatus( boolean b ) {
- Logger.d( TAG, "callWindowStatus: "+ b);
- mIsCallChatWindowVisible = b;
- if ( !mHasAddWindow || mWindowView == null ) {
- return;
- }
- if ( mIsCallChatWindowVisible ) {
- mWindowView.setVisibility(View.GONE );
- } else {
- mWindowView.setVisibility(View.VISIBLE);
- }
- }
- };
- if ( ServiceMediaHandler.getCarsChattingApis() != null ) {
- ServiceMediaHandler.getCarsChattingApis().registerCallWindowStatusListener( MediaConstants.MODULE_TYPE, mContext, mCallProviderResponse);
- }
- isFirstPlay = true;
- }
-
- @Override
- public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) {
- Log.d(TAG, " onStatusChanged ----- descriptor = " + descriptor);
- if (descriptor == StatusDescriptor.ACC_STATUS&&!isTrue) {
- ServiceMediaHandler.getMogoWindowManager().removeView(mWindowView);
- mHasAddWindow = false;
- }
-
- if (descriptor == StatusDescriptor.VR_MODE) {
- if (mWindowView == null) {
- return;
- }
-
- ServiceMediaHandler.getMogoWindowManager().removeView(mWindowView);
- mHasAddWindow = false;
- addWindowView();
- }
- }
-
- private void addWindowView() {
- Log.d(TAG, "addWindowView===" + mHasAddWindow);
- if (ServiceMediaHandler.getMogoWindowManager() == null) {
- Log.d(TAG, "addWindowView return");
- return;
- }
-
- if (!mHasAddWindow) {
- mHasAddWindow = true;
- if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
- mWindowView =
- LayoutInflater.from(mContext).inflate(R.layout.module_media_music_window_alert_layout_new, null);
- mPercentageRingView = mWindowView.findViewById(R.id.window_circle_bg);
- mAnimCircleImageView = mWindowView.findViewById(R.id.window_circle_img_new);
- mPauseImage = mWindowView.findViewById(R.id.window_play_pause_new);
-
-// int[] arcColors = new int[]{
-// Color.parseColor("#1Affffff"),
-// Color.parseColor("#80ffffff"),
-// Color.parseColor("#BFffffff"),
-// Color.parseColor("#ffffff")
-// };
-//
-// mPercentageRingView.setArcColors(arcColors);
-
- if (mPauseImage != null) {
- mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
- }
-
- int yPos =
- getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_new);
- int xPos =
- getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x_new);
- int statusBarHeight = WindowUtils.getStatusBarHeight(mContext);
- Logger.d(TAG,
- "yPos: " + yPos + " xPos: " + xPos + " statusBarHeight: " + statusBarHeight);
- Log.d(TAG, "addMediaWindoView");
- FrameLayout.LayoutParams params =
- new FrameLayout.LayoutParams((int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_width_new), (int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_height_new));
- params.leftMargin = xPos;
- params.topMargin = yPos;
- ServiceMediaHandler.getMogoWindowManager().addView(mWindowView, params, false);
- updateWindowUI(true);
-
- mWindowView.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- mPresenter.openApp();
- }
- });
-
- mPauseImage.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- if (mMediaInfoData != null) {
- if (mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PAUSE_OR_STOP) {
- mPresenter.play(mMediaInfoData);
- } else {
- // 没有做详细判断，不是暂停就是播放
- mPresenter.pause(mMediaInfoData);
- }
- } else {
- mPresenter.openApp();
- }
- }
- });
-
- if ( mIsCallChatWindowVisible ) {
- Logger.d( TAG, "vr mWindowView.setVisibility: status = " + mIsCallChatWindowVisible );
- mWindowView.setVisibility(View.GONE);
- } else {
- mWindowView.setVisibility(View.VISIBLE);
- }
- } else {
- mWindowView =
- LayoutInflater.from(mContext).inflate(R.layout.module_media_music_window_alert_layout, null);
- mCircleImg = mWindowView.findViewById(R.id.window_circle_img);
- mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
- mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
- mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
- mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
- mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
- mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
- if (mWindowPlayPause != null) {
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause);
- }
- int yPos =
- getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location);
- int xPos =
- getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
- int statusBarHeight = WindowUtils.getStatusBarHeight(mContext);
- Logger.d(TAG,
- "yPos: " + yPos + " xPos: " + xPos + " statusBarHeight: " + statusBarHeight);
- Log.d(TAG, "addMediaWindoView");
- FrameLayout.LayoutParams params =
- new FrameLayout.LayoutParams((int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_width), (int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_height));
- params.leftMargin = xPos;
- params.topMargin = yPos;
- ServiceMediaHandler.getMogoWindowManager().addView(mWindowView, params, false);
- updateWindowUI(true);
- mWindowView.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- mPresenter.openApp();
- }
- });
-
- mWindowPlayPause.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- if (mMediaInfoData != null) {
- if (mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PAUSE_OR_STOP) {
- mPresenter.play(mMediaInfoData);
- } else {
- // 没有做详细判断，不是暂停就是播放
- mPresenter.pause(mMediaInfoData);
- }
- } else {
- mPresenter.openApp();
- }
- }
- });
-
- mWindowPlayNext.setOnClickListener(new NoDoubleClickListener() {
- @Override
- public void onClicks(View view) {
- if (mPresenter != null) {
- mPresenter.next();
- }
- }
- });
-
- if ( mIsCallChatWindowVisible ) {
- Logger.d( TAG, "mWindowView.setVisibility: status = " + mIsCallChatWindowVisible );
- mWindowView.setVisibility(View.GONE);
- } else {
- mWindowView.setVisibility(View.VISIBLE);
- }
- }
- }
- }
-
- private void updateWindowUI() {
- updateWindowUI(false);
- }
-
- private void updateWindowUI(boolean first) {
- if (mWindowView == null) {
- return;
- }
- if (mMediaInfoData != null) {
- if (mMediaInfoData.getType() == MusicConstant.PLAY_STATE_ERROR||isFirstPlay) {
- mWindowView.setVisibility(View.GONE);
- } else {
- if ( mIsCallChatWindowVisible ) {
- mWindowView.setVisibility(View.GONE );
- } else {
- mWindowView.setVisibility(View.VISIBLE);
- }
- }
- } else {
- mWindowView.setVisibility(View.GONE);
- return;
- }
-
- if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
- if (first || mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING || mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_BUFF) {
- if( mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) {
- // kw音乐做的容错
- if (mPauseImage != null) {
- mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new);
- }
- if (mAnimCircleImageView != null) {
- mAnimCircleImageView.startAnim();
- }
- }
- }
-
- if (mAnimCircleImageView != null) {
- if(mMediaInfoData!=null&&mMediaInfoData.getMediaImg()!=null&&!mMediaInfoData.getMediaImg().isEmpty()) {
- int size =
- mContext.getResources().getDimensionPixelSize(R.dimen.module_media_pop_window_anim_img_size_new);
- Logger.d(TAG, "overload: " + size);
- com.bumptech.glide.request.RequestOptions options =
- new com.bumptech.glide.request.RequestOptions()
- .placeholder(R.drawable.module_media_default_music_img).error(R.drawable.module_media_default_music_img).override(size, size);
- GlideApp.with(mContext).asBitmap().apply(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mAnimCircleImageView, options));
-// GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
- }else{
- Logger.e(TAG, "mMediaInfoData == null ");
- mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img_new);
- }
- }
- } else {
- if (mScrollText != null) {
- mScrollText.setText(mMediaInfoData.getMediaName());
- }
-
- if (first || mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING || mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_BUFF) {
- if (mWindowMaxTime != null) {
- mWindowMaxTime.setText(Utils.calculateTime((int) mMediaInfoData.getMaxTime()));
- }
- if (mWindowCurrTime != null) {
- mWindowCurrTime.setText(Utils.calculateTime((int) mMediaInfoData.getCurTime()));
- }
-
- if( mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) {
- // kw音乐做的容错
- if (mWindowPlayPause != null) {
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_play);
- }
- if (mCircleImg != null) {
- mCircleImg.startAnim();
- }
- }
- }
-
- if (mCircleImg != null) {
- if(mMediaInfoData!=null&&mMediaInfoData.getMediaImg()!=null&&!mMediaInfoData.getMediaImg().isEmpty()) {
- int size =
- mContext.getResources().getDimensionPixelSize(R.dimen.module_media_pop_window_anim_img_size);
- com.bumptech.glide.request.RequestOptions options =
- new com.bumptech.glide.request.RequestOptions()
- .placeholder(R.drawable.module_media_default_music_img).error(R.drawable.module_media_default_music_img).override(size, size);
- GlideApp.with(mContext).asBitmap().apply(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
-// GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
- }else{
- mCircleImg.setImageResource(R.drawable.module_media_default_music_img);
- }
- }
- }
-
- }
-
- @Override
- public Context getContext() {
- return mContext;
- }
-
- @Override
- public void onMusicPlaying() {
- Logger.d(TAG, "onMusicPlaying===" + mMediaInfoData);
- isFirstPlay = false;
- updateWindowUI(false);
- if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
- if (mPauseImage != null) {
- mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new);
- }
-
- if (mAnimCircleImageView != null) {
- mAnimCircleImageView.startAnim();
- }
- } else {
- if (mWindowPlayPause != null) {
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_play);
- }
-
- if (mCircleImg != null) {
- mCircleImg.startAnim();
- }
- }
-
- MogoApisHandler.getInstance().getApis().getStatusManagerApi().setMediaPlayStatus(TAG, true);
- }
-
- @Override
- public void onMusicPause() {
- Logger.d(TAG, "onMusicPause: ===" + mMediaInfoData);
- if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
- if (mPauseImage != null) {
- mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
- }
-
- if (mAnimCircleImageView != null) {
- mAnimCircleImageView.stopAnim();
- }
- } else {
- if (mWindowPlayPause != null) {
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause);
- }
-
- if (mAnimCircleImageView != null) {
- mAnimCircleImageView.stopAnim();
- }
- }
-
- MogoApisHandler.getInstance().getApis().getStatusManagerApi().setMediaPlayStatus(TAG,false);
- }
-
- @Override
- public void onMusicStopped() {
- Logger.d(TAG, "onMusicStopped===" + mMediaInfoData);
- if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
- if (mPauseImage != null) {
- mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
- }
-
- if (mAnimCircleImageView != null) {
- mAnimCircleImageView.stopAnim();
- }
- } else {
- if (mWindowPlayPause != null) {
- mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause);
- }
-
- if (mCircleImg != null) {
- mCircleImg.stopAnim();
- }
- }
-
- MogoApisHandler.getInstance().getApis().getStatusManagerApi().setMediaPlayStatus(TAG,false);
- }
-
- @Override
- public void onMediaInfoChanged(MediaInfoData mediaInfoData) {
- Logger.d(TAG, "onMediaInfoChanged: " + mediaInfoData);
- mMediaInfoData = mediaInfoData;
- addWindowView();
- updateWindowUI();
- }
-
- @Override
- public void onMusicProgress(long current, long total) {
-// Logger.d(TAG, "onMusicProgress==current: " + current + " total: " + total);
- if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
- try {
- int progress =
- (int) ((current * 1.0f * 100) / (total * 1.0f));
- if (mPercentageRingView != null) {
- mPercentageRingView.setVisibility(View.VISIBLE);
- mPercentageRingView.setProgress(progress);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else {
- if (mMediaInfoData != null) {
- mMediaInfoData.setCurTime((int) current);
- mMediaInfoData.setMaxTime((int) total);
- }
- if (mWindowCurrTime != null) {
- mWindowCurrTime.setText(Utils.calculateTime((int) current));
- mWindowMaxTime.setText(Utils.calculateTime((int) total));
- }
- try {
- int progress =
- (int) ((current * 1.0f * 100) / (total * 1.0f));
- if (mWindowProgress != null) {
- mWindowProgress.setProgress(progress);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- @Override
- public void onAppExit() {
- if ( mWindowView != null ) {
- mWindowView.setVisibility(View.GONE);
- }
- }
-
- public void onDestroy(){
- Logger.d(TAG, "onDestroy");
- if ( ServiceMediaHandler.getCarsChattingApis() != null ) {
- ServiceMediaHandler.getCarsChattingApis().unRegisterCallWindowStatusListener( MediaConstants.MODULE_TYPE, mContext);
- }
- ServiceMediaHandler.getIMogoStatusManager().unregisterStatusChangedListener(MediaConstants.MODULE_TYPE, StatusDescriptor.ACC_STATUS,this);
- }
-}
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_choice_point.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_choice_point.png
deleted file mode 100644
index 8ca4538285..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_choice_point.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_poi_location.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_poi_location.png
deleted file mode 100644
index 25940d02c6..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_poi_location.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_unshadow.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_unshadow.png
deleted file mode 100644
index cd32e7f85f..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_unshadow.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_blur_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_blur_default_icon.png
deleted file mode 100644
index 30d5891d96..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_blur_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_default_music_img.png
deleted file mode 100644
index d8de3c1ef3..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_default_music_img.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_full_screen.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_full_screen.png
deleted file mode 100644
index 240f148149..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_full_screen.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_have_heart.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_have_heart.png
deleted file mode 100644
index f86d4f3fde..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_have_heart.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_head_default_img.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_head_default_img.png
deleted file mode 100644
index 0597a02397..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_head_default_img.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_last_song.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_last_song.png
deleted file mode 100644
index eb4a4099a1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_last_song.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_next_song.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_next_song.png
deleted file mode 100644
index dcb18e202f..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_next_song.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_heart.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_heart.png
deleted file mode 100644
index 804057b9ca..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_heart.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_img_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_img_default_icon.png
deleted file mode 100644
index 04f4e5c139..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_img_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_play.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_play.png
deleted file mode 100644
index 1b16f5d635..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_play.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon.png
deleted file mode 100644
index a6ab1c9620..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon2.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon2.png
deleted file mode 100644
index 2dbb8b6773..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon2.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_rect_icon.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_rect_icon.png
deleted file mode 100644
index fc0b6145b1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_rect_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_fail.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_fail.png
deleted file mode 100644
index e15649f868..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_fail.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_normal.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_normal.png
deleted file mode 100644
index 2562454404..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_normal.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_success.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_success.png
deleted file mode 100644
index 2508848c10..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_success.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_suspend.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_suspend.png
deleted file mode 100644
index 88df36ee6d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_suspend.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png
deleted file mode 100644
index 8e6032a5f1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_pause.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_pause.png
deleted file mode 100644
index 6d35054284..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_pause.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_play.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_play.png
deleted file mode 100644
index 61510381d0..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_play.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_choice_point.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_choice_point.png
deleted file mode 100644
index 8ca4538285..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_choice_point.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_poi_location.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_poi_location.png
deleted file mode 100644
index 25940d02c6..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_poi_location.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_unshadow.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_unshadow.png
deleted file mode 100644
index cd32e7f85f..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_unshadow.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_blur_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_blur_default_icon.png
deleted file mode 100644
index 30d5891d96..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_blur_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_default_music_img.png
deleted file mode 100644
index d8de3c1ef3..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_default_music_img.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_full_screen.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_full_screen.png
deleted file mode 100644
index 240f148149..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_full_screen.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_have_heart.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_have_heart.png
deleted file mode 100644
index f86d4f3fde..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_have_heart.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_head_default_img.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_head_default_img.png
deleted file mode 100644
index 0597a02397..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_head_default_img.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_last_song.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_last_song.png
deleted file mode 100644
index eb4a4099a1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_last_song.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_next_song.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_next_song.png
deleted file mode 100644
index dcb18e202f..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_next_song.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_no_heart.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_no_heart.png
deleted file mode 100644
index 804057b9ca..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_no_heart.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_no_img_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_no_img_default_icon.png
deleted file mode 100644
index 04f4e5c139..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_no_img_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_play.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_play.png
deleted file mode 100644
index 1b16f5d635..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_play.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_icon.png
deleted file mode 100644
index a6ab1c9620..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_icon2.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_icon2.png
deleted file mode 100644
index 2dbb8b6773..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_icon2.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_rect_icon.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_rect_icon.png
deleted file mode 100644
index fc0b6145b1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_default_rect_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_fail.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_fail.png
deleted file mode 100644
index e15649f868..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_fail.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_normal.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_normal.png
deleted file mode 100644
index 2562454404..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_normal.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_success.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_success.png
deleted file mode 100644
index 2508848c10..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_share_success.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_suspend.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_suspend.png
deleted file mode 100644
index 88df36ee6d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_suspend.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png
deleted file mode 100644
index 8e6032a5f1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_pop_pause.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_pop_pause.png
deleted file mode 100644
index 6d35054284..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_pop_pause.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_pop_play.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_pop_play.png
deleted file mode 100644
index 61510381d0..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_pop_play.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/ic_search_choice_point.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/ic_search_choice_point.png
deleted file mode 100644
index 9f75ac8e88..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/ic_search_choice_point.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/ic_search_poi_location.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/ic_search_poi_location.png
deleted file mode 100644
index 484f80efd5..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/ic_search_poi_location.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_blur_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_blur_default_icon.png
deleted file mode 100644
index 7198c071db..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_blur_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png
deleted file mode 100644
index df81e5d06d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png
deleted file mode 100644
index fcc9015490..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_full_screen.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_full_screen.png
deleted file mode 100644
index bc14feee50..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_full_screen.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_full_screen_select.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_full_screen_select.png
deleted file mode 100644
index 170785863b..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_full_screen_select.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_have_heart.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_have_heart.png
deleted file mode 100644
index d660105c2d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_have_heart.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_head_default_img.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_head_default_img.png
deleted file mode 100644
index f2e5a03cab..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_head_default_img.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_icon_map_marker_music.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_icon_map_marker_music.png
deleted file mode 100644
index 398912c0ea..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_icon_map_marker_music.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_last_song.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_last_song.png
deleted file mode 100644
index f3a0b6f28e..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_last_song.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_last_song_click.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_last_song_click.png
deleted file mode 100644
index 80ec16e26f..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_last_song_click.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon1.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon1.png
deleted file mode 100644
index 172a5934ae..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon1.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon10.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon10.png
deleted file mode 100644
index dc9589159b..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon10.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon11.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon11.png
deleted file mode 100644
index d913d05154..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon11.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon12.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon12.png
deleted file mode 100644
index 35702bc1ab..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon12.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon13.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon13.png
deleted file mode 100644
index 94faa2ac0e..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon13.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon14.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon14.png
deleted file mode 100644
index 341e9ce7b9..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon14.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon15.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon15.png
deleted file mode 100644
index a271a09b42..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon15.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon16.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon16.png
deleted file mode 100644
index 4ff5b09209..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon16.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon17.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon17.png
deleted file mode 100644
index 1a96b0115a..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon17.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon18.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon18.png
deleted file mode 100644
index 238f47d78c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon18.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon19.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon19.png
deleted file mode 100644
index b45536a4d1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon19.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon2.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon2.png
deleted file mode 100644
index 775d44e934..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon2.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon20.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon20.png
deleted file mode 100644
index b70e929788..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon20.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon21.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon21.png
deleted file mode 100644
index b17ef58d95..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon21.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon22.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon22.png
deleted file mode 100644
index 28a667b077..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon22.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon23.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon23.png
deleted file mode 100644
index 8fb205f65c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon23.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon24.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon24.png
deleted file mode 100644
index 57216edd8b..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon24.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon25.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon25.png
deleted file mode 100644
index bf1db703d9..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon25.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon26.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon26.png
deleted file mode 100644
index ff783cb414..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon26.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon27.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon27.png
deleted file mode 100644
index b8c70103a6..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon27.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon28.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon28.png
deleted file mode 100644
index 0b53d4e0cc..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon28.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon29.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon29.png
deleted file mode 100644
index 35910fc41e..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon29.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon3.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon3.png
deleted file mode 100644
index f2aef2d862..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon3.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon30.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon30.png
deleted file mode 100644
index a8e76f4292..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon30.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon31.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon31.png
deleted file mode 100644
index 2cfcb1239b..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon31.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon32.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon32.png
deleted file mode 100644
index 8a7e0eab0c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon32.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon33.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon33.png
deleted file mode 100644
index 801817119d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon33.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon34.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon34.png
deleted file mode 100644
index 0775b3aae6..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon34.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon35.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon35.png
deleted file mode 100644
index d78c1ad2fc..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon35.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon36.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon36.png
deleted file mode 100644
index 00c647affa..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon36.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon37.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon37.png
deleted file mode 100644
index 72d9a66e36..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon37.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon38.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon38.png
deleted file mode 100644
index 36525eec91..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon38.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon39.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon39.png
deleted file mode 100644
index 1ef84eba37..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon39.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon4.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon4.png
deleted file mode 100644
index 8180b14e9a..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon4.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon40.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon40.png
deleted file mode 100644
index 14e67a0b5a..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon40.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon41.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon41.png
deleted file mode 100644
index bc95f9f96c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon41.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon42.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon42.png
deleted file mode 100644
index ed0b6f76ce..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon42.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon43.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon43.png
deleted file mode 100644
index 7e36135339..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon43.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon44.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon44.png
deleted file mode 100644
index eb86260b6d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon44.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon45.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon45.png
deleted file mode 100644
index 4d2423aacc..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon45.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon46.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon46.png
deleted file mode 100644
index ddf538ab6e..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon46.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon47.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon47.png
deleted file mode 100644
index 04e325d6c0..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon47.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon48.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon48.png
deleted file mode 100644
index 6b029f0a17..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon48.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon49.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon49.png
deleted file mode 100644
index e329da91b6..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon49.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon5.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon5.png
deleted file mode 100644
index 4fda193c49..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon5.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon50.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon50.png
deleted file mode 100644
index d357202e6d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon50.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon51.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon51.png
deleted file mode 100644
index d3c5a2d346..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon51.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon52.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon52.png
deleted file mode 100644
index ca7c4220a9..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon52.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon53.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon53.png
deleted file mode 100644
index f3ee370442..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon53.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon54.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon54.png
deleted file mode 100644
index c9a047e05e..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon54.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon55.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon55.png
deleted file mode 100644
index 35d3b5a7c4..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon55.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon56.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon56.png
deleted file mode 100644
index 44912aa767..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon56.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon57.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon57.png
deleted file mode 100644
index f87729a3fc..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon57.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon58.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon58.png
deleted file mode 100644
index b031cda549..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon58.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon59.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon59.png
deleted file mode 100644
index 37241888fc..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon59.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon6.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon6.png
deleted file mode 100644
index 74ff4016fc..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon6.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon60.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon60.png
deleted file mode 100644
index b8d636130d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon60.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon61.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon61.png
deleted file mode 100644
index f37807f227..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon61.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon62.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon62.png
deleted file mode 100644
index 8e91f014c8..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon62.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon63.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon63.png
deleted file mode 100644
index eb93bf536c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon63.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon64.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon64.png
deleted file mode 100644
index 5eee54dd42..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon64.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon65.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon65.png
deleted file mode 100644
index 757cbb1047..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon65.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon66.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon66.png
deleted file mode 100644
index 7ec3c175b6..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon66.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon67.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon67.png
deleted file mode 100644
index 89547994eb..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon67.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon68.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon68.png
deleted file mode 100644
index 41ba271e26..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon68.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon69.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon69.png
deleted file mode 100644
index 2e9f59de0a..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon69.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon7.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon7.png
deleted file mode 100644
index 86cfdf616c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon7.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon70.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon70.png
deleted file mode 100644
index d9cc30556d..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon70.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon71.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon71.png
deleted file mode 100644
index b996b8de6b..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon71.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon72.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon72.png
deleted file mode 100644
index a93bb38648..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon72.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon73.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon73.png
deleted file mode 100644
index a3089c41eb..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon73.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon74.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon74.png
deleted file mode 100644
index a3d862aa22..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon74.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon75.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon75.png
deleted file mode 100644
index 18e155874b..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon75.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon8.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon8.png
deleted file mode 100644
index 946405b451..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon8.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon9.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon9.png
deleted file mode 100644
index 43622cdd9c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_music_animal_icon9.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png
deleted file mode 100644
index a3898c5827..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song_click.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song_click.png
deleted file mode 100644
index 6194927beb..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song_click.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_no_heart.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_no_heart.png
deleted file mode 100644
index 4c1d667884..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_no_heart.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_no_img_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_no_img_default_icon.png
deleted file mode 100644
index d1978ce559..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_no_img_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_play.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_play.png
deleted file mode 100644
index d46389d86e..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_play.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_click.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_click.png
deleted file mode 100644
index 246b92c4a9..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_click.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_icon.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_icon.png
deleted file mode 100644
index bfaed8e0f5..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_icon1.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_icon1.png
deleted file mode 100644
index 38c4a43636..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_icon1.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_rect_icon.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_rect_icon.png
deleted file mode 100644
index 51d4b92fe8..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_default_rect_icon.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_fail.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_fail.png
deleted file mode 100644
index b70bfed8c1..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_fail.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_normal.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_normal.png
deleted file mode 100644
index dcc359bf47..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_normal.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_success.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_success.png
deleted file mode 100644
index 0005916564..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_share_success.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_suspend.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_suspend.png
deleted file mode 100644
index 3dfa5da5c6..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_suspend.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png
deleted file mode 100644
index 96ddb81326..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_next.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_next.png
deleted file mode 100644
index d23e33246b..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_next.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png
deleted file mode 100644
index a908c23da5..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png
deleted file mode 100644
index 86f936f702..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png
deleted file mode 100644
index ab6f5e4d7c..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png
deleted file mode 100644
index 78e5680e91..0000000000
Binary files a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png and /dev/null differ
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_bottom_revert_trianle_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_bottom_revert_trianle_bg.xml
deleted file mode 100644
index 19bc1f9d13..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_bottom_revert_trianle_bg.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_card_back.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_card_back.xml
deleted file mode 100644
index 71b9ee964e..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_card_back.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_card_tran_img_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_card_tran_img_bg.xml
deleted file mode 100644
index fc072d2f97..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_card_tran_img_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_circle_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_circle_bg.xml
deleted file mode 100644
index 4f0286a260..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_circle_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_click_poi_bg_top.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_click_poi_bg_top.xml
deleted file mode 100644
index df19595e70..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_click_poi_bg_top.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_demo_selector.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_demo_selector.xml
deleted file mode 100644
index d17daeaa24..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_demo_selector.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_next_bg_selector.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_next_bg_selector.xml
deleted file mode 100644
index 3141e1a44a..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_next_bg_selector.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml
deleted file mode 100644
index eafad48464..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- -
-
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_progress_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_progress_bg.xml
deleted file mode 100644
index 11e0a400c7..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_progress_bg.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_progress_pop_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_progress_pop_bg.xml
deleted file mode 100644
index a8e74c1033..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_progress_pop_bg.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_bg.xml
deleted file mode 100644
index 222dea52a8..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_bg.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_left_btn_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_left_btn_bg.xml
deleted file mode 100644
index fad92a439a..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_left_btn_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_right_btn_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_right_btn_bg.xml
deleted file mode 100644
index 111ff2af99..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_right_btn_bg.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_title_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_title_bg.xml
deleted file mode 100644
index 9037314b49..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_share_dialog_title_bg.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_share_toast_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_share_toast_bg.xml
deleted file mode 100644
index c3ade0a821..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_share_toast_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_user_share_music_back.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_user_share_music_back.xml
deleted file mode 100644
index 42bde49ed3..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_user_share_music_back.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_window_progress_bar.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_window_progress_bar.xml
deleted file mode 100644
index a62ffcda8f..0000000000
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_window_progress_bar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_bubble_marker.xml b/modules/mogo-module-media/src/main/res/layout/module_media_bubble_marker.xml
deleted file mode 100644
index 0fc5b67336..0000000000
--- a/modules/mogo-module-media/src/main/res/layout/module_media_bubble_marker.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_card_fragment_view.xml b/modules/mogo-module-media/src/main/res/layout/module_media_card_fragment_view.xml
deleted file mode 100644
index 2223bb6dbf..0000000000
--- a/modules/mogo-module-media/src/main/res/layout/module_media_card_fragment_view.xml
+++ /dev/null
@@ -1,375 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_dialog_cutom_layout.xml b/modules/mogo-module-media/src/main/res/layout/module_media_dialog_cutom_layout.xml
deleted file mode 100644
index e6aaae273c..0000000000
--- a/modules/mogo-module-media/src/main/res/layout/module_media_dialog_cutom_layout.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml
deleted file mode 100644
index 7a0b082d3b..0000000000
--- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
deleted file mode 100644
index 9002881140..0000000000
--- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_share_fragment_view.xml b/modules/mogo-module-media/src/main/res/layout/module_media_share_fragment_view.xml
deleted file mode 100644
index 6389fdef75..0000000000
--- a/modules/mogo-module-media/src/main/res/layout/module_media_share_fragment_view.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_share_toast_view.xml b/modules/mogo-module-media/src/main/res/layout/module_media_share_toast_view.xml
deleted file mode 100644
index 73fc49ae04..0000000000
--- a/modules/mogo-module-media/src/main/res/layout/module_media_share_toast_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/colors.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/colors.xml
deleted file mode 100644
index 69b22338c6..0000000000
--- a/modules/mogo-module-media/src/main/res/values-xhdpi/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- #008577
- #00574B
- #D81B60
-
diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
deleted file mode 100644
index 75bfb5e9d1..0000000000
--- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
- 872px
- 1067px
- 40px
- 1760px
-
- 660px
- 660px
- 20px
- 23px
- 67.5px
- 67.5px
- 67.5px
- 10px
- 23px
- 116px
- 30px
- 145px
- 20px
- 30px
- 90px
- 90px
- 21px
- 24px
- 23px
- 26px
- 30px
- 16px
- 68px
- 68px
- 23px
- 35px
- 56px
- 56px
- 126px
- 3px
- 116px
- 116px
- 22px
- 37.5px
- 28px
-
-
-
- 790px
- 525px
- 55px
- 61px
- 20px
- 136px
- 20px
- 136px
- 34px
- 40px
- 30px
- 34px
- 40px
- 60px
- 96px
- 130px
- 4px
- 6px
-
- 600px
- 140px
- 116px
- 116px
- 112px
- 30px
- 80px
- 101px
- 60px
- 115px
- 230px
- 14px
- 35px
- 24px
- 56px
- 40px
- 8px
- 16px
- 16px
- 500px
- 350px
- 20px
- 120px
- 36px
- 20px
-
- 660px
- 660px
- 20px
- 22px
- 22px
- 348px
- 348px
- 226px
- 226px
- 36px
- 28px
- 4px
- 2px
- 11px
- 22px
- 21px
- 4px
- 6px
- 2px
-
- 15px
- 78px
- 107px
- 53px
- 2px
- 64px
- 6px
- 12px
- 6px
- 8px
- 180px
-
- 60px
- 750px
- 120px
- 270px
- 30px
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/strings.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/strings.xml
deleted file mode 100644
index 952949198b..0000000000
--- a/modules/mogo-module-media/src/main/res/values-xhdpi/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- mogo-module-media
-
diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/styles.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/styles.xml
deleted file mode 100644
index 5885930df6..0000000000
--- a/modules/mogo-module-media/src/main/res/values-xhdpi/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/main/res/values/attrs.xml b/modules/mogo-module-media/src/main/res/values/attrs.xml
deleted file mode 100644
index d8f98cf7bf..0000000000
--- a/modules/mogo-module-media/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/values/colors.xml b/modules/mogo-module-media/src/main/res/values/colors.xml
deleted file mode 100644
index 7c39678a81..0000000000
--- a/modules/mogo-module-media/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- #fff
- #7affffff
- #444E6E
- #f6ffffff
- #1Affffff
- #ffffff
-
diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml
deleted file mode 100644
index d0351297ed..0000000000
--- a/modules/mogo-module-media/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
- 467px
- 573px
- 80px
- 930px
-
-
- 352px
- 352px
- 10.67px
- 12px
- 36px
- 36px
- 36px
- 5px
- 12px
- 62px
- 16px
- 78px
- 10.6px
- 16px
- 48px
- 48px
- 11px
- 12px
- 12px
- 14px
- 16px
- 8px
- 36px
- 36px
- 12px
- 18px
- 30px
- 30px
- 67.2px
- 3px
- 62px
- 62px
- 12px
- 20px
- 15px
-
-
-
- 421px
- 280px
- 28px
- 32.5px
- 11.5px
- 72.5px
- 10.7px
- 72.5px
- 10px
- 22px
- 16px
- 18px
- 22px
- 32px
- 51px
- 68px
- 2px
- 3.2px
-
- 338px
- 82px
- 116px
- 116px
- 60px
- 18px
- 44px
- 60px
- 60px
- 123px
- 10px
- 18px
- 14px
- 30px
- 21px
- 4px
- 8px
- 7px
-
- 267px
- 187px
- 10px
- 64px
- 18px
- 11px
-
- 352px
- 352px
- 10.5px
- 11px
- 11.5px
- 175px
- 175px
- 114px
- 114px
- 20px
- 15px
- 4px
- 2px
- 6px
- 12px
- 11px
- 4px
- 1px
-
- 8px
- 44px
- 62px
- 28px
- 1px
- 35px
- 3.2px
- 6.4px
- 3px
- 4px
- 96px
-
- 32px
- 400px
- 80px
- 150px
- 16px
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/values/strings.xml b/modules/mogo-module-media/src/main/res/values/strings.xml
deleted file mode 100644
index 913d27b8a0..0000000000
--- a/modules/mogo-module-media/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
- mogo-module-media
-
- 来自
- 的分享
- 是否确认分享此歌曲？
- 是否确认分享此书？
- 是否确认分享此新闻？
- 分享成功
- 分享失败
-
-
diff --git a/modules/mogo-module-media/src/main/res/values/styles.xml b/modules/mogo-module-media/src/main/res/values/styles.xml
deleted file mode 100644
index 5885930df6..0000000000
--- a/modules/mogo-module-media/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/modules/mogo-module-media/src/test/java/com/mogo/module/media/ExampleUnitTest.java b/modules/mogo-module-media/src/test/java/com/mogo/module/media/ExampleUnitTest.java
deleted file mode 100644
index 7a2aef7111..0000000000
--- a/modules/mogo-module-media/src/test/java/com/mogo/module/media/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mogo.module.media;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see Testing documentation
- */
-public class ExampleUnitTest {
- @Test
- public void addition_isCorrect() {
- assertEquals(4, 2 + 2);
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-obu-mogo/build.gradle b/modules/mogo-module-obu-mogo/build.gradle
index 411735d7a2..44a46d97f7 100644
--- a/modules/mogo-module-obu-mogo/build.gradle
+++ b/modules/mogo-module-obu-mogo/build.gradle
@@ -59,7 +59,7 @@ dependencies {
api project(":foudations:mogo-utils")
api project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
- implementation project(':modules:mogo-module-data')
+ implementation project(':core:mogo-core-data')
}
implementation rootProject.ext.dependencies.mogoobu
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
index f0c25082c6..bee003e374 100644
--- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
+++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
@@ -5,14 +5,14 @@ import android.util.Log
import com.alibaba.android.arouter.launcher.ARouter
import com.mogo.module.common.datacenter.SnapshotLocationDataCenter
import com.mogo.module.common.drawer.TrafficMarkerDrawer
-import com.mogo.module.common.enums.WarningTypeEnum
-import com.mogo.module.data.enums.WarningDirectionEnum
+import com.mogo.module.common.enums.EventTypeEnum
+import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.module.obu.mogo.utils.TrafficDataConvertUtils
import com.mogo.service.IMogoServiceApis
import com.mogo.service.MogoServicePaths
import com.mogo.service.map.IMogoMapService
-import com.mogo.service.warning.IMoGoWaringProvider
-import com.mogo.service.warning.WarningStatusListener
+import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
+import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
import com.mogo.utils.logger.Logger
import com.mogo.utils.storage.SharedPrefsMgr
import com.zhidao.support.obu.MogoObuManager
@@ -43,9 +43,8 @@ class MogoPrivateObuManager private constructor() {
fun init(context: Context?) {
Logger.d(MogoObuConst.TAG_MOGO_OBU, "obuManager初始化--")
mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
- .navigation(context) as IMogoServiceApis
+ .navigation(context) as IMogoServiceApis
mContext = context
-
// 获取预警模块的接口
mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi
mIMogoMapService = mMogoServiceApis!!.mapServiceApi
@@ -162,18 +161,15 @@ class MogoPrivateObuManager private constructor() {
if (info != null && info.threat_info != null && info.ext_info != null) {
var alertContent = ""
var ttsContent = ""
- var appId = info.threat_info.app_id
+ var appId = info.threat_info.app_id.toString()
val status = info.status
val level = info.threat_info.threat_level
val direction =
- getMessageDirection(if (info.ext_info != null) info.ext_info.pos_classification else -1)
+ getMessageDirection(if (info.ext_info != null) info.ext_info.pos_classification else -1)
when (appId) {
// 道路危险情况预警
- WarningTypeEnum.TYPE_USECASE_ID_HLW.useCaseId -> {
- Logger.d(
- MogoObuConst.TAG_MOGO_OBU,
- "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type}"
- )
+ EventTypeEnum.TYPE_USECASE_ID_HLW.poiType -> {
+ Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type}")
when (info.ext_info.rti_type) {
//急转弯
0x2 -> {
@@ -183,65 +179,65 @@ class MogoPrivateObuManager private constructor() {
WarningDirectionEnum.ALERT_WARNING_TOP_LEFT,
WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT -> {
appId =
- WarningTypeEnum.TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.useCaseId
+ EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType
}
WarningDirectionEnum.ALERT_WARNING_RIGHT,
WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT,
WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT -> {
appId =
- WarningTypeEnum.TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.useCaseId
+ EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType
}
}
}
//施工
0x7 -> {
- appId = ObuConstants.USE_CASE_ID.IVS
+ appId = EventTypeEnum.TYPE_USECASE_ID_IVS.poiType
}
//限速
0xA -> {
- appId = ObuConstants.USE_CASE_ID.SLW
+ appId = EventTypeEnum.TYPE_USECASE_ID_SLW.poiType
}
//事故
0xC -> {
appId =
- WarningTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.useCaseId
+ EventTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType
}
//拥堵
0xD -> {
- appId = ObuConstants.USE_CASE_ID.TJW
+ appId = EventTypeEnum.TYPE_USECASE_ID_TJW.poiType
}
//行人
0xF -> {
appId =
- WarningTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.useCaseId
+ EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
}
//禁止停车
0x13 -> {
- appId = WarningTypeEnum.TYPE_USECASE_ID_ROAD_NO_PARKING.useCaseId
+ appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_NO_PARKING.poiType
}
//学校
0x14 -> {
appId =
- WarningTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.useCaseId
+ EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
}
//桥梁
0x17 -> {
- appId = WarningTypeEnum.TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.useCaseId
+ appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType
}
}
- alertContent = WarningTypeEnum.getWarningContent(appId)
- ttsContent = WarningTypeEnum.getWarningTts(appId)
+ alertContent = EventTypeEnum.getWarningContent(appId)
+ ttsContent = EventTypeEnum.getWarningTts(appId)
}
// 车内标牌
- WarningTypeEnum.TYPE_USECASE_ID_IVS.useCaseId -> {
- alertContent = WarningTypeEnum.getWarningContent(appId)
- ttsContent = WarningTypeEnum.getWarningTts(appId)
+ EventTypeEnum.TYPE_USECASE_ID_IVS.poiType -> {
+ alertContent = EventTypeEnum.getWarningContent(appId)
+ ttsContent = EventTypeEnum.getWarningTts(appId)
}
// 前方拥堵提醒
- WarningTypeEnum.TYPE_USECASE_ID_TJW.useCaseId -> {
- alertContent = WarningTypeEnum.getWarningContent(appId)
+ EventTypeEnum.TYPE_USECASE_ID_TJW.poiType -> {
+ alertContent = EventTypeEnum.getWarningContent(appId)
ttsContent = String.format(
- WarningTypeEnum.getWarningTts(appId),
+ EventTypeEnum.getWarningTts(appId),
info.threat_info.distance.toInt()
)
}
@@ -257,7 +253,7 @@ class MogoPrivateObuManager private constructor() {
mIMoGoWaringProvider!!.showWarning(direction)
//显示弹框，语音提示
mIMoGoWaringProvider!!.showWarningV2X(
- appId,
+ appId.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
(appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
@@ -295,12 +291,12 @@ class MogoPrivateObuManager private constructor() {
// (4) V2I预警信息：CVX_IVP_THREAT_IND
override fun onCvxIvpThreatIndInfo(info: CvxIvpThreatIndInfo?) {
Logger.d(MogoObuConst.TAG_MOGO_OBU, "CvxIvpThreatIndInfo ------> $info")
- if (info != null && info.ext_info != null && info.ext_info.lights.isNotEmpty()) {
+ if (info != null && info.ext_info != null && info.threat_info != null && info.ext_info.lights != null && info.ext_info.lights.isNotEmpty()) {
handlerTrafficLight(
- info.threat_info.app_id,
- info.status,
- info.ext_info.lights,
- info.ext_info.indicator
+ info.threat_info.app_id,
+ info.status,
+ info.ext_info.lights,
+ info.ext_info.indicator
)
}
}
@@ -308,12 +304,12 @@ class MogoPrivateObuManager private constructor() {
// (6) 地图红绿灯信息：CVX_MAP_SPAT_INFO_IND
override fun onCvxMapSpatInfoIndInfo(info: CvxMapSpatInfoIndInfo?) {
Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxMapSpatInfoIndInfo ------> $info")
- if (info != null && info.ivp_threat_ext != null && info.ivp_threat_ext.lights.isNotEmpty()) {
+ if (info != null && info.ivp_threat_ext != null && info.ivp_threat_ext.lights != null && info.ivp_threat_ext.lights.isNotEmpty()) {
handlerTrafficLight(
- info.ivp_threat_info.app_id,
- info.status,
- info.ivp_threat_ext.lights,
- info.ivp_threat_ext.indicator
+ info.ivp_threat_info.app_id,
+ info.status,
+ info.ivp_threat_ext.lights,
+ info.ivp_threat_ext.indicator
)
}
}
@@ -323,20 +319,20 @@ class MogoPrivateObuManager private constructor() {
Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxPtcInfoIndInfo ------> $info")
if (info != null) {
Logger.d(
- MogoObuConst.TAG_MOGO_OBU,
- "onCvxPtcInfoIndInfo ---status---> ${info.status}"
+ MogoObuConst.TAG_MOGO_OBU,
+ "onCvxPtcInfoIndInfo ---status---> ${info.status}"
)
- var v2xType = 0
+ var v2xType = ""
if (info.ptc_type == 1) { //摩托车
- v2xType = WarningTypeEnum.TYPE_USECASE_ID_VRUCW_MOTORBIKE.useCaseId
+ v2xType = EventTypeEnum.TYPE_USECASE_ID_VRUCW_MOTORBIKE.poiType
} else if (info.ptc_type == 2) { //行人
- v2xType = WarningTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.useCaseId
+ v2xType = EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.poiType
}
- val ttsContent = WarningTypeEnum.getWarningTts(v2xType)
- val alertContent = WarningTypeEnum.getWarningContent(v2xType)
+ val ttsContent = EventTypeEnum.getWarningTts(v2xType)
+ val alertContent = EventTypeEnum.getWarningContent(v2xType)
val direction =
- getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
- val level = info.threat_info.threat_level
+ getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
+ val level = if (info.threat_info != null) info.threat_info.threat_level else -1
when (info.status) {
// 添加
@@ -347,7 +343,7 @@ class MogoPrivateObuManager private constructor() {
//显示警告红边
mIMoGoWaringProvider?.showWarning(direction)
mIMoGoWaringProvider?.showWarningV2X(
- v2xType,
+ v2xType.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
(v2xType + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
@@ -391,7 +387,9 @@ class MogoPrivateObuManager private constructor() {
ObuConstants.STATUS.ADD,
ObuConstants.STATUS.UPDATE,
-> {
- mIMoGoWaringProvider?.showLimitingVelocity(info.ext_info.speed_limit_max.toInt())
+ if (info.ext_info != null) {
+ mIMoGoWaringProvider?.showLimitingVelocity(info.ext_info.speed_limit_max.toInt())
+ }
}
// 删除
ObuConstants.STATUS.DELETE -> {
@@ -415,10 +413,10 @@ class MogoPrivateObuManager private constructor() {
val level = info.threat_info.threat_level
val status = info.status
Logger.d(
- MogoObuConst.TAG_MOGO_OBU,
- "onCvxV2vThreatIndInfo target_classification = ${
+ MogoObuConst.TAG_MOGO_OBU,
+ "onCvxV2vThreatIndInfo target_classification = ${
getMessageDirection(info.ext_info.target_classification)
- } --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
+ } --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
)
handleSdkObu(appId, direction, status, level, info)
}
@@ -482,8 +480,8 @@ class MogoPrivateObuManager private constructor() {
*/
private fun handlerTrafficLight(appId: Int, status: Int, lights: List, indicator: Int) {
Logger.d(
- MogoObuConst.TAG_MOGO_OBU,
- "handlerTrafficLight appId = $appId --- status = $status ---indicator = $indicator "
+ MogoObuConst.TAG_MOGO_OBU,
+ "handlerTrafficLight appId = $appId --- status = $status ---indicator = $indicator ---lights = $lights ---lights.size = ${lights.size}"
)
when (status) {
// 添加
@@ -501,19 +499,23 @@ class MogoPrivateObuManager private constructor() {
}
}
+ private var isRedLight = false
+ private var isGreenLight = false
+
/**
* 修改红绿灯
*/
private fun changeTrafficLightStatus(
- appId: Int,
- lights: List,
- indicator: Int
+ appId: Int,
+ lights: List,
+ indicator: Int
) {
var ttsContent = ""
var alertContent = ""
- // TODO 这里需要根据真实数据确定 indicator 取值方式
+ // TODO 这里需要根据真实数据确定 indicator 取值方式，暂时写 0 调试
if (lights.size >= indicator) {
- val currentLight = lights[indicator]
+ val currentLight = lights[0]
+ Logger.d(MogoObuConst.TAG_MOGO_OBU, "currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} --- indicator = $indicator ---appId = $appId")
when (currentLight.phase) {
// 灯光不可用
0x0 -> {
@@ -521,50 +523,58 @@ class MogoPrivateObuManager private constructor() {
}
// 红灯
0x1 -> {
- //显示警告红边
- mIMoGoWaringProvider?.showWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
+ if (!isRedLight) {
+ mIMoGoWaringProvider!!.disableWarningV2X(appId.toString())
+ isRedLight = true
+ }
+ isGreenLight = false
mIMoGoWaringProvider?.showWarningTrafficLight(1)
mIMoGoWaringProvider?.changeCountdownRed(currentLight.count_down.toInt())
- ttsContent = WarningTypeEnum.getWarningTts(appId)
- alertContent = WarningTypeEnum.getWarningContent(appId)
+ ttsContent = EventTypeEnum.getWarningTts(appId.toString())
+ alertContent = EventTypeEnum.getWarningContent(appId.toString())
mIMoGoWaringProvider!!.showWarningV2X(
- appId,
- alertContent,
- ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
- appId.toString(),
- object : WarningStatusListener {
- override fun onDismiss() {
- //关闭显示警告红边
- mIMoGoWaringProvider?.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
- }
- }
+ appId,
+ alertContent,
+ ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+ appId.toString(),
+ null
)
}
// 绿灯
0x2 -> {
+ if (!isGreenLight) {
+ mIMoGoWaringProvider!!.disableWarningV2X(appId.toString())
+ isGreenLight = true
+ }
+ isRedLight = false
mIMoGoWaringProvider?.showWarningTrafficLight(3)
- mIMoGoWaringProvider?.changeCountdownGreen(currentLight.count_down.toInt())
+ mIMoGoWaringProvider?.changeCountdownGreen(currentLight.count_down.toInt() + 1)
+ //防止数据出现问题的容错
+ mIMoGoWaringProvider?.changeCountdownRed(0)
+ mIMoGoWaringProvider?.changeCountdownYellow(0)
// 拼接建议速度
+ Logger.d(MogoObuConst.TAG_MOGO_OBU, "speed_min = ${currentLight.glosa_suggested_speed_min} --speed_max = ${currentLight.glosa_suggested_speed_max.toInt()}")
val adviceSpeed =
- "${currentLight.glosa_suggested_speed_min.toInt()} - ${currentLight.glosa_suggested_speed_max.toInt()}"
+ "${currentLight.glosa_suggested_speed_min.toInt()} - ${currentLight.glosa_suggested_speed_max.toInt()}"
val adviceSpeedTts =
- "${currentLight.glosa_suggested_speed_min.toInt()}到${currentLight.glosa_suggested_speed_max.toInt()}"
+ "${currentLight.glosa_suggested_speed_min.toInt()}到${currentLight.glosa_suggested_speed_max.toInt()}"
ttsContent =
String.format(
- WarningTypeEnum.getWarningTts(WarningTypeEnum.TYPE_USECASE_ID_IVP_GREEN.useCaseId),
+ EventTypeEnum.getWarningTts(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
adviceSpeedTts
)
alertContent =
String.format(
- WarningTypeEnum.getWarningContent(WarningTypeEnum.TYPE_USECASE_ID_IVP_GREEN.useCaseId),
+ EventTypeEnum.getWarningContent(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
adviceSpeed
)
+ var maxSpeed = currentLight.glosa_suggested_speed_max.toInt()
mIMoGoWaringProvider!!.showWarningV2X(
- WarningTypeEnum.TYPE_USECASE_ID_IVP_GREEN.useCaseId,
+ EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType.toInt(),
alertContent,
ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
appId.toString(),
@@ -573,8 +583,11 @@ class MogoPrivateObuManager private constructor() {
}
// 黄灯
0x3 -> {
+ mIMoGoWaringProvider!!.disableWarningV2X(appId.toString())
mIMoGoWaringProvider?.showWarningTrafficLight(2)
- mIMoGoWaringProvider?.changeCountdownYellow(currentLight.count_down.toInt())
+ mIMoGoWaringProvider?.changeCountdownYellow(currentLight.count_down.toInt() + 1)
+ mIMoGoWaringProvider?.changeCountdownGreen(0)
+ mIMoGoWaringProvider?.changeCountdownRed(0)
}
}
}
@@ -587,38 +600,38 @@ class MogoPrivateObuManager private constructor() {
*
* @param appId 使用WarningTypeEnum获取icon、提示内容、tts内容
*
- * @see com.mogo.module.common.enums.WarningTypeEnum
+ * @see com.mogo.module.common.enums.EventTypeEnum
*/
private fun handleSdkObu(
- appId: Int,
- direction: WarningDirectionEnum,
- status: Int,
- level: Int,
- info: CvxV2vThreatIndInfo
+ appId: Int,
+ direction: WarningDirectionEnum,
+ status: Int,
+ level: Int,
+ info: CvxV2vThreatIndInfo
) {
- // 这里排除需要特殊定制的语音及文案外,其余的都可以使用 WarningTypeEnum 提供的
+ // 这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnum 提供的
Log.d(
- MogoObuConst.TAG_MOGO_OBU,
- "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
+ MogoObuConst.TAG_MOGO_OBU,
+ "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
)
- var alertContent = ""
- var ttsContent = ""
- when (appId) {
+ var alertContent: String
+ var ttsContent: String
+ when (appId.toString()) {
// 变道预警,注意左后车辆/注意右后车辆
- WarningTypeEnum.TYPE_USECASE_ID_LCW.useCaseId -> {
- alertContent = WarningTypeEnum.getWarningContent(appId)
- ttsContent = WarningTypeEnum.getWarningTts(appId)
+ EventTypeEnum.TYPE_USECASE_ID_LCW.poiType -> {
+ alertContent = EventTypeEnum.getWarningContent(appId.toString())
+ ttsContent = EventTypeEnum.getWarningTts(appId.toString())
if (
- direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
- direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
- direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
+ direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
) {
ttsContent = String.format(ttsContent, "左")
alertContent = String.format(alertContent, "左")
} else if (
- direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
- direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
- direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
+ direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
) {
ttsContent = String.format(ttsContent, "右")
alertContent = String.format(alertContent, "右")
@@ -626,56 +639,56 @@ class MogoPrivateObuManager private constructor() {
}
//车辆失控预警
- WarningTypeEnum.TYPE_USECASE_ID_CLW.useCaseId -> {
- alertContent = WarningTypeEnum.getWarningContent(appId)
- ttsContent = WarningTypeEnum.getWarningTts(appId)
+ EventTypeEnum.TYPE_USECASE_ID_CLW.poiType -> {
+ alertContent = EventTypeEnum.getWarningContent(appId.toString())
+ ttsContent = EventTypeEnum.getWarningTts(appId.toString())
alertContent = String.format(alertContent, direction.desc)
ttsContent = String.format(ttsContent, direction.desc)
}
//左转辅助
- WarningTypeEnum.TYPE_USECASE_ID_LTA.useCaseId -> {
- alertContent = WarningTypeEnum.getWarningContent(appId)
- ttsContent = WarningTypeEnum.getWarningTts(appId)
+ EventTypeEnum.TYPE_USECASE_ID_LTA.poiType -> {
+ alertContent = EventTypeEnum.getWarningContent(appId.toString())
+ ttsContent = EventTypeEnum.getWarningTts(appId.toString())
if (
- direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
- direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
- direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
+ direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
) {
ttsContent = String.format(ttsContent, "左")
} else if (
- direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
- direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
- direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
+ direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
) {
ttsContent = String.format(ttsContent, "右")
}
}
//异常车辆提醒
- WarningTypeEnum.TYPE_USECASE_ID_AVW.useCaseId -> {
- alertContent = WarningTypeEnum.getWarningContent(appId)
- ttsContent = WarningTypeEnum.getWarningTts(appId)
+ EventTypeEnum.TYPE_USECASE_ID_AVW.poiType -> {
+ alertContent = EventTypeEnum.getWarningContent(appId.toString())
+ ttsContent = EventTypeEnum.getWarningTts(appId.toString())
alertContent = String.format(alertContent, direction.desc)
ttsContent = String.format(ttsContent, direction.desc)
}
//盲区预警
- WarningTypeEnum.TYPE_USECASE_ID_BSW.useCaseId -> {
- ttsContent = WarningTypeEnum.getWarningTts(appId)
- alertContent = WarningTypeEnum.getWarningContent(appId)
+ EventTypeEnum.TYPE_USECASE_ID_BSW.poiType -> {
+ ttsContent = EventTypeEnum.getWarningTts(appId.toString())
+ alertContent = EventTypeEnum.getWarningContent(appId.toString())
if (
- direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
- direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
- direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
+ direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
) { //左后
ttsContent = String.format(ttsContent, "左")
alertContent = String.format(alertContent, "左")
} else if (
- direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
- direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
- direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
+ direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
+ direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
) { //右后
ttsContent = String.format(ttsContent, "右")
alertContent = String.format(alertContent, "右")
@@ -684,8 +697,8 @@ class MogoPrivateObuManager private constructor() {
// 这里处理固定的提示信息
else -> {
- ttsContent = WarningTypeEnum.getWarningTts(appId)
- alertContent = WarningTypeEnum.getWarningContent(appId)
+ ttsContent = EventTypeEnum.getWarningTts(appId.toString())
+ alertContent = EventTypeEnum.getWarningContent(appId.toString())
}
}
@@ -694,22 +707,22 @@ class MogoPrivateObuManager private constructor() {
ObuConstants.STATUS.ADD,
ObuConstants.STATUS.UPDATE -> {
Log.d(
- MogoObuConst.TAG_MOGO_OBU,
- "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
+ MogoObuConst.TAG_MOGO_OBU,
+ "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
)
if (level == 2 || level == 3) {
//显示弹框，语音提示
mIMoGoWaringProvider?.showWarningV2X(
- appId,
- alertContent,
- ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
- (appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
- object : WarningStatusListener {
- override fun onDismiss() {
- // 关闭警告红边
- mIMoGoWaringProvider!!.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+ appId,
+ alertContent,
+ ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+ (appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
+ object : WarningStatusListener {
+ override fun onDismiss() {
+ // 关闭警告红边
+ mIMoGoWaringProvider!!.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+ }
}
- }
)
//显示警告红边
mIMoGoWaringProvider?.showWarning(direction)
diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt
index 026ffd7a86..e8e311e69c 100644
--- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt
+++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt
@@ -51,10 +51,10 @@ class ObuRsuTestTriggerReceiver : BroadcastReceiver() {
cvxIvpThreatIndInfo.threat_info = ivpThreat
val lightList = listOf(
- Light(1, 0x0, 1000, 100, 6000, 3000, 100, 1000),
- Light(1, 0x1, 1000, 100, 6000, 3000, 100, 1000),
- Light(1, 0x2, 1000, 100, 6000, 3000, 100, 1000),
- Light(1, 0x3, 1000, 100, 6000, 3000, 100, 1000)
+ Light(1, 0x0, 1000, 3000, 6000, 3000, 100, 1000),
+ Light(1, 0x1, 1000, 3000, 6000, 3000, 100, 1000),
+ Light(1, 0x2, 1000, 3000, 6000, 3000, 100, 1000),
+ Light(1, 0x3, 1000, 3000, 6000, 3000, 100, 1000)
)
val ivpThreatExt = IvpThreatExt(1, 1000, 1000, 0, indicator, lightList)
cvxIvpThreatIndInfo.ext_info = ivpThreatExt
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index b17823e7cb..f31e797e98 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -983,7 +983,7 @@ public class MogoServices implements IMogoMapListener,
try {
data.putOpt( "systemTime", Long.parseLong( stateInfo.getValues().getSystemTime() ) );
} catch ( Exception e ) {
- e.printStackTrace();
+// e.printStackTrace();
}
try {
data.putOpt( "satelliteTime", Long.parseLong( stateInfo.getValues().getSatelliteTime() ) );
@@ -993,12 +993,12 @@ public class MogoServices implements IMogoMapListener,
try {
data.putOpt( "receiverDataTime", Long.parseLong( stateInfo.getValues().getReceiverDataTime() ) );
} catch ( Exception e ) {
- e.printStackTrace();
+// e.printStackTrace();
}
try {
data.putOpt( "adasSatelliteTime", Long.parseLong( stateInfo.getValues().getAdasSatelliteTime() ) );
} catch ( Exception e ) {
- e.printStackTrace();
+// e.printStackTrace();
}
MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().syncLocation2Map( data );
SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo( data );
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
index 3c6284abb4..3c1142c0a9 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -9,6 +9,7 @@ import android.location.Location;
import android.os.Handler;
import android.os.Message;
+import com.mogo.cloud.commons.utils.CoordinateUtils;
import com.mogo.map.MogoLatLng;
import com.mogo.map.location.MogoLocation;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
@@ -16,16 +17,21 @@ import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean;
import com.mogo.module.service.dispatch.model.DispatchServiceModel;
import com.mogo.module.service.dispatch.model.IDispatch;
+import com.mogo.service.IMogoServiceApis;
import com.mogo.service.adas.IMogoAdasOCHCallback;
import com.mogo.service.adas.RemoteControlAutoPilotParameters;
import com.mogo.service.adas.entity.AdasOCHData;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
+import com.mogo.service.entrance.IMogoEntranceAutopilotStatusClickListener;
import com.mogo.utils.logger.Logger;
+import java.util.ArrayList;
+import java.util.List;
+
//负责监听自动驾驶状态并进行状态上报，自动驾驶路线上报，接收调度指令展示指令弹窗
public class DispatchAutoPilotManager implements IMogoOnMessageListener
, IDispatchRemindClickListener
- , IMogoCarLocationChangedListener2, IMogoAdasOCHCallback {
+ , IMogoCarLocationChangedListener2, IMogoAdasOCHCallback, IMogoEntranceAutopilotStatusClickListener {
private static final String TAG = "DispatchAutoPilotManager";
private static volatile DispatchAutoPilotManager instance;
@@ -40,6 +46,10 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener wayLatLon = new ArrayList<>();
+ for (MogoLatLng mogoLatLng : receiverBean.getStopsList()) {
+ wayLatLon.add(new RemoteControlAutoPilotParameters.AutoPilotLonLat(mogoLatLng.lat, mogoLatLng.lon));
+ }
+ currentAutopilot.wayLatLons = wayLatLon;
+ currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(receiverBean.getStartLat(), receiverBean.getStartLon());
+ currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(receiverBean.getEndLat(), receiverBean.getEndLon());
+ currentAutopilot.vehicleType = 10;
+ Logger.d(TAG, "开启自动驾驶====" + currentAutopilot);
+ mApis.getAdasControllerApi().aiCloudToAdasData(currentAutopilot);
+ }
+
@Override
public void cancel(boolean manualTrigger) {
dispatchDialogManager.releaseDialog();
@@ -164,6 +187,41 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener());
this.receiverBean = adasAutoPilotLocReceiverBean;
DispatchDialogManager.getInstance(mContext).showDialog(adasAutoPilotLocReceiverBean);
}
@@ -185,7 +243,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener());
this.receiverBean = adasAutoPilotLocReceiverBean;
DispatchDialogManager.getInstance(mContext).showDialog(adasAutoPilotLocReceiverBean);
}
@@ -196,7 +254,7 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener());
this.receiverBean = adasAutoPilotLocReceiverBean;
DispatchDialogManager.getInstance(mContext).showDialog(adasAutoPilotLocReceiverBean);
}
@@ -214,15 +272,4 @@ public class DispatchAutoPilotManager implements IMogoOnMessageListener stopsList;
- public DispatchAdasAutoPilotLocReceiverBean(int source, int type, String poiId, double startLat, double startLon, String startLocAddress, double endLat, double endLon, String endLocAddress, String taskTime, String flightInfo, String taskInfo, long systemTime) {
+ public DispatchAdasAutoPilotLocReceiverBean(int source, int type, String poiId, double startLat, double startLon, String startLocAddress, double endLat, double endLon, String endLocAddress, String taskTime, String flightInfo, String taskInfo, long systemTime, List stopsList) {
this.source = source;
this.type = type;
this.poiId = poiId;
@@ -38,6 +43,7 @@ public class DispatchAdasAutoPilotLocReceiverBean {
this.flightInfo = flightInfo;
this.taskInfo = taskInfo;
this.systemTime = systemTime;
+ this.stopsList = stopsList;
}
public int getSource() {
@@ -144,6 +150,14 @@ public class DispatchAdasAutoPilotLocReceiverBean {
this.systemTime = systemTime;
}
+ public List getStopsList() {
+ return stopsList;
+ }
+
+ public void setStopsList(List stopsList) {
+ this.stopsList = stopsList;
+ }
+
@Override
public String toString() {
return "DispatchAdasAutoPilotLocReceiverBean{" +
@@ -160,6 +174,7 @@ public class DispatchAdasAutoPilotLocReceiverBean {
", flightInfo='" + flightInfo + '\'' +
", taskInfo='" + taskInfo + '\'' +
", systemTime=" + systemTime +
+ ", stopsList=" + stopsList +
'}';
}
}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index d46c7342a8..7c515afe1b 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -729,7 +729,7 @@ public class MockIntentHandler implements IntentHandler {
try {
if (readers != null) {
for (BufferedReader reader : readers) {
- reader.close();
+ if (reader != null) reader.close();
}
}
} catch (IOException ex) {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index b3e298e681..91fd86008c 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -101,6 +101,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
* @param context 上下文对象
*/
public void init(Context context) {
+ Logger.d(TAG, "<------init------>");
if (mContext != null) {
return;
@@ -179,10 +180,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
// msg.obj = resultList;
// msg.what = MSG_ADAS;
// msg.sendToTarget();
- // 使用与渠道配置一样的gps提供者提供的数据 武汉四跨不需要感知渲染，暂时去掉
-// if (FunctionBuildConfig.gpsProvider != 2) {
-// AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList);
-// }
+ // 使用与渠道配置一样的gps提供者提供的数据 修改fPadLenovo.gradle文件中的GPS_PROVIDER字段控制渲染来源
+ Logger.d(TAG, "result.addAdasRecognizedDataCallback == 3 ------> ");
+ if (FunctionBuildConfig.gpsProvider != 2) {
+ AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList);
+ }
//添加自车的定位图标，碰撞只有一个预警,还需要和adas 联调，
// for ( ADASRecognizedResult result : resultList) {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java
index 46a8cb4a82..3d9f578eed 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java
@@ -67,6 +67,8 @@ public class MogoReceiver extends BroadcastReceiver {
public static final String ACTION_V2X_FRONT_WARNING = "ACTION_V2X_FRONT_WARNING";
//v2x预警弹框清除
public static final String ACTION_V2X_REMOVE_TIP_WINDOW = "ACTION_V2X_REMOVE_TIP_WINDOW";
+ //车辆监控
+ public static final String ACTION_CHECK_VEHICLE_MONITORING = "ACTION_CHECK_VEHICLE_MONITORING";
private IMogoIntentManager mMogoIntentManager;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
index 513fb7f7d9..b004de7d61 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
@@ -4,7 +4,7 @@ import android.content.Context
import android.util.Log
import com.mogo.commons.voice.AIAssist
import com.mogo.map.MogoLatLng
-import com.mogo.module.common.entity.MarkerPoiTypeEnum
+import com.mogo.module.common.enums.EventTypeEnum
import com.mogo.module.share.R
import com.mogo.module.share.constant.ShareConstants.*
import com.mogo.service.share.TanluUploadParams
@@ -93,18 +93,7 @@ object UploadHelper {
private fun getTypeName(type: String): String? {
- return when (type) {
- MarkerPoiTypeEnum.TRAFFIC_CHECK -> "交通检查"
- MarkerPoiTypeEnum.ROAD_CLOSED -> "封路"
- MarkerPoiTypeEnum.FOURS_ROAD_WORK -> "施工"
- MarkerPoiTypeEnum.FOURS_BLOCK_UP -> "拥堵"
- MarkerPoiTypeEnum.FOURS_PONDING -> "道路积水"
- MarkerPoiTypeEnum.FOURS_ICE -> "道路结冰"
- MarkerPoiTypeEnum.FOURS_FOG -> "浓雾"
- MarkerPoiTypeEnum.FOURS_ACCIDENT -> "交通事故"
- MarkerPoiTypeEnum.FOURS_LIVING -> "实时路况"
- else -> "实时路况"
- }
+ return EventTypeEnum.getTypeName(type)
}
}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/generated/source/buildConfig/debug/com/zhidao/mogo/module/splash/BuildConfig.java b/modules/mogo-module-splash-noop/build/generated/source/buildConfig/debug/com/zhidao/mogo/module/splash/BuildConfig.java
deleted file mode 100644
index 1b17d555d6..0000000000
--- a/modules/mogo-module-splash-noop/build/generated/source/buildConfig/debug/com/zhidao/mogo/module/splash/BuildConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.zhidao.mogo.module.splash;
-
-public final class BuildConfig {
- public static final boolean DEBUG = Boolean.parseBoolean("true");
- public static final String LIBRARY_PACKAGE_NAME = "com.zhidao.mogo.module.splash";
- /**
- * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
- */
- @Deprecated
- public static final String APPLICATION_ID = "com.zhidao.mogo.module.splash";
- public static final String BUILD_TYPE = "debug";
- public static final String FLAVOR = "";
- public static final int VERSION_CODE = 1;
- public static final String VERSION_NAME = "2.0.16";
-}
diff --git a/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$carmachine.java b/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$carmachine.java
deleted file mode 100644
index 2d8a935287..0000000000
--- a/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$carmachine.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.zhidao.mogo.module.splash.BydProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Group$$carmachine implements IRouteGroup {
- @Override
- public void loadInto(Map atlas) {
- atlas.put("/carmachine/byd", RouteMeta.build(RouteType.PROVIDER, BydProvider.class, "/carmachine/byd", "carmachine", null, -1, -2147483648));
- }
-}
diff --git a/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplashnoop.java b/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplashnoop.java
deleted file mode 100644
index 79d53886a4..0000000000
--- a/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplashnoop.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IProviderGroup;
-import com.zhidao.mogo.module.splash.BydProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Providers$$mogomodulesplashnoop implements IProviderGroup {
- @Override
- public void loadInto(Map providers) {
- providers.put("com.mogo.service.module.IMogoModuleProvider", RouteMeta.build(RouteType.PROVIDER, BydProvider.class, "/carmachine/byd", "carmachine", null, -1, -2147483648));
- }
-}
diff --git a/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplashnoop.java b/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplashnoop.java
deleted file mode 100644
index 34984514ca..0000000000
--- a/modules/mogo-module-splash-noop/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplashnoop.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.alibaba.android.arouter.facade.template.IRouteRoot;
-import java.lang.Class;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Root$$mogomodulesplashnoop implements IRouteRoot {
- @Override
- public void loadInto(Map> routes) {
- routes.put("carmachine", ARouter$$Group$$carmachine.class);
- }
-}
diff --git a/modules/mogo-module-splash-noop/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/modules/mogo-module-splash-noop/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
deleted file mode 100644
index fca2138b85..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/modules/mogo-module-splash-noop/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
deleted file mode 100644
index f2631d9684..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.16","enabled":true,"outputFile":"mogo-module-splash-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.module.splash","split":""}}]
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/modules/mogo-module-splash-noop/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/modules/mogo-module-splash-noop/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
deleted file mode 100644
index 1a239ab888..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/consumer_proguard_file/debug/proguard.txt b/modules/mogo-module-splash-noop/build/intermediates/consumer_proguard_file/debug/proguard.txt
deleted file mode 100644
index 3ef05240ac..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/consumer_proguard_file/debug/proguard.txt
+++ /dev/null
@@ -1 +0,0 @@
--keep class com.zhidao.mogo.module.splash.BydConst{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/modules/mogo-module-splash-noop/build/intermediates/incremental/debug-mergeJavaRes/merge-state
deleted file mode 100644
index 3a5364f8b4..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/modules/mogo-module-splash-noop/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
deleted file mode 100644
index 6d1612ad02..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/incremental/mergeDebugShaders/merger.xml b/modules/mogo-module-splash-noop/build/intermediates/incremental/mergeDebugShaders/merger.xml
deleted file mode 100644
index 83880d6220..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugAssets/merger.xml b/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugAssets/merger.xml
deleted file mode 100644
index 32a051f73b..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugAssets/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
deleted file mode 100644
index 6a5db4cb52..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ /dev/null
@@ -1 +0,0 @@
-#Tue Aug 31 15:00:17 CST 2021
diff --git a/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugResources/merger.xml b/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugResources/merger.xml
deleted file mode 100644
index cb7ab19ca8..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/incremental/packageDebugResources/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$carmachine.class b/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$carmachine.class
deleted file mode 100644
index 6d0582ac18..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$carmachine.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplashnoop.class b/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplashnoop.class
deleted file mode 100644
index b4ae085628..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplashnoop.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplashnoop.class b/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplashnoop.class
deleted file mode 100644
index 23c22b4408..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplashnoop.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/zhidao/mogo/module/splash/BuildConfig.class b/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/zhidao/mogo/module/splash/BuildConfig.class
deleted file mode 100644
index 13eefe7aef..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/javac/debug/classes/com/zhidao/mogo/module/splash/BuildConfig.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/library_manifest/debug/AndroidManifest.xml b/modules/mogo-module-splash-noop/build/intermediates/library_manifest/debug/AndroidManifest.xml
deleted file mode 100644
index fca2138b85..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/library_manifest/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt b/modules/mogo-module-splash-noop/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
deleted file mode 100644
index 78ac5b8bef..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-R_DEF: Internal format may change without notice
-local
diff --git a/modules/mogo-module-splash-noop/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/modules/mogo-module-splash-noop/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
deleted file mode 100644
index 58f10201d6..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-1
-2
-6
-7 /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-9 android:targetSdkVersion="19" />
-9-->/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-10
-11
diff --git a/modules/mogo-module-splash-noop/build/intermediates/merged_java_res/debug/out.jar b/modules/mogo-module-splash-noop/build/intermediates/merged_java_res/debug/out.jar
deleted file mode 100644
index e1eaea19ba..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/merged_java_res/debug/out.jar and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/merged_manifests/debug/output.json b/modules/mogo-module-splash-noop/build/intermediates/merged_manifests/debug/output.json
deleted file mode 100644
index e4c6d64ed0..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/merged_manifests/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.16","enabled":true,"outputFile":"mogo-module-splash-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.module.splash","split":""}}]
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/intermediates/packaged-classes/debug/classes.jar b/modules/mogo-module-splash-noop/build/intermediates/packaged-classes/debug/classes.jar
deleted file mode 100644
index b6ed4599e2..0000000000
Binary files a/modules/mogo-module-splash-noop/build/intermediates/packaged-classes/debug/classes.jar and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/modules/mogo-module-splash-noop/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
deleted file mode 100644
index 1875215eee..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ /dev/null
@@ -1,1341 +0,0 @@
-com.zhidao.mogo.module.splash
-anim abc_fade_in
-anim abc_fade_out
-anim abc_grow_fade_in_from_bottom
-anim abc_popup_enter
-anim abc_popup_exit
-anim abc_shrink_fade_out_from_bottom
-anim abc_slide_in_bottom
-anim abc_slide_in_top
-anim abc_slide_out_bottom
-anim abc_slide_out_top
-anim abc_tooltip_enter
-anim abc_tooltip_exit
-anim btn_checkbox_to_checked_box_inner_merged_animation
-anim btn_checkbox_to_checked_box_outer_merged_animation
-anim btn_checkbox_to_checked_icon_null_animation
-anim btn_checkbox_to_unchecked_box_inner_merged_animation
-anim btn_checkbox_to_unchecked_check_path_merged_animation
-anim btn_checkbox_to_unchecked_icon_null_animation
-anim btn_radio_to_off_mtrl_dot_group_animation
-anim btn_radio_to_off_mtrl_ring_outer_animation
-anim btn_radio_to_off_mtrl_ring_outer_path_animation
-anim btn_radio_to_on_mtrl_dot_group_animation
-anim btn_radio_to_on_mtrl_ring_outer_animation
-anim btn_radio_to_on_mtrl_ring_outer_path_animation
-attr actionBarDivider
-attr actionBarItemBackground
-attr actionBarPopupTheme
-attr actionBarSize
-attr actionBarSplitStyle
-attr actionBarStyle
-attr actionBarTabBarStyle
-attr actionBarTabStyle
-attr actionBarTabTextStyle
-attr actionBarTheme
-attr actionBarWidgetTheme
-attr actionButtonStyle
-attr actionDropDownStyle
-attr actionLayout
-attr actionMenuTextAppearance
-attr actionMenuTextColor
-attr actionModeBackground
-attr actionModeCloseButtonStyle
-attr actionModeCloseDrawable
-attr actionModeCopyDrawable
-attr actionModeCutDrawable
-attr actionModeFindDrawable
-attr actionModePasteDrawable
-attr actionModePopupWindowStyle
-attr actionModeSelectAllDrawable
-attr actionModeShareDrawable
-attr actionModeSplitBackground
-attr actionModeStyle
-attr actionModeWebSearchDrawable
-attr actionOverflowButtonStyle
-attr actionOverflowMenuStyle
-attr actionProviderClass
-attr actionViewClass
-attr activityChooserViewStyle
-attr alertDialogButtonGroupStyle
-attr alertDialogCenterButtons
-attr alertDialogStyle
-attr alertDialogTheme
-attr allowStacking
-attr alpha
-attr alphabeticModifiers
-attr arrowHeadLength
-attr arrowShaftLength
-attr autoCompleteTextViewStyle
-attr autoSizeMaxTextSize
-attr autoSizeMinTextSize
-attr autoSizePresetSizes
-attr autoSizeStepGranularity
-attr autoSizeTextType
-attr background
-attr backgroundSplit
-attr backgroundStacked
-attr backgroundTint
-attr backgroundTintMode
-attr barLength
-attr barrierAllowsGoneWidgets
-attr barrierDirection
-attr borderlessButtonStyle
-attr buttonBarButtonStyle
-attr buttonBarNegativeButtonStyle
-attr buttonBarNeutralButtonStyle
-attr buttonBarPositiveButtonStyle
-attr buttonBarStyle
-attr buttonCompat
-attr buttonGravity
-attr buttonIconDimen
-attr buttonPanelSideLayout
-attr buttonStyle
-attr buttonStyleSmall
-attr buttonTint
-attr buttonTintMode
-attr chainUseRtl
-attr checkboxStyle
-attr checkedTextViewStyle
-attr closeIcon
-attr closeItemLayout
-attr collapseContentDescription
-attr collapseIcon
-attr color
-attr colorAccent
-attr colorBackgroundFloating
-attr colorButtonNormal
-attr colorControlActivated
-attr colorControlHighlight
-attr colorControlNormal
-attr colorError
-attr colorPrimary
-attr colorPrimaryDark
-attr colorSwitchThumbNormal
-attr commitIcon
-attr constraintSet
-attr constraint_referenced_ids
-attr content
-attr contentDescription
-attr contentInsetEnd
-attr contentInsetEndWithActions
-attr contentInsetLeft
-attr contentInsetRight
-attr contentInsetStart
-attr contentInsetStartWithNavigation
-attr controlBackground
-attr coordinatorLayoutStyle
-attr customNavigationLayout
-attr defaultQueryHint
-attr dialogCornerRadius
-attr dialogPreferredPadding
-attr dialogTheme
-attr displayOptions
-attr divider
-attr dividerHorizontal
-attr dividerPadding
-attr dividerVertical
-attr drawableBottomCompat
-attr drawableEndCompat
-attr drawableLeftCompat
-attr drawableRightCompat
-attr drawableSize
-attr drawableStartCompat
-attr drawableTint
-attr drawableTintMode
-attr drawableTopCompat
-attr drawerArrowStyle
-attr dropDownListViewStyle
-attr dropdownListPreferredItemHeight
-attr editTextBackground
-attr editTextColor
-attr editTextStyle
-attr elevation
-attr emptyVisibility
-attr expandActivityOverflowButtonDrawable
-attr firstBaselineToTopHeight
-attr font
-attr fontFamily
-attr fontProviderAuthority
-attr fontProviderCerts
-attr fontProviderFetchStrategy
-attr fontProviderFetchTimeout
-attr fontProviderPackage
-attr fontProviderQuery
-attr fontStyle
-attr fontVariationSettings
-attr fontWeight
-attr gapBetweenBars
-attr goIcon
-attr height
-attr hideOnContentScroll
-attr homeAsUpIndicator
-attr homeLayout
-attr icon
-attr iconTint
-attr iconTintMode
-attr iconifiedByDefault
-attr imageButtonStyle
-attr indeterminateProgressStyle
-attr initialActivityCount
-attr isLightTheme
-attr itemPadding
-attr keylines
-attr lastBaselineToBottomHeight
-attr layout
-attr layout_anchor
-attr layout_anchorGravity
-attr layout_behavior
-attr layout_constrainedHeight
-attr layout_constrainedWidth
-attr layout_constraintBaseline_creator
-attr layout_constraintBaseline_toBaselineOf
-attr layout_constraintBottom_creator
-attr layout_constraintBottom_toBottomOf
-attr layout_constraintBottom_toTopOf
-attr layout_constraintCircle
-attr layout_constraintCircleAngle
-attr layout_constraintCircleRadius
-attr layout_constraintDimensionRatio
-attr layout_constraintEnd_toEndOf
-attr layout_constraintEnd_toStartOf
-attr layout_constraintGuide_begin
-attr layout_constraintGuide_end
-attr layout_constraintGuide_percent
-attr layout_constraintHeight_default
-attr layout_constraintHeight_max
-attr layout_constraintHeight_min
-attr layout_constraintHeight_percent
-attr layout_constraintHorizontal_bias
-attr layout_constraintHorizontal_chainStyle
-attr layout_constraintHorizontal_weight
-attr layout_constraintLeft_creator
-attr layout_constraintLeft_toLeftOf
-attr layout_constraintLeft_toRightOf
-attr layout_constraintRight_creator
-attr layout_constraintRight_toLeftOf
-attr layout_constraintRight_toRightOf
-attr layout_constraintStart_toEndOf
-attr layout_constraintStart_toStartOf
-attr layout_constraintTop_creator
-attr layout_constraintTop_toBottomOf
-attr layout_constraintTop_toTopOf
-attr layout_constraintVertical_bias
-attr layout_constraintVertical_chainStyle
-attr layout_constraintVertical_weight
-attr layout_constraintWidth_default
-attr layout_constraintWidth_max
-attr layout_constraintWidth_min
-attr layout_constraintWidth_percent
-attr layout_dodgeInsetEdges
-attr layout_editor_absoluteX
-attr layout_editor_absoluteY
-attr layout_goneMarginBottom
-attr layout_goneMarginEnd
-attr layout_goneMarginLeft
-attr layout_goneMarginRight
-attr layout_goneMarginStart
-attr layout_goneMarginTop
-attr layout_insetEdge
-attr layout_keyline
-attr layout_optimizationLevel
-attr lineHeight
-attr listChoiceBackgroundIndicator
-attr listChoiceIndicatorMultipleAnimated
-attr listChoiceIndicatorSingleAnimated
-attr listDividerAlertDialog
-attr listItemLayout
-attr listLayout
-attr listMenuViewStyle
-attr listPopupWindowStyle
-attr listPreferredItemHeight
-attr listPreferredItemHeightLarge
-attr listPreferredItemHeightSmall
-attr listPreferredItemPaddingEnd
-attr listPreferredItemPaddingLeft
-attr listPreferredItemPaddingRight
-attr listPreferredItemPaddingStart
-attr logo
-attr logoDescription
-attr maxButtonHeight
-attr measureWithLargestChild
-attr menu
-attr multiChoiceItemLayout
-attr navigationContentDescription
-attr navigationIcon
-attr navigationMode
-attr numericModifiers
-attr overlapAnchor
-attr paddingBottomNoButtons
-attr paddingEnd
-attr paddingStart
-attr paddingTopNoTitle
-attr panelBackground
-attr panelMenuListTheme
-attr panelMenuListWidth
-attr popupMenuStyle
-attr popupTheme
-attr popupWindowStyle
-attr preserveIconSpacing
-attr progressBarPadding
-attr progressBarStyle
-attr queryBackground
-attr queryHint
-attr radioButtonStyle
-attr ratingBarStyle
-attr ratingBarStyleIndicator
-attr ratingBarStyleSmall
-attr searchHintIcon
-attr searchIcon
-attr searchViewStyle
-attr seekBarStyle
-attr selectableItemBackground
-attr selectableItemBackgroundBorderless
-attr showAsAction
-attr showDividers
-attr showText
-attr showTitle
-attr singleChoiceItemLayout
-attr spinBars
-attr spinnerDropDownItemStyle
-attr spinnerStyle
-attr splitTrack
-attr srcCompat
-attr state_above_anchor
-attr statusBarBackground
-attr subMenuArrow
-attr submitBackground
-attr subtitle
-attr subtitleTextAppearance
-attr subtitleTextColor
-attr subtitleTextStyle
-attr suggestionRowLayout
-attr switchMinWidth
-attr switchPadding
-attr switchStyle
-attr switchTextAppearance
-attr textAllCaps
-attr textAppearanceLargePopupMenu
-attr textAppearanceListItem
-attr textAppearanceListItemSecondary
-attr textAppearanceListItemSmall
-attr textAppearancePopupMenuHeader
-attr textAppearanceSearchResultSubtitle
-attr textAppearanceSearchResultTitle
-attr textAppearanceSmallPopupMenu
-attr textColorAlertDialogListItem
-attr textColorSearchUrl
-attr textLocale
-attr theme
-attr thickness
-attr thumbTextPadding
-attr thumbTint
-attr thumbTintMode
-attr tickMark
-attr tickMarkTint
-attr tickMarkTintMode
-attr tint
-attr tintMode
-attr title
-attr titleMargin
-attr titleMarginBottom
-attr titleMarginEnd
-attr titleMarginStart
-attr titleMarginTop
-attr titleMargins
-attr titleTextAppearance
-attr titleTextColor
-attr titleTextStyle
-attr toolbarNavigationButtonStyle
-attr toolbarStyle
-attr tooltipForegroundColor
-attr tooltipFrameBackground
-attr tooltipText
-attr track
-attr trackTint
-attr trackTintMode
-attr ttcIndex
-attr viewInflaterClass
-attr voiceIcon
-attr windowActionBar
-attr windowActionBarOverlay
-attr windowActionModeOverlay
-attr windowFixedHeightMajor
-attr windowFixedHeightMinor
-attr windowFixedWidthMajor
-attr windowFixedWidthMinor
-attr windowMinWidthMajor
-attr windowMinWidthMinor
-attr windowNoTitle
-bool abc_action_bar_embed_tabs
-bool abc_allow_stacked_button_bar
-bool abc_config_actionMenuItemAllCaps
-color abc_background_cache_hint_selector_material_dark
-color abc_background_cache_hint_selector_material_light
-color abc_btn_colored_borderless_text_material
-color abc_btn_colored_text_material
-color abc_color_highlight_material
-color abc_hint_foreground_material_dark
-color abc_hint_foreground_material_light
-color abc_input_method_navigation_guard
-color abc_primary_text_disable_only_material_dark
-color abc_primary_text_disable_only_material_light
-color abc_primary_text_material_dark
-color abc_primary_text_material_light
-color abc_search_url_text
-color abc_search_url_text_normal
-color abc_search_url_text_pressed
-color abc_search_url_text_selected
-color abc_secondary_text_material_dark
-color abc_secondary_text_material_light
-color abc_tint_btn_checkable
-color abc_tint_default
-color abc_tint_edittext
-color abc_tint_seek_thumb
-color abc_tint_spinner
-color abc_tint_switch_track
-color accent_material_dark
-color accent_material_light
-color androidx_core_ripple_material_light
-color androidx_core_secondary_text_default_material_light
-color background_floating_material_dark
-color background_floating_material_light
-color background_material_dark
-color background_material_light
-color bright_foreground_disabled_material_dark
-color bright_foreground_disabled_material_light
-color bright_foreground_inverse_material_dark
-color bright_foreground_inverse_material_light
-color bright_foreground_material_dark
-color bright_foreground_material_light
-color button_material_dark
-color button_material_light
-color dim_foreground_disabled_material_dark
-color dim_foreground_disabled_material_light
-color dim_foreground_material_dark
-color dim_foreground_material_light
-color error_color_material_dark
-color error_color_material_light
-color foreground_material_dark
-color foreground_material_light
-color highlighted_text_material_dark
-color highlighted_text_material_light
-color material_blue_grey_800
-color material_blue_grey_900
-color material_blue_grey_950
-color material_deep_teal_200
-color material_deep_teal_500
-color material_grey_100
-color material_grey_300
-color material_grey_50
-color material_grey_600
-color material_grey_800
-color material_grey_850
-color material_grey_900
-color notification_action_color_filter
-color notification_icon_bg_color
-color notification_material_background_media_default_color
-color primary_dark_material_dark
-color primary_dark_material_light
-color primary_material_dark
-color primary_material_light
-color primary_text_default_material_dark
-color primary_text_default_material_light
-color primary_text_disabled_material_dark
-color primary_text_disabled_material_light
-color ripple_material_dark
-color ripple_material_light
-color secondary_text_default_material_dark
-color secondary_text_default_material_light
-color secondary_text_disabled_material_dark
-color secondary_text_disabled_material_light
-color switch_thumb_disabled_material_dark
-color switch_thumb_disabled_material_light
-color switch_thumb_material_dark
-color switch_thumb_material_light
-color switch_thumb_normal_material_dark
-color switch_thumb_normal_material_light
-color tooltip_background_dark
-color tooltip_background_light
-dimen abc_action_bar_content_inset_material
-dimen abc_action_bar_content_inset_with_nav
-dimen abc_action_bar_default_height_material
-dimen abc_action_bar_default_padding_end_material
-dimen abc_action_bar_default_padding_start_material
-dimen abc_action_bar_elevation_material
-dimen abc_action_bar_icon_vertical_padding_material
-dimen abc_action_bar_overflow_padding_end_material
-dimen abc_action_bar_overflow_padding_start_material
-dimen abc_action_bar_stacked_max_height
-dimen abc_action_bar_stacked_tab_max_width
-dimen abc_action_bar_subtitle_bottom_margin_material
-dimen abc_action_bar_subtitle_top_margin_material
-dimen abc_action_button_min_height_material
-dimen abc_action_button_min_width_material
-dimen abc_action_button_min_width_overflow_material
-dimen abc_alert_dialog_button_bar_height
-dimen abc_alert_dialog_button_dimen
-dimen abc_button_inset_horizontal_material
-dimen abc_button_inset_vertical_material
-dimen abc_button_padding_horizontal_material
-dimen abc_button_padding_vertical_material
-dimen abc_cascading_menus_min_smallest_width
-dimen abc_config_prefDialogWidth
-dimen abc_control_corner_material
-dimen abc_control_inset_material
-dimen abc_control_padding_material
-dimen abc_dialog_corner_radius_material
-dimen abc_dialog_fixed_height_major
-dimen abc_dialog_fixed_height_minor
-dimen abc_dialog_fixed_width_major
-dimen abc_dialog_fixed_width_minor
-dimen abc_dialog_list_padding_bottom_no_buttons
-dimen abc_dialog_list_padding_top_no_title
-dimen abc_dialog_min_width_major
-dimen abc_dialog_min_width_minor
-dimen abc_dialog_padding_material
-dimen abc_dialog_padding_top_material
-dimen abc_dialog_title_divider_material
-dimen abc_disabled_alpha_material_dark
-dimen abc_disabled_alpha_material_light
-dimen abc_dropdownitem_icon_width
-dimen abc_dropdownitem_text_padding_left
-dimen abc_dropdownitem_text_padding_right
-dimen abc_edit_text_inset_bottom_material
-dimen abc_edit_text_inset_horizontal_material
-dimen abc_edit_text_inset_top_material
-dimen abc_floating_window_z
-dimen abc_list_item_height_large_material
-dimen abc_list_item_height_material
-dimen abc_list_item_height_small_material
-dimen abc_list_item_padding_horizontal_material
-dimen abc_panel_menu_list_width
-dimen abc_progress_bar_height_material
-dimen abc_search_view_preferred_height
-dimen abc_search_view_preferred_width
-dimen abc_seekbar_track_background_height_material
-dimen abc_seekbar_track_progress_height_material
-dimen abc_select_dialog_padding_start_material
-dimen abc_switch_padding
-dimen abc_text_size_body_1_material
-dimen abc_text_size_body_2_material
-dimen abc_text_size_button_material
-dimen abc_text_size_caption_material
-dimen abc_text_size_display_1_material
-dimen abc_text_size_display_2_material
-dimen abc_text_size_display_3_material
-dimen abc_text_size_display_4_material
-dimen abc_text_size_headline_material
-dimen abc_text_size_large_material
-dimen abc_text_size_medium_material
-dimen abc_text_size_menu_header_material
-dimen abc_text_size_menu_material
-dimen abc_text_size_small_material
-dimen abc_text_size_subhead_material
-dimen abc_text_size_subtitle_material_toolbar
-dimen abc_text_size_title_material
-dimen abc_text_size_title_material_toolbar
-dimen compat_button_inset_horizontal_material
-dimen compat_button_inset_vertical_material
-dimen compat_button_padding_horizontal_material
-dimen compat_button_padding_vertical_material
-dimen compat_control_corner_material
-dimen compat_notification_large_icon_max_height
-dimen compat_notification_large_icon_max_width
-dimen disabled_alpha_material_dark
-dimen disabled_alpha_material_light
-dimen highlight_alpha_material_colored
-dimen highlight_alpha_material_dark
-dimen highlight_alpha_material_light
-dimen hint_alpha_material_dark
-dimen hint_alpha_material_light
-dimen hint_pressed_alpha_material_dark
-dimen hint_pressed_alpha_material_light
-dimen notification_action_icon_size
-dimen notification_action_text_size
-dimen notification_big_circle_margin
-dimen notification_content_margin_start
-dimen notification_large_icon_height
-dimen notification_large_icon_width
-dimen notification_main_column_padding_top
-dimen notification_media_narrow_margin
-dimen notification_right_icon_size
-dimen notification_right_side_padding_top
-dimen notification_small_icon_background_padding
-dimen notification_small_icon_size_as_large
-dimen notification_subtext_size
-dimen notification_top_pad
-dimen notification_top_pad_large_text
-dimen subtitle_corner_radius
-dimen subtitle_outline_width
-dimen subtitle_shadow_offset
-dimen subtitle_shadow_radius
-dimen tooltip_corner_radius
-dimen tooltip_horizontal_padding
-dimen tooltip_margin
-dimen tooltip_precise_anchor_extra_offset
-dimen tooltip_precise_anchor_threshold
-dimen tooltip_vertical_padding
-dimen tooltip_y_offset_non_touch
-dimen tooltip_y_offset_touch
-drawable abc_ab_share_pack_mtrl_alpha
-drawable abc_action_bar_item_background_material
-drawable abc_btn_borderless_material
-drawable abc_btn_check_material
-drawable abc_btn_check_material_anim
-drawable abc_btn_check_to_on_mtrl_000
-drawable abc_btn_check_to_on_mtrl_015
-drawable abc_btn_colored_material
-drawable abc_btn_default_mtrl_shape
-drawable abc_btn_radio_material
-drawable abc_btn_radio_material_anim
-drawable abc_btn_radio_to_on_mtrl_000
-drawable abc_btn_radio_to_on_mtrl_015
-drawable abc_btn_switch_to_on_mtrl_00001
-drawable abc_btn_switch_to_on_mtrl_00012
-drawable abc_cab_background_internal_bg
-drawable abc_cab_background_top_material
-drawable abc_cab_background_top_mtrl_alpha
-drawable abc_control_background_material
-drawable abc_dialog_material_background
-drawable abc_edit_text_material
-drawable abc_ic_ab_back_material
-drawable abc_ic_arrow_drop_right_black_24dp
-drawable abc_ic_clear_material
-drawable abc_ic_commit_search_api_mtrl_alpha
-drawable abc_ic_go_search_api_material
-drawable abc_ic_menu_copy_mtrl_am_alpha
-drawable abc_ic_menu_cut_mtrl_alpha
-drawable abc_ic_menu_overflow_material
-drawable abc_ic_menu_paste_mtrl_am_alpha
-drawable abc_ic_menu_selectall_mtrl_alpha
-drawable abc_ic_menu_share_mtrl_alpha
-drawable abc_ic_search_api_material
-drawable abc_ic_star_black_16dp
-drawable abc_ic_star_black_36dp
-drawable abc_ic_star_black_48dp
-drawable abc_ic_star_half_black_16dp
-drawable abc_ic_star_half_black_36dp
-drawable abc_ic_star_half_black_48dp
-drawable abc_ic_voice_search_api_material
-drawable abc_item_background_holo_dark
-drawable abc_item_background_holo_light
-drawable abc_list_divider_material
-drawable abc_list_divider_mtrl_alpha
-drawable abc_list_focused_holo
-drawable abc_list_longpressed_holo
-drawable abc_list_pressed_holo_dark
-drawable abc_list_pressed_holo_light
-drawable abc_list_selector_background_transition_holo_dark
-drawable abc_list_selector_background_transition_holo_light
-drawable abc_list_selector_disabled_holo_dark
-drawable abc_list_selector_disabled_holo_light
-drawable abc_list_selector_holo_dark
-drawable abc_list_selector_holo_light
-drawable abc_menu_hardkey_panel_mtrl_mult
-drawable abc_popup_background_mtrl_mult
-drawable abc_ratingbar_indicator_material
-drawable abc_ratingbar_material
-drawable abc_ratingbar_small_material
-drawable abc_scrubber_control_off_mtrl_alpha
-drawable abc_scrubber_control_to_pressed_mtrl_000
-drawable abc_scrubber_control_to_pressed_mtrl_005
-drawable abc_scrubber_primary_mtrl_alpha
-drawable abc_scrubber_track_mtrl_alpha
-drawable abc_seekbar_thumb_material
-drawable abc_seekbar_tick_mark_material
-drawable abc_seekbar_track_material
-drawable abc_spinner_mtrl_am_alpha
-drawable abc_spinner_textfield_background_material
-drawable abc_switch_thumb_material
-drawable abc_switch_track_mtrl_alpha
-drawable abc_tab_indicator_material
-drawable abc_tab_indicator_mtrl_alpha
-drawable abc_text_cursor_material
-drawable abc_text_select_handle_left_mtrl_dark
-drawable abc_text_select_handle_left_mtrl_light
-drawable abc_text_select_handle_middle_mtrl_dark
-drawable abc_text_select_handle_middle_mtrl_light
-drawable abc_text_select_handle_right_mtrl_dark
-drawable abc_text_select_handle_right_mtrl_light
-drawable abc_textfield_activated_mtrl_alpha
-drawable abc_textfield_default_mtrl_alpha
-drawable abc_textfield_search_activated_mtrl_alpha
-drawable abc_textfield_search_default_mtrl_alpha
-drawable abc_textfield_search_material
-drawable abc_vector_test
-drawable btn_checkbox_checked_mtrl
-drawable btn_checkbox_checked_to_unchecked_mtrl_animation
-drawable btn_checkbox_unchecked_mtrl
-drawable btn_checkbox_unchecked_to_checked_mtrl_animation
-drawable btn_radio_off_mtrl
-drawable btn_radio_off_to_on_mtrl_animation
-drawable btn_radio_on_mtrl
-drawable btn_radio_on_to_off_mtrl_animation
-drawable notification_action_background
-drawable notification_bg
-drawable notification_bg_low
-drawable notification_bg_low_normal
-drawable notification_bg_low_pressed
-drawable notification_bg_normal
-drawable notification_bg_normal_pressed
-drawable notification_icon_background
-drawable notification_template_icon_bg
-drawable notification_template_icon_low_bg
-drawable notification_tile_bg
-drawable notify_panel_notification_icon_bg
-drawable tooltip_frame_dark
-drawable tooltip_frame_light
-id accessibility_action_clickable_span
-id accessibility_custom_action_0
-id accessibility_custom_action_1
-id accessibility_custom_action_10
-id accessibility_custom_action_11
-id accessibility_custom_action_12
-id accessibility_custom_action_13
-id accessibility_custom_action_14
-id accessibility_custom_action_15
-id accessibility_custom_action_16
-id accessibility_custom_action_17
-id accessibility_custom_action_18
-id accessibility_custom_action_19
-id accessibility_custom_action_2
-id accessibility_custom_action_20
-id accessibility_custom_action_21
-id accessibility_custom_action_22
-id accessibility_custom_action_23
-id accessibility_custom_action_24
-id accessibility_custom_action_25
-id accessibility_custom_action_26
-id accessibility_custom_action_27
-id accessibility_custom_action_28
-id accessibility_custom_action_29
-id accessibility_custom_action_3
-id accessibility_custom_action_30
-id accessibility_custom_action_31
-id accessibility_custom_action_4
-id accessibility_custom_action_5
-id accessibility_custom_action_6
-id accessibility_custom_action_7
-id accessibility_custom_action_8
-id accessibility_custom_action_9
-id action0
-id action_bar
-id action_bar_activity_content
-id action_bar_container
-id action_bar_root
-id action_bar_spinner
-id action_bar_subtitle
-id action_bar_title
-id action_container
-id action_context_bar
-id action_divider
-id action_image
-id action_menu_divider
-id action_menu_presenter
-id action_mode_bar
-id action_mode_bar_stub
-id action_mode_close_button
-id action_text
-id actions
-id activity_chooser_view_content
-id add
-id alertTitle
-id async
-id blocking
-id bottom
-id buttonPanel
-id cancel_action
-id checkbox
-id checked
-id chronometer
-id content
-id contentPanel
-id custom
-id customPanel
-id decor_content_parent
-id default_activity_button
-id dialog_button
-id edit_query
-id end
-id end_padder
-id expand_activities_button
-id expanded_menu
-id forever
-id gone
-id group_divider
-id home
-id icon
-id icon_group
-id image
-id info
-id invisible
-id italic
-id left
-id line1
-id line3
-id listMode
-id list_item
-id media_actions
-id message
-id multiply
-id none
-id normal
-id notification_background
-id notification_main_column
-id notification_main_column_container
-id off
-id on
-id packed
-id parent
-id parentPanel
-id percent
-id progress_circular
-id progress_horizontal
-id radio
-id right
-id right_icon
-id right_side
-id screen
-id scrollIndicatorDown
-id scrollIndicatorUp
-id scrollView
-id search_badge
-id search_bar
-id search_button
-id search_close_btn
-id search_edit_frame
-id search_go_btn
-id search_mag_icon
-id search_plate
-id search_src_text
-id search_voice_btn
-id select_dialog_listview
-id shortcut
-id spacer
-id split_action_bar
-id spread
-id spread_inside
-id src_atop
-id src_in
-id src_over
-id start
-id status_bar_latest_event_content
-id submenuarrow
-id submit_area
-id tabMode
-id tag_accessibility_actions
-id tag_accessibility_clickable_spans
-id tag_accessibility_heading
-id tag_accessibility_pane_title
-id tag_screen_reader_focusable
-id tag_transition_group
-id tag_unhandled_key_event_manager
-id tag_unhandled_key_listeners
-id text
-id text2
-id textSpacerNoButtons
-id textSpacerNoTitle
-id time
-id title
-id titleDividerNoCustom
-id title_template
-id top
-id topPanel
-id unchecked
-id uniform
-id up
-id wrap
-id wrap_content
-integer abc_config_activityDefaultDur
-integer abc_config_activityShortDur
-integer cancel_button_image_alpha
-integer config_tooltipAnimTime
-integer status_bar_notification_info_maxnum
-interpolator btn_checkbox_checked_mtrl_animation_interpolator_0
-interpolator btn_checkbox_checked_mtrl_animation_interpolator_1
-interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_0
-interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_1
-interpolator btn_radio_to_off_mtrl_animation_interpolator_0
-interpolator btn_radio_to_on_mtrl_animation_interpolator_0
-interpolator fast_out_slow_in
-layout abc_action_bar_title_item
-layout abc_action_bar_up_container
-layout abc_action_menu_item_layout
-layout abc_action_menu_layout
-layout abc_action_mode_bar
-layout abc_action_mode_close_item_material
-layout abc_activity_chooser_view
-layout abc_activity_chooser_view_list_item
-layout abc_alert_dialog_button_bar_material
-layout abc_alert_dialog_material
-layout abc_alert_dialog_title_material
-layout abc_cascading_menu_item_layout
-layout abc_dialog_title_material
-layout abc_expanded_menu_layout
-layout abc_list_menu_item_checkbox
-layout abc_list_menu_item_icon
-layout abc_list_menu_item_layout
-layout abc_list_menu_item_radio
-layout abc_popup_menu_header_item_layout
-layout abc_popup_menu_item_layout
-layout abc_screen_content_include
-layout abc_screen_simple
-layout abc_screen_simple_overlay_action_mode
-layout abc_screen_toolbar
-layout abc_search_dropdown_item_icons_2line
-layout abc_search_view
-layout abc_select_dialog_material
-layout abc_tooltip
-layout custom_dialog
-layout notification_action
-layout notification_action_tombstone
-layout notification_media_action
-layout notification_media_cancel_action
-layout notification_template_big_media
-layout notification_template_big_media_custom
-layout notification_template_big_media_narrow
-layout notification_template_big_media_narrow_custom
-layout notification_template_custom_big
-layout notification_template_icon_group
-layout notification_template_lines_media
-layout notification_template_media
-layout notification_template_media_custom
-layout notification_template_part_chronometer
-layout notification_template_part_time
-layout select_dialog_item_material
-layout select_dialog_multichoice_material
-layout select_dialog_singlechoice_material
-layout support_simple_spinner_dropdown_item
-string abc_action_bar_home_description
-string abc_action_bar_up_description
-string abc_action_menu_overflow_description
-string abc_action_mode_done
-string abc_activity_chooser_view_see_all
-string abc_activitychooserview_choose_application
-string abc_capital_off
-string abc_capital_on
-string abc_menu_alt_shortcut_label
-string abc_menu_ctrl_shortcut_label
-string abc_menu_delete_shortcut_label
-string abc_menu_enter_shortcut_label
-string abc_menu_function_shortcut_label
-string abc_menu_meta_shortcut_label
-string abc_menu_shift_shortcut_label
-string abc_menu_space_shortcut_label
-string abc_menu_sym_shortcut_label
-string abc_prepend_shortcut_label
-string abc_search_hint
-string abc_searchview_description_clear
-string abc_searchview_description_query
-string abc_searchview_description_search
-string abc_searchview_description_submit
-string abc_searchview_description_voice
-string abc_shareactionprovider_share_with
-string abc_shareactionprovider_share_with_application
-string abc_toolbar_collapse_description
-string search_menu_title
-string status_bar_notification_info_overflow
-style AlertDialog_AppCompat
-style AlertDialog_AppCompat_Light
-style Animation_AppCompat_Dialog
-style Animation_AppCompat_DropDownUp
-style Animation_AppCompat_Tooltip
-style Base_AlertDialog_AppCompat
-style Base_AlertDialog_AppCompat_Light
-style Base_Animation_AppCompat_Dialog
-style Base_Animation_AppCompat_DropDownUp
-style Base_Animation_AppCompat_Tooltip
-style Base_DialogWindowTitleBackground_AppCompat
-style Base_DialogWindowTitle_AppCompat
-style Base_TextAppearance_AppCompat
-style Base_TextAppearance_AppCompat_Body1
-style Base_TextAppearance_AppCompat_Body2
-style Base_TextAppearance_AppCompat_Button
-style Base_TextAppearance_AppCompat_Caption
-style Base_TextAppearance_AppCompat_Display1
-style Base_TextAppearance_AppCompat_Display2
-style Base_TextAppearance_AppCompat_Display3
-style Base_TextAppearance_AppCompat_Display4
-style Base_TextAppearance_AppCompat_Headline
-style Base_TextAppearance_AppCompat_Inverse
-style Base_TextAppearance_AppCompat_Large
-style Base_TextAppearance_AppCompat_Large_Inverse
-style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large
-style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small
-style Base_TextAppearance_AppCompat_Medium
-style Base_TextAppearance_AppCompat_Medium_Inverse
-style Base_TextAppearance_AppCompat_Menu
-style Base_TextAppearance_AppCompat_SearchResult
-style Base_TextAppearance_AppCompat_SearchResult_Subtitle
-style Base_TextAppearance_AppCompat_SearchResult_Title
-style Base_TextAppearance_AppCompat_Small
-style Base_TextAppearance_AppCompat_Small_Inverse
-style Base_TextAppearance_AppCompat_Subhead
-style Base_TextAppearance_AppCompat_Subhead_Inverse
-style Base_TextAppearance_AppCompat_Title
-style Base_TextAppearance_AppCompat_Title_Inverse
-style Base_TextAppearance_AppCompat_Tooltip
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Menu
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Title
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse
-style Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle
-style Base_TextAppearance_AppCompat_Widget_ActionMode_Title
-style Base_TextAppearance_AppCompat_Widget_Button
-style Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored
-style Base_TextAppearance_AppCompat_Widget_Button_Colored
-style Base_TextAppearance_AppCompat_Widget_Button_Inverse
-style Base_TextAppearance_AppCompat_Widget_DropDownItem
-style Base_TextAppearance_AppCompat_Widget_PopupMenu_Header
-style Base_TextAppearance_AppCompat_Widget_PopupMenu_Large
-style Base_TextAppearance_AppCompat_Widget_PopupMenu_Small
-style Base_TextAppearance_AppCompat_Widget_Switch
-style Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem
-style Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item
-style Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle
-style Base_TextAppearance_Widget_AppCompat_Toolbar_Title
-style Base_ThemeOverlay_AppCompat
-style Base_ThemeOverlay_AppCompat_ActionBar
-style Base_ThemeOverlay_AppCompat_Dark
-style Base_ThemeOverlay_AppCompat_Dark_ActionBar
-style Base_ThemeOverlay_AppCompat_Dialog
-style Base_ThemeOverlay_AppCompat_Dialog_Alert
-style Base_ThemeOverlay_AppCompat_Light
-style Base_Theme_AppCompat
-style Base_Theme_AppCompat_CompactMenu
-style Base_Theme_AppCompat_Dialog
-style Base_Theme_AppCompat_DialogWhenLarge
-style Base_Theme_AppCompat_Dialog_Alert
-style Base_Theme_AppCompat_Dialog_FixedSize
-style Base_Theme_AppCompat_Dialog_MinWidth
-style Base_Theme_AppCompat_Light
-style Base_Theme_AppCompat_Light_DarkActionBar
-style Base_Theme_AppCompat_Light_Dialog
-style Base_Theme_AppCompat_Light_DialogWhenLarge
-style Base_Theme_AppCompat_Light_Dialog_Alert
-style Base_Theme_AppCompat_Light_Dialog_FixedSize
-style Base_Theme_AppCompat_Light_Dialog_MinWidth
-style Base_V21_ThemeOverlay_AppCompat_Dialog
-style Base_V21_Theme_AppCompat
-style Base_V21_Theme_AppCompat_Dialog
-style Base_V21_Theme_AppCompat_Light
-style Base_V21_Theme_AppCompat_Light_Dialog
-style Base_V22_Theme_AppCompat
-style Base_V22_Theme_AppCompat_Light
-style Base_V23_Theme_AppCompat
-style Base_V23_Theme_AppCompat_Light
-style Base_V26_Theme_AppCompat
-style Base_V26_Theme_AppCompat_Light
-style Base_V26_Widget_AppCompat_Toolbar
-style Base_V28_Theme_AppCompat
-style Base_V28_Theme_AppCompat_Light
-style Base_V7_ThemeOverlay_AppCompat_Dialog
-style Base_V7_Theme_AppCompat
-style Base_V7_Theme_AppCompat_Dialog
-style Base_V7_Theme_AppCompat_Light
-style Base_V7_Theme_AppCompat_Light_Dialog
-style Base_V7_Widget_AppCompat_AutoCompleteTextView
-style Base_V7_Widget_AppCompat_EditText
-style Base_V7_Widget_AppCompat_Toolbar
-style Base_Widget_AppCompat_ActionBar
-style Base_Widget_AppCompat_ActionBar_Solid
-style Base_Widget_AppCompat_ActionBar_TabBar
-style Base_Widget_AppCompat_ActionBar_TabText
-style Base_Widget_AppCompat_ActionBar_TabView
-style Base_Widget_AppCompat_ActionButton
-style Base_Widget_AppCompat_ActionButton_CloseMode
-style Base_Widget_AppCompat_ActionButton_Overflow
-style Base_Widget_AppCompat_ActionMode
-style Base_Widget_AppCompat_ActivityChooserView
-style Base_Widget_AppCompat_AutoCompleteTextView
-style Base_Widget_AppCompat_Button
-style Base_Widget_AppCompat_ButtonBar
-style Base_Widget_AppCompat_ButtonBar_AlertDialog
-style Base_Widget_AppCompat_Button_Borderless
-style Base_Widget_AppCompat_Button_Borderless_Colored
-style Base_Widget_AppCompat_Button_ButtonBar_AlertDialog
-style Base_Widget_AppCompat_Button_Colored
-style Base_Widget_AppCompat_Button_Small
-style Base_Widget_AppCompat_CompoundButton_CheckBox
-style Base_Widget_AppCompat_CompoundButton_RadioButton
-style Base_Widget_AppCompat_CompoundButton_Switch
-style Base_Widget_AppCompat_DrawerArrowToggle
-style Base_Widget_AppCompat_DrawerArrowToggle_Common
-style Base_Widget_AppCompat_DropDownItem_Spinner
-style Base_Widget_AppCompat_EditText
-style Base_Widget_AppCompat_ImageButton
-style Base_Widget_AppCompat_Light_ActionBar
-style Base_Widget_AppCompat_Light_ActionBar_Solid
-style Base_Widget_AppCompat_Light_ActionBar_TabBar
-style Base_Widget_AppCompat_Light_ActionBar_TabText
-style Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse
-style Base_Widget_AppCompat_Light_ActionBar_TabView
-style Base_Widget_AppCompat_Light_PopupMenu
-style Base_Widget_AppCompat_Light_PopupMenu_Overflow
-style Base_Widget_AppCompat_ListMenuView
-style Base_Widget_AppCompat_ListPopupWindow
-style Base_Widget_AppCompat_ListView
-style Base_Widget_AppCompat_ListView_DropDown
-style Base_Widget_AppCompat_ListView_Menu
-style Base_Widget_AppCompat_PopupMenu
-style Base_Widget_AppCompat_PopupMenu_Overflow
-style Base_Widget_AppCompat_PopupWindow
-style Base_Widget_AppCompat_ProgressBar
-style Base_Widget_AppCompat_ProgressBar_Horizontal
-style Base_Widget_AppCompat_RatingBar
-style Base_Widget_AppCompat_RatingBar_Indicator
-style Base_Widget_AppCompat_RatingBar_Small
-style Base_Widget_AppCompat_SearchView
-style Base_Widget_AppCompat_SearchView_ActionBar
-style Base_Widget_AppCompat_SeekBar
-style Base_Widget_AppCompat_SeekBar_Discrete
-style Base_Widget_AppCompat_Spinner
-style Base_Widget_AppCompat_Spinner_Underlined
-style Base_Widget_AppCompat_TextView
-style Base_Widget_AppCompat_TextView_SpinnerItem
-style Base_Widget_AppCompat_Toolbar
-style Base_Widget_AppCompat_Toolbar_Button_Navigation
-style Platform_AppCompat
-style Platform_AppCompat_Light
-style Platform_ThemeOverlay_AppCompat
-style Platform_ThemeOverlay_AppCompat_Dark
-style Platform_ThemeOverlay_AppCompat_Light
-style Platform_V21_AppCompat
-style Platform_V21_AppCompat_Light
-style Platform_V25_AppCompat
-style Platform_V25_AppCompat_Light
-style Platform_Widget_AppCompat_Spinner
-style RtlOverlay_DialogWindowTitle_AppCompat
-style RtlOverlay_Widget_AppCompat_ActionBar_TitleItem
-style RtlOverlay_Widget_AppCompat_DialogTitle_Icon
-style RtlOverlay_Widget_AppCompat_PopupMenuItem
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_Text
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_Title
-style RtlOverlay_Widget_AppCompat_SearchView_MagIcon
-style RtlOverlay_Widget_AppCompat_Search_DropDown
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Query
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Text
-style RtlUnderlay_Widget_AppCompat_ActionButton
-style RtlUnderlay_Widget_AppCompat_ActionButton_Overflow
-style TextAppearance_AppCompat
-style TextAppearance_AppCompat_Body1
-style TextAppearance_AppCompat_Body2
-style TextAppearance_AppCompat_Button
-style TextAppearance_AppCompat_Caption
-style TextAppearance_AppCompat_Display1
-style TextAppearance_AppCompat_Display2
-style TextAppearance_AppCompat_Display3
-style TextAppearance_AppCompat_Display4
-style TextAppearance_AppCompat_Headline
-style TextAppearance_AppCompat_Inverse
-style TextAppearance_AppCompat_Large
-style TextAppearance_AppCompat_Large_Inverse
-style TextAppearance_AppCompat_Light_SearchResult_Subtitle
-style TextAppearance_AppCompat_Light_SearchResult_Title
-style TextAppearance_AppCompat_Light_Widget_PopupMenu_Large
-style TextAppearance_AppCompat_Light_Widget_PopupMenu_Small
-style TextAppearance_AppCompat_Medium
-style TextAppearance_AppCompat_Medium_Inverse
-style TextAppearance_AppCompat_Menu
-style TextAppearance_AppCompat_SearchResult_Subtitle
-style TextAppearance_AppCompat_SearchResult_Title
-style TextAppearance_AppCompat_Small
-style TextAppearance_AppCompat_Small_Inverse
-style TextAppearance_AppCompat_Subhead
-style TextAppearance_AppCompat_Subhead_Inverse
-style TextAppearance_AppCompat_Title
-style TextAppearance_AppCompat_Title_Inverse
-style TextAppearance_AppCompat_Tooltip
-style TextAppearance_AppCompat_Widget_ActionBar_Menu
-style TextAppearance_AppCompat_Widget_ActionBar_Subtitle
-style TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse
-style TextAppearance_AppCompat_Widget_ActionBar_Title
-style TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse
-style TextAppearance_AppCompat_Widget_ActionMode_Subtitle
-style TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse
-style TextAppearance_AppCompat_Widget_ActionMode_Title
-style TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse
-style TextAppearance_AppCompat_Widget_Button
-style TextAppearance_AppCompat_Widget_Button_Borderless_Colored
-style TextAppearance_AppCompat_Widget_Button_Colored
-style TextAppearance_AppCompat_Widget_Button_Inverse
-style TextAppearance_AppCompat_Widget_DropDownItem
-style TextAppearance_AppCompat_Widget_PopupMenu_Header
-style TextAppearance_AppCompat_Widget_PopupMenu_Large
-style TextAppearance_AppCompat_Widget_PopupMenu_Small
-style TextAppearance_AppCompat_Widget_Switch
-style TextAppearance_AppCompat_Widget_TextView_SpinnerItem
-style TextAppearance_Compat_Notification
-style TextAppearance_Compat_Notification_Info
-style TextAppearance_Compat_Notification_Info_Media
-style TextAppearance_Compat_Notification_Line2
-style TextAppearance_Compat_Notification_Line2_Media
-style TextAppearance_Compat_Notification_Media
-style TextAppearance_Compat_Notification_Time
-style TextAppearance_Compat_Notification_Time_Media
-style TextAppearance_Compat_Notification_Title
-style TextAppearance_Compat_Notification_Title_Media
-style TextAppearance_Widget_AppCompat_ExpandedMenu_Item
-style TextAppearance_Widget_AppCompat_Toolbar_Subtitle
-style TextAppearance_Widget_AppCompat_Toolbar_Title
-style ThemeOverlay_AppCompat
-style ThemeOverlay_AppCompat_ActionBar
-style ThemeOverlay_AppCompat_Dark
-style ThemeOverlay_AppCompat_Dark_ActionBar
-style ThemeOverlay_AppCompat_DayNight
-style ThemeOverlay_AppCompat_DayNight_ActionBar
-style ThemeOverlay_AppCompat_Dialog
-style ThemeOverlay_AppCompat_Dialog_Alert
-style ThemeOverlay_AppCompat_Light
-style Theme_AppCompat
-style Theme_AppCompat_CompactMenu
-style Theme_AppCompat_DayNight
-style Theme_AppCompat_DayNight_DarkActionBar
-style Theme_AppCompat_DayNight_Dialog
-style Theme_AppCompat_DayNight_DialogWhenLarge
-style Theme_AppCompat_DayNight_Dialog_Alert
-style Theme_AppCompat_DayNight_Dialog_MinWidth
-style Theme_AppCompat_DayNight_NoActionBar
-style Theme_AppCompat_Dialog
-style Theme_AppCompat_DialogWhenLarge
-style Theme_AppCompat_Dialog_Alert
-style Theme_AppCompat_Dialog_MinWidth
-style Theme_AppCompat_Light
-style Theme_AppCompat_Light_DarkActionBar
-style Theme_AppCompat_Light_Dialog
-style Theme_AppCompat_Light_DialogWhenLarge
-style Theme_AppCompat_Light_Dialog_Alert
-style Theme_AppCompat_Light_Dialog_MinWidth
-style Theme_AppCompat_Light_NoActionBar
-style Theme_AppCompat_NoActionBar
-style Widget_AppCompat_ActionBar
-style Widget_AppCompat_ActionBar_Solid
-style Widget_AppCompat_ActionBar_TabBar
-style Widget_AppCompat_ActionBar_TabText
-style Widget_AppCompat_ActionBar_TabView
-style Widget_AppCompat_ActionButton
-style Widget_AppCompat_ActionButton_CloseMode
-style Widget_AppCompat_ActionButton_Overflow
-style Widget_AppCompat_ActionMode
-style Widget_AppCompat_ActivityChooserView
-style Widget_AppCompat_AutoCompleteTextView
-style Widget_AppCompat_Button
-style Widget_AppCompat_ButtonBar
-style Widget_AppCompat_ButtonBar_AlertDialog
-style Widget_AppCompat_Button_Borderless
-style Widget_AppCompat_Button_Borderless_Colored
-style Widget_AppCompat_Button_ButtonBar_AlertDialog
-style Widget_AppCompat_Button_Colored
-style Widget_AppCompat_Button_Small
-style Widget_AppCompat_CompoundButton_CheckBox
-style Widget_AppCompat_CompoundButton_RadioButton
-style Widget_AppCompat_CompoundButton_Switch
-style Widget_AppCompat_DrawerArrowToggle
-style Widget_AppCompat_DropDownItem_Spinner
-style Widget_AppCompat_EditText
-style Widget_AppCompat_ImageButton
-style Widget_AppCompat_Light_ActionBar
-style Widget_AppCompat_Light_ActionBar_Solid
-style Widget_AppCompat_Light_ActionBar_Solid_Inverse
-style Widget_AppCompat_Light_ActionBar_TabBar
-style Widget_AppCompat_Light_ActionBar_TabBar_Inverse
-style Widget_AppCompat_Light_ActionBar_TabText
-style Widget_AppCompat_Light_ActionBar_TabText_Inverse
-style Widget_AppCompat_Light_ActionBar_TabView
-style Widget_AppCompat_Light_ActionBar_TabView_Inverse
-style Widget_AppCompat_Light_ActionButton
-style Widget_AppCompat_Light_ActionButton_CloseMode
-style Widget_AppCompat_Light_ActionButton_Overflow
-style Widget_AppCompat_Light_ActionMode_Inverse
-style Widget_AppCompat_Light_ActivityChooserView
-style Widget_AppCompat_Light_AutoCompleteTextView
-style Widget_AppCompat_Light_DropDownItem_Spinner
-style Widget_AppCompat_Light_ListPopupWindow
-style Widget_AppCompat_Light_ListView_DropDown
-style Widget_AppCompat_Light_PopupMenu
-style Widget_AppCompat_Light_PopupMenu_Overflow
-style Widget_AppCompat_Light_SearchView
-style Widget_AppCompat_Light_Spinner_DropDown_ActionBar
-style Widget_AppCompat_ListMenuView
-style Widget_AppCompat_ListPopupWindow
-style Widget_AppCompat_ListView
-style Widget_AppCompat_ListView_DropDown
-style Widget_AppCompat_ListView_Menu
-style Widget_AppCompat_PopupMenu
-style Widget_AppCompat_PopupMenu_Overflow
-style Widget_AppCompat_PopupWindow
-style Widget_AppCompat_ProgressBar
-style Widget_AppCompat_ProgressBar_Horizontal
-style Widget_AppCompat_RatingBar
-style Widget_AppCompat_RatingBar_Indicator
-style Widget_AppCompat_RatingBar_Small
-style Widget_AppCompat_SearchView
-style Widget_AppCompat_SearchView_ActionBar
-style Widget_AppCompat_SeekBar
-style Widget_AppCompat_SeekBar_Discrete
-style Widget_AppCompat_Spinner
-style Widget_AppCompat_Spinner_DropDown
-style Widget_AppCompat_Spinner_DropDown_ActionBar
-style Widget_AppCompat_Spinner_Underlined
-style Widget_AppCompat_TextView
-style Widget_AppCompat_TextView_SpinnerItem
-style Widget_AppCompat_Toolbar
-style Widget_AppCompat_Toolbar_Button_Navigation
-style Widget_Compat_NotificationActionContainer
-style Widget_Compat_NotificationActionText
-style Widget_Support_CoordinatorLayout
-styleable ActionBar background backgroundSplit backgroundStacked contentInsetEnd contentInsetEndWithActions contentInsetLeft contentInsetRight contentInsetStart contentInsetStartWithNavigation customNavigationLayout displayOptions divider elevation height hideOnContentScroll homeAsUpIndicator homeLayout icon indeterminateProgressStyle itemPadding logo navigationMode popupTheme progressBarPadding progressBarStyle subtitle subtitleTextStyle title titleTextStyle
-styleable ActionBarLayout android_layout_gravity
-styleable ActionMenuItemView android_minWidth
-styleable ActionMenuView
-styleable ActionMode background backgroundSplit closeItemLayout height subtitleTextStyle titleTextStyle
-styleable ActivityChooserView expandActivityOverflowButtonDrawable initialActivityCount
-styleable AlertDialog android_layout buttonIconDimen buttonPanelSideLayout listItemLayout listLayout multiChoiceItemLayout showTitle singleChoiceItemLayout
-styleable AnimatedStateListDrawableCompat android_constantSize android_dither android_enterFadeDuration android_exitFadeDuration android_variablePadding android_visible
-styleable AnimatedStateListDrawableItem android_drawable android_id
-styleable AnimatedStateListDrawableTransition android_drawable android_fromId android_reversible android_toId
-styleable AppCompatImageView android_src srcCompat tint tintMode
-styleable AppCompatSeekBar android_thumb tickMark tickMarkTint tickMarkTintMode
-styleable AppCompatTextHelper android_drawableBottom android_drawableEnd android_drawableLeft android_drawableRight android_drawableStart android_drawableTop android_textAppearance
-styleable AppCompatTextView android_textAppearance autoSizeMaxTextSize autoSizeMinTextSize autoSizePresetSizes autoSizeStepGranularity autoSizeTextType drawableBottomCompat drawableEndCompat drawableLeftCompat drawableRightCompat drawableStartCompat drawableTint drawableTintMode drawableTopCompat firstBaselineToTopHeight fontFamily fontVariationSettings lastBaselineToBottomHeight lineHeight textAllCaps textLocale
-styleable AppCompatTheme actionBarDivider actionBarItemBackground actionBarPopupTheme actionBarSize actionBarSplitStyle actionBarStyle actionBarTabBarStyle actionBarTabStyle actionBarTabTextStyle actionBarTheme actionBarWidgetTheme actionButtonStyle actionDropDownStyle actionMenuTextAppearance actionMenuTextColor actionModeBackground actionModeCloseButtonStyle actionModeCloseDrawable actionModeCopyDrawable actionModeCutDrawable actionModeFindDrawable actionModePasteDrawable actionModePopupWindowStyle actionModeSelectAllDrawable actionModeShareDrawable actionModeSplitBackground actionModeStyle actionModeWebSearchDrawable actionOverflowButtonStyle actionOverflowMenuStyle activityChooserViewStyle alertDialogButtonGroupStyle alertDialogCenterButtons alertDialogStyle alertDialogTheme android_windowAnimationStyle android_windowIsFloating autoCompleteTextViewStyle borderlessButtonStyle buttonBarButtonStyle buttonBarNegativeButtonStyle buttonBarNeutralButtonStyle buttonBarPositiveButtonStyle buttonBarStyle buttonStyle buttonStyleSmall checkboxStyle checkedTextViewStyle colorAccent colorBackgroundFloating colorButtonNormal colorControlActivated colorControlHighlight colorControlNormal colorError colorPrimary colorPrimaryDark colorSwitchThumbNormal controlBackground dialogCornerRadius dialogPreferredPadding dialogTheme dividerHorizontal dividerVertical dropDownListViewStyle dropdownListPreferredItemHeight editTextBackground editTextColor editTextStyle homeAsUpIndicator imageButtonStyle listChoiceBackgroundIndicator listChoiceIndicatorMultipleAnimated listChoiceIndicatorSingleAnimated listDividerAlertDialog listMenuViewStyle listPopupWindowStyle listPreferredItemHeight listPreferredItemHeightLarge listPreferredItemHeightSmall listPreferredItemPaddingEnd listPreferredItemPaddingLeft listPreferredItemPaddingRight listPreferredItemPaddingStart panelBackground panelMenuListTheme panelMenuListWidth popupMenuStyle popupWindowStyle radioButtonStyle ratingBarStyle ratingBarStyleIndicator ratingBarStyleSmall searchViewStyle seekBarStyle selectableItemBackground selectableItemBackgroundBorderless spinnerDropDownItemStyle spinnerStyle switchStyle textAppearanceLargePopupMenu textAppearanceListItem textAppearanceListItemSecondary textAppearanceListItemSmall textAppearancePopupMenuHeader textAppearanceSearchResultSubtitle textAppearanceSearchResultTitle textAppearanceSmallPopupMenu textColorAlertDialogListItem textColorSearchUrl toolbarNavigationButtonStyle toolbarStyle tooltipForegroundColor tooltipFrameBackground viewInflaterClass windowActionBar windowActionBarOverlay windowActionModeOverlay windowFixedHeightMajor windowFixedHeightMinor windowFixedWidthMajor windowFixedWidthMinor windowMinWidthMajor windowMinWidthMinor windowNoTitle
-styleable ButtonBarLayout allowStacking
-styleable ColorStateListItem alpha android_alpha android_color
-styleable CompoundButton android_button buttonCompat buttonTint buttonTintMode
-styleable ConstraintLayout_Layout android_maxHeight android_maxWidth android_minHeight android_minWidth android_orientation barrierAllowsGoneWidgets barrierDirection chainUseRtl constraintSet constraint_referenced_ids layout_constrainedHeight layout_constrainedWidth layout_constraintBaseline_creator layout_constraintBaseline_toBaselineOf layout_constraintBottom_creator layout_constraintBottom_toBottomOf layout_constraintBottom_toTopOf layout_constraintCircle layout_constraintCircleAngle layout_constraintCircleRadius layout_constraintDimensionRatio layout_constraintEnd_toEndOf layout_constraintEnd_toStartOf layout_constraintGuide_begin layout_constraintGuide_end layout_constraintGuide_percent layout_constraintHeight_default layout_constraintHeight_max layout_constraintHeight_min layout_constraintHeight_percent layout_constraintHorizontal_bias layout_constraintHorizontal_chainStyle layout_constraintHorizontal_weight layout_constraintLeft_creator layout_constraintLeft_toLeftOf layout_constraintLeft_toRightOf layout_constraintRight_creator layout_constraintRight_toLeftOf layout_constraintRight_toRightOf layout_constraintStart_toEndOf layout_constraintStart_toStartOf layout_constraintTop_creator layout_constraintTop_toBottomOf layout_constraintTop_toTopOf layout_constraintVertical_bias layout_constraintVertical_chainStyle layout_constraintVertical_weight layout_constraintWidth_default layout_constraintWidth_max layout_constraintWidth_min layout_constraintWidth_percent layout_editor_absoluteX layout_editor_absoluteY layout_goneMarginBottom layout_goneMarginEnd layout_goneMarginLeft layout_goneMarginRight layout_goneMarginStart layout_goneMarginTop layout_optimizationLevel
-styleable ConstraintLayout_placeholder content emptyVisibility
-styleable ConstraintSet android_alpha android_elevation android_id android_layout_height android_layout_marginBottom android_layout_marginEnd android_layout_marginLeft android_layout_marginRight android_layout_marginStart android_layout_marginTop android_layout_width android_maxHeight android_maxWidth android_minHeight android_minWidth android_orientation android_rotation android_rotationX android_rotationY android_scaleX android_scaleY android_transformPivotX android_transformPivotY android_translationX android_translationY android_translationZ android_visibility barrierAllowsGoneWidgets barrierDirection chainUseRtl constraint_referenced_ids layout_constrainedHeight layout_constrainedWidth layout_constraintBaseline_creator layout_constraintBaseline_toBaselineOf layout_constraintBottom_creator layout_constraintBottom_toBottomOf layout_constraintBottom_toTopOf layout_constraintCircle layout_constraintCircleAngle layout_constraintCircleRadius layout_constraintDimensionRatio layout_constraintEnd_toEndOf layout_constraintEnd_toStartOf layout_constraintGuide_begin layout_constraintGuide_end layout_constraintGuide_percent layout_constraintHeight_default layout_constraintHeight_max layout_constraintHeight_min layout_constraintHeight_percent layout_constraintHorizontal_bias layout_constraintHorizontal_chainStyle layout_constraintHorizontal_weight layout_constraintLeft_creator layout_constraintLeft_toLeftOf layout_constraintLeft_toRightOf layout_constraintRight_creator layout_constraintRight_toLeftOf layout_constraintRight_toRightOf layout_constraintStart_toEndOf layout_constraintStart_toStartOf layout_constraintTop_creator layout_constraintTop_toBottomOf layout_constraintTop_toTopOf layout_constraintVertical_bias layout_constraintVertical_chainStyle layout_constraintVertical_weight layout_constraintWidth_default layout_constraintWidth_max layout_constraintWidth_min layout_constraintWidth_percent layout_editor_absoluteX layout_editor_absoluteY layout_goneMarginBottom layout_goneMarginEnd layout_goneMarginLeft layout_goneMarginRight layout_goneMarginStart layout_goneMarginTop
-styleable CoordinatorLayout keylines statusBarBackground
-styleable CoordinatorLayout_Layout android_layout_gravity layout_anchor layout_anchorGravity layout_behavior layout_dodgeInsetEdges layout_insetEdge layout_keyline
-styleable DrawerArrowToggle arrowHeadLength arrowShaftLength barLength color drawableSize gapBetweenBars spinBars thickness
-styleable FontFamily fontProviderAuthority fontProviderCerts fontProviderFetchStrategy fontProviderFetchTimeout fontProviderPackage fontProviderQuery
-styleable FontFamilyFont android_font android_fontStyle android_fontVariationSettings android_fontWeight android_ttcIndex font fontStyle fontVariationSettings fontWeight ttcIndex
-styleable GradientColor android_centerColor android_centerX android_centerY android_endColor android_endX android_endY android_gradientRadius android_startColor android_startX android_startY android_tileMode android_type
-styleable GradientColorItem android_color android_offset
-styleable LinearConstraintLayout android_orientation
-styleable LinearLayoutCompat android_baselineAligned android_baselineAlignedChildIndex android_gravity android_orientation android_weightSum divider dividerPadding measureWithLargestChild showDividers
-styleable LinearLayoutCompat_Layout android_layout_gravity android_layout_height android_layout_weight android_layout_width
-styleable ListPopupWindow android_dropDownHorizontalOffset android_dropDownVerticalOffset
-styleable MenuGroup android_checkableBehavior android_enabled android_id android_menuCategory android_orderInCategory android_visible
-styleable MenuItem actionLayout actionProviderClass actionViewClass alphabeticModifiers android_alphabeticShortcut android_checkable android_checked android_enabled android_icon android_id android_menuCategory android_numericShortcut android_onClick android_orderInCategory android_title android_titleCondensed android_visible contentDescription iconTint iconTintMode numericModifiers showAsAction tooltipText
-styleable MenuView android_headerBackground android_horizontalDivider android_itemBackground android_itemIconDisabledAlpha android_itemTextAppearance android_verticalDivider android_windowAnimationStyle preserveIconSpacing subMenuArrow
-styleable PopupWindow android_popupAnimationStyle android_popupBackground overlapAnchor
-styleable PopupWindowBackgroundState state_above_anchor
-styleable RecycleListView paddingBottomNoButtons paddingTopNoTitle
-styleable SearchView android_focusable android_imeOptions android_inputType android_maxWidth closeIcon commitIcon defaultQueryHint goIcon iconifiedByDefault layout queryBackground queryHint searchHintIcon searchIcon submitBackground suggestionRowLayout voiceIcon
-styleable Spinner android_dropDownWidth android_entries android_popupBackground android_prompt popupTheme
-styleable StateListDrawable android_constantSize android_dither android_enterFadeDuration android_exitFadeDuration android_variablePadding android_visible
-styleable StateListDrawableItem android_drawable
-styleable SwitchCompat android_textOff android_textOn android_thumb showText splitTrack switchMinWidth switchPadding switchTextAppearance thumbTextPadding thumbTint thumbTintMode track trackTint trackTintMode
-styleable TextAppearance android_fontFamily android_shadowColor android_shadowDx android_shadowDy android_shadowRadius android_textColor android_textColorHint android_textColorLink android_textFontWeight android_textSize android_textStyle android_typeface fontFamily fontVariationSettings textAllCaps textLocale
-styleable Toolbar android_gravity android_minHeight buttonGravity collapseContentDescription collapseIcon contentInsetEnd contentInsetEndWithActions contentInsetLeft contentInsetRight contentInsetStart contentInsetStartWithNavigation logo logoDescription maxButtonHeight menu navigationContentDescription navigationIcon popupTheme subtitle subtitleTextAppearance subtitleTextColor title titleMargin titleMarginBottom titleMarginEnd titleMarginStart titleMarginTop titleMargins titleTextAppearance titleTextColor
-styleable View android_focusable android_theme paddingEnd paddingStart theme
-styleable ViewBackgroundHelper android_background backgroundTint backgroundTintMode
-styleable ViewStubCompat android_id android_inflatedId android_layout
diff --git a/modules/mogo-module-splash-noop/build/intermediates/symbols/debug/R.txt b/modules/mogo-module-splash-noop/build/intermediates/symbols/debug/R.txt
deleted file mode 100644
index b8a11e6dfd..0000000000
--- a/modules/mogo-module-splash-noop/build/intermediates/symbols/debug/R.txt
+++ /dev/null
@@ -1,1917 +0,0 @@
-int anim abc_fade_in 0x7f010001
-int anim abc_fade_out 0x7f010002
-int anim abc_grow_fade_in_from_bottom 0x7f010003
-int anim abc_popup_enter 0x7f010004
-int anim abc_popup_exit 0x7f010005
-int anim abc_shrink_fade_out_from_bottom 0x7f010006
-int anim abc_slide_in_bottom 0x7f010007
-int anim abc_slide_in_top 0x7f010008
-int anim abc_slide_out_bottom 0x7f010009
-int anim abc_slide_out_top 0x7f01000a
-int anim abc_tooltip_enter 0x7f01000b
-int anim abc_tooltip_exit 0x7f01000c
-int anim btn_checkbox_to_checked_box_inner_merged_animation 0x7f01000d
-int anim btn_checkbox_to_checked_box_outer_merged_animation 0x7f01000e
-int anim btn_checkbox_to_checked_icon_null_animation 0x7f01000f
-int anim btn_checkbox_to_unchecked_box_inner_merged_animation 0x7f010010
-int anim btn_checkbox_to_unchecked_check_path_merged_animation 0x7f010011
-int anim btn_checkbox_to_unchecked_icon_null_animation 0x7f010012
-int anim btn_radio_to_off_mtrl_dot_group_animation 0x7f010013
-int anim btn_radio_to_off_mtrl_ring_outer_animation 0x7f010014
-int anim btn_radio_to_off_mtrl_ring_outer_path_animation 0x7f010015
-int anim btn_radio_to_on_mtrl_dot_group_animation 0x7f010016
-int anim btn_radio_to_on_mtrl_ring_outer_animation 0x7f010017
-int anim btn_radio_to_on_mtrl_ring_outer_path_animation 0x7f010018
-int attr actionBarDivider 0x7f040001
-int attr actionBarItemBackground 0x7f040002
-int attr actionBarPopupTheme 0x7f040003
-int attr actionBarSize 0x7f040004
-int attr actionBarSplitStyle 0x7f040005
-int attr actionBarStyle 0x7f040006
-int attr actionBarTabBarStyle 0x7f040007
-int attr actionBarTabStyle 0x7f040008
-int attr actionBarTabTextStyle 0x7f040009
-int attr actionBarTheme 0x7f04000a
-int attr actionBarWidgetTheme 0x7f04000b
-int attr actionButtonStyle 0x7f04000c
-int attr actionDropDownStyle 0x7f04000d
-int attr actionLayout 0x7f04000e
-int attr actionMenuTextAppearance 0x7f04000f
-int attr actionMenuTextColor 0x7f040010
-int attr actionModeBackground 0x7f040011
-int attr actionModeCloseButtonStyle 0x7f040012
-int attr actionModeCloseDrawable 0x7f040013
-int attr actionModeCopyDrawable 0x7f040014
-int attr actionModeCutDrawable 0x7f040015
-int attr actionModeFindDrawable 0x7f040016
-int attr actionModePasteDrawable 0x7f040017
-int attr actionModePopupWindowStyle 0x7f040018
-int attr actionModeSelectAllDrawable 0x7f040019
-int attr actionModeShareDrawable 0x7f04001a
-int attr actionModeSplitBackground 0x7f04001b
-int attr actionModeStyle 0x7f04001c
-int attr actionModeWebSearchDrawable 0x7f04001d
-int attr actionOverflowButtonStyle 0x7f04001e
-int attr actionOverflowMenuStyle 0x7f04001f
-int attr actionProviderClass 0x7f040020
-int attr actionViewClass 0x7f040021
-int attr activityChooserViewStyle 0x7f040022
-int attr alertDialogButtonGroupStyle 0x7f040023
-int attr alertDialogCenterButtons 0x7f040024
-int attr alertDialogStyle 0x7f040025
-int attr alertDialogTheme 0x7f040026
-int attr allowStacking 0x7f040027
-int attr alpha 0x7f040028
-int attr alphabeticModifiers 0x7f040029
-int attr arrowHeadLength 0x7f04002a
-int attr arrowShaftLength 0x7f04002b
-int attr autoCompleteTextViewStyle 0x7f04002c
-int attr autoSizeMaxTextSize 0x7f04002d
-int attr autoSizeMinTextSize 0x7f04002e
-int attr autoSizePresetSizes 0x7f04002f
-int attr autoSizeStepGranularity 0x7f040030
-int attr autoSizeTextType 0x7f040031
-int attr background 0x7f040032
-int attr backgroundSplit 0x7f040033
-int attr backgroundStacked 0x7f040034
-int attr backgroundTint 0x7f040035
-int attr backgroundTintMode 0x7f040036
-int attr barLength 0x7f040037
-int attr barrierAllowsGoneWidgets 0x7f040038
-int attr barrierDirection 0x7f040039
-int attr borderlessButtonStyle 0x7f04003a
-int attr buttonBarButtonStyle 0x7f04003b
-int attr buttonBarNegativeButtonStyle 0x7f04003c
-int attr buttonBarNeutralButtonStyle 0x7f04003d
-int attr buttonBarPositiveButtonStyle 0x7f04003e
-int attr buttonBarStyle 0x7f04003f
-int attr buttonCompat 0x7f040040
-int attr buttonGravity 0x7f040041
-int attr buttonIconDimen 0x7f040042
-int attr buttonPanelSideLayout 0x7f040043
-int attr buttonStyle 0x7f040044
-int attr buttonStyleSmall 0x7f040045
-int attr buttonTint 0x7f040046
-int attr buttonTintMode 0x7f040047
-int attr chainUseRtl 0x7f040048
-int attr checkboxStyle 0x7f040049
-int attr checkedTextViewStyle 0x7f04004a
-int attr closeIcon 0x7f04004b
-int attr closeItemLayout 0x7f04004c
-int attr collapseContentDescription 0x7f04004d
-int attr collapseIcon 0x7f04004e
-int attr color 0x7f04004f
-int attr colorAccent 0x7f040050
-int attr colorBackgroundFloating 0x7f040051
-int attr colorButtonNormal 0x7f040052
-int attr colorControlActivated 0x7f040053
-int attr colorControlHighlight 0x7f040054
-int attr colorControlNormal 0x7f040055
-int attr colorError 0x7f040056
-int attr colorPrimary 0x7f040057
-int attr colorPrimaryDark 0x7f040058
-int attr colorSwitchThumbNormal 0x7f040059
-int attr commitIcon 0x7f04005a
-int attr constraintSet 0x7f04005b
-int attr constraint_referenced_ids 0x7f04005c
-int attr content 0x7f04005d
-int attr contentDescription 0x7f04005e
-int attr contentInsetEnd 0x7f04005f
-int attr contentInsetEndWithActions 0x7f040060
-int attr contentInsetLeft 0x7f040061
-int attr contentInsetRight 0x7f040062
-int attr contentInsetStart 0x7f040063
-int attr contentInsetStartWithNavigation 0x7f040064
-int attr controlBackground 0x7f040065
-int attr coordinatorLayoutStyle 0x7f040066
-int attr customNavigationLayout 0x7f040067
-int attr defaultQueryHint 0x7f040068
-int attr dialogCornerRadius 0x7f040069
-int attr dialogPreferredPadding 0x7f04006a
-int attr dialogTheme 0x7f04006b
-int attr displayOptions 0x7f04006c
-int attr divider 0x7f04006d
-int attr dividerHorizontal 0x7f04006e
-int attr dividerPadding 0x7f04006f
-int attr dividerVertical 0x7f040070
-int attr drawableBottomCompat 0x7f040071
-int attr drawableEndCompat 0x7f040072
-int attr drawableLeftCompat 0x7f040073
-int attr drawableRightCompat 0x7f040074
-int attr drawableSize 0x7f040075
-int attr drawableStartCompat 0x7f040076
-int attr drawableTint 0x7f040077
-int attr drawableTintMode 0x7f040078
-int attr drawableTopCompat 0x7f040079
-int attr drawerArrowStyle 0x7f04007a
-int attr dropDownListViewStyle 0x7f04007b
-int attr dropdownListPreferredItemHeight 0x7f04007c
-int attr editTextBackground 0x7f04007d
-int attr editTextColor 0x7f04007e
-int attr editTextStyle 0x7f04007f
-int attr elevation 0x7f040080
-int attr emptyVisibility 0x7f040081
-int attr expandActivityOverflowButtonDrawable 0x7f040082
-int attr firstBaselineToTopHeight 0x7f040083
-int attr font 0x7f040084
-int attr fontFamily 0x7f040085
-int attr fontProviderAuthority 0x7f040086
-int attr fontProviderCerts 0x7f040087
-int attr fontProviderFetchStrategy 0x7f040088
-int attr fontProviderFetchTimeout 0x7f040089
-int attr fontProviderPackage 0x7f04008a
-int attr fontProviderQuery 0x7f04008b
-int attr fontStyle 0x7f04008c
-int attr fontVariationSettings 0x7f04008d
-int attr fontWeight 0x7f04008e
-int attr gapBetweenBars 0x7f04008f
-int attr goIcon 0x7f040090
-int attr height 0x7f040091
-int attr hideOnContentScroll 0x7f040092
-int attr homeAsUpIndicator 0x7f040093
-int attr homeLayout 0x7f040094
-int attr icon 0x7f040095
-int attr iconTint 0x7f040096
-int attr iconTintMode 0x7f040097
-int attr iconifiedByDefault 0x7f040098
-int attr imageButtonStyle 0x7f040099
-int attr indeterminateProgressStyle 0x7f04009a
-int attr initialActivityCount 0x7f04009b
-int attr isLightTheme 0x7f04009c
-int attr itemPadding 0x7f04009d
-int attr keylines 0x7f04009e
-int attr lastBaselineToBottomHeight 0x7f04009f
-int attr layout 0x7f0400a0
-int attr layout_anchor 0x7f0400a1
-int attr layout_anchorGravity 0x7f0400a2
-int attr layout_behavior 0x7f0400a3
-int attr layout_constrainedHeight 0x7f0400a4
-int attr layout_constrainedWidth 0x7f0400a5
-int attr layout_constraintBaseline_creator 0x7f0400a6
-int attr layout_constraintBaseline_toBaselineOf 0x7f0400a7
-int attr layout_constraintBottom_creator 0x7f0400a8
-int attr layout_constraintBottom_toBottomOf 0x7f0400a9
-int attr layout_constraintBottom_toTopOf 0x7f0400aa
-int attr layout_constraintCircle 0x7f0400ab
-int attr layout_constraintCircleAngle 0x7f0400ac
-int attr layout_constraintCircleRadius 0x7f0400ad
-int attr layout_constraintDimensionRatio 0x7f0400ae
-int attr layout_constraintEnd_toEndOf 0x7f0400af
-int attr layout_constraintEnd_toStartOf 0x7f0400b0
-int attr layout_constraintGuide_begin 0x7f0400b1
-int attr layout_constraintGuide_end 0x7f0400b2
-int attr layout_constraintGuide_percent 0x7f0400b3
-int attr layout_constraintHeight_default 0x7f0400b4
-int attr layout_constraintHeight_max 0x7f0400b5
-int attr layout_constraintHeight_min 0x7f0400b6
-int attr layout_constraintHeight_percent 0x7f0400b7
-int attr layout_constraintHorizontal_bias 0x7f0400b8
-int attr layout_constraintHorizontal_chainStyle 0x7f0400b9
-int attr layout_constraintHorizontal_weight 0x7f0400ba
-int attr layout_constraintLeft_creator 0x7f0400bb
-int attr layout_constraintLeft_toLeftOf 0x7f0400bc
-int attr layout_constraintLeft_toRightOf 0x7f0400bd
-int attr layout_constraintRight_creator 0x7f0400be
-int attr layout_constraintRight_toLeftOf 0x7f0400bf
-int attr layout_constraintRight_toRightOf 0x7f0400c0
-int attr layout_constraintStart_toEndOf 0x7f0400c1
-int attr layout_constraintStart_toStartOf 0x7f0400c2
-int attr layout_constraintTop_creator 0x7f0400c3
-int attr layout_constraintTop_toBottomOf 0x7f0400c4
-int attr layout_constraintTop_toTopOf 0x7f0400c5
-int attr layout_constraintVertical_bias 0x7f0400c6
-int attr layout_constraintVertical_chainStyle 0x7f0400c7
-int attr layout_constraintVertical_weight 0x7f0400c8
-int attr layout_constraintWidth_default 0x7f0400c9
-int attr layout_constraintWidth_max 0x7f0400ca
-int attr layout_constraintWidth_min 0x7f0400cb
-int attr layout_constraintWidth_percent 0x7f0400cc
-int attr layout_dodgeInsetEdges 0x7f0400cd
-int attr layout_editor_absoluteX 0x7f0400ce
-int attr layout_editor_absoluteY 0x7f0400cf
-int attr layout_goneMarginBottom 0x7f0400d0
-int attr layout_goneMarginEnd 0x7f0400d1
-int attr layout_goneMarginLeft 0x7f0400d2
-int attr layout_goneMarginRight 0x7f0400d3
-int attr layout_goneMarginStart 0x7f0400d4
-int attr layout_goneMarginTop 0x7f0400d5
-int attr layout_insetEdge 0x7f0400d6
-int attr layout_keyline 0x7f0400d7
-int attr layout_optimizationLevel 0x7f0400d8
-int attr lineHeight 0x7f0400d9
-int attr listChoiceBackgroundIndicator 0x7f0400da
-int attr listChoiceIndicatorMultipleAnimated 0x7f0400db
-int attr listChoiceIndicatorSingleAnimated 0x7f0400dc
-int attr listDividerAlertDialog 0x7f0400dd
-int attr listItemLayout 0x7f0400de
-int attr listLayout 0x7f0400df
-int attr listMenuViewStyle 0x7f0400e0
-int attr listPopupWindowStyle 0x7f0400e1
-int attr listPreferredItemHeight 0x7f0400e2
-int attr listPreferredItemHeightLarge 0x7f0400e3
-int attr listPreferredItemHeightSmall 0x7f0400e4
-int attr listPreferredItemPaddingEnd 0x7f0400e5
-int attr listPreferredItemPaddingLeft 0x7f0400e6
-int attr listPreferredItemPaddingRight 0x7f0400e7
-int attr listPreferredItemPaddingStart 0x7f0400e8
-int attr logo 0x7f0400e9
-int attr logoDescription 0x7f0400ea
-int attr maxButtonHeight 0x7f0400eb
-int attr measureWithLargestChild 0x7f0400ec
-int attr menu 0x7f0400ed
-int attr multiChoiceItemLayout 0x7f0400ee
-int attr navigationContentDescription 0x7f0400ef
-int attr navigationIcon 0x7f0400f0
-int attr navigationMode 0x7f0400f1
-int attr numericModifiers 0x7f0400f2
-int attr overlapAnchor 0x7f0400f3
-int attr paddingBottomNoButtons 0x7f0400f4
-int attr paddingEnd 0x7f0400f5
-int attr paddingStart 0x7f0400f6
-int attr paddingTopNoTitle 0x7f0400f7
-int attr panelBackground 0x7f0400f8
-int attr panelMenuListTheme 0x7f0400f9
-int attr panelMenuListWidth 0x7f0400fa
-int attr popupMenuStyle 0x7f0400fb
-int attr popupTheme 0x7f0400fc
-int attr popupWindowStyle 0x7f0400fd
-int attr preserveIconSpacing 0x7f0400fe
-int attr progressBarPadding 0x7f0400ff
-int attr progressBarStyle 0x7f040100
-int attr queryBackground 0x7f040101
-int attr queryHint 0x7f040102
-int attr radioButtonStyle 0x7f040103
-int attr ratingBarStyle 0x7f040104
-int attr ratingBarStyleIndicator 0x7f040105
-int attr ratingBarStyleSmall 0x7f040106
-int attr searchHintIcon 0x7f040107
-int attr searchIcon 0x7f040108
-int attr searchViewStyle 0x7f040109
-int attr seekBarStyle 0x7f04010a
-int attr selectableItemBackground 0x7f04010b
-int attr selectableItemBackgroundBorderless 0x7f04010c
-int attr showAsAction 0x7f04010d
-int attr showDividers 0x7f04010e
-int attr showText 0x7f04010f
-int attr showTitle 0x7f040110
-int attr singleChoiceItemLayout 0x7f040111
-int attr spinBars 0x7f040112
-int attr spinnerDropDownItemStyle 0x7f040113
-int attr spinnerStyle 0x7f040114
-int attr splitTrack 0x7f040115
-int attr srcCompat 0x7f040116
-int attr state_above_anchor 0x7f040117
-int attr statusBarBackground 0x7f040118
-int attr subMenuArrow 0x7f040119
-int attr submitBackground 0x7f04011a
-int attr subtitle 0x7f04011b
-int attr subtitleTextAppearance 0x7f04011c
-int attr subtitleTextColor 0x7f04011d
-int attr subtitleTextStyle 0x7f04011e
-int attr suggestionRowLayout 0x7f04011f
-int attr switchMinWidth 0x7f040120
-int attr switchPadding 0x7f040121
-int attr switchStyle 0x7f040122
-int attr switchTextAppearance 0x7f040123
-int attr textAllCaps 0x7f040124
-int attr textAppearanceLargePopupMenu 0x7f040125
-int attr textAppearanceListItem 0x7f040126
-int attr textAppearanceListItemSecondary 0x7f040127
-int attr textAppearanceListItemSmall 0x7f040128
-int attr textAppearancePopupMenuHeader 0x7f040129
-int attr textAppearanceSearchResultSubtitle 0x7f04012a
-int attr textAppearanceSearchResultTitle 0x7f04012b
-int attr textAppearanceSmallPopupMenu 0x7f04012c
-int attr textColorAlertDialogListItem 0x7f04012d
-int attr textColorSearchUrl 0x7f04012e
-int attr textLocale 0x7f04012f
-int attr theme 0x7f040130
-int attr thickness 0x7f040131
-int attr thumbTextPadding 0x7f040132
-int attr thumbTint 0x7f040133
-int attr thumbTintMode 0x7f040134
-int attr tickMark 0x7f040135
-int attr tickMarkTint 0x7f040136
-int attr tickMarkTintMode 0x7f040137
-int attr tint 0x7f040138
-int attr tintMode 0x7f040139
-int attr title 0x7f04013a
-int attr titleMargin 0x7f04013b
-int attr titleMarginBottom 0x7f04013c
-int attr titleMarginEnd 0x7f04013d
-int attr titleMarginStart 0x7f04013e
-int attr titleMarginTop 0x7f04013f
-int attr titleMargins 0x7f040140
-int attr titleTextAppearance 0x7f040141
-int attr titleTextColor 0x7f040142
-int attr titleTextStyle 0x7f040143
-int attr toolbarNavigationButtonStyle 0x7f040144
-int attr toolbarStyle 0x7f040145
-int attr tooltipForegroundColor 0x7f040146
-int attr tooltipFrameBackground 0x7f040147
-int attr tooltipText 0x7f040148
-int attr track 0x7f040149
-int attr trackTint 0x7f04014a
-int attr trackTintMode 0x7f04014b
-int attr ttcIndex 0x7f04014c
-int attr viewInflaterClass 0x7f04014d
-int attr voiceIcon 0x7f04014e
-int attr windowActionBar 0x7f04014f
-int attr windowActionBarOverlay 0x7f040150
-int attr windowActionModeOverlay 0x7f040151
-int attr windowFixedHeightMajor 0x7f040152
-int attr windowFixedHeightMinor 0x7f040153
-int attr windowFixedWidthMajor 0x7f040154
-int attr windowFixedWidthMinor 0x7f040155
-int attr windowMinWidthMajor 0x7f040156
-int attr windowMinWidthMinor 0x7f040157
-int attr windowNoTitle 0x7f040158
-int bool abc_action_bar_embed_tabs 0x7f050001
-int bool abc_allow_stacked_button_bar 0x7f050002
-int bool abc_config_actionMenuItemAllCaps 0x7f050003
-int color abc_background_cache_hint_selector_material_dark 0x7f060001
-int color abc_background_cache_hint_selector_material_light 0x7f060002
-int color abc_btn_colored_borderless_text_material 0x7f060003
-int color abc_btn_colored_text_material 0x7f060004
-int color abc_color_highlight_material 0x7f060005
-int color abc_hint_foreground_material_dark 0x7f060006
-int color abc_hint_foreground_material_light 0x7f060007
-int color abc_input_method_navigation_guard 0x7f060008
-int color abc_primary_text_disable_only_material_dark 0x7f060009
-int color abc_primary_text_disable_only_material_light 0x7f06000a
-int color abc_primary_text_material_dark 0x7f06000b
-int color abc_primary_text_material_light 0x7f06000c
-int color abc_search_url_text 0x7f06000d
-int color abc_search_url_text_normal 0x7f06000e
-int color abc_search_url_text_pressed 0x7f06000f
-int color abc_search_url_text_selected 0x7f060010
-int color abc_secondary_text_material_dark 0x7f060011
-int color abc_secondary_text_material_light 0x7f060012
-int color abc_tint_btn_checkable 0x7f060013
-int color abc_tint_default 0x7f060014
-int color abc_tint_edittext 0x7f060015
-int color abc_tint_seek_thumb 0x7f060016
-int color abc_tint_spinner 0x7f060017
-int color abc_tint_switch_track 0x7f060018
-int color accent_material_dark 0x7f060019
-int color accent_material_light 0x7f06001a
-int color androidx_core_ripple_material_light 0x7f06001b
-int color androidx_core_secondary_text_default_material_light 0x7f06001c
-int color background_floating_material_dark 0x7f06001d
-int color background_floating_material_light 0x7f06001e
-int color background_material_dark 0x7f06001f
-int color background_material_light 0x7f060020
-int color bright_foreground_disabled_material_dark 0x7f060021
-int color bright_foreground_disabled_material_light 0x7f060022
-int color bright_foreground_inverse_material_dark 0x7f060023
-int color bright_foreground_inverse_material_light 0x7f060024
-int color bright_foreground_material_dark 0x7f060025
-int color bright_foreground_material_light 0x7f060026
-int color button_material_dark 0x7f060027
-int color button_material_light 0x7f060028
-int color dim_foreground_disabled_material_dark 0x7f060029
-int color dim_foreground_disabled_material_light 0x7f06002a
-int color dim_foreground_material_dark 0x7f06002b
-int color dim_foreground_material_light 0x7f06002c
-int color error_color_material_dark 0x7f06002d
-int color error_color_material_light 0x7f06002e
-int color foreground_material_dark 0x7f06002f
-int color foreground_material_light 0x7f060030
-int color highlighted_text_material_dark 0x7f060031
-int color highlighted_text_material_light 0x7f060032
-int color material_blue_grey_800 0x7f060033
-int color material_blue_grey_900 0x7f060034
-int color material_blue_grey_950 0x7f060035
-int color material_deep_teal_200 0x7f060036
-int color material_deep_teal_500 0x7f060037
-int color material_grey_100 0x7f060038
-int color material_grey_300 0x7f060039
-int color material_grey_50 0x7f06003a
-int color material_grey_600 0x7f06003b
-int color material_grey_800 0x7f06003c
-int color material_grey_850 0x7f06003d
-int color material_grey_900 0x7f06003e
-int color notification_action_color_filter 0x7f06003f
-int color notification_icon_bg_color 0x7f060040
-int color notification_material_background_media_default_color 0x7f060041
-int color primary_dark_material_dark 0x7f060042
-int color primary_dark_material_light 0x7f060043
-int color primary_material_dark 0x7f060044
-int color primary_material_light 0x7f060045
-int color primary_text_default_material_dark 0x7f060046
-int color primary_text_default_material_light 0x7f060047
-int color primary_text_disabled_material_dark 0x7f060048
-int color primary_text_disabled_material_light 0x7f060049
-int color ripple_material_dark 0x7f06004a
-int color ripple_material_light 0x7f06004b
-int color secondary_text_default_material_dark 0x7f06004c
-int color secondary_text_default_material_light 0x7f06004d
-int color secondary_text_disabled_material_dark 0x7f06004e
-int color secondary_text_disabled_material_light 0x7f06004f
-int color switch_thumb_disabled_material_dark 0x7f060050
-int color switch_thumb_disabled_material_light 0x7f060051
-int color switch_thumb_material_dark 0x7f060052
-int color switch_thumb_material_light 0x7f060053
-int color switch_thumb_normal_material_dark 0x7f060054
-int color switch_thumb_normal_material_light 0x7f060055
-int color tooltip_background_dark 0x7f060056
-int color tooltip_background_light 0x7f060057
-int dimen abc_action_bar_content_inset_material 0x7f070001
-int dimen abc_action_bar_content_inset_with_nav 0x7f070002
-int dimen abc_action_bar_default_height_material 0x7f070003
-int dimen abc_action_bar_default_padding_end_material 0x7f070004
-int dimen abc_action_bar_default_padding_start_material 0x7f070005
-int dimen abc_action_bar_elevation_material 0x7f070006
-int dimen abc_action_bar_icon_vertical_padding_material 0x7f070007
-int dimen abc_action_bar_overflow_padding_end_material 0x7f070008
-int dimen abc_action_bar_overflow_padding_start_material 0x7f070009
-int dimen abc_action_bar_stacked_max_height 0x7f07000a
-int dimen abc_action_bar_stacked_tab_max_width 0x7f07000b
-int dimen abc_action_bar_subtitle_bottom_margin_material 0x7f07000c
-int dimen abc_action_bar_subtitle_top_margin_material 0x7f07000d
-int dimen abc_action_button_min_height_material 0x7f07000e
-int dimen abc_action_button_min_width_material 0x7f07000f
-int dimen abc_action_button_min_width_overflow_material 0x7f070010
-int dimen abc_alert_dialog_button_bar_height 0x7f070011
-int dimen abc_alert_dialog_button_dimen 0x7f070012
-int dimen abc_button_inset_horizontal_material 0x7f070013
-int dimen abc_button_inset_vertical_material 0x7f070014
-int dimen abc_button_padding_horizontal_material 0x7f070015
-int dimen abc_button_padding_vertical_material 0x7f070016
-int dimen abc_cascading_menus_min_smallest_width 0x7f070017
-int dimen abc_config_prefDialogWidth 0x7f070018
-int dimen abc_control_corner_material 0x7f070019
-int dimen abc_control_inset_material 0x7f07001a
-int dimen abc_control_padding_material 0x7f07001b
-int dimen abc_dialog_corner_radius_material 0x7f07001c
-int dimen abc_dialog_fixed_height_major 0x7f07001d
-int dimen abc_dialog_fixed_height_minor 0x7f07001e
-int dimen abc_dialog_fixed_width_major 0x7f07001f
-int dimen abc_dialog_fixed_width_minor 0x7f070020
-int dimen abc_dialog_list_padding_bottom_no_buttons 0x7f070021
-int dimen abc_dialog_list_padding_top_no_title 0x7f070022
-int dimen abc_dialog_min_width_major 0x7f070023
-int dimen abc_dialog_min_width_minor 0x7f070024
-int dimen abc_dialog_padding_material 0x7f070025
-int dimen abc_dialog_padding_top_material 0x7f070026
-int dimen abc_dialog_title_divider_material 0x7f070027
-int dimen abc_disabled_alpha_material_dark 0x7f070028
-int dimen abc_disabled_alpha_material_light 0x7f070029
-int dimen abc_dropdownitem_icon_width 0x7f07002a
-int dimen abc_dropdownitem_text_padding_left 0x7f07002b
-int dimen abc_dropdownitem_text_padding_right 0x7f07002c
-int dimen abc_edit_text_inset_bottom_material 0x7f07002d
-int dimen abc_edit_text_inset_horizontal_material 0x7f07002e
-int dimen abc_edit_text_inset_top_material 0x7f07002f
-int dimen abc_floating_window_z 0x7f070030
-int dimen abc_list_item_height_large_material 0x7f070031
-int dimen abc_list_item_height_material 0x7f070032
-int dimen abc_list_item_height_small_material 0x7f070033
-int dimen abc_list_item_padding_horizontal_material 0x7f070034
-int dimen abc_panel_menu_list_width 0x7f070035
-int dimen abc_progress_bar_height_material 0x7f070036
-int dimen abc_search_view_preferred_height 0x7f070037
-int dimen abc_search_view_preferred_width 0x7f070038
-int dimen abc_seekbar_track_background_height_material 0x7f070039
-int dimen abc_seekbar_track_progress_height_material 0x7f07003a
-int dimen abc_select_dialog_padding_start_material 0x7f07003b
-int dimen abc_switch_padding 0x7f07003c
-int dimen abc_text_size_body_1_material 0x7f07003d
-int dimen abc_text_size_body_2_material 0x7f07003e
-int dimen abc_text_size_button_material 0x7f07003f
-int dimen abc_text_size_caption_material 0x7f070040
-int dimen abc_text_size_display_1_material 0x7f070041
-int dimen abc_text_size_display_2_material 0x7f070042
-int dimen abc_text_size_display_3_material 0x7f070043
-int dimen abc_text_size_display_4_material 0x7f070044
-int dimen abc_text_size_headline_material 0x7f070045
-int dimen abc_text_size_large_material 0x7f070046
-int dimen abc_text_size_medium_material 0x7f070047
-int dimen abc_text_size_menu_header_material 0x7f070048
-int dimen abc_text_size_menu_material 0x7f070049
-int dimen abc_text_size_small_material 0x7f07004a
-int dimen abc_text_size_subhead_material 0x7f07004b
-int dimen abc_text_size_subtitle_material_toolbar 0x7f07004c
-int dimen abc_text_size_title_material 0x7f07004d
-int dimen abc_text_size_title_material_toolbar 0x7f07004e
-int dimen compat_button_inset_horizontal_material 0x7f07004f
-int dimen compat_button_inset_vertical_material 0x7f070050
-int dimen compat_button_padding_horizontal_material 0x7f070051
-int dimen compat_button_padding_vertical_material 0x7f070052
-int dimen compat_control_corner_material 0x7f070053
-int dimen compat_notification_large_icon_max_height 0x7f070054
-int dimen compat_notification_large_icon_max_width 0x7f070055
-int dimen disabled_alpha_material_dark 0x7f070056
-int dimen disabled_alpha_material_light 0x7f070057
-int dimen highlight_alpha_material_colored 0x7f070058
-int dimen highlight_alpha_material_dark 0x7f070059
-int dimen highlight_alpha_material_light 0x7f07005a
-int dimen hint_alpha_material_dark 0x7f07005b
-int dimen hint_alpha_material_light 0x7f07005c
-int dimen hint_pressed_alpha_material_dark 0x7f07005d
-int dimen hint_pressed_alpha_material_light 0x7f07005e
-int dimen notification_action_icon_size 0x7f07005f
-int dimen notification_action_text_size 0x7f070060
-int dimen notification_big_circle_margin 0x7f070061
-int dimen notification_content_margin_start 0x7f070062
-int dimen notification_large_icon_height 0x7f070063
-int dimen notification_large_icon_width 0x7f070064
-int dimen notification_main_column_padding_top 0x7f070065
-int dimen notification_media_narrow_margin 0x7f070066
-int dimen notification_right_icon_size 0x7f070067
-int dimen notification_right_side_padding_top 0x7f070068
-int dimen notification_small_icon_background_padding 0x7f070069
-int dimen notification_small_icon_size_as_large 0x7f07006a
-int dimen notification_subtext_size 0x7f07006b
-int dimen notification_top_pad 0x7f07006c
-int dimen notification_top_pad_large_text 0x7f07006d
-int dimen subtitle_corner_radius 0x7f07006e
-int dimen subtitle_outline_width 0x7f07006f
-int dimen subtitle_shadow_offset 0x7f070070
-int dimen subtitle_shadow_radius 0x7f070071
-int dimen tooltip_corner_radius 0x7f070072
-int dimen tooltip_horizontal_padding 0x7f070073
-int dimen tooltip_margin 0x7f070074
-int dimen tooltip_precise_anchor_extra_offset 0x7f070075
-int dimen tooltip_precise_anchor_threshold 0x7f070076
-int dimen tooltip_vertical_padding 0x7f070077
-int dimen tooltip_y_offset_non_touch 0x7f070078
-int dimen tooltip_y_offset_touch 0x7f070079
-int drawable abc_ab_share_pack_mtrl_alpha 0x7f080001
-int drawable abc_action_bar_item_background_material 0x7f080002
-int drawable abc_btn_borderless_material 0x7f080003
-int drawable abc_btn_check_material 0x7f080004
-int drawable abc_btn_check_material_anim 0x7f080005
-int drawable abc_btn_check_to_on_mtrl_000 0x7f080006
-int drawable abc_btn_check_to_on_mtrl_015 0x7f080007
-int drawable abc_btn_colored_material 0x7f080008
-int drawable abc_btn_default_mtrl_shape 0x7f080009
-int drawable abc_btn_radio_material 0x7f08000a
-int drawable abc_btn_radio_material_anim 0x7f08000b
-int drawable abc_btn_radio_to_on_mtrl_000 0x7f08000c
-int drawable abc_btn_radio_to_on_mtrl_015 0x7f08000d
-int drawable abc_btn_switch_to_on_mtrl_00001 0x7f08000e
-int drawable abc_btn_switch_to_on_mtrl_00012 0x7f08000f
-int drawable abc_cab_background_internal_bg 0x7f080010
-int drawable abc_cab_background_top_material 0x7f080011
-int drawable abc_cab_background_top_mtrl_alpha 0x7f080012
-int drawable abc_control_background_material 0x7f080013
-int drawable abc_dialog_material_background 0x7f080014
-int drawable abc_edit_text_material 0x7f080015
-int drawable abc_ic_ab_back_material 0x7f080016
-int drawable abc_ic_arrow_drop_right_black_24dp 0x7f080017
-int drawable abc_ic_clear_material 0x7f080018
-int drawable abc_ic_commit_search_api_mtrl_alpha 0x7f080019
-int drawable abc_ic_go_search_api_material 0x7f08001a
-int drawable abc_ic_menu_copy_mtrl_am_alpha 0x7f08001b
-int drawable abc_ic_menu_cut_mtrl_alpha 0x7f08001c
-int drawable abc_ic_menu_overflow_material 0x7f08001d
-int drawable abc_ic_menu_paste_mtrl_am_alpha 0x7f08001e
-int drawable abc_ic_menu_selectall_mtrl_alpha 0x7f08001f
-int drawable abc_ic_menu_share_mtrl_alpha 0x7f080020
-int drawable abc_ic_search_api_material 0x7f080021
-int drawable abc_ic_star_black_16dp 0x7f080022
-int drawable abc_ic_star_black_36dp 0x7f080023
-int drawable abc_ic_star_black_48dp 0x7f080024
-int drawable abc_ic_star_half_black_16dp 0x7f080025
-int drawable abc_ic_star_half_black_36dp 0x7f080026
-int drawable abc_ic_star_half_black_48dp 0x7f080027
-int drawable abc_ic_voice_search_api_material 0x7f080028
-int drawable abc_item_background_holo_dark 0x7f080029
-int drawable abc_item_background_holo_light 0x7f08002a
-int drawable abc_list_divider_material 0x7f08002b
-int drawable abc_list_divider_mtrl_alpha 0x7f08002c
-int drawable abc_list_focused_holo 0x7f08002d
-int drawable abc_list_longpressed_holo 0x7f08002e
-int drawable abc_list_pressed_holo_dark 0x7f08002f
-int drawable abc_list_pressed_holo_light 0x7f080030
-int drawable abc_list_selector_background_transition_holo_dark 0x7f080031
-int drawable abc_list_selector_background_transition_holo_light 0x7f080032
-int drawable abc_list_selector_disabled_holo_dark 0x7f080033
-int drawable abc_list_selector_disabled_holo_light 0x7f080034
-int drawable abc_list_selector_holo_dark 0x7f080035
-int drawable abc_list_selector_holo_light 0x7f080036
-int drawable abc_menu_hardkey_panel_mtrl_mult 0x7f080037
-int drawable abc_popup_background_mtrl_mult 0x7f080038
-int drawable abc_ratingbar_indicator_material 0x7f080039
-int drawable abc_ratingbar_material 0x7f08003a
-int drawable abc_ratingbar_small_material 0x7f08003b
-int drawable abc_scrubber_control_off_mtrl_alpha 0x7f08003c
-int drawable abc_scrubber_control_to_pressed_mtrl_000 0x7f08003d
-int drawable abc_scrubber_control_to_pressed_mtrl_005 0x7f08003e
-int drawable abc_scrubber_primary_mtrl_alpha 0x7f08003f
-int drawable abc_scrubber_track_mtrl_alpha 0x7f080040
-int drawable abc_seekbar_thumb_material 0x7f080041
-int drawable abc_seekbar_tick_mark_material 0x7f080042
-int drawable abc_seekbar_track_material 0x7f080043
-int drawable abc_spinner_mtrl_am_alpha 0x7f080044
-int drawable abc_spinner_textfield_background_material 0x7f080045
-int drawable abc_switch_thumb_material 0x7f080046
-int drawable abc_switch_track_mtrl_alpha 0x7f080047
-int drawable abc_tab_indicator_material 0x7f080048
-int drawable abc_tab_indicator_mtrl_alpha 0x7f080049
-int drawable abc_text_cursor_material 0x7f08004a
-int drawable abc_text_select_handle_left_mtrl_dark 0x7f08004b
-int drawable abc_text_select_handle_left_mtrl_light 0x7f08004c
-int drawable abc_text_select_handle_middle_mtrl_dark 0x7f08004d
-int drawable abc_text_select_handle_middle_mtrl_light 0x7f08004e
-int drawable abc_text_select_handle_right_mtrl_dark 0x7f08004f
-int drawable abc_text_select_handle_right_mtrl_light 0x7f080050
-int drawable abc_textfield_activated_mtrl_alpha 0x7f080051
-int drawable abc_textfield_default_mtrl_alpha 0x7f080052
-int drawable abc_textfield_search_activated_mtrl_alpha 0x7f080053
-int drawable abc_textfield_search_default_mtrl_alpha 0x7f080054
-int drawable abc_textfield_search_material 0x7f080055
-int drawable abc_vector_test 0x7f080056
-int drawable btn_checkbox_checked_mtrl 0x7f080057
-int drawable btn_checkbox_checked_to_unchecked_mtrl_animation 0x7f080058
-int drawable btn_checkbox_unchecked_mtrl 0x7f080059
-int drawable btn_checkbox_unchecked_to_checked_mtrl_animation 0x7f08005a
-int drawable btn_radio_off_mtrl 0x7f08005b
-int drawable btn_radio_off_to_on_mtrl_animation 0x7f08005c
-int drawable btn_radio_on_mtrl 0x7f08005d
-int drawable btn_radio_on_to_off_mtrl_animation 0x7f08005e
-int drawable notification_action_background 0x7f08005f
-int drawable notification_bg 0x7f080060
-int drawable notification_bg_low 0x7f080061
-int drawable notification_bg_low_normal 0x7f080062
-int drawable notification_bg_low_pressed 0x7f080063
-int drawable notification_bg_normal 0x7f080064
-int drawable notification_bg_normal_pressed 0x7f080065
-int drawable notification_icon_background 0x7f080066
-int drawable notification_template_icon_bg 0x7f080067
-int drawable notification_template_icon_low_bg 0x7f080068
-int drawable notification_tile_bg 0x7f080069
-int drawable notify_panel_notification_icon_bg 0x7f08006a
-int drawable tooltip_frame_dark 0x7f08006b
-int drawable tooltip_frame_light 0x7f08006c
-int id accessibility_action_clickable_span 0x7f0b0001
-int id accessibility_custom_action_0 0x7f0b0002
-int id accessibility_custom_action_1 0x7f0b0003
-int id accessibility_custom_action_10 0x7f0b0004
-int id accessibility_custom_action_11 0x7f0b0005
-int id accessibility_custom_action_12 0x7f0b0006
-int id accessibility_custom_action_13 0x7f0b0007
-int id accessibility_custom_action_14 0x7f0b0008
-int id accessibility_custom_action_15 0x7f0b0009
-int id accessibility_custom_action_16 0x7f0b000a
-int id accessibility_custom_action_17 0x7f0b000b
-int id accessibility_custom_action_18 0x7f0b000c
-int id accessibility_custom_action_19 0x7f0b000d
-int id accessibility_custom_action_2 0x7f0b000e
-int id accessibility_custom_action_20 0x7f0b000f
-int id accessibility_custom_action_21 0x7f0b0010
-int id accessibility_custom_action_22 0x7f0b0011
-int id accessibility_custom_action_23 0x7f0b0012
-int id accessibility_custom_action_24 0x7f0b0013
-int id accessibility_custom_action_25 0x7f0b0014
-int id accessibility_custom_action_26 0x7f0b0015
-int id accessibility_custom_action_27 0x7f0b0016
-int id accessibility_custom_action_28 0x7f0b0017
-int id accessibility_custom_action_29 0x7f0b0018
-int id accessibility_custom_action_3 0x7f0b0019
-int id accessibility_custom_action_30 0x7f0b001a
-int id accessibility_custom_action_31 0x7f0b001b
-int id accessibility_custom_action_4 0x7f0b001c
-int id accessibility_custom_action_5 0x7f0b001d
-int id accessibility_custom_action_6 0x7f0b001e
-int id accessibility_custom_action_7 0x7f0b001f
-int id accessibility_custom_action_8 0x7f0b0020
-int id accessibility_custom_action_9 0x7f0b0021
-int id action0 0x7f0b0022
-int id action_bar 0x7f0b0023
-int id action_bar_activity_content 0x7f0b0024
-int id action_bar_container 0x7f0b0025
-int id action_bar_root 0x7f0b0026
-int id action_bar_spinner 0x7f0b0027
-int id action_bar_subtitle 0x7f0b0028
-int id action_bar_title 0x7f0b0029
-int id action_container 0x7f0b002a
-int id action_context_bar 0x7f0b002b
-int id action_divider 0x7f0b002c
-int id action_image 0x7f0b002d
-int id action_menu_divider 0x7f0b002e
-int id action_menu_presenter 0x7f0b002f
-int id action_mode_bar 0x7f0b0030
-int id action_mode_bar_stub 0x7f0b0031
-int id action_mode_close_button 0x7f0b0032
-int id action_text 0x7f0b0033
-int id actions 0x7f0b0034
-int id activity_chooser_view_content 0x7f0b0035
-int id add 0x7f0b0036
-int id alertTitle 0x7f0b0037
-int id async 0x7f0b0038
-int id blocking 0x7f0b0039
-int id bottom 0x7f0b003a
-int id buttonPanel 0x7f0b003b
-int id cancel_action 0x7f0b003c
-int id checkbox 0x7f0b003d
-int id checked 0x7f0b003e
-int id chronometer 0x7f0b003f
-int id content 0x7f0b0040
-int id contentPanel 0x7f0b0041
-int id custom 0x7f0b0042
-int id customPanel 0x7f0b0043
-int id decor_content_parent 0x7f0b0044
-int id default_activity_button 0x7f0b0045
-int id dialog_button 0x7f0b0046
-int id edit_query 0x7f0b0047
-int id end 0x7f0b0048
-int id end_padder 0x7f0b0049
-int id expand_activities_button 0x7f0b004a
-int id expanded_menu 0x7f0b004b
-int id forever 0x7f0b004c
-int id gone 0x7f0b004d
-int id group_divider 0x7f0b004e
-int id home 0x7f0b004f
-int id icon 0x7f0b0050
-int id icon_group 0x7f0b0051
-int id image 0x7f0b0052
-int id info 0x7f0b0053
-int id invisible 0x7f0b0054
-int id italic 0x7f0b0055
-int id left 0x7f0b0056
-int id line1 0x7f0b0057
-int id line3 0x7f0b0058
-int id listMode 0x7f0b0059
-int id list_item 0x7f0b005a
-int id media_actions 0x7f0b005b
-int id message 0x7f0b005c
-int id multiply 0x7f0b005d
-int id none 0x7f0b005e
-int id normal 0x7f0b005f
-int id notification_background 0x7f0b0060
-int id notification_main_column 0x7f0b0061
-int id notification_main_column_container 0x7f0b0062
-int id off 0x7f0b0063
-int id on 0x7f0b0064
-int id packed 0x7f0b0065
-int id parent 0x7f0b0066
-int id parentPanel 0x7f0b0067
-int id percent 0x7f0b0068
-int id progress_circular 0x7f0b0069
-int id progress_horizontal 0x7f0b006a
-int id radio 0x7f0b006b
-int id right 0x7f0b006c
-int id right_icon 0x7f0b006d
-int id right_side 0x7f0b006e
-int id screen 0x7f0b006f
-int id scrollIndicatorDown 0x7f0b0070
-int id scrollIndicatorUp 0x7f0b0071
-int id scrollView 0x7f0b0072
-int id search_badge 0x7f0b0073
-int id search_bar 0x7f0b0074
-int id search_button 0x7f0b0075
-int id search_close_btn 0x7f0b0076
-int id search_edit_frame 0x7f0b0077
-int id search_go_btn 0x7f0b0078
-int id search_mag_icon 0x7f0b0079
-int id search_plate 0x7f0b007a
-int id search_src_text 0x7f0b007b
-int id search_voice_btn 0x7f0b007c
-int id select_dialog_listview 0x7f0b007d
-int id shortcut 0x7f0b007e
-int id spacer 0x7f0b007f
-int id split_action_bar 0x7f0b0080
-int id spread 0x7f0b0081
-int id spread_inside 0x7f0b0082
-int id src_atop 0x7f0b0083
-int id src_in 0x7f0b0084
-int id src_over 0x7f0b0085
-int id start 0x7f0b0086
-int id status_bar_latest_event_content 0x7f0b0087
-int id submenuarrow 0x7f0b0088
-int id submit_area 0x7f0b0089
-int id tabMode 0x7f0b008a
-int id tag_accessibility_actions 0x7f0b008b
-int id tag_accessibility_clickable_spans 0x7f0b008c
-int id tag_accessibility_heading 0x7f0b008d
-int id tag_accessibility_pane_title 0x7f0b008e
-int id tag_screen_reader_focusable 0x7f0b008f
-int id tag_transition_group 0x7f0b0090
-int id tag_unhandled_key_event_manager 0x7f0b0091
-int id tag_unhandled_key_listeners 0x7f0b0092
-int id text 0x7f0b0093
-int id text2 0x7f0b0094
-int id textSpacerNoButtons 0x7f0b0095
-int id textSpacerNoTitle 0x7f0b0096
-int id time 0x7f0b0097
-int id title 0x7f0b0098
-int id titleDividerNoCustom 0x7f0b0099
-int id title_template 0x7f0b009a
-int id top 0x7f0b009b
-int id topPanel 0x7f0b009c
-int id unchecked 0x7f0b009d
-int id uniform 0x7f0b009e
-int id up 0x7f0b009f
-int id wrap 0x7f0b00a0
-int id wrap_content 0x7f0b00a1
-int integer abc_config_activityDefaultDur 0x7f0c0001
-int integer abc_config_activityShortDur 0x7f0c0002
-int integer cancel_button_image_alpha 0x7f0c0003
-int integer config_tooltipAnimTime 0x7f0c0004
-int integer status_bar_notification_info_maxnum 0x7f0c0005
-int interpolator btn_checkbox_checked_mtrl_animation_interpolator_0 0x7f0d0001
-int interpolator btn_checkbox_checked_mtrl_animation_interpolator_1 0x7f0d0002
-int interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_0 0x7f0d0003
-int interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_1 0x7f0d0004
-int interpolator btn_radio_to_off_mtrl_animation_interpolator_0 0x7f0d0005
-int interpolator btn_radio_to_on_mtrl_animation_interpolator_0 0x7f0d0006
-int interpolator fast_out_slow_in 0x7f0d0007
-int layout abc_action_bar_title_item 0x7f0e0001
-int layout abc_action_bar_up_container 0x7f0e0002
-int layout abc_action_menu_item_layout 0x7f0e0003
-int layout abc_action_menu_layout 0x7f0e0004
-int layout abc_action_mode_bar 0x7f0e0005
-int layout abc_action_mode_close_item_material 0x7f0e0006
-int layout abc_activity_chooser_view 0x7f0e0007
-int layout abc_activity_chooser_view_list_item 0x7f0e0008
-int layout abc_alert_dialog_button_bar_material 0x7f0e0009
-int layout abc_alert_dialog_material 0x7f0e000a
-int layout abc_alert_dialog_title_material 0x7f0e000b
-int layout abc_cascading_menu_item_layout 0x7f0e000c
-int layout abc_dialog_title_material 0x7f0e000d
-int layout abc_expanded_menu_layout 0x7f0e000e
-int layout abc_list_menu_item_checkbox 0x7f0e000f
-int layout abc_list_menu_item_icon 0x7f0e0010
-int layout abc_list_menu_item_layout 0x7f0e0011
-int layout abc_list_menu_item_radio 0x7f0e0012
-int layout abc_popup_menu_header_item_layout 0x7f0e0013
-int layout abc_popup_menu_item_layout 0x7f0e0014
-int layout abc_screen_content_include 0x7f0e0015
-int layout abc_screen_simple 0x7f0e0016
-int layout abc_screen_simple_overlay_action_mode 0x7f0e0017
-int layout abc_screen_toolbar 0x7f0e0018
-int layout abc_search_dropdown_item_icons_2line 0x7f0e0019
-int layout abc_search_view 0x7f0e001a
-int layout abc_select_dialog_material 0x7f0e001b
-int layout abc_tooltip 0x7f0e001c
-int layout custom_dialog 0x7f0e001d
-int layout notification_action 0x7f0e001e
-int layout notification_action_tombstone 0x7f0e001f
-int layout notification_media_action 0x7f0e0020
-int layout notification_media_cancel_action 0x7f0e0021
-int layout notification_template_big_media 0x7f0e0022
-int layout notification_template_big_media_custom 0x7f0e0023
-int layout notification_template_big_media_narrow 0x7f0e0024
-int layout notification_template_big_media_narrow_custom 0x7f0e0025
-int layout notification_template_custom_big 0x7f0e0026
-int layout notification_template_icon_group 0x7f0e0027
-int layout notification_template_lines_media 0x7f0e0028
-int layout notification_template_media 0x7f0e0029
-int layout notification_template_media_custom 0x7f0e002a
-int layout notification_template_part_chronometer 0x7f0e002b
-int layout notification_template_part_time 0x7f0e002c
-int layout select_dialog_item_material 0x7f0e002d
-int layout select_dialog_multichoice_material 0x7f0e002e
-int layout select_dialog_singlechoice_material 0x7f0e002f
-int layout support_simple_spinner_dropdown_item 0x7f0e0030
-int string abc_action_bar_home_description 0x7f140001
-int string abc_action_bar_up_description 0x7f140002
-int string abc_action_menu_overflow_description 0x7f140003
-int string abc_action_mode_done 0x7f140004
-int string abc_activity_chooser_view_see_all 0x7f140005
-int string abc_activitychooserview_choose_application 0x7f140006
-int string abc_capital_off 0x7f140007
-int string abc_capital_on 0x7f140008
-int string abc_menu_alt_shortcut_label 0x7f140009
-int string abc_menu_ctrl_shortcut_label 0x7f14000a
-int string abc_menu_delete_shortcut_label 0x7f14000b
-int string abc_menu_enter_shortcut_label 0x7f14000c
-int string abc_menu_function_shortcut_label 0x7f14000d
-int string abc_menu_meta_shortcut_label 0x7f14000e
-int string abc_menu_shift_shortcut_label 0x7f14000f
-int string abc_menu_space_shortcut_label 0x7f140010
-int string abc_menu_sym_shortcut_label 0x7f140011
-int string abc_prepend_shortcut_label 0x7f140012
-int string abc_search_hint 0x7f140013
-int string abc_searchview_description_clear 0x7f140014
-int string abc_searchview_description_query 0x7f140015
-int string abc_searchview_description_search 0x7f140016
-int string abc_searchview_description_submit 0x7f140017
-int string abc_searchview_description_voice 0x7f140018
-int string abc_shareactionprovider_share_with 0x7f140019
-int string abc_shareactionprovider_share_with_application 0x7f14001a
-int string abc_toolbar_collapse_description 0x7f14001b
-int string search_menu_title 0x7f14001c
-int string status_bar_notification_info_overflow 0x7f14001d
-int style AlertDialog_AppCompat 0x7f150001
-int style AlertDialog_AppCompat_Light 0x7f150002
-int style Animation_AppCompat_Dialog 0x7f150003
-int style Animation_AppCompat_DropDownUp 0x7f150004
-int style Animation_AppCompat_Tooltip 0x7f150005
-int style Base_AlertDialog_AppCompat 0x7f150006
-int style Base_AlertDialog_AppCompat_Light 0x7f150007
-int style Base_Animation_AppCompat_Dialog 0x7f150008
-int style Base_Animation_AppCompat_DropDownUp 0x7f150009
-int style Base_Animation_AppCompat_Tooltip 0x7f15000a
-int style Base_DialogWindowTitleBackground_AppCompat 0x7f15000b
-int style Base_DialogWindowTitle_AppCompat 0x7f15000c
-int style Base_TextAppearance_AppCompat 0x7f15000d
-int style Base_TextAppearance_AppCompat_Body1 0x7f15000e
-int style Base_TextAppearance_AppCompat_Body2 0x7f15000f
-int style Base_TextAppearance_AppCompat_Button 0x7f150010
-int style Base_TextAppearance_AppCompat_Caption 0x7f150011
-int style Base_TextAppearance_AppCompat_Display1 0x7f150012
-int style Base_TextAppearance_AppCompat_Display2 0x7f150013
-int style Base_TextAppearance_AppCompat_Display3 0x7f150014
-int style Base_TextAppearance_AppCompat_Display4 0x7f150015
-int style Base_TextAppearance_AppCompat_Headline 0x7f150016
-int style Base_TextAppearance_AppCompat_Inverse 0x7f150017
-int style Base_TextAppearance_AppCompat_Large 0x7f150018
-int style Base_TextAppearance_AppCompat_Large_Inverse 0x7f150019
-int style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large 0x7f15001a
-int style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small 0x7f15001b
-int style Base_TextAppearance_AppCompat_Medium 0x7f15001c
-int style Base_TextAppearance_AppCompat_Medium_Inverse 0x7f15001d
-int style Base_TextAppearance_AppCompat_Menu 0x7f15001e
-int style Base_TextAppearance_AppCompat_SearchResult 0x7f15001f
-int style Base_TextAppearance_AppCompat_SearchResult_Subtitle 0x7f150020
-int style Base_TextAppearance_AppCompat_SearchResult_Title 0x7f150021
-int style Base_TextAppearance_AppCompat_Small 0x7f150022
-int style Base_TextAppearance_AppCompat_Small_Inverse 0x7f150023
-int style Base_TextAppearance_AppCompat_Subhead 0x7f150024
-int style Base_TextAppearance_AppCompat_Subhead_Inverse 0x7f150025
-int style Base_TextAppearance_AppCompat_Title 0x7f150026
-int style Base_TextAppearance_AppCompat_Title_Inverse 0x7f150027
-int style Base_TextAppearance_AppCompat_Tooltip 0x7f150028
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Menu 0x7f150029
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle 0x7f15002a
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse 0x7f15002b
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Title 0x7f15002c
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse 0x7f15002d
-int style Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle 0x7f15002e
-int style Base_TextAppearance_AppCompat_Widget_ActionMode_Title 0x7f15002f
-int style Base_TextAppearance_AppCompat_Widget_Button 0x7f150030
-int style Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored 0x7f150031
-int style Base_TextAppearance_AppCompat_Widget_Button_Colored 0x7f150032
-int style Base_TextAppearance_AppCompat_Widget_Button_Inverse 0x7f150033
-int style Base_TextAppearance_AppCompat_Widget_DropDownItem 0x7f150034
-int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Header 0x7f150035
-int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Large 0x7f150036
-int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Small 0x7f150037
-int style Base_TextAppearance_AppCompat_Widget_Switch 0x7f150038
-int style Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem 0x7f150039
-int style Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item 0x7f15003a
-int style Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle 0x7f15003b
-int style Base_TextAppearance_Widget_AppCompat_Toolbar_Title 0x7f15003c
-int style Base_ThemeOverlay_AppCompat 0x7f15003d
-int style Base_ThemeOverlay_AppCompat_ActionBar 0x7f15003e
-int style Base_ThemeOverlay_AppCompat_Dark 0x7f15003f
-int style Base_ThemeOverlay_AppCompat_Dark_ActionBar 0x7f150040
-int style Base_ThemeOverlay_AppCompat_Dialog 0x7f150041
-int style Base_ThemeOverlay_AppCompat_Dialog_Alert 0x7f150042
-int style Base_ThemeOverlay_AppCompat_Light 0x7f150043
-int style Base_Theme_AppCompat 0x7f150044
-int style Base_Theme_AppCompat_CompactMenu 0x7f150045
-int style Base_Theme_AppCompat_Dialog 0x7f150046
-int style Base_Theme_AppCompat_DialogWhenLarge 0x7f150047
-int style Base_Theme_AppCompat_Dialog_Alert 0x7f150048
-int style Base_Theme_AppCompat_Dialog_FixedSize 0x7f150049
-int style Base_Theme_AppCompat_Dialog_MinWidth 0x7f15004a
-int style Base_Theme_AppCompat_Light 0x7f15004b
-int style Base_Theme_AppCompat_Light_DarkActionBar 0x7f15004c
-int style Base_Theme_AppCompat_Light_Dialog 0x7f15004d
-int style Base_Theme_AppCompat_Light_DialogWhenLarge 0x7f15004e
-int style Base_Theme_AppCompat_Light_Dialog_Alert 0x7f15004f
-int style Base_Theme_AppCompat_Light_Dialog_FixedSize 0x7f150050
-int style Base_Theme_AppCompat_Light_Dialog_MinWidth 0x7f150051
-int style Base_V21_ThemeOverlay_AppCompat_Dialog 0x7f150052
-int style Base_V21_Theme_AppCompat 0x7f150053
-int style Base_V21_Theme_AppCompat_Dialog 0x7f150054
-int style Base_V21_Theme_AppCompat_Light 0x7f150055
-int style Base_V21_Theme_AppCompat_Light_Dialog 0x7f150056
-int style Base_V22_Theme_AppCompat 0x7f150057
-int style Base_V22_Theme_AppCompat_Light 0x7f150058
-int style Base_V23_Theme_AppCompat 0x7f150059
-int style Base_V23_Theme_AppCompat_Light 0x7f15005a
-int style Base_V26_Theme_AppCompat 0x7f15005b
-int style Base_V26_Theme_AppCompat_Light 0x7f15005c
-int style Base_V26_Widget_AppCompat_Toolbar 0x7f15005d
-int style Base_V28_Theme_AppCompat 0x7f15005e
-int style Base_V28_Theme_AppCompat_Light 0x7f15005f
-int style Base_V7_ThemeOverlay_AppCompat_Dialog 0x7f150060
-int style Base_V7_Theme_AppCompat 0x7f150061
-int style Base_V7_Theme_AppCompat_Dialog 0x7f150062
-int style Base_V7_Theme_AppCompat_Light 0x7f150063
-int style Base_V7_Theme_AppCompat_Light_Dialog 0x7f150064
-int style Base_V7_Widget_AppCompat_AutoCompleteTextView 0x7f150065
-int style Base_V7_Widget_AppCompat_EditText 0x7f150066
-int style Base_V7_Widget_AppCompat_Toolbar 0x7f150067
-int style Base_Widget_AppCompat_ActionBar 0x7f150068
-int style Base_Widget_AppCompat_ActionBar_Solid 0x7f150069
-int style Base_Widget_AppCompat_ActionBar_TabBar 0x7f15006a
-int style Base_Widget_AppCompat_ActionBar_TabText 0x7f15006b
-int style Base_Widget_AppCompat_ActionBar_TabView 0x7f15006c
-int style Base_Widget_AppCompat_ActionButton 0x7f15006d
-int style Base_Widget_AppCompat_ActionButton_CloseMode 0x7f15006e
-int style Base_Widget_AppCompat_ActionButton_Overflow 0x7f15006f
-int style Base_Widget_AppCompat_ActionMode 0x7f150070
-int style Base_Widget_AppCompat_ActivityChooserView 0x7f150071
-int style Base_Widget_AppCompat_AutoCompleteTextView 0x7f150072
-int style Base_Widget_AppCompat_Button 0x7f150073
-int style Base_Widget_AppCompat_ButtonBar 0x7f150074
-int style Base_Widget_AppCompat_ButtonBar_AlertDialog 0x7f150075
-int style Base_Widget_AppCompat_Button_Borderless 0x7f150076
-int style Base_Widget_AppCompat_Button_Borderless_Colored 0x7f150077
-int style Base_Widget_AppCompat_Button_ButtonBar_AlertDialog 0x7f150078
-int style Base_Widget_AppCompat_Button_Colored 0x7f150079
-int style Base_Widget_AppCompat_Button_Small 0x7f15007a
-int style Base_Widget_AppCompat_CompoundButton_CheckBox 0x7f15007b
-int style Base_Widget_AppCompat_CompoundButton_RadioButton 0x7f15007c
-int style Base_Widget_AppCompat_CompoundButton_Switch 0x7f15007d
-int style Base_Widget_AppCompat_DrawerArrowToggle 0x7f15007e
-int style Base_Widget_AppCompat_DrawerArrowToggle_Common 0x7f15007f
-int style Base_Widget_AppCompat_DropDownItem_Spinner 0x7f150080
-int style Base_Widget_AppCompat_EditText 0x7f150081
-int style Base_Widget_AppCompat_ImageButton 0x7f150082
-int style Base_Widget_AppCompat_Light_ActionBar 0x7f150083
-int style Base_Widget_AppCompat_Light_ActionBar_Solid 0x7f150084
-int style Base_Widget_AppCompat_Light_ActionBar_TabBar 0x7f150085
-int style Base_Widget_AppCompat_Light_ActionBar_TabText 0x7f150086
-int style Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse 0x7f150087
-int style Base_Widget_AppCompat_Light_ActionBar_TabView 0x7f150088
-int style Base_Widget_AppCompat_Light_PopupMenu 0x7f150089
-int style Base_Widget_AppCompat_Light_PopupMenu_Overflow 0x7f15008a
-int style Base_Widget_AppCompat_ListMenuView 0x7f15008b
-int style Base_Widget_AppCompat_ListPopupWindow 0x7f15008c
-int style Base_Widget_AppCompat_ListView 0x7f15008d
-int style Base_Widget_AppCompat_ListView_DropDown 0x7f15008e
-int style Base_Widget_AppCompat_ListView_Menu 0x7f15008f
-int style Base_Widget_AppCompat_PopupMenu 0x7f150090
-int style Base_Widget_AppCompat_PopupMenu_Overflow 0x7f150091
-int style Base_Widget_AppCompat_PopupWindow 0x7f150092
-int style Base_Widget_AppCompat_ProgressBar 0x7f150093
-int style Base_Widget_AppCompat_ProgressBar_Horizontal 0x7f150094
-int style Base_Widget_AppCompat_RatingBar 0x7f150095
-int style Base_Widget_AppCompat_RatingBar_Indicator 0x7f150096
-int style Base_Widget_AppCompat_RatingBar_Small 0x7f150097
-int style Base_Widget_AppCompat_SearchView 0x7f150098
-int style Base_Widget_AppCompat_SearchView_ActionBar 0x7f150099
-int style Base_Widget_AppCompat_SeekBar 0x7f15009a
-int style Base_Widget_AppCompat_SeekBar_Discrete 0x7f15009b
-int style Base_Widget_AppCompat_Spinner 0x7f15009c
-int style Base_Widget_AppCompat_Spinner_Underlined 0x7f15009d
-int style Base_Widget_AppCompat_TextView 0x7f15009e
-int style Base_Widget_AppCompat_TextView_SpinnerItem 0x7f15009f
-int style Base_Widget_AppCompat_Toolbar 0x7f1500a0
-int style Base_Widget_AppCompat_Toolbar_Button_Navigation 0x7f1500a1
-int style Platform_AppCompat 0x7f1500a2
-int style Platform_AppCompat_Light 0x7f1500a3
-int style Platform_ThemeOverlay_AppCompat 0x7f1500a4
-int style Platform_ThemeOverlay_AppCompat_Dark 0x7f1500a5
-int style Platform_ThemeOverlay_AppCompat_Light 0x7f1500a6
-int style Platform_V21_AppCompat 0x7f1500a7
-int style Platform_V21_AppCompat_Light 0x7f1500a8
-int style Platform_V25_AppCompat 0x7f1500a9
-int style Platform_V25_AppCompat_Light 0x7f1500aa
-int style Platform_Widget_AppCompat_Spinner 0x7f1500ab
-int style RtlOverlay_DialogWindowTitle_AppCompat 0x7f1500ac
-int style RtlOverlay_Widget_AppCompat_ActionBar_TitleItem 0x7f1500ad
-int style RtlOverlay_Widget_AppCompat_DialogTitle_Icon 0x7f1500ae
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem 0x7f1500af
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup 0x7f1500b0
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut 0x7f1500b1
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow 0x7f1500b2
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Text 0x7f1500b3
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Title 0x7f1500b4
-int style RtlOverlay_Widget_AppCompat_SearchView_MagIcon 0x7f1500b5
-int style RtlOverlay_Widget_AppCompat_Search_DropDown 0x7f1500b6
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 0x7f1500b7
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 0x7f1500b8
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Query 0x7f1500b9
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Text 0x7f1500ba
-int style RtlUnderlay_Widget_AppCompat_ActionButton 0x7f1500bb
-int style RtlUnderlay_Widget_AppCompat_ActionButton_Overflow 0x7f1500bc
-int style TextAppearance_AppCompat 0x7f1500bd
-int style TextAppearance_AppCompat_Body1 0x7f1500be
-int style TextAppearance_AppCompat_Body2 0x7f1500bf
-int style TextAppearance_AppCompat_Button 0x7f1500c0
-int style TextAppearance_AppCompat_Caption 0x7f1500c1
-int style TextAppearance_AppCompat_Display1 0x7f1500c2
-int style TextAppearance_AppCompat_Display2 0x7f1500c3
-int style TextAppearance_AppCompat_Display3 0x7f1500c4
-int style TextAppearance_AppCompat_Display4 0x7f1500c5
-int style TextAppearance_AppCompat_Headline 0x7f1500c6
-int style TextAppearance_AppCompat_Inverse 0x7f1500c7
-int style TextAppearance_AppCompat_Large 0x7f1500c8
-int style TextAppearance_AppCompat_Large_Inverse 0x7f1500c9
-int style TextAppearance_AppCompat_Light_SearchResult_Subtitle 0x7f1500ca
-int style TextAppearance_AppCompat_Light_SearchResult_Title 0x7f1500cb
-int style TextAppearance_AppCompat_Light_Widget_PopupMenu_Large 0x7f1500cc
-int style TextAppearance_AppCompat_Light_Widget_PopupMenu_Small 0x7f1500cd
-int style TextAppearance_AppCompat_Medium 0x7f1500ce
-int style TextAppearance_AppCompat_Medium_Inverse 0x7f1500cf
-int style TextAppearance_AppCompat_Menu 0x7f1500d0
-int style TextAppearance_AppCompat_SearchResult_Subtitle 0x7f1500d1
-int style TextAppearance_AppCompat_SearchResult_Title 0x7f1500d2
-int style TextAppearance_AppCompat_Small 0x7f1500d3
-int style TextAppearance_AppCompat_Small_Inverse 0x7f1500d4
-int style TextAppearance_AppCompat_Subhead 0x7f1500d5
-int style TextAppearance_AppCompat_Subhead_Inverse 0x7f1500d6
-int style TextAppearance_AppCompat_Title 0x7f1500d7
-int style TextAppearance_AppCompat_Title_Inverse 0x7f1500d8
-int style TextAppearance_AppCompat_Tooltip 0x7f1500d9
-int style TextAppearance_AppCompat_Widget_ActionBar_Menu 0x7f1500da
-int style TextAppearance_AppCompat_Widget_ActionBar_Subtitle 0x7f1500db
-int style TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse 0x7f1500dc
-int style TextAppearance_AppCompat_Widget_ActionBar_Title 0x7f1500dd
-int style TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse 0x7f1500de
-int style TextAppearance_AppCompat_Widget_ActionMode_Subtitle 0x7f1500df
-int style TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse 0x7f1500e0
-int style TextAppearance_AppCompat_Widget_ActionMode_Title 0x7f1500e1
-int style TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse 0x7f1500e2
-int style TextAppearance_AppCompat_Widget_Button 0x7f1500e3
-int style TextAppearance_AppCompat_Widget_Button_Borderless_Colored 0x7f1500e4
-int style TextAppearance_AppCompat_Widget_Button_Colored 0x7f1500e5
-int style TextAppearance_AppCompat_Widget_Button_Inverse 0x7f1500e6
-int style TextAppearance_AppCompat_Widget_DropDownItem 0x7f1500e7
-int style TextAppearance_AppCompat_Widget_PopupMenu_Header 0x7f1500e8
-int style TextAppearance_AppCompat_Widget_PopupMenu_Large 0x7f1500e9
-int style TextAppearance_AppCompat_Widget_PopupMenu_Small 0x7f1500ea
-int style TextAppearance_AppCompat_Widget_Switch 0x7f1500eb
-int style TextAppearance_AppCompat_Widget_TextView_SpinnerItem 0x7f1500ec
-int style TextAppearance_Compat_Notification 0x7f1500ed
-int style TextAppearance_Compat_Notification_Info 0x7f1500ee
-int style TextAppearance_Compat_Notification_Info_Media 0x7f1500ef
-int style TextAppearance_Compat_Notification_Line2 0x7f1500f0
-int style TextAppearance_Compat_Notification_Line2_Media 0x7f1500f1
-int style TextAppearance_Compat_Notification_Media 0x7f1500f2
-int style TextAppearance_Compat_Notification_Time 0x7f1500f3
-int style TextAppearance_Compat_Notification_Time_Media 0x7f1500f4
-int style TextAppearance_Compat_Notification_Title 0x7f1500f5
-int style TextAppearance_Compat_Notification_Title_Media 0x7f1500f6
-int style TextAppearance_Widget_AppCompat_ExpandedMenu_Item 0x7f1500f7
-int style TextAppearance_Widget_AppCompat_Toolbar_Subtitle 0x7f1500f8
-int style TextAppearance_Widget_AppCompat_Toolbar_Title 0x7f1500f9
-int style ThemeOverlay_AppCompat 0x7f1500fa
-int style ThemeOverlay_AppCompat_ActionBar 0x7f1500fb
-int style ThemeOverlay_AppCompat_Dark 0x7f1500fc
-int style ThemeOverlay_AppCompat_Dark_ActionBar 0x7f1500fd
-int style ThemeOverlay_AppCompat_DayNight 0x7f1500fe
-int style ThemeOverlay_AppCompat_DayNight_ActionBar 0x7f1500ff
-int style ThemeOverlay_AppCompat_Dialog 0x7f150100
-int style ThemeOverlay_AppCompat_Dialog_Alert 0x7f150101
-int style ThemeOverlay_AppCompat_Light 0x7f150102
-int style Theme_AppCompat 0x7f150103
-int style Theme_AppCompat_CompactMenu 0x7f150104
-int style Theme_AppCompat_DayNight 0x7f150105
-int style Theme_AppCompat_DayNight_DarkActionBar 0x7f150106
-int style Theme_AppCompat_DayNight_Dialog 0x7f150107
-int style Theme_AppCompat_DayNight_DialogWhenLarge 0x7f150108
-int style Theme_AppCompat_DayNight_Dialog_Alert 0x7f150109
-int style Theme_AppCompat_DayNight_Dialog_MinWidth 0x7f15010a
-int style Theme_AppCompat_DayNight_NoActionBar 0x7f15010b
-int style Theme_AppCompat_Dialog 0x7f15010c
-int style Theme_AppCompat_DialogWhenLarge 0x7f15010d
-int style Theme_AppCompat_Dialog_Alert 0x7f15010e
-int style Theme_AppCompat_Dialog_MinWidth 0x7f15010f
-int style Theme_AppCompat_Light 0x7f150110
-int style Theme_AppCompat_Light_DarkActionBar 0x7f150111
-int style Theme_AppCompat_Light_Dialog 0x7f150112
-int style Theme_AppCompat_Light_DialogWhenLarge 0x7f150113
-int style Theme_AppCompat_Light_Dialog_Alert 0x7f150114
-int style Theme_AppCompat_Light_Dialog_MinWidth 0x7f150115
-int style Theme_AppCompat_Light_NoActionBar 0x7f150116
-int style Theme_AppCompat_NoActionBar 0x7f150117
-int style Widget_AppCompat_ActionBar 0x7f150118
-int style Widget_AppCompat_ActionBar_Solid 0x7f150119
-int style Widget_AppCompat_ActionBar_TabBar 0x7f15011a
-int style Widget_AppCompat_ActionBar_TabText 0x7f15011b
-int style Widget_AppCompat_ActionBar_TabView 0x7f15011c
-int style Widget_AppCompat_ActionButton 0x7f15011d
-int style Widget_AppCompat_ActionButton_CloseMode 0x7f15011e
-int style Widget_AppCompat_ActionButton_Overflow 0x7f15011f
-int style Widget_AppCompat_ActionMode 0x7f150120
-int style Widget_AppCompat_ActivityChooserView 0x7f150121
-int style Widget_AppCompat_AutoCompleteTextView 0x7f150122
-int style Widget_AppCompat_Button 0x7f150123
-int style Widget_AppCompat_ButtonBar 0x7f150124
-int style Widget_AppCompat_ButtonBar_AlertDialog 0x7f150125
-int style Widget_AppCompat_Button_Borderless 0x7f150126
-int style Widget_AppCompat_Button_Borderless_Colored 0x7f150127
-int style Widget_AppCompat_Button_ButtonBar_AlertDialog 0x7f150128
-int style Widget_AppCompat_Button_Colored 0x7f150129
-int style Widget_AppCompat_Button_Small 0x7f15012a
-int style Widget_AppCompat_CompoundButton_CheckBox 0x7f15012b
-int style Widget_AppCompat_CompoundButton_RadioButton 0x7f15012c
-int style Widget_AppCompat_CompoundButton_Switch 0x7f15012d
-int style Widget_AppCompat_DrawerArrowToggle 0x7f15012e
-int style Widget_AppCompat_DropDownItem_Spinner 0x7f15012f
-int style Widget_AppCompat_EditText 0x7f150130
-int style Widget_AppCompat_ImageButton 0x7f150131
-int style Widget_AppCompat_Light_ActionBar 0x7f150132
-int style Widget_AppCompat_Light_ActionBar_Solid 0x7f150133
-int style Widget_AppCompat_Light_ActionBar_Solid_Inverse 0x7f150134
-int style Widget_AppCompat_Light_ActionBar_TabBar 0x7f150135
-int style Widget_AppCompat_Light_ActionBar_TabBar_Inverse 0x7f150136
-int style Widget_AppCompat_Light_ActionBar_TabText 0x7f150137
-int style Widget_AppCompat_Light_ActionBar_TabText_Inverse 0x7f150138
-int style Widget_AppCompat_Light_ActionBar_TabView 0x7f150139
-int style Widget_AppCompat_Light_ActionBar_TabView_Inverse 0x7f15013a
-int style Widget_AppCompat_Light_ActionButton 0x7f15013b
-int style Widget_AppCompat_Light_ActionButton_CloseMode 0x7f15013c
-int style Widget_AppCompat_Light_ActionButton_Overflow 0x7f15013d
-int style Widget_AppCompat_Light_ActionMode_Inverse 0x7f15013e
-int style Widget_AppCompat_Light_ActivityChooserView 0x7f15013f
-int style Widget_AppCompat_Light_AutoCompleteTextView 0x7f150140
-int style Widget_AppCompat_Light_DropDownItem_Spinner 0x7f150141
-int style Widget_AppCompat_Light_ListPopupWindow 0x7f150142
-int style Widget_AppCompat_Light_ListView_DropDown 0x7f150143
-int style Widget_AppCompat_Light_PopupMenu 0x7f150144
-int style Widget_AppCompat_Light_PopupMenu_Overflow 0x7f150145
-int style Widget_AppCompat_Light_SearchView 0x7f150146
-int style Widget_AppCompat_Light_Spinner_DropDown_ActionBar 0x7f150147
-int style Widget_AppCompat_ListMenuView 0x7f150148
-int style Widget_AppCompat_ListPopupWindow 0x7f150149
-int style Widget_AppCompat_ListView 0x7f15014a
-int style Widget_AppCompat_ListView_DropDown 0x7f15014b
-int style Widget_AppCompat_ListView_Menu 0x7f15014c
-int style Widget_AppCompat_PopupMenu 0x7f15014d
-int style Widget_AppCompat_PopupMenu_Overflow 0x7f15014e
-int style Widget_AppCompat_PopupWindow 0x7f15014f
-int style Widget_AppCompat_ProgressBar 0x7f150150
-int style Widget_AppCompat_ProgressBar_Horizontal 0x7f150151
-int style Widget_AppCompat_RatingBar 0x7f150152
-int style Widget_AppCompat_RatingBar_Indicator 0x7f150153
-int style Widget_AppCompat_RatingBar_Small 0x7f150154
-int style Widget_AppCompat_SearchView 0x7f150155
-int style Widget_AppCompat_SearchView_ActionBar 0x7f150156
-int style Widget_AppCompat_SeekBar 0x7f150157
-int style Widget_AppCompat_SeekBar_Discrete 0x7f150158
-int style Widget_AppCompat_Spinner 0x7f150159
-int style Widget_AppCompat_Spinner_DropDown 0x7f15015a
-int style Widget_AppCompat_Spinner_DropDown_ActionBar 0x7f15015b
-int style Widget_AppCompat_Spinner_Underlined 0x7f15015c
-int style Widget_AppCompat_TextView 0x7f15015d
-int style Widget_AppCompat_TextView_SpinnerItem 0x7f15015e
-int style Widget_AppCompat_Toolbar 0x7f15015f
-int style Widget_AppCompat_Toolbar_Button_Navigation 0x7f150160
-int style Widget_Compat_NotificationActionContainer 0x7f150161
-int style Widget_Compat_NotificationActionText 0x7f150162
-int style Widget_Support_CoordinatorLayout 0x7f150163
-int[] styleable ActionBar { 0x7f040032, 0x7f040033, 0x7f040034, 0x7f04005f, 0x7f040060, 0x7f040061, 0x7f040062, 0x7f040063, 0x7f040064, 0x7f040067, 0x7f04006c, 0x7f04006d, 0x7f040080, 0x7f040091, 0x7f040092, 0x7f040093, 0x7f040094, 0x7f040095, 0x7f04009a, 0x7f04009d, 0x7f0400e9, 0x7f0400f1, 0x7f0400fc, 0x7f0400ff, 0x7f040100, 0x7f04011b, 0x7f04011e, 0x7f04013a, 0x7f040143 }
-int styleable ActionBar_background 0
-int styleable ActionBar_backgroundSplit 1
-int styleable ActionBar_backgroundStacked 2
-int styleable ActionBar_contentInsetEnd 3
-int styleable ActionBar_contentInsetEndWithActions 4
-int styleable ActionBar_contentInsetLeft 5
-int styleable ActionBar_contentInsetRight 6
-int styleable ActionBar_contentInsetStart 7
-int styleable ActionBar_contentInsetStartWithNavigation 8
-int styleable ActionBar_customNavigationLayout 9
-int styleable ActionBar_displayOptions 10
-int styleable ActionBar_divider 11
-int styleable ActionBar_elevation 12
-int styleable ActionBar_height 13
-int styleable ActionBar_hideOnContentScroll 14
-int styleable ActionBar_homeAsUpIndicator 15
-int styleable ActionBar_homeLayout 16
-int styleable ActionBar_icon 17
-int styleable ActionBar_indeterminateProgressStyle 18
-int styleable ActionBar_itemPadding 19
-int styleable ActionBar_logo 20
-int styleable ActionBar_navigationMode 21
-int styleable ActionBar_popupTheme 22
-int styleable ActionBar_progressBarPadding 23
-int styleable ActionBar_progressBarStyle 24
-int styleable ActionBar_subtitle 25
-int styleable ActionBar_subtitleTextStyle 26
-int styleable ActionBar_title 27
-int styleable ActionBar_titleTextStyle 28
-int[] styleable ActionBarLayout { 0x10100b3 }
-int styleable ActionBarLayout_android_layout_gravity 0
-int[] styleable ActionMenuItemView { 0x101013f }
-int styleable ActionMenuItemView_android_minWidth 0
-int[] styleable ActionMenuView { }
-int[] styleable ActionMode { 0x7f040032, 0x7f040033, 0x7f04004c, 0x7f040091, 0x7f04011e, 0x7f040143 }
-int styleable ActionMode_background 0
-int styleable ActionMode_backgroundSplit 1
-int styleable ActionMode_closeItemLayout 2
-int styleable ActionMode_height 3
-int styleable ActionMode_subtitleTextStyle 4
-int styleable ActionMode_titleTextStyle 5
-int[] styleable ActivityChooserView { 0x7f040082, 0x7f04009b }
-int styleable ActivityChooserView_expandActivityOverflowButtonDrawable 0
-int styleable ActivityChooserView_initialActivityCount 1
-int[] styleable AlertDialog { 0x10100f2, 0x7f040042, 0x7f040043, 0x7f0400de, 0x7f0400df, 0x7f0400ee, 0x7f040110, 0x7f040111 }
-int styleable AlertDialog_android_layout 0
-int styleable AlertDialog_buttonIconDimen 1
-int styleable AlertDialog_buttonPanelSideLayout 2
-int styleable AlertDialog_listItemLayout 3
-int styleable AlertDialog_listLayout 4
-int styleable AlertDialog_multiChoiceItemLayout 5
-int styleable AlertDialog_showTitle 6
-int styleable AlertDialog_singleChoiceItemLayout 7
-int[] styleable AnimatedStateListDrawableCompat { 0x1010196, 0x101011c, 0x101030c, 0x101030d, 0x1010195, 0x1010194 }
-int styleable AnimatedStateListDrawableCompat_android_constantSize 0
-int styleable AnimatedStateListDrawableCompat_android_dither 1
-int styleable AnimatedStateListDrawableCompat_android_enterFadeDuration 2
-int styleable AnimatedStateListDrawableCompat_android_exitFadeDuration 3
-int styleable AnimatedStateListDrawableCompat_android_variablePadding 4
-int styleable AnimatedStateListDrawableCompat_android_visible 5
-int[] styleable AnimatedStateListDrawableItem { 0x1010199, 0x10100d0 }
-int styleable AnimatedStateListDrawableItem_android_drawable 0
-int styleable AnimatedStateListDrawableItem_android_id 1
-int[] styleable AnimatedStateListDrawableTransition { 0x1010199, 0x101044a, 0x101044b, 0x1010449 }
-int styleable AnimatedStateListDrawableTransition_android_drawable 0
-int styleable AnimatedStateListDrawableTransition_android_fromId 1
-int styleable AnimatedStateListDrawableTransition_android_reversible 2
-int styleable AnimatedStateListDrawableTransition_android_toId 3
-int[] styleable AppCompatImageView { 0x1010119, 0x7f040116, 0x7f040138, 0x7f040139 }
-int styleable AppCompatImageView_android_src 0
-int styleable AppCompatImageView_srcCompat 1
-int styleable AppCompatImageView_tint 2
-int styleable AppCompatImageView_tintMode 3
-int[] styleable AppCompatSeekBar { 0x1010142, 0x7f040135, 0x7f040136, 0x7f040137 }
-int styleable AppCompatSeekBar_android_thumb 0
-int styleable AppCompatSeekBar_tickMark 1
-int styleable AppCompatSeekBar_tickMarkTint 2
-int styleable AppCompatSeekBar_tickMarkTintMode 3
-int[] styleable AppCompatTextHelper { 0x101016e, 0x1010393, 0x101016f, 0x1010170, 0x1010392, 0x101016d, 0x1010034 }
-int styleable AppCompatTextHelper_android_drawableBottom 0
-int styleable AppCompatTextHelper_android_drawableEnd 1
-int styleable AppCompatTextHelper_android_drawableLeft 2
-int styleable AppCompatTextHelper_android_drawableRight 3
-int styleable AppCompatTextHelper_android_drawableStart 4
-int styleable AppCompatTextHelper_android_drawableTop 5
-int styleable AppCompatTextHelper_android_textAppearance 6
-int[] styleable AppCompatTextView { 0x1010034, 0x7f04002d, 0x7f04002e, 0x7f04002f, 0x7f040030, 0x7f040031, 0x7f040071, 0x7f040072, 0x7f040073, 0x7f040074, 0x7f040076, 0x7f040077, 0x7f040078, 0x7f040079, 0x7f040083, 0x7f040085, 0x7f04008d, 0x7f04009f, 0x7f0400d9, 0x7f040124, 0x7f04012f }
-int styleable AppCompatTextView_android_textAppearance 0
-int styleable AppCompatTextView_autoSizeMaxTextSize 1
-int styleable AppCompatTextView_autoSizeMinTextSize 2
-int styleable AppCompatTextView_autoSizePresetSizes 3
-int styleable AppCompatTextView_autoSizeStepGranularity 4
-int styleable AppCompatTextView_autoSizeTextType 5
-int styleable AppCompatTextView_drawableBottomCompat 6
-int styleable AppCompatTextView_drawableEndCompat 7
-int styleable AppCompatTextView_drawableLeftCompat 8
-int styleable AppCompatTextView_drawableRightCompat 9
-int styleable AppCompatTextView_drawableStartCompat 10
-int styleable AppCompatTextView_drawableTint 11
-int styleable AppCompatTextView_drawableTintMode 12
-int styleable AppCompatTextView_drawableTopCompat 13
-int styleable AppCompatTextView_firstBaselineToTopHeight 14
-int styleable AppCompatTextView_fontFamily 15
-int styleable AppCompatTextView_fontVariationSettings 16
-int styleable AppCompatTextView_lastBaselineToBottomHeight 17
-int styleable AppCompatTextView_lineHeight 18
-int styleable AppCompatTextView_textAllCaps 19
-int styleable AppCompatTextView_textLocale 20
-int[] styleable AppCompatTheme { 0x7f040001, 0x7f040002, 0x7f040003, 0x7f040004, 0x7f040005, 0x7f040006, 0x7f040007, 0x7f040008, 0x7f040009, 0x7f04000a, 0x7f04000b, 0x7f04000c, 0x7f04000d, 0x7f04000f, 0x7f040010, 0x7f040011, 0x7f040012, 0x7f040013, 0x7f040014, 0x7f040015, 0x7f040016, 0x7f040017, 0x7f040018, 0x7f040019, 0x7f04001a, 0x7f04001b, 0x7f04001c, 0x7f04001d, 0x7f04001e, 0x7f04001f, 0x7f040022, 0x7f040023, 0x7f040024, 0x7f040025, 0x7f040026, 0x10100ae, 0x1010057, 0x7f04002c, 0x7f04003a, 0x7f04003b, 0x7f04003c, 0x7f04003d, 0x7f04003e, 0x7f04003f, 0x7f040044, 0x7f040045, 0x7f040049, 0x7f04004a, 0x7f040050, 0x7f040051, 0x7f040052, 0x7f040053, 0x7f040054, 0x7f040055, 0x7f040056, 0x7f040057, 0x7f040058, 0x7f040059, 0x7f040065, 0x7f040069, 0x7f04006a, 0x7f04006b, 0x7f04006e, 0x7f040070, 0x7f04007b, 0x7f04007c, 0x7f04007d, 0x7f04007e, 0x7f04007f, 0x7f040093, 0x7f040099, 0x7f0400da, 0x7f0400db, 0x7f0400dc, 0x7f0400dd, 0x7f0400e0, 0x7f0400e1, 0x7f0400e2, 0x7f0400e3, 0x7f0400e4, 0x7f0400e5, 0x7f0400e6, 0x7f0400e7, 0x7f0400e8, 0x7f0400f8, 0x7f0400f9, 0x7f0400fa, 0x7f0400fb, 0x7f0400fd, 0x7f040103, 0x7f040104, 0x7f040105, 0x7f040106, 0x7f040109, 0x7f04010a, 0x7f04010b, 0x7f04010c, 0x7f040113, 0x7f040114, 0x7f040122, 0x7f040125, 0x7f040126, 0x7f040127, 0x7f040128, 0x7f040129, 0x7f04012a, 0x7f04012b, 0x7f04012c, 0x7f04012d, 0x7f04012e, 0x7f040144, 0x7f040145, 0x7f040146, 0x7f040147, 0x7f04014d, 0x7f04014f, 0x7f040150, 0x7f040151, 0x7f040152, 0x7f040153, 0x7f040154, 0x7f040155, 0x7f040156, 0x7f040157, 0x7f040158 }
-int styleable AppCompatTheme_actionBarDivider 0
-int styleable AppCompatTheme_actionBarItemBackground 1
-int styleable AppCompatTheme_actionBarPopupTheme 2
-int styleable AppCompatTheme_actionBarSize 3
-int styleable AppCompatTheme_actionBarSplitStyle 4
-int styleable AppCompatTheme_actionBarStyle 5
-int styleable AppCompatTheme_actionBarTabBarStyle 6
-int styleable AppCompatTheme_actionBarTabStyle 7
-int styleable AppCompatTheme_actionBarTabTextStyle 8
-int styleable AppCompatTheme_actionBarTheme 9
-int styleable AppCompatTheme_actionBarWidgetTheme 10
-int styleable AppCompatTheme_actionButtonStyle 11
-int styleable AppCompatTheme_actionDropDownStyle 12
-int styleable AppCompatTheme_actionMenuTextAppearance 13
-int styleable AppCompatTheme_actionMenuTextColor 14
-int styleable AppCompatTheme_actionModeBackground 15
-int styleable AppCompatTheme_actionModeCloseButtonStyle 16
-int styleable AppCompatTheme_actionModeCloseDrawable 17
-int styleable AppCompatTheme_actionModeCopyDrawable 18
-int styleable AppCompatTheme_actionModeCutDrawable 19
-int styleable AppCompatTheme_actionModeFindDrawable 20
-int styleable AppCompatTheme_actionModePasteDrawable 21
-int styleable AppCompatTheme_actionModePopupWindowStyle 22
-int styleable AppCompatTheme_actionModeSelectAllDrawable 23
-int styleable AppCompatTheme_actionModeShareDrawable 24
-int styleable AppCompatTheme_actionModeSplitBackground 25
-int styleable AppCompatTheme_actionModeStyle 26
-int styleable AppCompatTheme_actionModeWebSearchDrawable 27
-int styleable AppCompatTheme_actionOverflowButtonStyle 28
-int styleable AppCompatTheme_actionOverflowMenuStyle 29
-int styleable AppCompatTheme_activityChooserViewStyle 30
-int styleable AppCompatTheme_alertDialogButtonGroupStyle 31
-int styleable AppCompatTheme_alertDialogCenterButtons 32
-int styleable AppCompatTheme_alertDialogStyle 33
-int styleable AppCompatTheme_alertDialogTheme 34
-int styleable AppCompatTheme_android_windowAnimationStyle 35
-int styleable AppCompatTheme_android_windowIsFloating 36
-int styleable AppCompatTheme_autoCompleteTextViewStyle 37
-int styleable AppCompatTheme_borderlessButtonStyle 38
-int styleable AppCompatTheme_buttonBarButtonStyle 39
-int styleable AppCompatTheme_buttonBarNegativeButtonStyle 40
-int styleable AppCompatTheme_buttonBarNeutralButtonStyle 41
-int styleable AppCompatTheme_buttonBarPositiveButtonStyle 42
-int styleable AppCompatTheme_buttonBarStyle 43
-int styleable AppCompatTheme_buttonStyle 44
-int styleable AppCompatTheme_buttonStyleSmall 45
-int styleable AppCompatTheme_checkboxStyle 46
-int styleable AppCompatTheme_checkedTextViewStyle 47
-int styleable AppCompatTheme_colorAccent 48
-int styleable AppCompatTheme_colorBackgroundFloating 49
-int styleable AppCompatTheme_colorButtonNormal 50
-int styleable AppCompatTheme_colorControlActivated 51
-int styleable AppCompatTheme_colorControlHighlight 52
-int styleable AppCompatTheme_colorControlNormal 53
-int styleable AppCompatTheme_colorError 54
-int styleable AppCompatTheme_colorPrimary 55
-int styleable AppCompatTheme_colorPrimaryDark 56
-int styleable AppCompatTheme_colorSwitchThumbNormal 57
-int styleable AppCompatTheme_controlBackground 58
-int styleable AppCompatTheme_dialogCornerRadius 59
-int styleable AppCompatTheme_dialogPreferredPadding 60
-int styleable AppCompatTheme_dialogTheme 61
-int styleable AppCompatTheme_dividerHorizontal 62
-int styleable AppCompatTheme_dividerVertical 63
-int styleable AppCompatTheme_dropDownListViewStyle 64
-int styleable AppCompatTheme_dropdownListPreferredItemHeight 65
-int styleable AppCompatTheme_editTextBackground 66
-int styleable AppCompatTheme_editTextColor 67
-int styleable AppCompatTheme_editTextStyle 68
-int styleable AppCompatTheme_homeAsUpIndicator 69
-int styleable AppCompatTheme_imageButtonStyle 70
-int styleable AppCompatTheme_listChoiceBackgroundIndicator 71
-int styleable AppCompatTheme_listChoiceIndicatorMultipleAnimated 72
-int styleable AppCompatTheme_listChoiceIndicatorSingleAnimated 73
-int styleable AppCompatTheme_listDividerAlertDialog 74
-int styleable AppCompatTheme_listMenuViewStyle 75
-int styleable AppCompatTheme_listPopupWindowStyle 76
-int styleable AppCompatTheme_listPreferredItemHeight 77
-int styleable AppCompatTheme_listPreferredItemHeightLarge 78
-int styleable AppCompatTheme_listPreferredItemHeightSmall 79
-int styleable AppCompatTheme_listPreferredItemPaddingEnd 80
-int styleable AppCompatTheme_listPreferredItemPaddingLeft 81
-int styleable AppCompatTheme_listPreferredItemPaddingRight 82
-int styleable AppCompatTheme_listPreferredItemPaddingStart 83
-int styleable AppCompatTheme_panelBackground 84
-int styleable AppCompatTheme_panelMenuListTheme 85
-int styleable AppCompatTheme_panelMenuListWidth 86
-int styleable AppCompatTheme_popupMenuStyle 87
-int styleable AppCompatTheme_popupWindowStyle 88
-int styleable AppCompatTheme_radioButtonStyle 89
-int styleable AppCompatTheme_ratingBarStyle 90
-int styleable AppCompatTheme_ratingBarStyleIndicator 91
-int styleable AppCompatTheme_ratingBarStyleSmall 92
-int styleable AppCompatTheme_searchViewStyle 93
-int styleable AppCompatTheme_seekBarStyle 94
-int styleable AppCompatTheme_selectableItemBackground 95
-int styleable AppCompatTheme_selectableItemBackgroundBorderless 96
-int styleable AppCompatTheme_spinnerDropDownItemStyle 97
-int styleable AppCompatTheme_spinnerStyle 98
-int styleable AppCompatTheme_switchStyle 99
-int styleable AppCompatTheme_textAppearanceLargePopupMenu 100
-int styleable AppCompatTheme_textAppearanceListItem 101
-int styleable AppCompatTheme_textAppearanceListItemSecondary 102
-int styleable AppCompatTheme_textAppearanceListItemSmall 103
-int styleable AppCompatTheme_textAppearancePopupMenuHeader 104
-int styleable AppCompatTheme_textAppearanceSearchResultSubtitle 105
-int styleable AppCompatTheme_textAppearanceSearchResultTitle 106
-int styleable AppCompatTheme_textAppearanceSmallPopupMenu 107
-int styleable AppCompatTheme_textColorAlertDialogListItem 108
-int styleable AppCompatTheme_textColorSearchUrl 109
-int styleable AppCompatTheme_toolbarNavigationButtonStyle 110
-int styleable AppCompatTheme_toolbarStyle 111
-int styleable AppCompatTheme_tooltipForegroundColor 112
-int styleable AppCompatTheme_tooltipFrameBackground 113
-int styleable AppCompatTheme_viewInflaterClass 114
-int styleable AppCompatTheme_windowActionBar 115
-int styleable AppCompatTheme_windowActionBarOverlay 116
-int styleable AppCompatTheme_windowActionModeOverlay 117
-int styleable AppCompatTheme_windowFixedHeightMajor 118
-int styleable AppCompatTheme_windowFixedHeightMinor 119
-int styleable AppCompatTheme_windowFixedWidthMajor 120
-int styleable AppCompatTheme_windowFixedWidthMinor 121
-int styleable AppCompatTheme_windowMinWidthMajor 122
-int styleable AppCompatTheme_windowMinWidthMinor 123
-int styleable AppCompatTheme_windowNoTitle 124
-int[] styleable ButtonBarLayout { 0x7f040027 }
-int styleable ButtonBarLayout_allowStacking 0
-int[] styleable ColorStateListItem { 0x7f040028, 0x101031f, 0x10101a5 }
-int styleable ColorStateListItem_alpha 0
-int styleable ColorStateListItem_android_alpha 1
-int styleable ColorStateListItem_android_color 2
-int[] styleable CompoundButton { 0x1010107, 0x7f040040, 0x7f040046, 0x7f040047 }
-int styleable CompoundButton_android_button 0
-int styleable CompoundButton_buttonCompat 1
-int styleable CompoundButton_buttonTint 2
-int styleable CompoundButton_buttonTintMode 3
-int[] styleable ConstraintLayout_Layout { 0x1010120, 0x101011f, 0x1010140, 0x101013f, 0x10100c4, 0x7f040038, 0x7f040039, 0x7f040048, 0x7f04005b, 0x7f04005c, 0x7f0400a4, 0x7f0400a5, 0x7f0400a6, 0x7f0400a7, 0x7f0400a8, 0x7f0400a9, 0x7f0400aa, 0x7f0400ab, 0x7f0400ac, 0x7f0400ad, 0x7f0400ae, 0x7f0400af, 0x7f0400b0, 0x7f0400b1, 0x7f0400b2, 0x7f0400b3, 0x7f0400b4, 0x7f0400b5, 0x7f0400b6, 0x7f0400b7, 0x7f0400b8, 0x7f0400b9, 0x7f0400ba, 0x7f0400bb, 0x7f0400bc, 0x7f0400bd, 0x7f0400be, 0x7f0400bf, 0x7f0400c0, 0x7f0400c1, 0x7f0400c2, 0x7f0400c3, 0x7f0400c4, 0x7f0400c5, 0x7f0400c6, 0x7f0400c7, 0x7f0400c8, 0x7f0400c9, 0x7f0400ca, 0x7f0400cb, 0x7f0400cc, 0x7f0400ce, 0x7f0400cf, 0x7f0400d0, 0x7f0400d1, 0x7f0400d2, 0x7f0400d3, 0x7f0400d4, 0x7f0400d5, 0x7f0400d8 }
-int styleable ConstraintLayout_Layout_android_maxHeight 0
-int styleable ConstraintLayout_Layout_android_maxWidth 1
-int styleable ConstraintLayout_Layout_android_minHeight 2
-int styleable ConstraintLayout_Layout_android_minWidth 3
-int styleable ConstraintLayout_Layout_android_orientation 4
-int styleable ConstraintLayout_Layout_barrierAllowsGoneWidgets 5
-int styleable ConstraintLayout_Layout_barrierDirection 6
-int styleable ConstraintLayout_Layout_chainUseRtl 7
-int styleable ConstraintLayout_Layout_constraintSet 8
-int styleable ConstraintLayout_Layout_constraint_referenced_ids 9
-int styleable ConstraintLayout_Layout_layout_constrainedHeight 10
-int styleable ConstraintLayout_Layout_layout_constrainedWidth 11
-int styleable ConstraintLayout_Layout_layout_constraintBaseline_creator 12
-int styleable ConstraintLayout_Layout_layout_constraintBaseline_toBaselineOf 13
-int styleable ConstraintLayout_Layout_layout_constraintBottom_creator 14
-int styleable ConstraintLayout_Layout_layout_constraintBottom_toBottomOf 15
-int styleable ConstraintLayout_Layout_layout_constraintBottom_toTopOf 16
-int styleable ConstraintLayout_Layout_layout_constraintCircle 17
-int styleable ConstraintLayout_Layout_layout_constraintCircleAngle 18
-int styleable ConstraintLayout_Layout_layout_constraintCircleRadius 19
-int styleable ConstraintLayout_Layout_layout_constraintDimensionRatio 20
-int styleable ConstraintLayout_Layout_layout_constraintEnd_toEndOf 21
-int styleable ConstraintLayout_Layout_layout_constraintEnd_toStartOf 22
-int styleable ConstraintLayout_Layout_layout_constraintGuide_begin 23
-int styleable ConstraintLayout_Layout_layout_constraintGuide_end 24
-int styleable ConstraintLayout_Layout_layout_constraintGuide_percent 25
-int styleable ConstraintLayout_Layout_layout_constraintHeight_default 26
-int styleable ConstraintLayout_Layout_layout_constraintHeight_max 27
-int styleable ConstraintLayout_Layout_layout_constraintHeight_min 28
-int styleable ConstraintLayout_Layout_layout_constraintHeight_percent 29
-int styleable ConstraintLayout_Layout_layout_constraintHorizontal_bias 30
-int styleable ConstraintLayout_Layout_layout_constraintHorizontal_chainStyle 31
-int styleable ConstraintLayout_Layout_layout_constraintHorizontal_weight 32
-int styleable ConstraintLayout_Layout_layout_constraintLeft_creator 33
-int styleable ConstraintLayout_Layout_layout_constraintLeft_toLeftOf 34
-int styleable ConstraintLayout_Layout_layout_constraintLeft_toRightOf 35
-int styleable ConstraintLayout_Layout_layout_constraintRight_creator 36
-int styleable ConstraintLayout_Layout_layout_constraintRight_toLeftOf 37
-int styleable ConstraintLayout_Layout_layout_constraintRight_toRightOf 38
-int styleable ConstraintLayout_Layout_layout_constraintStart_toEndOf 39
-int styleable ConstraintLayout_Layout_layout_constraintStart_toStartOf 40
-int styleable ConstraintLayout_Layout_layout_constraintTop_creator 41
-int styleable ConstraintLayout_Layout_layout_constraintTop_toBottomOf 42
-int styleable ConstraintLayout_Layout_layout_constraintTop_toTopOf 43
-int styleable ConstraintLayout_Layout_layout_constraintVertical_bias 44
-int styleable ConstraintLayout_Layout_layout_constraintVertical_chainStyle 45
-int styleable ConstraintLayout_Layout_layout_constraintVertical_weight 46
-int styleable ConstraintLayout_Layout_layout_constraintWidth_default 47
-int styleable ConstraintLayout_Layout_layout_constraintWidth_max 48
-int styleable ConstraintLayout_Layout_layout_constraintWidth_min 49
-int styleable ConstraintLayout_Layout_layout_constraintWidth_percent 50
-int styleable ConstraintLayout_Layout_layout_editor_absoluteX 51
-int styleable ConstraintLayout_Layout_layout_editor_absoluteY 52
-int styleable ConstraintLayout_Layout_layout_goneMarginBottom 53
-int styleable ConstraintLayout_Layout_layout_goneMarginEnd 54
-int styleable ConstraintLayout_Layout_layout_goneMarginLeft 55
-int styleable ConstraintLayout_Layout_layout_goneMarginRight 56
-int styleable ConstraintLayout_Layout_layout_goneMarginStart 57
-int styleable ConstraintLayout_Layout_layout_goneMarginTop 58
-int styleable ConstraintLayout_Layout_layout_optimizationLevel 59
-int[] styleable ConstraintLayout_placeholder { 0x7f04005d, 0x7f040081 }
-int styleable ConstraintLayout_placeholder_content 0
-int styleable ConstraintLayout_placeholder_emptyVisibility 1
-int[] styleable ConstraintSet { 0x101031f, 0x1010440, 0x10100d0, 0x10100f5, 0x10100fa, 0x10103b6, 0x10100f7, 0x10100f9, 0x10103b5, 0x10100f8, 0x10100f4, 0x1010120, 0x101011f, 0x1010140, 0x101013f, 0x10100c4, 0x1010326, 0x1010327, 0x1010328, 0x1010324, 0x1010325, 0x1010320, 0x1010321, 0x1010322, 0x1010323, 0x10103fa, 0x10100dc, 0x7f040038, 0x7f040039, 0x7f040048, 0x7f04005c, 0x7f0400a4, 0x7f0400a5, 0x7f0400a6, 0x7f0400a7, 0x7f0400a8, 0x7f0400a9, 0x7f0400aa, 0x7f0400ab, 0x7f0400ac, 0x7f0400ad, 0x7f0400ae, 0x7f0400af, 0x7f0400b0, 0x7f0400b1, 0x7f0400b2, 0x7f0400b3, 0x7f0400b4, 0x7f0400b5, 0x7f0400b6, 0x7f0400b7, 0x7f0400b8, 0x7f0400b9, 0x7f0400ba, 0x7f0400bb, 0x7f0400bc, 0x7f0400bd, 0x7f0400be, 0x7f0400bf, 0x7f0400c0, 0x7f0400c1, 0x7f0400c2, 0x7f0400c3, 0x7f0400c4, 0x7f0400c5, 0x7f0400c6, 0x7f0400c7, 0x7f0400c8, 0x7f0400c9, 0x7f0400ca, 0x7f0400cb, 0x7f0400cc, 0x7f0400ce, 0x7f0400cf, 0x7f0400d0, 0x7f0400d1, 0x7f0400d2, 0x7f0400d3, 0x7f0400d4, 0x7f0400d5 }
-int styleable ConstraintSet_android_alpha 0
-int styleable ConstraintSet_android_elevation 1
-int styleable ConstraintSet_android_id 2
-int styleable ConstraintSet_android_layout_height 3
-int styleable ConstraintSet_android_layout_marginBottom 4
-int styleable ConstraintSet_android_layout_marginEnd 5
-int styleable ConstraintSet_android_layout_marginLeft 6
-int styleable ConstraintSet_android_layout_marginRight 7
-int styleable ConstraintSet_android_layout_marginStart 8
-int styleable ConstraintSet_android_layout_marginTop 9
-int styleable ConstraintSet_android_layout_width 10
-int styleable ConstraintSet_android_maxHeight 11
-int styleable ConstraintSet_android_maxWidth 12
-int styleable ConstraintSet_android_minHeight 13
-int styleable ConstraintSet_android_minWidth 14
-int styleable ConstraintSet_android_orientation 15
-int styleable ConstraintSet_android_rotation 16
-int styleable ConstraintSet_android_rotationX 17
-int styleable ConstraintSet_android_rotationY 18
-int styleable ConstraintSet_android_scaleX 19
-int styleable ConstraintSet_android_scaleY 20
-int styleable ConstraintSet_android_transformPivotX 21
-int styleable ConstraintSet_android_transformPivotY 22
-int styleable ConstraintSet_android_translationX 23
-int styleable ConstraintSet_android_translationY 24
-int styleable ConstraintSet_android_translationZ 25
-int styleable ConstraintSet_android_visibility 26
-int styleable ConstraintSet_barrierAllowsGoneWidgets 27
-int styleable ConstraintSet_barrierDirection 28
-int styleable ConstraintSet_chainUseRtl 29
-int styleable ConstraintSet_constraint_referenced_ids 30
-int styleable ConstraintSet_layout_constrainedHeight 31
-int styleable ConstraintSet_layout_constrainedWidth 32
-int styleable ConstraintSet_layout_constraintBaseline_creator 33
-int styleable ConstraintSet_layout_constraintBaseline_toBaselineOf 34
-int styleable ConstraintSet_layout_constraintBottom_creator 35
-int styleable ConstraintSet_layout_constraintBottom_toBottomOf 36
-int styleable ConstraintSet_layout_constraintBottom_toTopOf 37
-int styleable ConstraintSet_layout_constraintCircle 38
-int styleable ConstraintSet_layout_constraintCircleAngle 39
-int styleable ConstraintSet_layout_constraintCircleRadius 40
-int styleable ConstraintSet_layout_constraintDimensionRatio 41
-int styleable ConstraintSet_layout_constraintEnd_toEndOf 42
-int styleable ConstraintSet_layout_constraintEnd_toStartOf 43
-int styleable ConstraintSet_layout_constraintGuide_begin 44
-int styleable ConstraintSet_layout_constraintGuide_end 45
-int styleable ConstraintSet_layout_constraintGuide_percent 46
-int styleable ConstraintSet_layout_constraintHeight_default 47
-int styleable ConstraintSet_layout_constraintHeight_max 48
-int styleable ConstraintSet_layout_constraintHeight_min 49
-int styleable ConstraintSet_layout_constraintHeight_percent 50
-int styleable ConstraintSet_layout_constraintHorizontal_bias 51
-int styleable ConstraintSet_layout_constraintHorizontal_chainStyle 52
-int styleable ConstraintSet_layout_constraintHorizontal_weight 53
-int styleable ConstraintSet_layout_constraintLeft_creator 54
-int styleable ConstraintSet_layout_constraintLeft_toLeftOf 55
-int styleable ConstraintSet_layout_constraintLeft_toRightOf 56
-int styleable ConstraintSet_layout_constraintRight_creator 57
-int styleable ConstraintSet_layout_constraintRight_toLeftOf 58
-int styleable ConstraintSet_layout_constraintRight_toRightOf 59
-int styleable ConstraintSet_layout_constraintStart_toEndOf 60
-int styleable ConstraintSet_layout_constraintStart_toStartOf 61
-int styleable ConstraintSet_layout_constraintTop_creator 62
-int styleable ConstraintSet_layout_constraintTop_toBottomOf 63
-int styleable ConstraintSet_layout_constraintTop_toTopOf 64
-int styleable ConstraintSet_layout_constraintVertical_bias 65
-int styleable ConstraintSet_layout_constraintVertical_chainStyle 66
-int styleable ConstraintSet_layout_constraintVertical_weight 67
-int styleable ConstraintSet_layout_constraintWidth_default 68
-int styleable ConstraintSet_layout_constraintWidth_max 69
-int styleable ConstraintSet_layout_constraintWidth_min 70
-int styleable ConstraintSet_layout_constraintWidth_percent 71
-int styleable ConstraintSet_layout_editor_absoluteX 72
-int styleable ConstraintSet_layout_editor_absoluteY 73
-int styleable ConstraintSet_layout_goneMarginBottom 74
-int styleable ConstraintSet_layout_goneMarginEnd 75
-int styleable ConstraintSet_layout_goneMarginLeft 76
-int styleable ConstraintSet_layout_goneMarginRight 77
-int styleable ConstraintSet_layout_goneMarginStart 78
-int styleable ConstraintSet_layout_goneMarginTop 79
-int[] styleable CoordinatorLayout { 0x7f04009e, 0x7f040118 }
-int styleable CoordinatorLayout_keylines 0
-int styleable CoordinatorLayout_statusBarBackground 1
-int[] styleable CoordinatorLayout_Layout { 0x10100b3, 0x7f0400a1, 0x7f0400a2, 0x7f0400a3, 0x7f0400cd, 0x7f0400d6, 0x7f0400d7 }
-int styleable CoordinatorLayout_Layout_android_layout_gravity 0
-int styleable CoordinatorLayout_Layout_layout_anchor 1
-int styleable CoordinatorLayout_Layout_layout_anchorGravity 2
-int styleable CoordinatorLayout_Layout_layout_behavior 3
-int styleable CoordinatorLayout_Layout_layout_dodgeInsetEdges 4
-int styleable CoordinatorLayout_Layout_layout_insetEdge 5
-int styleable CoordinatorLayout_Layout_layout_keyline 6
-int[] styleable DrawerArrowToggle { 0x7f04002a, 0x7f04002b, 0x7f040037, 0x7f04004f, 0x7f040075, 0x7f04008f, 0x7f040112, 0x7f040131 }
-int styleable DrawerArrowToggle_arrowHeadLength 0
-int styleable DrawerArrowToggle_arrowShaftLength 1
-int styleable DrawerArrowToggle_barLength 2
-int styleable DrawerArrowToggle_color 3
-int styleable DrawerArrowToggle_drawableSize 4
-int styleable DrawerArrowToggle_gapBetweenBars 5
-int styleable DrawerArrowToggle_spinBars 6
-int styleable DrawerArrowToggle_thickness 7
-int[] styleable FontFamily { 0x7f040086, 0x7f040087, 0x7f040088, 0x7f040089, 0x7f04008a, 0x7f04008b }
-int styleable FontFamily_fontProviderAuthority 0
-int styleable FontFamily_fontProviderCerts 1
-int styleable FontFamily_fontProviderFetchStrategy 2
-int styleable FontFamily_fontProviderFetchTimeout 3
-int styleable FontFamily_fontProviderPackage 4
-int styleable FontFamily_fontProviderQuery 5
-int[] styleable FontFamilyFont { 0x1010532, 0x101053f, 0x1010570, 0x1010533, 0x101056f, 0x7f040084, 0x7f04008c, 0x7f04008d, 0x7f04008e, 0x7f04014c }
-int styleable FontFamilyFont_android_font 0
-int styleable FontFamilyFont_android_fontStyle 1
-int styleable FontFamilyFont_android_fontVariationSettings 2
-int styleable FontFamilyFont_android_fontWeight 3
-int styleable FontFamilyFont_android_ttcIndex 4
-int styleable FontFamilyFont_font 5
-int styleable FontFamilyFont_fontStyle 6
-int styleable FontFamilyFont_fontVariationSettings 7
-int styleable FontFamilyFont_fontWeight 8
-int styleable FontFamilyFont_ttcIndex 9
-int[] styleable GradientColor { 0x101020b, 0x10101a2, 0x10101a3, 0x101019e, 0x1010512, 0x1010513, 0x10101a4, 0x101019d, 0x1010510, 0x1010511, 0x1010201, 0x10101a1 }
-int styleable GradientColor_android_centerColor 0
-int styleable GradientColor_android_centerX 1
-int styleable GradientColor_android_centerY 2
-int styleable GradientColor_android_endColor 3
-int styleable GradientColor_android_endX 4
-int styleable GradientColor_android_endY 5
-int styleable GradientColor_android_gradientRadius 6
-int styleable GradientColor_android_startColor 7
-int styleable GradientColor_android_startX 8
-int styleable GradientColor_android_startY 9
-int styleable GradientColor_android_tileMode 10
-int styleable GradientColor_android_type 11
-int[] styleable GradientColorItem { 0x10101a5, 0x1010514 }
-int styleable GradientColorItem_android_color 0
-int styleable GradientColorItem_android_offset 1
-int[] styleable LinearConstraintLayout { 0x10100c4 }
-int styleable LinearConstraintLayout_android_orientation 0
-int[] styleable LinearLayoutCompat { 0x1010126, 0x1010127, 0x10100af, 0x10100c4, 0x1010128, 0x7f04006d, 0x7f04006f, 0x7f0400ec, 0x7f04010e }
-int styleable LinearLayoutCompat_android_baselineAligned 0
-int styleable LinearLayoutCompat_android_baselineAlignedChildIndex 1
-int styleable LinearLayoutCompat_android_gravity 2
-int styleable LinearLayoutCompat_android_orientation 3
-int styleable LinearLayoutCompat_android_weightSum 4
-int styleable LinearLayoutCompat_divider 5
-int styleable LinearLayoutCompat_dividerPadding 6
-int styleable LinearLayoutCompat_measureWithLargestChild 7
-int styleable LinearLayoutCompat_showDividers 8
-int[] styleable LinearLayoutCompat_Layout { 0x10100b3, 0x10100f5, 0x1010181, 0x10100f4 }
-int styleable LinearLayoutCompat_Layout_android_layout_gravity 0
-int styleable LinearLayoutCompat_Layout_android_layout_height 1
-int styleable LinearLayoutCompat_Layout_android_layout_weight 2
-int styleable LinearLayoutCompat_Layout_android_layout_width 3
-int[] styleable ListPopupWindow { 0x10102ac, 0x10102ad }
-int styleable ListPopupWindow_android_dropDownHorizontalOffset 0
-int styleable ListPopupWindow_android_dropDownVerticalOffset 1
-int[] styleable MenuGroup { 0x10101e0, 0x101000e, 0x10100d0, 0x10101de, 0x10101df, 0x1010194 }
-int styleable MenuGroup_android_checkableBehavior 0
-int styleable MenuGroup_android_enabled 1
-int styleable MenuGroup_android_id 2
-int styleable MenuGroup_android_menuCategory 3
-int styleable MenuGroup_android_orderInCategory 4
-int styleable MenuGroup_android_visible 5
-int[] styleable MenuItem { 0x7f04000e, 0x7f040020, 0x7f040021, 0x7f040029, 0x10101e3, 0x10101e5, 0x1010106, 0x101000e, 0x1010002, 0x10100d0, 0x10101de, 0x10101e4, 0x101026f, 0x10101df, 0x10101e1, 0x10101e2, 0x1010194, 0x7f04005e, 0x7f040096, 0x7f040097, 0x7f0400f2, 0x7f04010d, 0x7f040148 }
-int styleable MenuItem_actionLayout 0
-int styleable MenuItem_actionProviderClass 1
-int styleable MenuItem_actionViewClass 2
-int styleable MenuItem_alphabeticModifiers 3
-int styleable MenuItem_android_alphabeticShortcut 4
-int styleable MenuItem_android_checkable 5
-int styleable MenuItem_android_checked 6
-int styleable MenuItem_android_enabled 7
-int styleable MenuItem_android_icon 8
-int styleable MenuItem_android_id 9
-int styleable MenuItem_android_menuCategory 10
-int styleable MenuItem_android_numericShortcut 11
-int styleable MenuItem_android_onClick 12
-int styleable MenuItem_android_orderInCategory 13
-int styleable MenuItem_android_title 14
-int styleable MenuItem_android_titleCondensed 15
-int styleable MenuItem_android_visible 16
-int styleable MenuItem_contentDescription 17
-int styleable MenuItem_iconTint 18
-int styleable MenuItem_iconTintMode 19
-int styleable MenuItem_numericModifiers 20
-int styleable MenuItem_showAsAction 21
-int styleable MenuItem_tooltipText 22
-int[] styleable MenuView { 0x101012f, 0x101012d, 0x1010130, 0x1010131, 0x101012c, 0x101012e, 0x10100ae, 0x7f0400fe, 0x7f040119 }
-int styleable MenuView_android_headerBackground 0
-int styleable MenuView_android_horizontalDivider 1
-int styleable MenuView_android_itemBackground 2
-int styleable MenuView_android_itemIconDisabledAlpha 3
-int styleable MenuView_android_itemTextAppearance 4
-int styleable MenuView_android_verticalDivider 5
-int styleable MenuView_android_windowAnimationStyle 6
-int styleable MenuView_preserveIconSpacing 7
-int styleable MenuView_subMenuArrow 8
-int[] styleable PopupWindow { 0x10102c9, 0x1010176, 0x7f0400f3 }
-int styleable PopupWindow_android_popupAnimationStyle 0
-int styleable PopupWindow_android_popupBackground 1
-int styleable PopupWindow_overlapAnchor 2
-int[] styleable PopupWindowBackgroundState { 0x7f040117 }
-int styleable PopupWindowBackgroundState_state_above_anchor 0
-int[] styleable RecycleListView { 0x7f0400f4, 0x7f0400f7 }
-int styleable RecycleListView_paddingBottomNoButtons 0
-int styleable RecycleListView_paddingTopNoTitle 1
-int[] styleable SearchView { 0x10100da, 0x1010264, 0x1010220, 0x101011f, 0x7f04004b, 0x7f04005a, 0x7f040068, 0x7f040090, 0x7f040098, 0x7f0400a0, 0x7f040101, 0x7f040102, 0x7f040107, 0x7f040108, 0x7f04011a, 0x7f04011f, 0x7f04014e }
-int styleable SearchView_android_focusable 0
-int styleable SearchView_android_imeOptions 1
-int styleable SearchView_android_inputType 2
-int styleable SearchView_android_maxWidth 3
-int styleable SearchView_closeIcon 4
-int styleable SearchView_commitIcon 5
-int styleable SearchView_defaultQueryHint 6
-int styleable SearchView_goIcon 7
-int styleable SearchView_iconifiedByDefault 8
-int styleable SearchView_layout 9
-int styleable SearchView_queryBackground 10
-int styleable SearchView_queryHint 11
-int styleable SearchView_searchHintIcon 12
-int styleable SearchView_searchIcon 13
-int styleable SearchView_submitBackground 14
-int styleable SearchView_suggestionRowLayout 15
-int styleable SearchView_voiceIcon 16
-int[] styleable Spinner { 0x1010262, 0x10100b2, 0x1010176, 0x101017b, 0x7f0400fc }
-int styleable Spinner_android_dropDownWidth 0
-int styleable Spinner_android_entries 1
-int styleable Spinner_android_popupBackground 2
-int styleable Spinner_android_prompt 3
-int styleable Spinner_popupTheme 4
-int[] styleable StateListDrawable { 0x1010196, 0x101011c, 0x101030c, 0x101030d, 0x1010195, 0x1010194 }
-int styleable StateListDrawable_android_constantSize 0
-int styleable StateListDrawable_android_dither 1
-int styleable StateListDrawable_android_enterFadeDuration 2
-int styleable StateListDrawable_android_exitFadeDuration 3
-int styleable StateListDrawable_android_variablePadding 4
-int styleable StateListDrawable_android_visible 5
-int[] styleable StateListDrawableItem { 0x1010199 }
-int styleable StateListDrawableItem_android_drawable 0
-int[] styleable SwitchCompat { 0x1010125, 0x1010124, 0x1010142, 0x7f04010f, 0x7f040115, 0x7f040120, 0x7f040121, 0x7f040123, 0x7f040132, 0x7f040133, 0x7f040134, 0x7f040149, 0x7f04014a, 0x7f04014b }
-int styleable SwitchCompat_android_textOff 0
-int styleable SwitchCompat_android_textOn 1
-int styleable SwitchCompat_android_thumb 2
-int styleable SwitchCompat_showText 3
-int styleable SwitchCompat_splitTrack 4
-int styleable SwitchCompat_switchMinWidth 5
-int styleable SwitchCompat_switchPadding 6
-int styleable SwitchCompat_switchTextAppearance 7
-int styleable SwitchCompat_thumbTextPadding 8
-int styleable SwitchCompat_thumbTint 9
-int styleable SwitchCompat_thumbTintMode 10
-int styleable SwitchCompat_track 11
-int styleable SwitchCompat_trackTint 12
-int styleable SwitchCompat_trackTintMode 13
-int[] styleable TextAppearance { 0x10103ac, 0x1010161, 0x1010162, 0x1010163, 0x1010164, 0x1010098, 0x101009a, 0x101009b, 0x1010585, 0x1010095, 0x1010097, 0x1010096, 0x7f040085, 0x7f04008d, 0x7f040124, 0x7f04012f }
-int styleable TextAppearance_android_fontFamily 0
-int styleable TextAppearance_android_shadowColor 1
-int styleable TextAppearance_android_shadowDx 2
-int styleable TextAppearance_android_shadowDy 3
-int styleable TextAppearance_android_shadowRadius 4
-int styleable TextAppearance_android_textColor 5
-int styleable TextAppearance_android_textColorHint 6
-int styleable TextAppearance_android_textColorLink 7
-int styleable TextAppearance_android_textFontWeight 8
-int styleable TextAppearance_android_textSize 9
-int styleable TextAppearance_android_textStyle 10
-int styleable TextAppearance_android_typeface 11
-int styleable TextAppearance_fontFamily 12
-int styleable TextAppearance_fontVariationSettings 13
-int styleable TextAppearance_textAllCaps 14
-int styleable TextAppearance_textLocale 15
-int[] styleable Toolbar { 0x10100af, 0x1010140, 0x7f040041, 0x7f04004d, 0x7f04004e, 0x7f04005f, 0x7f040060, 0x7f040061, 0x7f040062, 0x7f040063, 0x7f040064, 0x7f0400e9, 0x7f0400ea, 0x7f0400eb, 0x7f0400ed, 0x7f0400ef, 0x7f0400f0, 0x7f0400fc, 0x7f04011b, 0x7f04011c, 0x7f04011d, 0x7f04013a, 0x7f04013b, 0x7f04013c, 0x7f04013d, 0x7f04013e, 0x7f04013f, 0x7f040140, 0x7f040141, 0x7f040142 }
-int styleable Toolbar_android_gravity 0
-int styleable Toolbar_android_minHeight 1
-int styleable Toolbar_buttonGravity 2
-int styleable Toolbar_collapseContentDescription 3
-int styleable Toolbar_collapseIcon 4
-int styleable Toolbar_contentInsetEnd 5
-int styleable Toolbar_contentInsetEndWithActions 6
-int styleable Toolbar_contentInsetLeft 7
-int styleable Toolbar_contentInsetRight 8
-int styleable Toolbar_contentInsetStart 9
-int styleable Toolbar_contentInsetStartWithNavigation 10
-int styleable Toolbar_logo 11
-int styleable Toolbar_logoDescription 12
-int styleable Toolbar_maxButtonHeight 13
-int styleable Toolbar_menu 14
-int styleable Toolbar_navigationContentDescription 15
-int styleable Toolbar_navigationIcon 16
-int styleable Toolbar_popupTheme 17
-int styleable Toolbar_subtitle 18
-int styleable Toolbar_subtitleTextAppearance 19
-int styleable Toolbar_subtitleTextColor 20
-int styleable Toolbar_title 21
-int styleable Toolbar_titleMargin 22
-int styleable Toolbar_titleMarginBottom 23
-int styleable Toolbar_titleMarginEnd 24
-int styleable Toolbar_titleMarginStart 25
-int styleable Toolbar_titleMarginTop 26
-int styleable Toolbar_titleMargins 27
-int styleable Toolbar_titleTextAppearance 28
-int styleable Toolbar_titleTextColor 29
-int[] styleable View { 0x10100da, 0x1010000, 0x7f0400f5, 0x7f0400f6, 0x7f040130 }
-int styleable View_android_focusable 0
-int styleable View_android_theme 1
-int styleable View_paddingEnd 2
-int styleable View_paddingStart 3
-int styleable View_theme 4
-int[] styleable ViewBackgroundHelper { 0x10100d4, 0x7f040035, 0x7f040036 }
-int styleable ViewBackgroundHelper_android_background 0
-int styleable ViewBackgroundHelper_backgroundTint 1
-int styleable ViewBackgroundHelper_backgroundTintMode 2
-int[] styleable ViewStubCompat { 0x10100d0, 0x10100f3, 0x10100f2 }
-int styleable ViewStubCompat_android_id 0
-int styleable ViewStubCompat_android_inflatedId 1
-int styleable ViewStubCompat_android_layout 2
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/build-history.bin b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/build-history.bin
deleted file mode 100644
index 0a60372de6..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/build-history.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab
deleted file mode 100644
index 28100f9669..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream
deleted file mode 100644
index 421508ba00..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at
deleted file mode 100644
index f516b4c513..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i
deleted file mode 100644
index f9dd54c0bb..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
deleted file mode 100644
index 13c365dd11..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
deleted file mode 100644
index 5fefbd7c4a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
deleted file mode 100644
index 8143849975..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
deleted file mode 100644
index 19003d89e7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
deleted file mode 100644
index 9964039332..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
deleted file mode 100644
index ce954487e3..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream
deleted file mode 100644
index 394e225462..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len
deleted file mode 100644
index 11d24d584a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
deleted file mode 100644
index dd8166bbfc..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i
deleted file mode 100644
index 9370c0c189..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
deleted file mode 100644
index 13c365dd11..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
deleted file mode 100644
index 431f47845a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
deleted file mode 100644
index 8143849975..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
deleted file mode 100644
index 19003d89e7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
deleted file mode 100644
index 5d4cfaae55..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
deleted file mode 100644
index 77e4867b0e..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
deleted file mode 100644
index ae81cd0583..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
deleted file mode 100644
index 24095040df..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len
deleted file mode 100644
index a9f80ae024..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
deleted file mode 100644
index 841341a069..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i
deleted file mode 100644
index 19ee7d1469..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
deleted file mode 100644
index d5748a3034..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
deleted file mode 100644
index 1d1ee20901..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
deleted file mode 100644
index 78afb772e2..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
deleted file mode 100644
index becad4a25a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
deleted file mode 100644
index bdf584a84b..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
deleted file mode 100644
index a4bbd5abf7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
deleted file mode 100644
index 79ad34c0ca..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
deleted file mode 100644
index 39088e87b8..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
deleted file mode 100644
index 5b3b52690d..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
deleted file mode 100644
index bdf584a84b..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
deleted file mode 100644
index 2789eb6a95..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
deleted file mode 100644
index 541378f226..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
deleted file mode 100644
index 9eb6a660cb..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
deleted file mode 100644
index 55f40bcada..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab
deleted file mode 100644
index 2ceb12b8de..0000000000
--- a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-0
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab
deleted file mode 100644
index 4eb88452e3..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream
deleted file mode 100644
index 1d1ee20901..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at
deleted file mode 100644
index 7d30a43be1..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i
deleted file mode 100644
index 9da8c9f7cc..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab
deleted file mode 100644
index 5cbf720d5f..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream
deleted file mode 100644
index 100d20553b..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
deleted file mode 100644
index ccfcbf4136..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at
deleted file mode 100644
index 19003d89e7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i
deleted file mode 100644
index f768a77ff2..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab
deleted file mode 100644
index eb007115d5..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream
deleted file mode 100644
index edd98edfb5..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len
deleted file mode 100644
index b287d95f65..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len
deleted file mode 100644
index 5ffc1b29da..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at
deleted file mode 100644
index 9237a6d0b9..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i
deleted file mode 100644
index ba5a1b4a61..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/last-build.bin b/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/last-build.bin
deleted file mode 100644
index c3d861df8c..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/compileDebugKotlin/last-build.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/build-history.bin b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/build-history.bin
deleted file mode 100644
index f31e66c776..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/build-history.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab
deleted file mode 100644
index ccbe21588a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream
deleted file mode 100644
index 421508ba00..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at
deleted file mode 100644
index b26dcb3b39..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i
deleted file mode 100644
index f9dd54c0bb..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
deleted file mode 100644
index 13c365dd11..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
deleted file mode 100644
index 5fefbd7c4a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
deleted file mode 100644
index 8143849975..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
deleted file mode 100644
index 19003d89e7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
deleted file mode 100644
index 9964039332..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
deleted file mode 100644
index ce954487e3..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream
deleted file mode 100644
index 394e225462..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len
deleted file mode 100644
index 11d24d584a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
deleted file mode 100644
index dd8166bbfc..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i
deleted file mode 100644
index 9370c0c189..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
deleted file mode 100644
index 13c365dd11..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
deleted file mode 100644
index 431f47845a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
deleted file mode 100644
index 8143849975..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
deleted file mode 100644
index 19003d89e7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
deleted file mode 100644
index 5d4cfaae55..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
deleted file mode 100644
index 77e4867b0e..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
deleted file mode 100644
index ae81cd0583..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
deleted file mode 100644
index 24095040df..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len
deleted file mode 100644
index a9f80ae024..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
deleted file mode 100644
index 841341a069..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i
deleted file mode 100644
index 19ee7d1469..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
deleted file mode 100644
index d5748a3034..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
deleted file mode 100644
index 1d1ee20901..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
deleted file mode 100644
index 78afb772e2..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
deleted file mode 100644
index becad4a25a..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
deleted file mode 100644
index bdf584a84b..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
deleted file mode 100644
index a4bbd5abf7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
deleted file mode 100644
index 79ad34c0ca..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
deleted file mode 100644
index 39088e87b8..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
deleted file mode 100644
index 5b3b52690d..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
deleted file mode 100644
index bdf584a84b..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
deleted file mode 100644
index 2789eb6a95..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
deleted file mode 100644
index 541378f226..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
deleted file mode 100644
index 9eb6a660cb..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
deleted file mode 100644
index 55f40bcada..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/counters.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/counters.tab
deleted file mode 100644
index 2ceb12b8de..0000000000
--- a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/counters.tab
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-0
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab
deleted file mode 100644
index 4eb88452e3..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream
deleted file mode 100644
index 1d1ee20901..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at
deleted file mode 100644
index 7d30a43be1..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i
deleted file mode 100644
index 9da8c9f7cc..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab
deleted file mode 100644
index 5cbf720d5f..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream
deleted file mode 100644
index 100d20553b..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
deleted file mode 100644
index ccfcbf4136..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at
deleted file mode 100644
index 19003d89e7..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i
deleted file mode 100644
index f768a77ff2..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab
deleted file mode 100644
index 7872b0d616..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream
deleted file mode 100644
index d6206bbb95..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len
deleted file mode 100644
index cf8a30a1c9..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.len
deleted file mode 100644
index 3085af4de9..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.values.at b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.values.at
deleted file mode 100644
index ff1bb03186..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i
deleted file mode 100644
index cdb5a15299..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i.len b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/last-build.bin b/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/last-build.bin
deleted file mode 100644
index ca57ecb3b3..0000000000
Binary files a/modules/mogo-module-splash-noop/build/kotlin/kaptGenerateStubsDebugKotlin/last-build.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/outputs/aar/mogo-module-splash-noop-debug.aar b/modules/mogo-module-splash-noop/build/outputs/aar/mogo-module-splash-noop-debug.aar
deleted file mode 100644
index 41913f9fa2..0000000000
Binary files a/modules/mogo-module-splash-noop/build/outputs/aar/mogo-module-splash-noop-debug.aar and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/outputs/logs/manifest-merger-debug-report.txt b/modules/mogo-module-splash-noop/build/outputs/logs/manifest-merger-debug-report.txt
deleted file mode 100644
index c1b06787f0..0000000000
--- a/modules/mogo-module-splash-noop/build/outputs/logs/manifest-merger-debug-report.txt
+++ /dev/null
@@ -1,37 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
- package
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:2:5-44
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:versionName
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:versionCode
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- xmlns:android
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:11-69
-uses-sdk
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:targetSdkVersion
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:minSdkVersion
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin b/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin
deleted file mode 100644
index aae35e6ec9..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/apt-cache.bin b/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/apt-cache.bin
deleted file mode 100644
index 9983310f1d..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/apt-cache.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/classpath-entries.bin b/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/classpath-entries.bin
deleted file mode 100644
index dce980ecb8..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/classpath-entries.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/classpath-structure.bin b/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/classpath-structure.bin
deleted file mode 100644
index bb1b603402..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/classpath-structure.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/java-cache.bin b/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/java-cache.bin
deleted file mode 100644
index 64bae7c8d2..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incApCache/debug/java-cache.bin and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/META-INF/mogo-module-splash-noop_debug.kotlin_module b/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/META-INF/mogo-module-splash-noop_debug.kotlin_module
deleted file mode 100644
index 609d952938..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/META-INF/mogo-module-splash-noop_debug.kotlin_module and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/BydConst.class b/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/BydConst.class
deleted file mode 100644
index 34a53fc49e..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/BydConst.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/BydProvider.class b/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/BydProvider.class
deleted file mode 100644
index 1818d29932..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/BydProvider.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydConst.java b/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydConst.java
deleted file mode 100644
index 5222ce80e9..0000000000
--- a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydConst.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zhidao.mogo.module.splash;
-
-import java.lang.System;
-
-@kotlin.Metadata(mv = {1, 4, 1}, bv = {1, 0, 3}, k = 1, d1 = {"\u0000\u0014\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u000e\n\u0002\b\u0002\b\u00c6\u0002\u0018\u00002\u00020\u0001B\u0007\b\u0002\u00a2\u0006\u0002\u0010\u0002R\u000e\u0010\u0003\u001a\u00020\u0004X\u0086T\u00a2\u0006\u0002\n\u0000R\u000e\u0010\u0005\u001a\u00020\u0004X\u0086T\u00a2\u0006\u0002\n\u0000\u00a8\u0006\u0006"}, d2 = {"Lcom/zhidao/mogo/module/splash/BydConst;", "", "()V", "MODULE_NAME", "", "PATH_NAME", "mogo-module-splash-noop_debug"})
-public final class BydConst {
- @org.jetbrains.annotations.NotNull()
- public static final java.lang.String MODULE_NAME = "MODULE_BYD";
- @org.jetbrains.annotations.NotNull()
- public static final java.lang.String PATH_NAME = "/carmachine/byd";
- @org.jetbrains.annotations.NotNull()
- public static final com.zhidao.mogo.module.splash.BydConst INSTANCE = null;
-
- private BydConst() {
- super();
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydConst.kapt_metadata b/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydConst.kapt_metadata
deleted file mode 100644
index 42943b6ce0..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydConst.kapt_metadata and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydProvider.java b/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydProvider.java
deleted file mode 100644
index f2c814424d..0000000000
--- a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.zhidao.mogo.module.splash;
-
-import java.lang.System;
-
-/**
- * 比亚迪车机provider
- *
- * @author tongchenfei
- */
-@com.alibaba.android.arouter.facade.annotation.Route(path = "/carmachine/byd")
-@kotlin.Metadata(mv = {1, 4, 1}, bv = {1, 0, 3}, k = 1, d1 = {"\u0000X\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u000e\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\b\n\u0000\n\u0002\u0010\u0002\n\u0000\b\u0007\u0018\u00002\u00020\u0001B\u0005\u00a2\u0006\u0002\u0010\u0002J\u001e\u0010\u0003\u001a\u0004\u0018\u00010\u00042\b\u0010\u0005\u001a\u0004\u0018\u00010\u00062\b\u0010\u0007\u001a\u0004\u0018\u00010\bH\u0016J\u0014\u0010\t\u001a\u0004\u0018\u00010\n2\b\u0010\u0005\u001a\u0004\u0018\u00010\u0006H\u0016J\b\u0010\u000b\u001a\u00020\fH\u0016J\b\u0010\r\u001a\u00020\fH\u0016J\n\u0010\u000e\u001a\u0004\u0018\u00010\u000fH\u0016J\n\u0010\u0010\u001a\u0004\u0018\u00010\u0011H\u0016J\n\u0010\u0012\u001a\u0004\u0018\u00010\u0013H\u0016J\n\u0010\u0014\u001a\u0004\u0018\u00010\u0015H\u0016J\b\u0010\u0016\u001a\u00020\fH\u0016J\n\u0010\u0017\u001a\u0004\u0018\u00010\u0018H\u0016J\b\u0010\u0019\u001a\u00020\u001aH\u0016J\u0012\u0010\u001b\u001a\u00020\u001c2\b\u0010\u0005\u001a\u0004\u0018\u00010\u0006H\u0016\u00a8\u0006\u001d"}, d2 = {"Lcom/zhidao/mogo/module/splash/BydProvider;", "Lcom/mogo/service/module/IMogoModuleProvider;", "()V", "createFragment", "Landroidx/fragment/app/Fragment;", "context", "Landroid/content/Context;", "data", "Landroid/os/Bundle;", "createView", "Landroid/view/View;", "getAppName", "", "getAppPackage", "getCardLifecycle", "Lcom/mogo/service/module/IMogoModuleLifecycle;", "getLocationListener", "Lcom/mogo/map/location/IMogoLocationListener;", "getMapListener", "Lcom/mogo/map/listener/IMogoMapListener;", "getMarkerClickListener", "Lcom/mogo/map/marker/IMogoMarkerClickListener;", "getModuleName", "getNaviListener", "Lcom/mogo/map/navi/IMogoNaviListener;", "getType", "", "init", "", "mogo-module-splash-noop_debug"})
-public final class BydProvider implements com.mogo.service.module.IMogoModuleProvider {
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.navi.IMogoNaviListener getNaviListener() {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.location.IMogoLocationListener getLocationListener() {
- return null;
- }
-
- @java.lang.Override()
- public int getType() {
- return 0;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.marker.IMogoMarkerClickListener getMarkerClickListener() {
- return null;
- }
-
- @java.lang.Override()
- public void init(@org.jetbrains.annotations.Nullable()
- android.content.Context context) {
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.listener.IMogoMapListener getMapListener() {
- return null;
- }
-
- @org.jetbrains.annotations.NotNull()
- @java.lang.Override()
- public java.lang.String getAppPackage() {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public android.view.View createView(@org.jetbrains.annotations.Nullable()
- android.content.Context context) {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public androidx.fragment.app.Fragment createFragment(@org.jetbrains.annotations.Nullable()
- android.content.Context context, @org.jetbrains.annotations.Nullable()
- android.os.Bundle data) {
- return null;
- }
-
- @org.jetbrains.annotations.NotNull()
- @java.lang.Override()
- public java.lang.String getModuleName() {
- return null;
- }
-
- @org.jetbrains.annotations.NotNull()
- @java.lang.Override()
- public java.lang.String getAppName() {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.service.module.IMogoModuleLifecycle getCardLifecycle() {
- return null;
- }
-
- public BydProvider() {
- super();
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydProvider.kapt_metadata b/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydProvider.kapt_metadata
deleted file mode 100644
index 95fe52fd0e..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/BydProvider.kapt_metadata and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/error/NonExistentClass.java b/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/error/NonExistentClass.java
deleted file mode 100644
index 73693e1c55..0000000000
--- a/modules/mogo-module-splash-noop/build/tmp/kapt3/stubs/debug/error/NonExistentClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package error;
-
-public final class NonExistentClass {
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/META-INF/mogo-module-splash-noop_debug.kotlin_module b/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/META-INF/mogo-module-splash-noop_debug.kotlin_module
deleted file mode 100644
index 609d952938..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/META-INF/mogo-module-splash-noop_debug.kotlin_module and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/BydConst.class b/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/BydConst.class
deleted file mode 100644
index c0f0b02779..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/BydConst.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/BydProvider.class b/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/BydProvider.class
deleted file mode 100644
index 0f2eadacbe..0000000000
Binary files a/modules/mogo-module-splash-noop/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/BydProvider.class and /dev/null differ
diff --git a/modules/mogo-module-splash-noop/consumer-rules.pro b/modules/mogo-module-splash-noop/consumer-rules.pro
deleted file mode 100644
index 3ef05240ac..0000000000
--- a/modules/mogo-module-splash-noop/consumer-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
--keep class com.zhidao.mogo.module.splash.BydConst{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/gradle.properties b/modules/mogo-module-splash-noop/gradle.properties
deleted file mode 100644
index 33dc22af32..0000000000
--- a/modules/mogo-module-splash-noop/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-splash-noop
-VERSION_CODE=1
diff --git a/modules/mogo-module-splash-noop/src/main/AndroidManifest.xml b/modules/mogo-module-splash-noop/src/main/AndroidManifest.xml
deleted file mode 100644
index 2ace90a42d..0000000000
--- a/modules/mogo-module-splash-noop/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt b/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt
deleted file mode 100644
index 74536ca572..0000000000
--- a/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.zhidao.mogo.module.splash
-
-object BydConst {
- const val MODULE_NAME = "MODULE_BYD"
- const val PATH_NAME = "/carmachine/byd"
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt b/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt
deleted file mode 100644
index 9b134711e7..0000000000
--- a/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.zhidao.mogo.module.splash
-
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.mogo.map.listener.IMogoMapListener
-import com.mogo.map.location.IMogoLocationListener
-import com.mogo.map.marker.IMogoMarkerClickListener
-import com.mogo.map.navi.IMogoNaviListener
-import com.mogo.service.module.IMogoModuleLifecycle
-import com.mogo.service.module.IMogoModuleProvider
-import com.mogo.utils.logger.Logger
-import com.zhidao.mogo.module.splash.BydConst.MODULE_NAME
-import com.zhidao.mogo.module.splash.BydConst.PATH_NAME
-
-/**
- * 比亚迪车机provider
- *
- * @author tongchenfei
- */
-@Route(path = PATH_NAME)
-class BydProvider:IMogoModuleProvider {
- override fun getNaviListener(): IMogoNaviListener? {
- return null
- }
-
- override fun getLocationListener(): IMogoLocationListener? {
- return null
- }
-
- override fun getType(): Int {
- return 0
- }
-
- override fun getMarkerClickListener(): IMogoMarkerClickListener? {
- return null
- }
-
- override fun init(context: Context?) {
- Logger.d(MODULE_NAME, "比亚迪noop模块初始化===")
- }
-
- override fun getMapListener(): IMogoMapListener? {
- return null
- }
-
- override fun getAppPackage(): String {
- return ""
- }
-
- override fun createView(context: Context?): View? {
- return null
- }
-
- override fun createFragment(context: Context?, data: Bundle?): Fragment? {
- return null
- }
-
- override fun getModuleName(): String {
- return MODULE_NAME
- }
-
- override fun getAppName(): String {
- return ""
- }
-
- override fun getCardLifecycle(): IMogoModuleLifecycle? {
- return null
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/generated/source/buildConfig/debug/com/zhidao/mogo/module/splash/BuildConfig.java b/modules/mogo-module-splash/build/generated/source/buildConfig/debug/com/zhidao/mogo/module/splash/BuildConfig.java
deleted file mode 100644
index 1b17d555d6..0000000000
--- a/modules/mogo-module-splash/build/generated/source/buildConfig/debug/com/zhidao/mogo/module/splash/BuildConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.zhidao.mogo.module.splash;
-
-public final class BuildConfig {
- public static final boolean DEBUG = Boolean.parseBoolean("true");
- public static final String LIBRARY_PACKAGE_NAME = "com.zhidao.mogo.module.splash";
- /**
- * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
- */
- @Deprecated
- public static final String APPLICATION_ID = "com.zhidao.mogo.module.splash";
- public static final String BUILD_TYPE = "debug";
- public static final String FLAVOR = "";
- public static final int VERSION_CODE = 1;
- public static final String VERSION_NAME = "2.0.16";
-}
diff --git a/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$splash.java b/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$splash.java
deleted file mode 100644
index 77caf8941f..0000000000
--- a/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$splash.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.zhidao.mogo.module.splash.SplashProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Group$$splash implements IRouteGroup {
- @Override
- public void loadInto(Map atlas) {
- atlas.put("/splash/api", RouteMeta.build(RouteType.PROVIDER, SplashProvider.class, "/splash/api", "splash", null, -1, -2147483648));
- }
-}
diff --git a/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplash.java b/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplash.java
deleted file mode 100644
index 757db6d16b..0000000000
--- a/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplash.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IProviderGroup;
-import com.zhidao.mogo.module.splash.SplashProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Providers$$mogomodulesplash implements IProviderGroup {
- @Override
- public void loadInto(Map providers) {
- providers.put("com.mogo.service.module.IMogoModuleProvider", RouteMeta.build(RouteType.PROVIDER, SplashProvider.class, "/splash/api", "splash", null, -1, -2147483648));
- }
-}
diff --git a/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplash.java b/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplash.java
deleted file mode 100644
index 8375e790cf..0000000000
--- a/modules/mogo-module-splash/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplash.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.alibaba.android.arouter.facade.template.IRouteRoot;
-import java.lang.Class;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Root$$mogomodulesplash implements IRouteRoot {
- @Override
- public void loadInto(Map> routes) {
- routes.put("splash", ARouter$$Group$$splash.class);
- }
-}
diff --git a/modules/mogo-module-splash/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/modules/mogo-module-splash/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
deleted file mode 100644
index fca2138b85..0000000000
--- a/modules/mogo-module-splash/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/modules/mogo-module-splash/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
deleted file mode 100644
index f2631d9684..0000000000
--- a/modules/mogo-module-splash/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.16","enabled":true,"outputFile":"mogo-module-splash-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.module.splash","split":""}}]
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/modules/mogo-module-splash/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/modules/mogo-module-splash/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/compile_library_classes/debug/classes.jar b/modules/mogo-module-splash/build/intermediates/compile_library_classes/debug/classes.jar
deleted file mode 100644
index 95a00eb6d4..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/compile_library_classes/debug/classes.jar and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/modules/mogo-module-splash/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
deleted file mode 100644
index 598d4dd68f..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/consumer_proguard_file/debug/proguard.txt b/modules/mogo-module-splash/build/intermediates/consumer_proguard_file/debug/proguard.txt
deleted file mode 100644
index 633730835f..0000000000
--- a/modules/mogo-module-splash/build/intermediates/consumer_proguard_file/debug/proguard.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-#-----ModuleSplash-----
--keep class com.zhidao.mogo.module.splash.SplashConst{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/modules/mogo-module-splash/build/intermediates/incremental/debug-mergeJavaRes/merge-state
deleted file mode 100644
index 19b3372cfc..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/modules/mogo-module-splash/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
deleted file mode 100644
index 6d1612ad02..0000000000
--- a/modules/mogo-module-splash/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/incremental/mergeDebugShaders/merger.xml b/modules/mogo-module-splash/build/intermediates/incremental/mergeDebugShaders/merger.xml
deleted file mode 100644
index 83880d6220..0000000000
--- a/modules/mogo-module-splash/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/incremental/packageDebugAssets/merger.xml b/modules/mogo-module-splash/build/intermediates/incremental/packageDebugAssets/merger.xml
deleted file mode 100644
index 32a051f73b..0000000000
--- a/modules/mogo-module-splash/build/intermediates/incremental/packageDebugAssets/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/modules/mogo-module-splash/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
deleted file mode 100644
index c4918aac79..0000000000
--- a/modules/mogo-module-splash/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Aug 31 15:00:18 CST 2021
-/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/res/drawable/byd_enter_btn_bg.xml=/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_enter_btn_bg.xml
-/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/res/drawable/byd_count_down_bg.xml=/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_count_down_bg.xml
-/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml=/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/build/intermediates/packaged_res/debug/layout/fragment_byd_splash.xml
-/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.webp=/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/module_byd_splash.webp
-/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/res/drawable-xhdpi-1920x1000/module_byd_splash.webp=/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/module_byd_splash.webp
diff --git a/modules/mogo-module-splash/build/intermediates/incremental/packageDebugResources/merger.xml b/modules/mogo-module-splash/build/intermediates/incremental/packageDebugResources/merger.xml
deleted file mode 100644
index 4d95af4fc4..0000000000
--- a/modules/mogo-module-splash/build/intermediates/incremental/packageDebugResources/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$splash.class b/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$splash.class
deleted file mode 100644
index f01da78219..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$splash.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplash.class b/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplash.class
deleted file mode 100644
index 4d84482063..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomodulesplash.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplash.class b/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplash.class
deleted file mode 100644
index 75b08be12f..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomodulesplash.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/zhidao/mogo/module/splash/BuildConfig.class b/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/zhidao/mogo/module/splash/BuildConfig.class
deleted file mode 100644
index 13eefe7aef..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/javac/debug/classes/com/zhidao/mogo/module/splash/BuildConfig.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/library_java_res/debug/res.jar b/modules/mogo-module-splash/build/intermediates/library_java_res/debug/res.jar
deleted file mode 100644
index ad0b40c9c1..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/library_java_res/debug/res.jar and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/library_manifest/debug/AndroidManifest.xml b/modules/mogo-module-splash/build/intermediates/library_manifest/debug/AndroidManifest.xml
deleted file mode 100644
index fca2138b85..0000000000
--- a/modules/mogo-module-splash/build/intermediates/library_manifest/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt b/modules/mogo-module-splash/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
deleted file mode 100644
index 5270cafa06..0000000000
--- a/modules/mogo-module-splash/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-R_DEF: Internal format may change without notice
-local
-drawable byd_count_down_bg
-drawable byd_enter_btn_bg
-drawable module_byd_splash
-id tvByd
-id tvCountDown
-layout fragment_byd_splash
diff --git a/modules/mogo-module-splash/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/modules/mogo-module-splash/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
deleted file mode 100644
index 58f10201d6..0000000000
--- a/modules/mogo-module-splash/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-1
-2
-6
-7 /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-9 android:targetSdkVersion="19" />
-9-->/Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-10
-11
diff --git a/modules/mogo-module-splash/build/intermediates/merged_java_res/debug/out.jar b/modules/mogo-module-splash/build/intermediates/merged_java_res/debug/out.jar
deleted file mode 100644
index e7c94ca92d..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/merged_java_res/debug/out.jar and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/merged_manifests/debug/output.json b/modules/mogo-module-splash/build/intermediates/merged_manifests/debug/output.json
deleted file mode 100644
index e4c6d64ed0..0000000000
--- a/modules/mogo-module-splash/build/intermediates/merged_manifests/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"2.0.16","enabled":true,"outputFile":"mogo-module-splash-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.module.splash","split":""}}]
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/packaged-classes/debug/classes.jar b/modules/mogo-module-splash/build/intermediates/packaged-classes/debug/classes.jar
deleted file mode 100644
index 7b364c2c92..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/packaged-classes/debug/classes.jar and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/module_byd_splash.webp b/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/module_byd_splash.webp
deleted file mode 100644
index d39b3abe55..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable-xhdpi-1920x1000-v4/module_byd_splash.webp and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_count_down_bg.xml b/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_count_down_bg.xml
deleted file mode 100644
index 83bc413969..0000000000
--- a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_count_down_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_enter_btn_bg.xml b/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_enter_btn_bg.xml
deleted file mode 100644
index e34b2f6181..0000000000
--- a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/byd_enter_btn_bg.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/module_byd_splash.webp b/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/module_byd_splash.webp
deleted file mode 100644
index d39b3abe55..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/drawable/module_byd_splash.webp and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/layout/fragment_byd_splash.xml b/modules/mogo-module-splash/build/intermediates/packaged_res/debug/layout/fragment_byd_splash.xml
deleted file mode 100644
index bb79601719..0000000000
--- a/modules/mogo-module-splash/build/intermediates/packaged_res/debug/layout/fragment_byd_splash.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/modules/mogo-module-splash/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
deleted file mode 100644
index c7a4245029..0000000000
--- a/modules/mogo-module-splash/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
+++ /dev/null
@@ -1,1347 +0,0 @@
-com.zhidao.mogo.module.splash
-anim abc_fade_in
-anim abc_fade_out
-anim abc_grow_fade_in_from_bottom
-anim abc_popup_enter
-anim abc_popup_exit
-anim abc_shrink_fade_out_from_bottom
-anim abc_slide_in_bottom
-anim abc_slide_in_top
-anim abc_slide_out_bottom
-anim abc_slide_out_top
-anim abc_tooltip_enter
-anim abc_tooltip_exit
-anim btn_checkbox_to_checked_box_inner_merged_animation
-anim btn_checkbox_to_checked_box_outer_merged_animation
-anim btn_checkbox_to_checked_icon_null_animation
-anim btn_checkbox_to_unchecked_box_inner_merged_animation
-anim btn_checkbox_to_unchecked_check_path_merged_animation
-anim btn_checkbox_to_unchecked_icon_null_animation
-anim btn_radio_to_off_mtrl_dot_group_animation
-anim btn_radio_to_off_mtrl_ring_outer_animation
-anim btn_radio_to_off_mtrl_ring_outer_path_animation
-anim btn_radio_to_on_mtrl_dot_group_animation
-anim btn_radio_to_on_mtrl_ring_outer_animation
-anim btn_radio_to_on_mtrl_ring_outer_path_animation
-attr actionBarDivider
-attr actionBarItemBackground
-attr actionBarPopupTheme
-attr actionBarSize
-attr actionBarSplitStyle
-attr actionBarStyle
-attr actionBarTabBarStyle
-attr actionBarTabStyle
-attr actionBarTabTextStyle
-attr actionBarTheme
-attr actionBarWidgetTheme
-attr actionButtonStyle
-attr actionDropDownStyle
-attr actionLayout
-attr actionMenuTextAppearance
-attr actionMenuTextColor
-attr actionModeBackground
-attr actionModeCloseButtonStyle
-attr actionModeCloseDrawable
-attr actionModeCopyDrawable
-attr actionModeCutDrawable
-attr actionModeFindDrawable
-attr actionModePasteDrawable
-attr actionModePopupWindowStyle
-attr actionModeSelectAllDrawable
-attr actionModeShareDrawable
-attr actionModeSplitBackground
-attr actionModeStyle
-attr actionModeWebSearchDrawable
-attr actionOverflowButtonStyle
-attr actionOverflowMenuStyle
-attr actionProviderClass
-attr actionViewClass
-attr activityChooserViewStyle
-attr alertDialogButtonGroupStyle
-attr alertDialogCenterButtons
-attr alertDialogStyle
-attr alertDialogTheme
-attr allowStacking
-attr alpha
-attr alphabeticModifiers
-attr arrowHeadLength
-attr arrowShaftLength
-attr autoCompleteTextViewStyle
-attr autoSizeMaxTextSize
-attr autoSizeMinTextSize
-attr autoSizePresetSizes
-attr autoSizeStepGranularity
-attr autoSizeTextType
-attr background
-attr backgroundSplit
-attr backgroundStacked
-attr backgroundTint
-attr backgroundTintMode
-attr barLength
-attr barrierAllowsGoneWidgets
-attr barrierDirection
-attr borderlessButtonStyle
-attr buttonBarButtonStyle
-attr buttonBarNegativeButtonStyle
-attr buttonBarNeutralButtonStyle
-attr buttonBarPositiveButtonStyle
-attr buttonBarStyle
-attr buttonCompat
-attr buttonGravity
-attr buttonIconDimen
-attr buttonPanelSideLayout
-attr buttonStyle
-attr buttonStyleSmall
-attr buttonTint
-attr buttonTintMode
-attr chainUseRtl
-attr checkboxStyle
-attr checkedTextViewStyle
-attr closeIcon
-attr closeItemLayout
-attr collapseContentDescription
-attr collapseIcon
-attr color
-attr colorAccent
-attr colorBackgroundFloating
-attr colorButtonNormal
-attr colorControlActivated
-attr colorControlHighlight
-attr colorControlNormal
-attr colorError
-attr colorPrimary
-attr colorPrimaryDark
-attr colorSwitchThumbNormal
-attr commitIcon
-attr constraintSet
-attr constraint_referenced_ids
-attr content
-attr contentDescription
-attr contentInsetEnd
-attr contentInsetEndWithActions
-attr contentInsetLeft
-attr contentInsetRight
-attr contentInsetStart
-attr contentInsetStartWithNavigation
-attr controlBackground
-attr coordinatorLayoutStyle
-attr customNavigationLayout
-attr defaultQueryHint
-attr dialogCornerRadius
-attr dialogPreferredPadding
-attr dialogTheme
-attr displayOptions
-attr divider
-attr dividerHorizontal
-attr dividerPadding
-attr dividerVertical
-attr drawableBottomCompat
-attr drawableEndCompat
-attr drawableLeftCompat
-attr drawableRightCompat
-attr drawableSize
-attr drawableStartCompat
-attr drawableTint
-attr drawableTintMode
-attr drawableTopCompat
-attr drawerArrowStyle
-attr dropDownListViewStyle
-attr dropdownListPreferredItemHeight
-attr editTextBackground
-attr editTextColor
-attr editTextStyle
-attr elevation
-attr emptyVisibility
-attr expandActivityOverflowButtonDrawable
-attr firstBaselineToTopHeight
-attr font
-attr fontFamily
-attr fontProviderAuthority
-attr fontProviderCerts
-attr fontProviderFetchStrategy
-attr fontProviderFetchTimeout
-attr fontProviderPackage
-attr fontProviderQuery
-attr fontStyle
-attr fontVariationSettings
-attr fontWeight
-attr gapBetweenBars
-attr goIcon
-attr height
-attr hideOnContentScroll
-attr homeAsUpIndicator
-attr homeLayout
-attr icon
-attr iconTint
-attr iconTintMode
-attr iconifiedByDefault
-attr imageButtonStyle
-attr indeterminateProgressStyle
-attr initialActivityCount
-attr isLightTheme
-attr itemPadding
-attr keylines
-attr lastBaselineToBottomHeight
-attr layout
-attr layout_anchor
-attr layout_anchorGravity
-attr layout_behavior
-attr layout_constrainedHeight
-attr layout_constrainedWidth
-attr layout_constraintBaseline_creator
-attr layout_constraintBaseline_toBaselineOf
-attr layout_constraintBottom_creator
-attr layout_constraintBottom_toBottomOf
-attr layout_constraintBottom_toTopOf
-attr layout_constraintCircle
-attr layout_constraintCircleAngle
-attr layout_constraintCircleRadius
-attr layout_constraintDimensionRatio
-attr layout_constraintEnd_toEndOf
-attr layout_constraintEnd_toStartOf
-attr layout_constraintGuide_begin
-attr layout_constraintGuide_end
-attr layout_constraintGuide_percent
-attr layout_constraintHeight_default
-attr layout_constraintHeight_max
-attr layout_constraintHeight_min
-attr layout_constraintHeight_percent
-attr layout_constraintHorizontal_bias
-attr layout_constraintHorizontal_chainStyle
-attr layout_constraintHorizontal_weight
-attr layout_constraintLeft_creator
-attr layout_constraintLeft_toLeftOf
-attr layout_constraintLeft_toRightOf
-attr layout_constraintRight_creator
-attr layout_constraintRight_toLeftOf
-attr layout_constraintRight_toRightOf
-attr layout_constraintStart_toEndOf
-attr layout_constraintStart_toStartOf
-attr layout_constraintTop_creator
-attr layout_constraintTop_toBottomOf
-attr layout_constraintTop_toTopOf
-attr layout_constraintVertical_bias
-attr layout_constraintVertical_chainStyle
-attr layout_constraintVertical_weight
-attr layout_constraintWidth_default
-attr layout_constraintWidth_max
-attr layout_constraintWidth_min
-attr layout_constraintWidth_percent
-attr layout_dodgeInsetEdges
-attr layout_editor_absoluteX
-attr layout_editor_absoluteY
-attr layout_goneMarginBottom
-attr layout_goneMarginEnd
-attr layout_goneMarginLeft
-attr layout_goneMarginRight
-attr layout_goneMarginStart
-attr layout_goneMarginTop
-attr layout_insetEdge
-attr layout_keyline
-attr layout_optimizationLevel
-attr lineHeight
-attr listChoiceBackgroundIndicator
-attr listChoiceIndicatorMultipleAnimated
-attr listChoiceIndicatorSingleAnimated
-attr listDividerAlertDialog
-attr listItemLayout
-attr listLayout
-attr listMenuViewStyle
-attr listPopupWindowStyle
-attr listPreferredItemHeight
-attr listPreferredItemHeightLarge
-attr listPreferredItemHeightSmall
-attr listPreferredItemPaddingEnd
-attr listPreferredItemPaddingLeft
-attr listPreferredItemPaddingRight
-attr listPreferredItemPaddingStart
-attr logo
-attr logoDescription
-attr maxButtonHeight
-attr measureWithLargestChild
-attr menu
-attr multiChoiceItemLayout
-attr navigationContentDescription
-attr navigationIcon
-attr navigationMode
-attr numericModifiers
-attr overlapAnchor
-attr paddingBottomNoButtons
-attr paddingEnd
-attr paddingStart
-attr paddingTopNoTitle
-attr panelBackground
-attr panelMenuListTheme
-attr panelMenuListWidth
-attr popupMenuStyle
-attr popupTheme
-attr popupWindowStyle
-attr preserveIconSpacing
-attr progressBarPadding
-attr progressBarStyle
-attr queryBackground
-attr queryHint
-attr radioButtonStyle
-attr ratingBarStyle
-attr ratingBarStyleIndicator
-attr ratingBarStyleSmall
-attr searchHintIcon
-attr searchIcon
-attr searchViewStyle
-attr seekBarStyle
-attr selectableItemBackground
-attr selectableItemBackgroundBorderless
-attr showAsAction
-attr showDividers
-attr showText
-attr showTitle
-attr singleChoiceItemLayout
-attr spinBars
-attr spinnerDropDownItemStyle
-attr spinnerStyle
-attr splitTrack
-attr srcCompat
-attr state_above_anchor
-attr statusBarBackground
-attr subMenuArrow
-attr submitBackground
-attr subtitle
-attr subtitleTextAppearance
-attr subtitleTextColor
-attr subtitleTextStyle
-attr suggestionRowLayout
-attr switchMinWidth
-attr switchPadding
-attr switchStyle
-attr switchTextAppearance
-attr textAllCaps
-attr textAppearanceLargePopupMenu
-attr textAppearanceListItem
-attr textAppearanceListItemSecondary
-attr textAppearanceListItemSmall
-attr textAppearancePopupMenuHeader
-attr textAppearanceSearchResultSubtitle
-attr textAppearanceSearchResultTitle
-attr textAppearanceSmallPopupMenu
-attr textColorAlertDialogListItem
-attr textColorSearchUrl
-attr textLocale
-attr theme
-attr thickness
-attr thumbTextPadding
-attr thumbTint
-attr thumbTintMode
-attr tickMark
-attr tickMarkTint
-attr tickMarkTintMode
-attr tint
-attr tintMode
-attr title
-attr titleMargin
-attr titleMarginBottom
-attr titleMarginEnd
-attr titleMarginStart
-attr titleMarginTop
-attr titleMargins
-attr titleTextAppearance
-attr titleTextColor
-attr titleTextStyle
-attr toolbarNavigationButtonStyle
-attr toolbarStyle
-attr tooltipForegroundColor
-attr tooltipFrameBackground
-attr tooltipText
-attr track
-attr trackTint
-attr trackTintMode
-attr ttcIndex
-attr viewInflaterClass
-attr voiceIcon
-attr windowActionBar
-attr windowActionBarOverlay
-attr windowActionModeOverlay
-attr windowFixedHeightMajor
-attr windowFixedHeightMinor
-attr windowFixedWidthMajor
-attr windowFixedWidthMinor
-attr windowMinWidthMajor
-attr windowMinWidthMinor
-attr windowNoTitle
-bool abc_action_bar_embed_tabs
-bool abc_allow_stacked_button_bar
-bool abc_config_actionMenuItemAllCaps
-color abc_background_cache_hint_selector_material_dark
-color abc_background_cache_hint_selector_material_light
-color abc_btn_colored_borderless_text_material
-color abc_btn_colored_text_material
-color abc_color_highlight_material
-color abc_hint_foreground_material_dark
-color abc_hint_foreground_material_light
-color abc_input_method_navigation_guard
-color abc_primary_text_disable_only_material_dark
-color abc_primary_text_disable_only_material_light
-color abc_primary_text_material_dark
-color abc_primary_text_material_light
-color abc_search_url_text
-color abc_search_url_text_normal
-color abc_search_url_text_pressed
-color abc_search_url_text_selected
-color abc_secondary_text_material_dark
-color abc_secondary_text_material_light
-color abc_tint_btn_checkable
-color abc_tint_default
-color abc_tint_edittext
-color abc_tint_seek_thumb
-color abc_tint_spinner
-color abc_tint_switch_track
-color accent_material_dark
-color accent_material_light
-color androidx_core_ripple_material_light
-color androidx_core_secondary_text_default_material_light
-color background_floating_material_dark
-color background_floating_material_light
-color background_material_dark
-color background_material_light
-color bright_foreground_disabled_material_dark
-color bright_foreground_disabled_material_light
-color bright_foreground_inverse_material_dark
-color bright_foreground_inverse_material_light
-color bright_foreground_material_dark
-color bright_foreground_material_light
-color button_material_dark
-color button_material_light
-color dim_foreground_disabled_material_dark
-color dim_foreground_disabled_material_light
-color dim_foreground_material_dark
-color dim_foreground_material_light
-color error_color_material_dark
-color error_color_material_light
-color foreground_material_dark
-color foreground_material_light
-color highlighted_text_material_dark
-color highlighted_text_material_light
-color material_blue_grey_800
-color material_blue_grey_900
-color material_blue_grey_950
-color material_deep_teal_200
-color material_deep_teal_500
-color material_grey_100
-color material_grey_300
-color material_grey_50
-color material_grey_600
-color material_grey_800
-color material_grey_850
-color material_grey_900
-color notification_action_color_filter
-color notification_icon_bg_color
-color notification_material_background_media_default_color
-color primary_dark_material_dark
-color primary_dark_material_light
-color primary_material_dark
-color primary_material_light
-color primary_text_default_material_dark
-color primary_text_default_material_light
-color primary_text_disabled_material_dark
-color primary_text_disabled_material_light
-color ripple_material_dark
-color ripple_material_light
-color secondary_text_default_material_dark
-color secondary_text_default_material_light
-color secondary_text_disabled_material_dark
-color secondary_text_disabled_material_light
-color switch_thumb_disabled_material_dark
-color switch_thumb_disabled_material_light
-color switch_thumb_material_dark
-color switch_thumb_material_light
-color switch_thumb_normal_material_dark
-color switch_thumb_normal_material_light
-color tooltip_background_dark
-color tooltip_background_light
-dimen abc_action_bar_content_inset_material
-dimen abc_action_bar_content_inset_with_nav
-dimen abc_action_bar_default_height_material
-dimen abc_action_bar_default_padding_end_material
-dimen abc_action_bar_default_padding_start_material
-dimen abc_action_bar_elevation_material
-dimen abc_action_bar_icon_vertical_padding_material
-dimen abc_action_bar_overflow_padding_end_material
-dimen abc_action_bar_overflow_padding_start_material
-dimen abc_action_bar_stacked_max_height
-dimen abc_action_bar_stacked_tab_max_width
-dimen abc_action_bar_subtitle_bottom_margin_material
-dimen abc_action_bar_subtitle_top_margin_material
-dimen abc_action_button_min_height_material
-dimen abc_action_button_min_width_material
-dimen abc_action_button_min_width_overflow_material
-dimen abc_alert_dialog_button_bar_height
-dimen abc_alert_dialog_button_dimen
-dimen abc_button_inset_horizontal_material
-dimen abc_button_inset_vertical_material
-dimen abc_button_padding_horizontal_material
-dimen abc_button_padding_vertical_material
-dimen abc_cascading_menus_min_smallest_width
-dimen abc_config_prefDialogWidth
-dimen abc_control_corner_material
-dimen abc_control_inset_material
-dimen abc_control_padding_material
-dimen abc_dialog_corner_radius_material
-dimen abc_dialog_fixed_height_major
-dimen abc_dialog_fixed_height_minor
-dimen abc_dialog_fixed_width_major
-dimen abc_dialog_fixed_width_minor
-dimen abc_dialog_list_padding_bottom_no_buttons
-dimen abc_dialog_list_padding_top_no_title
-dimen abc_dialog_min_width_major
-dimen abc_dialog_min_width_minor
-dimen abc_dialog_padding_material
-dimen abc_dialog_padding_top_material
-dimen abc_dialog_title_divider_material
-dimen abc_disabled_alpha_material_dark
-dimen abc_disabled_alpha_material_light
-dimen abc_dropdownitem_icon_width
-dimen abc_dropdownitem_text_padding_left
-dimen abc_dropdownitem_text_padding_right
-dimen abc_edit_text_inset_bottom_material
-dimen abc_edit_text_inset_horizontal_material
-dimen abc_edit_text_inset_top_material
-dimen abc_floating_window_z
-dimen abc_list_item_height_large_material
-dimen abc_list_item_height_material
-dimen abc_list_item_height_small_material
-dimen abc_list_item_padding_horizontal_material
-dimen abc_panel_menu_list_width
-dimen abc_progress_bar_height_material
-dimen abc_search_view_preferred_height
-dimen abc_search_view_preferred_width
-dimen abc_seekbar_track_background_height_material
-dimen abc_seekbar_track_progress_height_material
-dimen abc_select_dialog_padding_start_material
-dimen abc_switch_padding
-dimen abc_text_size_body_1_material
-dimen abc_text_size_body_2_material
-dimen abc_text_size_button_material
-dimen abc_text_size_caption_material
-dimen abc_text_size_display_1_material
-dimen abc_text_size_display_2_material
-dimen abc_text_size_display_3_material
-dimen abc_text_size_display_4_material
-dimen abc_text_size_headline_material
-dimen abc_text_size_large_material
-dimen abc_text_size_medium_material
-dimen abc_text_size_menu_header_material
-dimen abc_text_size_menu_material
-dimen abc_text_size_small_material
-dimen abc_text_size_subhead_material
-dimen abc_text_size_subtitle_material_toolbar
-dimen abc_text_size_title_material
-dimen abc_text_size_title_material_toolbar
-dimen compat_button_inset_horizontal_material
-dimen compat_button_inset_vertical_material
-dimen compat_button_padding_horizontal_material
-dimen compat_button_padding_vertical_material
-dimen compat_control_corner_material
-dimen compat_notification_large_icon_max_height
-dimen compat_notification_large_icon_max_width
-dimen disabled_alpha_material_dark
-dimen disabled_alpha_material_light
-dimen highlight_alpha_material_colored
-dimen highlight_alpha_material_dark
-dimen highlight_alpha_material_light
-dimen hint_alpha_material_dark
-dimen hint_alpha_material_light
-dimen hint_pressed_alpha_material_dark
-dimen hint_pressed_alpha_material_light
-dimen notification_action_icon_size
-dimen notification_action_text_size
-dimen notification_big_circle_margin
-dimen notification_content_margin_start
-dimen notification_large_icon_height
-dimen notification_large_icon_width
-dimen notification_main_column_padding_top
-dimen notification_media_narrow_margin
-dimen notification_right_icon_size
-dimen notification_right_side_padding_top
-dimen notification_small_icon_background_padding
-dimen notification_small_icon_size_as_large
-dimen notification_subtext_size
-dimen notification_top_pad
-dimen notification_top_pad_large_text
-dimen subtitle_corner_radius
-dimen subtitle_outline_width
-dimen subtitle_shadow_offset
-dimen subtitle_shadow_radius
-dimen tooltip_corner_radius
-dimen tooltip_horizontal_padding
-dimen tooltip_margin
-dimen tooltip_precise_anchor_extra_offset
-dimen tooltip_precise_anchor_threshold
-dimen tooltip_vertical_padding
-dimen tooltip_y_offset_non_touch
-dimen tooltip_y_offset_touch
-drawable abc_ab_share_pack_mtrl_alpha
-drawable abc_action_bar_item_background_material
-drawable abc_btn_borderless_material
-drawable abc_btn_check_material
-drawable abc_btn_check_material_anim
-drawable abc_btn_check_to_on_mtrl_000
-drawable abc_btn_check_to_on_mtrl_015
-drawable abc_btn_colored_material
-drawable abc_btn_default_mtrl_shape
-drawable abc_btn_radio_material
-drawable abc_btn_radio_material_anim
-drawable abc_btn_radio_to_on_mtrl_000
-drawable abc_btn_radio_to_on_mtrl_015
-drawable abc_btn_switch_to_on_mtrl_00001
-drawable abc_btn_switch_to_on_mtrl_00012
-drawable abc_cab_background_internal_bg
-drawable abc_cab_background_top_material
-drawable abc_cab_background_top_mtrl_alpha
-drawable abc_control_background_material
-drawable abc_dialog_material_background
-drawable abc_edit_text_material
-drawable abc_ic_ab_back_material
-drawable abc_ic_arrow_drop_right_black_24dp
-drawable abc_ic_clear_material
-drawable abc_ic_commit_search_api_mtrl_alpha
-drawable abc_ic_go_search_api_material
-drawable abc_ic_menu_copy_mtrl_am_alpha
-drawable abc_ic_menu_cut_mtrl_alpha
-drawable abc_ic_menu_overflow_material
-drawable abc_ic_menu_paste_mtrl_am_alpha
-drawable abc_ic_menu_selectall_mtrl_alpha
-drawable abc_ic_menu_share_mtrl_alpha
-drawable abc_ic_search_api_material
-drawable abc_ic_star_black_16dp
-drawable abc_ic_star_black_36dp
-drawable abc_ic_star_black_48dp
-drawable abc_ic_star_half_black_16dp
-drawable abc_ic_star_half_black_36dp
-drawable abc_ic_star_half_black_48dp
-drawable abc_ic_voice_search_api_material
-drawable abc_item_background_holo_dark
-drawable abc_item_background_holo_light
-drawable abc_list_divider_material
-drawable abc_list_divider_mtrl_alpha
-drawable abc_list_focused_holo
-drawable abc_list_longpressed_holo
-drawable abc_list_pressed_holo_dark
-drawable abc_list_pressed_holo_light
-drawable abc_list_selector_background_transition_holo_dark
-drawable abc_list_selector_background_transition_holo_light
-drawable abc_list_selector_disabled_holo_dark
-drawable abc_list_selector_disabled_holo_light
-drawable abc_list_selector_holo_dark
-drawable abc_list_selector_holo_light
-drawable abc_menu_hardkey_panel_mtrl_mult
-drawable abc_popup_background_mtrl_mult
-drawable abc_ratingbar_indicator_material
-drawable abc_ratingbar_material
-drawable abc_ratingbar_small_material
-drawable abc_scrubber_control_off_mtrl_alpha
-drawable abc_scrubber_control_to_pressed_mtrl_000
-drawable abc_scrubber_control_to_pressed_mtrl_005
-drawable abc_scrubber_primary_mtrl_alpha
-drawable abc_scrubber_track_mtrl_alpha
-drawable abc_seekbar_thumb_material
-drawable abc_seekbar_tick_mark_material
-drawable abc_seekbar_track_material
-drawable abc_spinner_mtrl_am_alpha
-drawable abc_spinner_textfield_background_material
-drawable abc_switch_thumb_material
-drawable abc_switch_track_mtrl_alpha
-drawable abc_tab_indicator_material
-drawable abc_tab_indicator_mtrl_alpha
-drawable abc_text_cursor_material
-drawable abc_text_select_handle_left_mtrl_dark
-drawable abc_text_select_handle_left_mtrl_light
-drawable abc_text_select_handle_middle_mtrl_dark
-drawable abc_text_select_handle_middle_mtrl_light
-drawable abc_text_select_handle_right_mtrl_dark
-drawable abc_text_select_handle_right_mtrl_light
-drawable abc_textfield_activated_mtrl_alpha
-drawable abc_textfield_default_mtrl_alpha
-drawable abc_textfield_search_activated_mtrl_alpha
-drawable abc_textfield_search_default_mtrl_alpha
-drawable abc_textfield_search_material
-drawable abc_vector_test
-drawable btn_checkbox_checked_mtrl
-drawable btn_checkbox_checked_to_unchecked_mtrl_animation
-drawable btn_checkbox_unchecked_mtrl
-drawable btn_checkbox_unchecked_to_checked_mtrl_animation
-drawable btn_radio_off_mtrl
-drawable btn_radio_off_to_on_mtrl_animation
-drawable btn_radio_on_mtrl
-drawable btn_radio_on_to_off_mtrl_animation
-drawable byd_count_down_bg
-drawable byd_enter_btn_bg
-drawable module_byd_splash
-drawable notification_action_background
-drawable notification_bg
-drawable notification_bg_low
-drawable notification_bg_low_normal
-drawable notification_bg_low_pressed
-drawable notification_bg_normal
-drawable notification_bg_normal_pressed
-drawable notification_icon_background
-drawable notification_template_icon_bg
-drawable notification_template_icon_low_bg
-drawable notification_tile_bg
-drawable notify_panel_notification_icon_bg
-drawable tooltip_frame_dark
-drawable tooltip_frame_light
-id accessibility_action_clickable_span
-id accessibility_custom_action_0
-id accessibility_custom_action_1
-id accessibility_custom_action_10
-id accessibility_custom_action_11
-id accessibility_custom_action_12
-id accessibility_custom_action_13
-id accessibility_custom_action_14
-id accessibility_custom_action_15
-id accessibility_custom_action_16
-id accessibility_custom_action_17
-id accessibility_custom_action_18
-id accessibility_custom_action_19
-id accessibility_custom_action_2
-id accessibility_custom_action_20
-id accessibility_custom_action_21
-id accessibility_custom_action_22
-id accessibility_custom_action_23
-id accessibility_custom_action_24
-id accessibility_custom_action_25
-id accessibility_custom_action_26
-id accessibility_custom_action_27
-id accessibility_custom_action_28
-id accessibility_custom_action_29
-id accessibility_custom_action_3
-id accessibility_custom_action_30
-id accessibility_custom_action_31
-id accessibility_custom_action_4
-id accessibility_custom_action_5
-id accessibility_custom_action_6
-id accessibility_custom_action_7
-id accessibility_custom_action_8
-id accessibility_custom_action_9
-id action0
-id action_bar
-id action_bar_activity_content
-id action_bar_container
-id action_bar_root
-id action_bar_spinner
-id action_bar_subtitle
-id action_bar_title
-id action_container
-id action_context_bar
-id action_divider
-id action_image
-id action_menu_divider
-id action_menu_presenter
-id action_mode_bar
-id action_mode_bar_stub
-id action_mode_close_button
-id action_text
-id actions
-id activity_chooser_view_content
-id add
-id alertTitle
-id async
-id blocking
-id bottom
-id buttonPanel
-id cancel_action
-id checkbox
-id checked
-id chronometer
-id content
-id contentPanel
-id custom
-id customPanel
-id decor_content_parent
-id default_activity_button
-id dialog_button
-id edit_query
-id end
-id end_padder
-id expand_activities_button
-id expanded_menu
-id forever
-id gone
-id group_divider
-id home
-id icon
-id icon_group
-id image
-id info
-id invisible
-id italic
-id left
-id line1
-id line3
-id listMode
-id list_item
-id media_actions
-id message
-id multiply
-id none
-id normal
-id notification_background
-id notification_main_column
-id notification_main_column_container
-id off
-id on
-id packed
-id parent
-id parentPanel
-id percent
-id progress_circular
-id progress_horizontal
-id radio
-id right
-id right_icon
-id right_side
-id screen
-id scrollIndicatorDown
-id scrollIndicatorUp
-id scrollView
-id search_badge
-id search_bar
-id search_button
-id search_close_btn
-id search_edit_frame
-id search_go_btn
-id search_mag_icon
-id search_plate
-id search_src_text
-id search_voice_btn
-id select_dialog_listview
-id shortcut
-id spacer
-id split_action_bar
-id spread
-id spread_inside
-id src_atop
-id src_in
-id src_over
-id start
-id status_bar_latest_event_content
-id submenuarrow
-id submit_area
-id tabMode
-id tag_accessibility_actions
-id tag_accessibility_clickable_spans
-id tag_accessibility_heading
-id tag_accessibility_pane_title
-id tag_screen_reader_focusable
-id tag_transition_group
-id tag_unhandled_key_event_manager
-id tag_unhandled_key_listeners
-id text
-id text2
-id textSpacerNoButtons
-id textSpacerNoTitle
-id time
-id title
-id titleDividerNoCustom
-id title_template
-id top
-id topPanel
-id tvByd
-id tvCountDown
-id unchecked
-id uniform
-id up
-id wrap
-id wrap_content
-integer abc_config_activityDefaultDur
-integer abc_config_activityShortDur
-integer cancel_button_image_alpha
-integer config_tooltipAnimTime
-integer status_bar_notification_info_maxnum
-interpolator btn_checkbox_checked_mtrl_animation_interpolator_0
-interpolator btn_checkbox_checked_mtrl_animation_interpolator_1
-interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_0
-interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_1
-interpolator btn_radio_to_off_mtrl_animation_interpolator_0
-interpolator btn_radio_to_on_mtrl_animation_interpolator_0
-interpolator fast_out_slow_in
-layout abc_action_bar_title_item
-layout abc_action_bar_up_container
-layout abc_action_menu_item_layout
-layout abc_action_menu_layout
-layout abc_action_mode_bar
-layout abc_action_mode_close_item_material
-layout abc_activity_chooser_view
-layout abc_activity_chooser_view_list_item
-layout abc_alert_dialog_button_bar_material
-layout abc_alert_dialog_material
-layout abc_alert_dialog_title_material
-layout abc_cascading_menu_item_layout
-layout abc_dialog_title_material
-layout abc_expanded_menu_layout
-layout abc_list_menu_item_checkbox
-layout abc_list_menu_item_icon
-layout abc_list_menu_item_layout
-layout abc_list_menu_item_radio
-layout abc_popup_menu_header_item_layout
-layout abc_popup_menu_item_layout
-layout abc_screen_content_include
-layout abc_screen_simple
-layout abc_screen_simple_overlay_action_mode
-layout abc_screen_toolbar
-layout abc_search_dropdown_item_icons_2line
-layout abc_search_view
-layout abc_select_dialog_material
-layout abc_tooltip
-layout custom_dialog
-layout fragment_byd_splash
-layout notification_action
-layout notification_action_tombstone
-layout notification_media_action
-layout notification_media_cancel_action
-layout notification_template_big_media
-layout notification_template_big_media_custom
-layout notification_template_big_media_narrow
-layout notification_template_big_media_narrow_custom
-layout notification_template_custom_big
-layout notification_template_icon_group
-layout notification_template_lines_media
-layout notification_template_media
-layout notification_template_media_custom
-layout notification_template_part_chronometer
-layout notification_template_part_time
-layout select_dialog_item_material
-layout select_dialog_multichoice_material
-layout select_dialog_singlechoice_material
-layout support_simple_spinner_dropdown_item
-string abc_action_bar_home_description
-string abc_action_bar_up_description
-string abc_action_menu_overflow_description
-string abc_action_mode_done
-string abc_activity_chooser_view_see_all
-string abc_activitychooserview_choose_application
-string abc_capital_off
-string abc_capital_on
-string abc_menu_alt_shortcut_label
-string abc_menu_ctrl_shortcut_label
-string abc_menu_delete_shortcut_label
-string abc_menu_enter_shortcut_label
-string abc_menu_function_shortcut_label
-string abc_menu_meta_shortcut_label
-string abc_menu_shift_shortcut_label
-string abc_menu_space_shortcut_label
-string abc_menu_sym_shortcut_label
-string abc_prepend_shortcut_label
-string abc_search_hint
-string abc_searchview_description_clear
-string abc_searchview_description_query
-string abc_searchview_description_search
-string abc_searchview_description_submit
-string abc_searchview_description_voice
-string abc_shareactionprovider_share_with
-string abc_shareactionprovider_share_with_application
-string abc_toolbar_collapse_description
-string search_menu_title
-string status_bar_notification_info_overflow
-style AlertDialog_AppCompat
-style AlertDialog_AppCompat_Light
-style Animation_AppCompat_Dialog
-style Animation_AppCompat_DropDownUp
-style Animation_AppCompat_Tooltip
-style Base_AlertDialog_AppCompat
-style Base_AlertDialog_AppCompat_Light
-style Base_Animation_AppCompat_Dialog
-style Base_Animation_AppCompat_DropDownUp
-style Base_Animation_AppCompat_Tooltip
-style Base_DialogWindowTitleBackground_AppCompat
-style Base_DialogWindowTitle_AppCompat
-style Base_TextAppearance_AppCompat
-style Base_TextAppearance_AppCompat_Body1
-style Base_TextAppearance_AppCompat_Body2
-style Base_TextAppearance_AppCompat_Button
-style Base_TextAppearance_AppCompat_Caption
-style Base_TextAppearance_AppCompat_Display1
-style Base_TextAppearance_AppCompat_Display2
-style Base_TextAppearance_AppCompat_Display3
-style Base_TextAppearance_AppCompat_Display4
-style Base_TextAppearance_AppCompat_Headline
-style Base_TextAppearance_AppCompat_Inverse
-style Base_TextAppearance_AppCompat_Large
-style Base_TextAppearance_AppCompat_Large_Inverse
-style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large
-style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small
-style Base_TextAppearance_AppCompat_Medium
-style Base_TextAppearance_AppCompat_Medium_Inverse
-style Base_TextAppearance_AppCompat_Menu
-style Base_TextAppearance_AppCompat_SearchResult
-style Base_TextAppearance_AppCompat_SearchResult_Subtitle
-style Base_TextAppearance_AppCompat_SearchResult_Title
-style Base_TextAppearance_AppCompat_Small
-style Base_TextAppearance_AppCompat_Small_Inverse
-style Base_TextAppearance_AppCompat_Subhead
-style Base_TextAppearance_AppCompat_Subhead_Inverse
-style Base_TextAppearance_AppCompat_Title
-style Base_TextAppearance_AppCompat_Title_Inverse
-style Base_TextAppearance_AppCompat_Tooltip
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Menu
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Title
-style Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse
-style Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle
-style Base_TextAppearance_AppCompat_Widget_ActionMode_Title
-style Base_TextAppearance_AppCompat_Widget_Button
-style Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored
-style Base_TextAppearance_AppCompat_Widget_Button_Colored
-style Base_TextAppearance_AppCompat_Widget_Button_Inverse
-style Base_TextAppearance_AppCompat_Widget_DropDownItem
-style Base_TextAppearance_AppCompat_Widget_PopupMenu_Header
-style Base_TextAppearance_AppCompat_Widget_PopupMenu_Large
-style Base_TextAppearance_AppCompat_Widget_PopupMenu_Small
-style Base_TextAppearance_AppCompat_Widget_Switch
-style Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem
-style Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item
-style Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle
-style Base_TextAppearance_Widget_AppCompat_Toolbar_Title
-style Base_ThemeOverlay_AppCompat
-style Base_ThemeOverlay_AppCompat_ActionBar
-style Base_ThemeOverlay_AppCompat_Dark
-style Base_ThemeOverlay_AppCompat_Dark_ActionBar
-style Base_ThemeOverlay_AppCompat_Dialog
-style Base_ThemeOverlay_AppCompat_Dialog_Alert
-style Base_ThemeOverlay_AppCompat_Light
-style Base_Theme_AppCompat
-style Base_Theme_AppCompat_CompactMenu
-style Base_Theme_AppCompat_Dialog
-style Base_Theme_AppCompat_DialogWhenLarge
-style Base_Theme_AppCompat_Dialog_Alert
-style Base_Theme_AppCompat_Dialog_FixedSize
-style Base_Theme_AppCompat_Dialog_MinWidth
-style Base_Theme_AppCompat_Light
-style Base_Theme_AppCompat_Light_DarkActionBar
-style Base_Theme_AppCompat_Light_Dialog
-style Base_Theme_AppCompat_Light_DialogWhenLarge
-style Base_Theme_AppCompat_Light_Dialog_Alert
-style Base_Theme_AppCompat_Light_Dialog_FixedSize
-style Base_Theme_AppCompat_Light_Dialog_MinWidth
-style Base_V21_ThemeOverlay_AppCompat_Dialog
-style Base_V21_Theme_AppCompat
-style Base_V21_Theme_AppCompat_Dialog
-style Base_V21_Theme_AppCompat_Light
-style Base_V21_Theme_AppCompat_Light_Dialog
-style Base_V22_Theme_AppCompat
-style Base_V22_Theme_AppCompat_Light
-style Base_V23_Theme_AppCompat
-style Base_V23_Theme_AppCompat_Light
-style Base_V26_Theme_AppCompat
-style Base_V26_Theme_AppCompat_Light
-style Base_V26_Widget_AppCompat_Toolbar
-style Base_V28_Theme_AppCompat
-style Base_V28_Theme_AppCompat_Light
-style Base_V7_ThemeOverlay_AppCompat_Dialog
-style Base_V7_Theme_AppCompat
-style Base_V7_Theme_AppCompat_Dialog
-style Base_V7_Theme_AppCompat_Light
-style Base_V7_Theme_AppCompat_Light_Dialog
-style Base_V7_Widget_AppCompat_AutoCompleteTextView
-style Base_V7_Widget_AppCompat_EditText
-style Base_V7_Widget_AppCompat_Toolbar
-style Base_Widget_AppCompat_ActionBar
-style Base_Widget_AppCompat_ActionBar_Solid
-style Base_Widget_AppCompat_ActionBar_TabBar
-style Base_Widget_AppCompat_ActionBar_TabText
-style Base_Widget_AppCompat_ActionBar_TabView
-style Base_Widget_AppCompat_ActionButton
-style Base_Widget_AppCompat_ActionButton_CloseMode
-style Base_Widget_AppCompat_ActionButton_Overflow
-style Base_Widget_AppCompat_ActionMode
-style Base_Widget_AppCompat_ActivityChooserView
-style Base_Widget_AppCompat_AutoCompleteTextView
-style Base_Widget_AppCompat_Button
-style Base_Widget_AppCompat_ButtonBar
-style Base_Widget_AppCompat_ButtonBar_AlertDialog
-style Base_Widget_AppCompat_Button_Borderless
-style Base_Widget_AppCompat_Button_Borderless_Colored
-style Base_Widget_AppCompat_Button_ButtonBar_AlertDialog
-style Base_Widget_AppCompat_Button_Colored
-style Base_Widget_AppCompat_Button_Small
-style Base_Widget_AppCompat_CompoundButton_CheckBox
-style Base_Widget_AppCompat_CompoundButton_RadioButton
-style Base_Widget_AppCompat_CompoundButton_Switch
-style Base_Widget_AppCompat_DrawerArrowToggle
-style Base_Widget_AppCompat_DrawerArrowToggle_Common
-style Base_Widget_AppCompat_DropDownItem_Spinner
-style Base_Widget_AppCompat_EditText
-style Base_Widget_AppCompat_ImageButton
-style Base_Widget_AppCompat_Light_ActionBar
-style Base_Widget_AppCompat_Light_ActionBar_Solid
-style Base_Widget_AppCompat_Light_ActionBar_TabBar
-style Base_Widget_AppCompat_Light_ActionBar_TabText
-style Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse
-style Base_Widget_AppCompat_Light_ActionBar_TabView
-style Base_Widget_AppCompat_Light_PopupMenu
-style Base_Widget_AppCompat_Light_PopupMenu_Overflow
-style Base_Widget_AppCompat_ListMenuView
-style Base_Widget_AppCompat_ListPopupWindow
-style Base_Widget_AppCompat_ListView
-style Base_Widget_AppCompat_ListView_DropDown
-style Base_Widget_AppCompat_ListView_Menu
-style Base_Widget_AppCompat_PopupMenu
-style Base_Widget_AppCompat_PopupMenu_Overflow
-style Base_Widget_AppCompat_PopupWindow
-style Base_Widget_AppCompat_ProgressBar
-style Base_Widget_AppCompat_ProgressBar_Horizontal
-style Base_Widget_AppCompat_RatingBar
-style Base_Widget_AppCompat_RatingBar_Indicator
-style Base_Widget_AppCompat_RatingBar_Small
-style Base_Widget_AppCompat_SearchView
-style Base_Widget_AppCompat_SearchView_ActionBar
-style Base_Widget_AppCompat_SeekBar
-style Base_Widget_AppCompat_SeekBar_Discrete
-style Base_Widget_AppCompat_Spinner
-style Base_Widget_AppCompat_Spinner_Underlined
-style Base_Widget_AppCompat_TextView
-style Base_Widget_AppCompat_TextView_SpinnerItem
-style Base_Widget_AppCompat_Toolbar
-style Base_Widget_AppCompat_Toolbar_Button_Navigation
-style Platform_AppCompat
-style Platform_AppCompat_Light
-style Platform_ThemeOverlay_AppCompat
-style Platform_ThemeOverlay_AppCompat_Dark
-style Platform_ThemeOverlay_AppCompat_Light
-style Platform_V21_AppCompat
-style Platform_V21_AppCompat_Light
-style Platform_V25_AppCompat
-style Platform_V25_AppCompat_Light
-style Platform_Widget_AppCompat_Spinner
-style RtlOverlay_DialogWindowTitle_AppCompat
-style RtlOverlay_Widget_AppCompat_ActionBar_TitleItem
-style RtlOverlay_Widget_AppCompat_DialogTitle_Icon
-style RtlOverlay_Widget_AppCompat_PopupMenuItem
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_Text
-style RtlOverlay_Widget_AppCompat_PopupMenuItem_Title
-style RtlOverlay_Widget_AppCompat_SearchView_MagIcon
-style RtlOverlay_Widget_AppCompat_Search_DropDown
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Query
-style RtlOverlay_Widget_AppCompat_Search_DropDown_Text
-style RtlUnderlay_Widget_AppCompat_ActionButton
-style RtlUnderlay_Widget_AppCompat_ActionButton_Overflow
-style TextAppearance_AppCompat
-style TextAppearance_AppCompat_Body1
-style TextAppearance_AppCompat_Body2
-style TextAppearance_AppCompat_Button
-style TextAppearance_AppCompat_Caption
-style TextAppearance_AppCompat_Display1
-style TextAppearance_AppCompat_Display2
-style TextAppearance_AppCompat_Display3
-style TextAppearance_AppCompat_Display4
-style TextAppearance_AppCompat_Headline
-style TextAppearance_AppCompat_Inverse
-style TextAppearance_AppCompat_Large
-style TextAppearance_AppCompat_Large_Inverse
-style TextAppearance_AppCompat_Light_SearchResult_Subtitle
-style TextAppearance_AppCompat_Light_SearchResult_Title
-style TextAppearance_AppCompat_Light_Widget_PopupMenu_Large
-style TextAppearance_AppCompat_Light_Widget_PopupMenu_Small
-style TextAppearance_AppCompat_Medium
-style TextAppearance_AppCompat_Medium_Inverse
-style TextAppearance_AppCompat_Menu
-style TextAppearance_AppCompat_SearchResult_Subtitle
-style TextAppearance_AppCompat_SearchResult_Title
-style TextAppearance_AppCompat_Small
-style TextAppearance_AppCompat_Small_Inverse
-style TextAppearance_AppCompat_Subhead
-style TextAppearance_AppCompat_Subhead_Inverse
-style TextAppearance_AppCompat_Title
-style TextAppearance_AppCompat_Title_Inverse
-style TextAppearance_AppCompat_Tooltip
-style TextAppearance_AppCompat_Widget_ActionBar_Menu
-style TextAppearance_AppCompat_Widget_ActionBar_Subtitle
-style TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse
-style TextAppearance_AppCompat_Widget_ActionBar_Title
-style TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse
-style TextAppearance_AppCompat_Widget_ActionMode_Subtitle
-style TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse
-style TextAppearance_AppCompat_Widget_ActionMode_Title
-style TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse
-style TextAppearance_AppCompat_Widget_Button
-style TextAppearance_AppCompat_Widget_Button_Borderless_Colored
-style TextAppearance_AppCompat_Widget_Button_Colored
-style TextAppearance_AppCompat_Widget_Button_Inverse
-style TextAppearance_AppCompat_Widget_DropDownItem
-style TextAppearance_AppCompat_Widget_PopupMenu_Header
-style TextAppearance_AppCompat_Widget_PopupMenu_Large
-style TextAppearance_AppCompat_Widget_PopupMenu_Small
-style TextAppearance_AppCompat_Widget_Switch
-style TextAppearance_AppCompat_Widget_TextView_SpinnerItem
-style TextAppearance_Compat_Notification
-style TextAppearance_Compat_Notification_Info
-style TextAppearance_Compat_Notification_Info_Media
-style TextAppearance_Compat_Notification_Line2
-style TextAppearance_Compat_Notification_Line2_Media
-style TextAppearance_Compat_Notification_Media
-style TextAppearance_Compat_Notification_Time
-style TextAppearance_Compat_Notification_Time_Media
-style TextAppearance_Compat_Notification_Title
-style TextAppearance_Compat_Notification_Title_Media
-style TextAppearance_Widget_AppCompat_ExpandedMenu_Item
-style TextAppearance_Widget_AppCompat_Toolbar_Subtitle
-style TextAppearance_Widget_AppCompat_Toolbar_Title
-style ThemeOverlay_AppCompat
-style ThemeOverlay_AppCompat_ActionBar
-style ThemeOverlay_AppCompat_Dark
-style ThemeOverlay_AppCompat_Dark_ActionBar
-style ThemeOverlay_AppCompat_DayNight
-style ThemeOverlay_AppCompat_DayNight_ActionBar
-style ThemeOverlay_AppCompat_Dialog
-style ThemeOverlay_AppCompat_Dialog_Alert
-style ThemeOverlay_AppCompat_Light
-style Theme_AppCompat
-style Theme_AppCompat_CompactMenu
-style Theme_AppCompat_DayNight
-style Theme_AppCompat_DayNight_DarkActionBar
-style Theme_AppCompat_DayNight_Dialog
-style Theme_AppCompat_DayNight_DialogWhenLarge
-style Theme_AppCompat_DayNight_Dialog_Alert
-style Theme_AppCompat_DayNight_Dialog_MinWidth
-style Theme_AppCompat_DayNight_NoActionBar
-style Theme_AppCompat_Dialog
-style Theme_AppCompat_DialogWhenLarge
-style Theme_AppCompat_Dialog_Alert
-style Theme_AppCompat_Dialog_MinWidth
-style Theme_AppCompat_Light
-style Theme_AppCompat_Light_DarkActionBar
-style Theme_AppCompat_Light_Dialog
-style Theme_AppCompat_Light_DialogWhenLarge
-style Theme_AppCompat_Light_Dialog_Alert
-style Theme_AppCompat_Light_Dialog_MinWidth
-style Theme_AppCompat_Light_NoActionBar
-style Theme_AppCompat_NoActionBar
-style Widget_AppCompat_ActionBar
-style Widget_AppCompat_ActionBar_Solid
-style Widget_AppCompat_ActionBar_TabBar
-style Widget_AppCompat_ActionBar_TabText
-style Widget_AppCompat_ActionBar_TabView
-style Widget_AppCompat_ActionButton
-style Widget_AppCompat_ActionButton_CloseMode
-style Widget_AppCompat_ActionButton_Overflow
-style Widget_AppCompat_ActionMode
-style Widget_AppCompat_ActivityChooserView
-style Widget_AppCompat_AutoCompleteTextView
-style Widget_AppCompat_Button
-style Widget_AppCompat_ButtonBar
-style Widget_AppCompat_ButtonBar_AlertDialog
-style Widget_AppCompat_Button_Borderless
-style Widget_AppCompat_Button_Borderless_Colored
-style Widget_AppCompat_Button_ButtonBar_AlertDialog
-style Widget_AppCompat_Button_Colored
-style Widget_AppCompat_Button_Small
-style Widget_AppCompat_CompoundButton_CheckBox
-style Widget_AppCompat_CompoundButton_RadioButton
-style Widget_AppCompat_CompoundButton_Switch
-style Widget_AppCompat_DrawerArrowToggle
-style Widget_AppCompat_DropDownItem_Spinner
-style Widget_AppCompat_EditText
-style Widget_AppCompat_ImageButton
-style Widget_AppCompat_Light_ActionBar
-style Widget_AppCompat_Light_ActionBar_Solid
-style Widget_AppCompat_Light_ActionBar_Solid_Inverse
-style Widget_AppCompat_Light_ActionBar_TabBar
-style Widget_AppCompat_Light_ActionBar_TabBar_Inverse
-style Widget_AppCompat_Light_ActionBar_TabText
-style Widget_AppCompat_Light_ActionBar_TabText_Inverse
-style Widget_AppCompat_Light_ActionBar_TabView
-style Widget_AppCompat_Light_ActionBar_TabView_Inverse
-style Widget_AppCompat_Light_ActionButton
-style Widget_AppCompat_Light_ActionButton_CloseMode
-style Widget_AppCompat_Light_ActionButton_Overflow
-style Widget_AppCompat_Light_ActionMode_Inverse
-style Widget_AppCompat_Light_ActivityChooserView
-style Widget_AppCompat_Light_AutoCompleteTextView
-style Widget_AppCompat_Light_DropDownItem_Spinner
-style Widget_AppCompat_Light_ListPopupWindow
-style Widget_AppCompat_Light_ListView_DropDown
-style Widget_AppCompat_Light_PopupMenu
-style Widget_AppCompat_Light_PopupMenu_Overflow
-style Widget_AppCompat_Light_SearchView
-style Widget_AppCompat_Light_Spinner_DropDown_ActionBar
-style Widget_AppCompat_ListMenuView
-style Widget_AppCompat_ListPopupWindow
-style Widget_AppCompat_ListView
-style Widget_AppCompat_ListView_DropDown
-style Widget_AppCompat_ListView_Menu
-style Widget_AppCompat_PopupMenu
-style Widget_AppCompat_PopupMenu_Overflow
-style Widget_AppCompat_PopupWindow
-style Widget_AppCompat_ProgressBar
-style Widget_AppCompat_ProgressBar_Horizontal
-style Widget_AppCompat_RatingBar
-style Widget_AppCompat_RatingBar_Indicator
-style Widget_AppCompat_RatingBar_Small
-style Widget_AppCompat_SearchView
-style Widget_AppCompat_SearchView_ActionBar
-style Widget_AppCompat_SeekBar
-style Widget_AppCompat_SeekBar_Discrete
-style Widget_AppCompat_Spinner
-style Widget_AppCompat_Spinner_DropDown
-style Widget_AppCompat_Spinner_DropDown_ActionBar
-style Widget_AppCompat_Spinner_Underlined
-style Widget_AppCompat_TextView
-style Widget_AppCompat_TextView_SpinnerItem
-style Widget_AppCompat_Toolbar
-style Widget_AppCompat_Toolbar_Button_Navigation
-style Widget_Compat_NotificationActionContainer
-style Widget_Compat_NotificationActionText
-style Widget_Support_CoordinatorLayout
-styleable ActionBar background backgroundSplit backgroundStacked contentInsetEnd contentInsetEndWithActions contentInsetLeft contentInsetRight contentInsetStart contentInsetStartWithNavigation customNavigationLayout displayOptions divider elevation height hideOnContentScroll homeAsUpIndicator homeLayout icon indeterminateProgressStyle itemPadding logo navigationMode popupTheme progressBarPadding progressBarStyle subtitle subtitleTextStyle title titleTextStyle
-styleable ActionBarLayout android_layout_gravity
-styleable ActionMenuItemView android_minWidth
-styleable ActionMenuView
-styleable ActionMode background backgroundSplit closeItemLayout height subtitleTextStyle titleTextStyle
-styleable ActivityChooserView expandActivityOverflowButtonDrawable initialActivityCount
-styleable AlertDialog android_layout buttonIconDimen buttonPanelSideLayout listItemLayout listLayout multiChoiceItemLayout showTitle singleChoiceItemLayout
-styleable AnimatedStateListDrawableCompat android_constantSize android_dither android_enterFadeDuration android_exitFadeDuration android_variablePadding android_visible
-styleable AnimatedStateListDrawableItem android_drawable android_id
-styleable AnimatedStateListDrawableTransition android_drawable android_fromId android_reversible android_toId
-styleable AppCompatImageView android_src srcCompat tint tintMode
-styleable AppCompatSeekBar android_thumb tickMark tickMarkTint tickMarkTintMode
-styleable AppCompatTextHelper android_drawableBottom android_drawableEnd android_drawableLeft android_drawableRight android_drawableStart android_drawableTop android_textAppearance
-styleable AppCompatTextView android_textAppearance autoSizeMaxTextSize autoSizeMinTextSize autoSizePresetSizes autoSizeStepGranularity autoSizeTextType drawableBottomCompat drawableEndCompat drawableLeftCompat drawableRightCompat drawableStartCompat drawableTint drawableTintMode drawableTopCompat firstBaselineToTopHeight fontFamily fontVariationSettings lastBaselineToBottomHeight lineHeight textAllCaps textLocale
-styleable AppCompatTheme actionBarDivider actionBarItemBackground actionBarPopupTheme actionBarSize actionBarSplitStyle actionBarStyle actionBarTabBarStyle actionBarTabStyle actionBarTabTextStyle actionBarTheme actionBarWidgetTheme actionButtonStyle actionDropDownStyle actionMenuTextAppearance actionMenuTextColor actionModeBackground actionModeCloseButtonStyle actionModeCloseDrawable actionModeCopyDrawable actionModeCutDrawable actionModeFindDrawable actionModePasteDrawable actionModePopupWindowStyle actionModeSelectAllDrawable actionModeShareDrawable actionModeSplitBackground actionModeStyle actionModeWebSearchDrawable actionOverflowButtonStyle actionOverflowMenuStyle activityChooserViewStyle alertDialogButtonGroupStyle alertDialogCenterButtons alertDialogStyle alertDialogTheme android_windowAnimationStyle android_windowIsFloating autoCompleteTextViewStyle borderlessButtonStyle buttonBarButtonStyle buttonBarNegativeButtonStyle buttonBarNeutralButtonStyle buttonBarPositiveButtonStyle buttonBarStyle buttonStyle buttonStyleSmall checkboxStyle checkedTextViewStyle colorAccent colorBackgroundFloating colorButtonNormal colorControlActivated colorControlHighlight colorControlNormal colorError colorPrimary colorPrimaryDark colorSwitchThumbNormal controlBackground dialogCornerRadius dialogPreferredPadding dialogTheme dividerHorizontal dividerVertical dropDownListViewStyle dropdownListPreferredItemHeight editTextBackground editTextColor editTextStyle homeAsUpIndicator imageButtonStyle listChoiceBackgroundIndicator listChoiceIndicatorMultipleAnimated listChoiceIndicatorSingleAnimated listDividerAlertDialog listMenuViewStyle listPopupWindowStyle listPreferredItemHeight listPreferredItemHeightLarge listPreferredItemHeightSmall listPreferredItemPaddingEnd listPreferredItemPaddingLeft listPreferredItemPaddingRight listPreferredItemPaddingStart panelBackground panelMenuListTheme panelMenuListWidth popupMenuStyle popupWindowStyle radioButtonStyle ratingBarStyle ratingBarStyleIndicator ratingBarStyleSmall searchViewStyle seekBarStyle selectableItemBackground selectableItemBackgroundBorderless spinnerDropDownItemStyle spinnerStyle switchStyle textAppearanceLargePopupMenu textAppearanceListItem textAppearanceListItemSecondary textAppearanceListItemSmall textAppearancePopupMenuHeader textAppearanceSearchResultSubtitle textAppearanceSearchResultTitle textAppearanceSmallPopupMenu textColorAlertDialogListItem textColorSearchUrl toolbarNavigationButtonStyle toolbarStyle tooltipForegroundColor tooltipFrameBackground viewInflaterClass windowActionBar windowActionBarOverlay windowActionModeOverlay windowFixedHeightMajor windowFixedHeightMinor windowFixedWidthMajor windowFixedWidthMinor windowMinWidthMajor windowMinWidthMinor windowNoTitle
-styleable ButtonBarLayout allowStacking
-styleable ColorStateListItem alpha android_alpha android_color
-styleable CompoundButton android_button buttonCompat buttonTint buttonTintMode
-styleable ConstraintLayout_Layout android_maxHeight android_maxWidth android_minHeight android_minWidth android_orientation barrierAllowsGoneWidgets barrierDirection chainUseRtl constraintSet constraint_referenced_ids layout_constrainedHeight layout_constrainedWidth layout_constraintBaseline_creator layout_constraintBaseline_toBaselineOf layout_constraintBottom_creator layout_constraintBottom_toBottomOf layout_constraintBottom_toTopOf layout_constraintCircle layout_constraintCircleAngle layout_constraintCircleRadius layout_constraintDimensionRatio layout_constraintEnd_toEndOf layout_constraintEnd_toStartOf layout_constraintGuide_begin layout_constraintGuide_end layout_constraintGuide_percent layout_constraintHeight_default layout_constraintHeight_max layout_constraintHeight_min layout_constraintHeight_percent layout_constraintHorizontal_bias layout_constraintHorizontal_chainStyle layout_constraintHorizontal_weight layout_constraintLeft_creator layout_constraintLeft_toLeftOf layout_constraintLeft_toRightOf layout_constraintRight_creator layout_constraintRight_toLeftOf layout_constraintRight_toRightOf layout_constraintStart_toEndOf layout_constraintStart_toStartOf layout_constraintTop_creator layout_constraintTop_toBottomOf layout_constraintTop_toTopOf layout_constraintVertical_bias layout_constraintVertical_chainStyle layout_constraintVertical_weight layout_constraintWidth_default layout_constraintWidth_max layout_constraintWidth_min layout_constraintWidth_percent layout_editor_absoluteX layout_editor_absoluteY layout_goneMarginBottom layout_goneMarginEnd layout_goneMarginLeft layout_goneMarginRight layout_goneMarginStart layout_goneMarginTop layout_optimizationLevel
-styleable ConstraintLayout_placeholder content emptyVisibility
-styleable ConstraintSet android_alpha android_elevation android_id android_layout_height android_layout_marginBottom android_layout_marginEnd android_layout_marginLeft android_layout_marginRight android_layout_marginStart android_layout_marginTop android_layout_width android_maxHeight android_maxWidth android_minHeight android_minWidth android_orientation android_rotation android_rotationX android_rotationY android_scaleX android_scaleY android_transformPivotX android_transformPivotY android_translationX android_translationY android_translationZ android_visibility barrierAllowsGoneWidgets barrierDirection chainUseRtl constraint_referenced_ids layout_constrainedHeight layout_constrainedWidth layout_constraintBaseline_creator layout_constraintBaseline_toBaselineOf layout_constraintBottom_creator layout_constraintBottom_toBottomOf layout_constraintBottom_toTopOf layout_constraintCircle layout_constraintCircleAngle layout_constraintCircleRadius layout_constraintDimensionRatio layout_constraintEnd_toEndOf layout_constraintEnd_toStartOf layout_constraintGuide_begin layout_constraintGuide_end layout_constraintGuide_percent layout_constraintHeight_default layout_constraintHeight_max layout_constraintHeight_min layout_constraintHeight_percent layout_constraintHorizontal_bias layout_constraintHorizontal_chainStyle layout_constraintHorizontal_weight layout_constraintLeft_creator layout_constraintLeft_toLeftOf layout_constraintLeft_toRightOf layout_constraintRight_creator layout_constraintRight_toLeftOf layout_constraintRight_toRightOf layout_constraintStart_toEndOf layout_constraintStart_toStartOf layout_constraintTop_creator layout_constraintTop_toBottomOf layout_constraintTop_toTopOf layout_constraintVertical_bias layout_constraintVertical_chainStyle layout_constraintVertical_weight layout_constraintWidth_default layout_constraintWidth_max layout_constraintWidth_min layout_constraintWidth_percent layout_editor_absoluteX layout_editor_absoluteY layout_goneMarginBottom layout_goneMarginEnd layout_goneMarginLeft layout_goneMarginRight layout_goneMarginStart layout_goneMarginTop
-styleable CoordinatorLayout keylines statusBarBackground
-styleable CoordinatorLayout_Layout android_layout_gravity layout_anchor layout_anchorGravity layout_behavior layout_dodgeInsetEdges layout_insetEdge layout_keyline
-styleable DrawerArrowToggle arrowHeadLength arrowShaftLength barLength color drawableSize gapBetweenBars spinBars thickness
-styleable FontFamily fontProviderAuthority fontProviderCerts fontProviderFetchStrategy fontProviderFetchTimeout fontProviderPackage fontProviderQuery
-styleable FontFamilyFont android_font android_fontStyle android_fontVariationSettings android_fontWeight android_ttcIndex font fontStyle fontVariationSettings fontWeight ttcIndex
-styleable GradientColor android_centerColor android_centerX android_centerY android_endColor android_endX android_endY android_gradientRadius android_startColor android_startX android_startY android_tileMode android_type
-styleable GradientColorItem android_color android_offset
-styleable LinearConstraintLayout android_orientation
-styleable LinearLayoutCompat android_baselineAligned android_baselineAlignedChildIndex android_gravity android_orientation android_weightSum divider dividerPadding measureWithLargestChild showDividers
-styleable LinearLayoutCompat_Layout android_layout_gravity android_layout_height android_layout_weight android_layout_width
-styleable ListPopupWindow android_dropDownHorizontalOffset android_dropDownVerticalOffset
-styleable MenuGroup android_checkableBehavior android_enabled android_id android_menuCategory android_orderInCategory android_visible
-styleable MenuItem actionLayout actionProviderClass actionViewClass alphabeticModifiers android_alphabeticShortcut android_checkable android_checked android_enabled android_icon android_id android_menuCategory android_numericShortcut android_onClick android_orderInCategory android_title android_titleCondensed android_visible contentDescription iconTint iconTintMode numericModifiers showAsAction tooltipText
-styleable MenuView android_headerBackground android_horizontalDivider android_itemBackground android_itemIconDisabledAlpha android_itemTextAppearance android_verticalDivider android_windowAnimationStyle preserveIconSpacing subMenuArrow
-styleable PopupWindow android_popupAnimationStyle android_popupBackground overlapAnchor
-styleable PopupWindowBackgroundState state_above_anchor
-styleable RecycleListView paddingBottomNoButtons paddingTopNoTitle
-styleable SearchView android_focusable android_imeOptions android_inputType android_maxWidth closeIcon commitIcon defaultQueryHint goIcon iconifiedByDefault layout queryBackground queryHint searchHintIcon searchIcon submitBackground suggestionRowLayout voiceIcon
-styleable Spinner android_dropDownWidth android_entries android_popupBackground android_prompt popupTheme
-styleable StateListDrawable android_constantSize android_dither android_enterFadeDuration android_exitFadeDuration android_variablePadding android_visible
-styleable StateListDrawableItem android_drawable
-styleable SwitchCompat android_textOff android_textOn android_thumb showText splitTrack switchMinWidth switchPadding switchTextAppearance thumbTextPadding thumbTint thumbTintMode track trackTint trackTintMode
-styleable TextAppearance android_fontFamily android_shadowColor android_shadowDx android_shadowDy android_shadowRadius android_textColor android_textColorHint android_textColorLink android_textFontWeight android_textSize android_textStyle android_typeface fontFamily fontVariationSettings textAllCaps textLocale
-styleable Toolbar android_gravity android_minHeight buttonGravity collapseContentDescription collapseIcon contentInsetEnd contentInsetEndWithActions contentInsetLeft contentInsetRight contentInsetStart contentInsetStartWithNavigation logo logoDescription maxButtonHeight menu navigationContentDescription navigationIcon popupTheme subtitle subtitleTextAppearance subtitleTextColor title titleMargin titleMarginBottom titleMarginEnd titleMarginStart titleMarginTop titleMargins titleTextAppearance titleTextColor
-styleable View android_focusable android_theme paddingEnd paddingStart theme
-styleable ViewBackgroundHelper android_background backgroundTint backgroundTintMode
-styleable ViewStubCompat android_id android_inflatedId android_layout
diff --git a/modules/mogo-module-splash/build/intermediates/runtime_library_classes/debug/classes.jar b/modules/mogo-module-splash/build/intermediates/runtime_library_classes/debug/classes.jar
deleted file mode 100644
index 95a00eb6d4..0000000000
Binary files a/modules/mogo-module-splash/build/intermediates/runtime_library_classes/debug/classes.jar and /dev/null differ
diff --git a/modules/mogo-module-splash/build/intermediates/symbols/debug/R.txt b/modules/mogo-module-splash/build/intermediates/symbols/debug/R.txt
deleted file mode 100644
index ca05cd29a4..0000000000
--- a/modules/mogo-module-splash/build/intermediates/symbols/debug/R.txt
+++ /dev/null
@@ -1,1923 +0,0 @@
-int anim abc_fade_in 0x7f010001
-int anim abc_fade_out 0x7f010002
-int anim abc_grow_fade_in_from_bottom 0x7f010003
-int anim abc_popup_enter 0x7f010004
-int anim abc_popup_exit 0x7f010005
-int anim abc_shrink_fade_out_from_bottom 0x7f010006
-int anim abc_slide_in_bottom 0x7f010007
-int anim abc_slide_in_top 0x7f010008
-int anim abc_slide_out_bottom 0x7f010009
-int anim abc_slide_out_top 0x7f01000a
-int anim abc_tooltip_enter 0x7f01000b
-int anim abc_tooltip_exit 0x7f01000c
-int anim btn_checkbox_to_checked_box_inner_merged_animation 0x7f01000d
-int anim btn_checkbox_to_checked_box_outer_merged_animation 0x7f01000e
-int anim btn_checkbox_to_checked_icon_null_animation 0x7f01000f
-int anim btn_checkbox_to_unchecked_box_inner_merged_animation 0x7f010010
-int anim btn_checkbox_to_unchecked_check_path_merged_animation 0x7f010011
-int anim btn_checkbox_to_unchecked_icon_null_animation 0x7f010012
-int anim btn_radio_to_off_mtrl_dot_group_animation 0x7f010013
-int anim btn_radio_to_off_mtrl_ring_outer_animation 0x7f010014
-int anim btn_radio_to_off_mtrl_ring_outer_path_animation 0x7f010015
-int anim btn_radio_to_on_mtrl_dot_group_animation 0x7f010016
-int anim btn_radio_to_on_mtrl_ring_outer_animation 0x7f010017
-int anim btn_radio_to_on_mtrl_ring_outer_path_animation 0x7f010018
-int attr actionBarDivider 0x7f040001
-int attr actionBarItemBackground 0x7f040002
-int attr actionBarPopupTheme 0x7f040003
-int attr actionBarSize 0x7f040004
-int attr actionBarSplitStyle 0x7f040005
-int attr actionBarStyle 0x7f040006
-int attr actionBarTabBarStyle 0x7f040007
-int attr actionBarTabStyle 0x7f040008
-int attr actionBarTabTextStyle 0x7f040009
-int attr actionBarTheme 0x7f04000a
-int attr actionBarWidgetTheme 0x7f04000b
-int attr actionButtonStyle 0x7f04000c
-int attr actionDropDownStyle 0x7f04000d
-int attr actionLayout 0x7f04000e
-int attr actionMenuTextAppearance 0x7f04000f
-int attr actionMenuTextColor 0x7f040010
-int attr actionModeBackground 0x7f040011
-int attr actionModeCloseButtonStyle 0x7f040012
-int attr actionModeCloseDrawable 0x7f040013
-int attr actionModeCopyDrawable 0x7f040014
-int attr actionModeCutDrawable 0x7f040015
-int attr actionModeFindDrawable 0x7f040016
-int attr actionModePasteDrawable 0x7f040017
-int attr actionModePopupWindowStyle 0x7f040018
-int attr actionModeSelectAllDrawable 0x7f040019
-int attr actionModeShareDrawable 0x7f04001a
-int attr actionModeSplitBackground 0x7f04001b
-int attr actionModeStyle 0x7f04001c
-int attr actionModeWebSearchDrawable 0x7f04001d
-int attr actionOverflowButtonStyle 0x7f04001e
-int attr actionOverflowMenuStyle 0x7f04001f
-int attr actionProviderClass 0x7f040020
-int attr actionViewClass 0x7f040021
-int attr activityChooserViewStyle 0x7f040022
-int attr alertDialogButtonGroupStyle 0x7f040023
-int attr alertDialogCenterButtons 0x7f040024
-int attr alertDialogStyle 0x7f040025
-int attr alertDialogTheme 0x7f040026
-int attr allowStacking 0x7f040027
-int attr alpha 0x7f040028
-int attr alphabeticModifiers 0x7f040029
-int attr arrowHeadLength 0x7f04002a
-int attr arrowShaftLength 0x7f04002b
-int attr autoCompleteTextViewStyle 0x7f04002c
-int attr autoSizeMaxTextSize 0x7f04002d
-int attr autoSizeMinTextSize 0x7f04002e
-int attr autoSizePresetSizes 0x7f04002f
-int attr autoSizeStepGranularity 0x7f040030
-int attr autoSizeTextType 0x7f040031
-int attr background 0x7f040032
-int attr backgroundSplit 0x7f040033
-int attr backgroundStacked 0x7f040034
-int attr backgroundTint 0x7f040035
-int attr backgroundTintMode 0x7f040036
-int attr barLength 0x7f040037
-int attr barrierAllowsGoneWidgets 0x7f040038
-int attr barrierDirection 0x7f040039
-int attr borderlessButtonStyle 0x7f04003a
-int attr buttonBarButtonStyle 0x7f04003b
-int attr buttonBarNegativeButtonStyle 0x7f04003c
-int attr buttonBarNeutralButtonStyle 0x7f04003d
-int attr buttonBarPositiveButtonStyle 0x7f04003e
-int attr buttonBarStyle 0x7f04003f
-int attr buttonCompat 0x7f040040
-int attr buttonGravity 0x7f040041
-int attr buttonIconDimen 0x7f040042
-int attr buttonPanelSideLayout 0x7f040043
-int attr buttonStyle 0x7f040044
-int attr buttonStyleSmall 0x7f040045
-int attr buttonTint 0x7f040046
-int attr buttonTintMode 0x7f040047
-int attr chainUseRtl 0x7f040048
-int attr checkboxStyle 0x7f040049
-int attr checkedTextViewStyle 0x7f04004a
-int attr closeIcon 0x7f04004b
-int attr closeItemLayout 0x7f04004c
-int attr collapseContentDescription 0x7f04004d
-int attr collapseIcon 0x7f04004e
-int attr color 0x7f04004f
-int attr colorAccent 0x7f040050
-int attr colorBackgroundFloating 0x7f040051
-int attr colorButtonNormal 0x7f040052
-int attr colorControlActivated 0x7f040053
-int attr colorControlHighlight 0x7f040054
-int attr colorControlNormal 0x7f040055
-int attr colorError 0x7f040056
-int attr colorPrimary 0x7f040057
-int attr colorPrimaryDark 0x7f040058
-int attr colorSwitchThumbNormal 0x7f040059
-int attr commitIcon 0x7f04005a
-int attr constraintSet 0x7f04005b
-int attr constraint_referenced_ids 0x7f04005c
-int attr content 0x7f04005d
-int attr contentDescription 0x7f04005e
-int attr contentInsetEnd 0x7f04005f
-int attr contentInsetEndWithActions 0x7f040060
-int attr contentInsetLeft 0x7f040061
-int attr contentInsetRight 0x7f040062
-int attr contentInsetStart 0x7f040063
-int attr contentInsetStartWithNavigation 0x7f040064
-int attr controlBackground 0x7f040065
-int attr coordinatorLayoutStyle 0x7f040066
-int attr customNavigationLayout 0x7f040067
-int attr defaultQueryHint 0x7f040068
-int attr dialogCornerRadius 0x7f040069
-int attr dialogPreferredPadding 0x7f04006a
-int attr dialogTheme 0x7f04006b
-int attr displayOptions 0x7f04006c
-int attr divider 0x7f04006d
-int attr dividerHorizontal 0x7f04006e
-int attr dividerPadding 0x7f04006f
-int attr dividerVertical 0x7f040070
-int attr drawableBottomCompat 0x7f040071
-int attr drawableEndCompat 0x7f040072
-int attr drawableLeftCompat 0x7f040073
-int attr drawableRightCompat 0x7f040074
-int attr drawableSize 0x7f040075
-int attr drawableStartCompat 0x7f040076
-int attr drawableTint 0x7f040077
-int attr drawableTintMode 0x7f040078
-int attr drawableTopCompat 0x7f040079
-int attr drawerArrowStyle 0x7f04007a
-int attr dropDownListViewStyle 0x7f04007b
-int attr dropdownListPreferredItemHeight 0x7f04007c
-int attr editTextBackground 0x7f04007d
-int attr editTextColor 0x7f04007e
-int attr editTextStyle 0x7f04007f
-int attr elevation 0x7f040080
-int attr emptyVisibility 0x7f040081
-int attr expandActivityOverflowButtonDrawable 0x7f040082
-int attr firstBaselineToTopHeight 0x7f040083
-int attr font 0x7f040084
-int attr fontFamily 0x7f040085
-int attr fontProviderAuthority 0x7f040086
-int attr fontProviderCerts 0x7f040087
-int attr fontProviderFetchStrategy 0x7f040088
-int attr fontProviderFetchTimeout 0x7f040089
-int attr fontProviderPackage 0x7f04008a
-int attr fontProviderQuery 0x7f04008b
-int attr fontStyle 0x7f04008c
-int attr fontVariationSettings 0x7f04008d
-int attr fontWeight 0x7f04008e
-int attr gapBetweenBars 0x7f04008f
-int attr goIcon 0x7f040090
-int attr height 0x7f040091
-int attr hideOnContentScroll 0x7f040092
-int attr homeAsUpIndicator 0x7f040093
-int attr homeLayout 0x7f040094
-int attr icon 0x7f040095
-int attr iconTint 0x7f040096
-int attr iconTintMode 0x7f040097
-int attr iconifiedByDefault 0x7f040098
-int attr imageButtonStyle 0x7f040099
-int attr indeterminateProgressStyle 0x7f04009a
-int attr initialActivityCount 0x7f04009b
-int attr isLightTheme 0x7f04009c
-int attr itemPadding 0x7f04009d
-int attr keylines 0x7f04009e
-int attr lastBaselineToBottomHeight 0x7f04009f
-int attr layout 0x7f0400a0
-int attr layout_anchor 0x7f0400a1
-int attr layout_anchorGravity 0x7f0400a2
-int attr layout_behavior 0x7f0400a3
-int attr layout_constrainedHeight 0x7f0400a4
-int attr layout_constrainedWidth 0x7f0400a5
-int attr layout_constraintBaseline_creator 0x7f0400a6
-int attr layout_constraintBaseline_toBaselineOf 0x7f0400a7
-int attr layout_constraintBottom_creator 0x7f0400a8
-int attr layout_constraintBottom_toBottomOf 0x7f0400a9
-int attr layout_constraintBottom_toTopOf 0x7f0400aa
-int attr layout_constraintCircle 0x7f0400ab
-int attr layout_constraintCircleAngle 0x7f0400ac
-int attr layout_constraintCircleRadius 0x7f0400ad
-int attr layout_constraintDimensionRatio 0x7f0400ae
-int attr layout_constraintEnd_toEndOf 0x7f0400af
-int attr layout_constraintEnd_toStartOf 0x7f0400b0
-int attr layout_constraintGuide_begin 0x7f0400b1
-int attr layout_constraintGuide_end 0x7f0400b2
-int attr layout_constraintGuide_percent 0x7f0400b3
-int attr layout_constraintHeight_default 0x7f0400b4
-int attr layout_constraintHeight_max 0x7f0400b5
-int attr layout_constraintHeight_min 0x7f0400b6
-int attr layout_constraintHeight_percent 0x7f0400b7
-int attr layout_constraintHorizontal_bias 0x7f0400b8
-int attr layout_constraintHorizontal_chainStyle 0x7f0400b9
-int attr layout_constraintHorizontal_weight 0x7f0400ba
-int attr layout_constraintLeft_creator 0x7f0400bb
-int attr layout_constraintLeft_toLeftOf 0x7f0400bc
-int attr layout_constraintLeft_toRightOf 0x7f0400bd
-int attr layout_constraintRight_creator 0x7f0400be
-int attr layout_constraintRight_toLeftOf 0x7f0400bf
-int attr layout_constraintRight_toRightOf 0x7f0400c0
-int attr layout_constraintStart_toEndOf 0x7f0400c1
-int attr layout_constraintStart_toStartOf 0x7f0400c2
-int attr layout_constraintTop_creator 0x7f0400c3
-int attr layout_constraintTop_toBottomOf 0x7f0400c4
-int attr layout_constraintTop_toTopOf 0x7f0400c5
-int attr layout_constraintVertical_bias 0x7f0400c6
-int attr layout_constraintVertical_chainStyle 0x7f0400c7
-int attr layout_constraintVertical_weight 0x7f0400c8
-int attr layout_constraintWidth_default 0x7f0400c9
-int attr layout_constraintWidth_max 0x7f0400ca
-int attr layout_constraintWidth_min 0x7f0400cb
-int attr layout_constraintWidth_percent 0x7f0400cc
-int attr layout_dodgeInsetEdges 0x7f0400cd
-int attr layout_editor_absoluteX 0x7f0400ce
-int attr layout_editor_absoluteY 0x7f0400cf
-int attr layout_goneMarginBottom 0x7f0400d0
-int attr layout_goneMarginEnd 0x7f0400d1
-int attr layout_goneMarginLeft 0x7f0400d2
-int attr layout_goneMarginRight 0x7f0400d3
-int attr layout_goneMarginStart 0x7f0400d4
-int attr layout_goneMarginTop 0x7f0400d5
-int attr layout_insetEdge 0x7f0400d6
-int attr layout_keyline 0x7f0400d7
-int attr layout_optimizationLevel 0x7f0400d8
-int attr lineHeight 0x7f0400d9
-int attr listChoiceBackgroundIndicator 0x7f0400da
-int attr listChoiceIndicatorMultipleAnimated 0x7f0400db
-int attr listChoiceIndicatorSingleAnimated 0x7f0400dc
-int attr listDividerAlertDialog 0x7f0400dd
-int attr listItemLayout 0x7f0400de
-int attr listLayout 0x7f0400df
-int attr listMenuViewStyle 0x7f0400e0
-int attr listPopupWindowStyle 0x7f0400e1
-int attr listPreferredItemHeight 0x7f0400e2
-int attr listPreferredItemHeightLarge 0x7f0400e3
-int attr listPreferredItemHeightSmall 0x7f0400e4
-int attr listPreferredItemPaddingEnd 0x7f0400e5
-int attr listPreferredItemPaddingLeft 0x7f0400e6
-int attr listPreferredItemPaddingRight 0x7f0400e7
-int attr listPreferredItemPaddingStart 0x7f0400e8
-int attr logo 0x7f0400e9
-int attr logoDescription 0x7f0400ea
-int attr maxButtonHeight 0x7f0400eb
-int attr measureWithLargestChild 0x7f0400ec
-int attr menu 0x7f0400ed
-int attr multiChoiceItemLayout 0x7f0400ee
-int attr navigationContentDescription 0x7f0400ef
-int attr navigationIcon 0x7f0400f0
-int attr navigationMode 0x7f0400f1
-int attr numericModifiers 0x7f0400f2
-int attr overlapAnchor 0x7f0400f3
-int attr paddingBottomNoButtons 0x7f0400f4
-int attr paddingEnd 0x7f0400f5
-int attr paddingStart 0x7f0400f6
-int attr paddingTopNoTitle 0x7f0400f7
-int attr panelBackground 0x7f0400f8
-int attr panelMenuListTheme 0x7f0400f9
-int attr panelMenuListWidth 0x7f0400fa
-int attr popupMenuStyle 0x7f0400fb
-int attr popupTheme 0x7f0400fc
-int attr popupWindowStyle 0x7f0400fd
-int attr preserveIconSpacing 0x7f0400fe
-int attr progressBarPadding 0x7f0400ff
-int attr progressBarStyle 0x7f040100
-int attr queryBackground 0x7f040101
-int attr queryHint 0x7f040102
-int attr radioButtonStyle 0x7f040103
-int attr ratingBarStyle 0x7f040104
-int attr ratingBarStyleIndicator 0x7f040105
-int attr ratingBarStyleSmall 0x7f040106
-int attr searchHintIcon 0x7f040107
-int attr searchIcon 0x7f040108
-int attr searchViewStyle 0x7f040109
-int attr seekBarStyle 0x7f04010a
-int attr selectableItemBackground 0x7f04010b
-int attr selectableItemBackgroundBorderless 0x7f04010c
-int attr showAsAction 0x7f04010d
-int attr showDividers 0x7f04010e
-int attr showText 0x7f04010f
-int attr showTitle 0x7f040110
-int attr singleChoiceItemLayout 0x7f040111
-int attr spinBars 0x7f040112
-int attr spinnerDropDownItemStyle 0x7f040113
-int attr spinnerStyle 0x7f040114
-int attr splitTrack 0x7f040115
-int attr srcCompat 0x7f040116
-int attr state_above_anchor 0x7f040117
-int attr statusBarBackground 0x7f040118
-int attr subMenuArrow 0x7f040119
-int attr submitBackground 0x7f04011a
-int attr subtitle 0x7f04011b
-int attr subtitleTextAppearance 0x7f04011c
-int attr subtitleTextColor 0x7f04011d
-int attr subtitleTextStyle 0x7f04011e
-int attr suggestionRowLayout 0x7f04011f
-int attr switchMinWidth 0x7f040120
-int attr switchPadding 0x7f040121
-int attr switchStyle 0x7f040122
-int attr switchTextAppearance 0x7f040123
-int attr textAllCaps 0x7f040124
-int attr textAppearanceLargePopupMenu 0x7f040125
-int attr textAppearanceListItem 0x7f040126
-int attr textAppearanceListItemSecondary 0x7f040127
-int attr textAppearanceListItemSmall 0x7f040128
-int attr textAppearancePopupMenuHeader 0x7f040129
-int attr textAppearanceSearchResultSubtitle 0x7f04012a
-int attr textAppearanceSearchResultTitle 0x7f04012b
-int attr textAppearanceSmallPopupMenu 0x7f04012c
-int attr textColorAlertDialogListItem 0x7f04012d
-int attr textColorSearchUrl 0x7f04012e
-int attr textLocale 0x7f04012f
-int attr theme 0x7f040130
-int attr thickness 0x7f040131
-int attr thumbTextPadding 0x7f040132
-int attr thumbTint 0x7f040133
-int attr thumbTintMode 0x7f040134
-int attr tickMark 0x7f040135
-int attr tickMarkTint 0x7f040136
-int attr tickMarkTintMode 0x7f040137
-int attr tint 0x7f040138
-int attr tintMode 0x7f040139
-int attr title 0x7f04013a
-int attr titleMargin 0x7f04013b
-int attr titleMarginBottom 0x7f04013c
-int attr titleMarginEnd 0x7f04013d
-int attr titleMarginStart 0x7f04013e
-int attr titleMarginTop 0x7f04013f
-int attr titleMargins 0x7f040140
-int attr titleTextAppearance 0x7f040141
-int attr titleTextColor 0x7f040142
-int attr titleTextStyle 0x7f040143
-int attr toolbarNavigationButtonStyle 0x7f040144
-int attr toolbarStyle 0x7f040145
-int attr tooltipForegroundColor 0x7f040146
-int attr tooltipFrameBackground 0x7f040147
-int attr tooltipText 0x7f040148
-int attr track 0x7f040149
-int attr trackTint 0x7f04014a
-int attr trackTintMode 0x7f04014b
-int attr ttcIndex 0x7f04014c
-int attr viewInflaterClass 0x7f04014d
-int attr voiceIcon 0x7f04014e
-int attr windowActionBar 0x7f04014f
-int attr windowActionBarOverlay 0x7f040150
-int attr windowActionModeOverlay 0x7f040151
-int attr windowFixedHeightMajor 0x7f040152
-int attr windowFixedHeightMinor 0x7f040153
-int attr windowFixedWidthMajor 0x7f040154
-int attr windowFixedWidthMinor 0x7f040155
-int attr windowMinWidthMajor 0x7f040156
-int attr windowMinWidthMinor 0x7f040157
-int attr windowNoTitle 0x7f040158
-int bool abc_action_bar_embed_tabs 0x7f050001
-int bool abc_allow_stacked_button_bar 0x7f050002
-int bool abc_config_actionMenuItemAllCaps 0x7f050003
-int color abc_background_cache_hint_selector_material_dark 0x7f060001
-int color abc_background_cache_hint_selector_material_light 0x7f060002
-int color abc_btn_colored_borderless_text_material 0x7f060003
-int color abc_btn_colored_text_material 0x7f060004
-int color abc_color_highlight_material 0x7f060005
-int color abc_hint_foreground_material_dark 0x7f060006
-int color abc_hint_foreground_material_light 0x7f060007
-int color abc_input_method_navigation_guard 0x7f060008
-int color abc_primary_text_disable_only_material_dark 0x7f060009
-int color abc_primary_text_disable_only_material_light 0x7f06000a
-int color abc_primary_text_material_dark 0x7f06000b
-int color abc_primary_text_material_light 0x7f06000c
-int color abc_search_url_text 0x7f06000d
-int color abc_search_url_text_normal 0x7f06000e
-int color abc_search_url_text_pressed 0x7f06000f
-int color abc_search_url_text_selected 0x7f060010
-int color abc_secondary_text_material_dark 0x7f060011
-int color abc_secondary_text_material_light 0x7f060012
-int color abc_tint_btn_checkable 0x7f060013
-int color abc_tint_default 0x7f060014
-int color abc_tint_edittext 0x7f060015
-int color abc_tint_seek_thumb 0x7f060016
-int color abc_tint_spinner 0x7f060017
-int color abc_tint_switch_track 0x7f060018
-int color accent_material_dark 0x7f060019
-int color accent_material_light 0x7f06001a
-int color androidx_core_ripple_material_light 0x7f06001b
-int color androidx_core_secondary_text_default_material_light 0x7f06001c
-int color background_floating_material_dark 0x7f06001d
-int color background_floating_material_light 0x7f06001e
-int color background_material_dark 0x7f06001f
-int color background_material_light 0x7f060020
-int color bright_foreground_disabled_material_dark 0x7f060021
-int color bright_foreground_disabled_material_light 0x7f060022
-int color bright_foreground_inverse_material_dark 0x7f060023
-int color bright_foreground_inverse_material_light 0x7f060024
-int color bright_foreground_material_dark 0x7f060025
-int color bright_foreground_material_light 0x7f060026
-int color button_material_dark 0x7f060027
-int color button_material_light 0x7f060028
-int color dim_foreground_disabled_material_dark 0x7f060029
-int color dim_foreground_disabled_material_light 0x7f06002a
-int color dim_foreground_material_dark 0x7f06002b
-int color dim_foreground_material_light 0x7f06002c
-int color error_color_material_dark 0x7f06002d
-int color error_color_material_light 0x7f06002e
-int color foreground_material_dark 0x7f06002f
-int color foreground_material_light 0x7f060030
-int color highlighted_text_material_dark 0x7f060031
-int color highlighted_text_material_light 0x7f060032
-int color material_blue_grey_800 0x7f060033
-int color material_blue_grey_900 0x7f060034
-int color material_blue_grey_950 0x7f060035
-int color material_deep_teal_200 0x7f060036
-int color material_deep_teal_500 0x7f060037
-int color material_grey_100 0x7f060038
-int color material_grey_300 0x7f060039
-int color material_grey_50 0x7f06003a
-int color material_grey_600 0x7f06003b
-int color material_grey_800 0x7f06003c
-int color material_grey_850 0x7f06003d
-int color material_grey_900 0x7f06003e
-int color notification_action_color_filter 0x7f06003f
-int color notification_icon_bg_color 0x7f060040
-int color notification_material_background_media_default_color 0x7f060041
-int color primary_dark_material_dark 0x7f060042
-int color primary_dark_material_light 0x7f060043
-int color primary_material_dark 0x7f060044
-int color primary_material_light 0x7f060045
-int color primary_text_default_material_dark 0x7f060046
-int color primary_text_default_material_light 0x7f060047
-int color primary_text_disabled_material_dark 0x7f060048
-int color primary_text_disabled_material_light 0x7f060049
-int color ripple_material_dark 0x7f06004a
-int color ripple_material_light 0x7f06004b
-int color secondary_text_default_material_dark 0x7f06004c
-int color secondary_text_default_material_light 0x7f06004d
-int color secondary_text_disabled_material_dark 0x7f06004e
-int color secondary_text_disabled_material_light 0x7f06004f
-int color switch_thumb_disabled_material_dark 0x7f060050
-int color switch_thumb_disabled_material_light 0x7f060051
-int color switch_thumb_material_dark 0x7f060052
-int color switch_thumb_material_light 0x7f060053
-int color switch_thumb_normal_material_dark 0x7f060054
-int color switch_thumb_normal_material_light 0x7f060055
-int color tooltip_background_dark 0x7f060056
-int color tooltip_background_light 0x7f060057
-int dimen abc_action_bar_content_inset_material 0x7f070001
-int dimen abc_action_bar_content_inset_with_nav 0x7f070002
-int dimen abc_action_bar_default_height_material 0x7f070003
-int dimen abc_action_bar_default_padding_end_material 0x7f070004
-int dimen abc_action_bar_default_padding_start_material 0x7f070005
-int dimen abc_action_bar_elevation_material 0x7f070006
-int dimen abc_action_bar_icon_vertical_padding_material 0x7f070007
-int dimen abc_action_bar_overflow_padding_end_material 0x7f070008
-int dimen abc_action_bar_overflow_padding_start_material 0x7f070009
-int dimen abc_action_bar_stacked_max_height 0x7f07000a
-int dimen abc_action_bar_stacked_tab_max_width 0x7f07000b
-int dimen abc_action_bar_subtitle_bottom_margin_material 0x7f07000c
-int dimen abc_action_bar_subtitle_top_margin_material 0x7f07000d
-int dimen abc_action_button_min_height_material 0x7f07000e
-int dimen abc_action_button_min_width_material 0x7f07000f
-int dimen abc_action_button_min_width_overflow_material 0x7f070010
-int dimen abc_alert_dialog_button_bar_height 0x7f070011
-int dimen abc_alert_dialog_button_dimen 0x7f070012
-int dimen abc_button_inset_horizontal_material 0x7f070013
-int dimen abc_button_inset_vertical_material 0x7f070014
-int dimen abc_button_padding_horizontal_material 0x7f070015
-int dimen abc_button_padding_vertical_material 0x7f070016
-int dimen abc_cascading_menus_min_smallest_width 0x7f070017
-int dimen abc_config_prefDialogWidth 0x7f070018
-int dimen abc_control_corner_material 0x7f070019
-int dimen abc_control_inset_material 0x7f07001a
-int dimen abc_control_padding_material 0x7f07001b
-int dimen abc_dialog_corner_radius_material 0x7f07001c
-int dimen abc_dialog_fixed_height_major 0x7f07001d
-int dimen abc_dialog_fixed_height_minor 0x7f07001e
-int dimen abc_dialog_fixed_width_major 0x7f07001f
-int dimen abc_dialog_fixed_width_minor 0x7f070020
-int dimen abc_dialog_list_padding_bottom_no_buttons 0x7f070021
-int dimen abc_dialog_list_padding_top_no_title 0x7f070022
-int dimen abc_dialog_min_width_major 0x7f070023
-int dimen abc_dialog_min_width_minor 0x7f070024
-int dimen abc_dialog_padding_material 0x7f070025
-int dimen abc_dialog_padding_top_material 0x7f070026
-int dimen abc_dialog_title_divider_material 0x7f070027
-int dimen abc_disabled_alpha_material_dark 0x7f070028
-int dimen abc_disabled_alpha_material_light 0x7f070029
-int dimen abc_dropdownitem_icon_width 0x7f07002a
-int dimen abc_dropdownitem_text_padding_left 0x7f07002b
-int dimen abc_dropdownitem_text_padding_right 0x7f07002c
-int dimen abc_edit_text_inset_bottom_material 0x7f07002d
-int dimen abc_edit_text_inset_horizontal_material 0x7f07002e
-int dimen abc_edit_text_inset_top_material 0x7f07002f
-int dimen abc_floating_window_z 0x7f070030
-int dimen abc_list_item_height_large_material 0x7f070031
-int dimen abc_list_item_height_material 0x7f070032
-int dimen abc_list_item_height_small_material 0x7f070033
-int dimen abc_list_item_padding_horizontal_material 0x7f070034
-int dimen abc_panel_menu_list_width 0x7f070035
-int dimen abc_progress_bar_height_material 0x7f070036
-int dimen abc_search_view_preferred_height 0x7f070037
-int dimen abc_search_view_preferred_width 0x7f070038
-int dimen abc_seekbar_track_background_height_material 0x7f070039
-int dimen abc_seekbar_track_progress_height_material 0x7f07003a
-int dimen abc_select_dialog_padding_start_material 0x7f07003b
-int dimen abc_switch_padding 0x7f07003c
-int dimen abc_text_size_body_1_material 0x7f07003d
-int dimen abc_text_size_body_2_material 0x7f07003e
-int dimen abc_text_size_button_material 0x7f07003f
-int dimen abc_text_size_caption_material 0x7f070040
-int dimen abc_text_size_display_1_material 0x7f070041
-int dimen abc_text_size_display_2_material 0x7f070042
-int dimen abc_text_size_display_3_material 0x7f070043
-int dimen abc_text_size_display_4_material 0x7f070044
-int dimen abc_text_size_headline_material 0x7f070045
-int dimen abc_text_size_large_material 0x7f070046
-int dimen abc_text_size_medium_material 0x7f070047
-int dimen abc_text_size_menu_header_material 0x7f070048
-int dimen abc_text_size_menu_material 0x7f070049
-int dimen abc_text_size_small_material 0x7f07004a
-int dimen abc_text_size_subhead_material 0x7f07004b
-int dimen abc_text_size_subtitle_material_toolbar 0x7f07004c
-int dimen abc_text_size_title_material 0x7f07004d
-int dimen abc_text_size_title_material_toolbar 0x7f07004e
-int dimen compat_button_inset_horizontal_material 0x7f07004f
-int dimen compat_button_inset_vertical_material 0x7f070050
-int dimen compat_button_padding_horizontal_material 0x7f070051
-int dimen compat_button_padding_vertical_material 0x7f070052
-int dimen compat_control_corner_material 0x7f070053
-int dimen compat_notification_large_icon_max_height 0x7f070054
-int dimen compat_notification_large_icon_max_width 0x7f070055
-int dimen disabled_alpha_material_dark 0x7f070056
-int dimen disabled_alpha_material_light 0x7f070057
-int dimen highlight_alpha_material_colored 0x7f070058
-int dimen highlight_alpha_material_dark 0x7f070059
-int dimen highlight_alpha_material_light 0x7f07005a
-int dimen hint_alpha_material_dark 0x7f07005b
-int dimen hint_alpha_material_light 0x7f07005c
-int dimen hint_pressed_alpha_material_dark 0x7f07005d
-int dimen hint_pressed_alpha_material_light 0x7f07005e
-int dimen notification_action_icon_size 0x7f07005f
-int dimen notification_action_text_size 0x7f070060
-int dimen notification_big_circle_margin 0x7f070061
-int dimen notification_content_margin_start 0x7f070062
-int dimen notification_large_icon_height 0x7f070063
-int dimen notification_large_icon_width 0x7f070064
-int dimen notification_main_column_padding_top 0x7f070065
-int dimen notification_media_narrow_margin 0x7f070066
-int dimen notification_right_icon_size 0x7f070067
-int dimen notification_right_side_padding_top 0x7f070068
-int dimen notification_small_icon_background_padding 0x7f070069
-int dimen notification_small_icon_size_as_large 0x7f07006a
-int dimen notification_subtext_size 0x7f07006b
-int dimen notification_top_pad 0x7f07006c
-int dimen notification_top_pad_large_text 0x7f07006d
-int dimen subtitle_corner_radius 0x7f07006e
-int dimen subtitle_outline_width 0x7f07006f
-int dimen subtitle_shadow_offset 0x7f070070
-int dimen subtitle_shadow_radius 0x7f070071
-int dimen tooltip_corner_radius 0x7f070072
-int dimen tooltip_horizontal_padding 0x7f070073
-int dimen tooltip_margin 0x7f070074
-int dimen tooltip_precise_anchor_extra_offset 0x7f070075
-int dimen tooltip_precise_anchor_threshold 0x7f070076
-int dimen tooltip_vertical_padding 0x7f070077
-int dimen tooltip_y_offset_non_touch 0x7f070078
-int dimen tooltip_y_offset_touch 0x7f070079
-int drawable abc_ab_share_pack_mtrl_alpha 0x7f080001
-int drawable abc_action_bar_item_background_material 0x7f080002
-int drawable abc_btn_borderless_material 0x7f080003
-int drawable abc_btn_check_material 0x7f080004
-int drawable abc_btn_check_material_anim 0x7f080005
-int drawable abc_btn_check_to_on_mtrl_000 0x7f080006
-int drawable abc_btn_check_to_on_mtrl_015 0x7f080007
-int drawable abc_btn_colored_material 0x7f080008
-int drawable abc_btn_default_mtrl_shape 0x7f080009
-int drawable abc_btn_radio_material 0x7f08000a
-int drawable abc_btn_radio_material_anim 0x7f08000b
-int drawable abc_btn_radio_to_on_mtrl_000 0x7f08000c
-int drawable abc_btn_radio_to_on_mtrl_015 0x7f08000d
-int drawable abc_btn_switch_to_on_mtrl_00001 0x7f08000e
-int drawable abc_btn_switch_to_on_mtrl_00012 0x7f08000f
-int drawable abc_cab_background_internal_bg 0x7f080010
-int drawable abc_cab_background_top_material 0x7f080011
-int drawable abc_cab_background_top_mtrl_alpha 0x7f080012
-int drawable abc_control_background_material 0x7f080013
-int drawable abc_dialog_material_background 0x7f080014
-int drawable abc_edit_text_material 0x7f080015
-int drawable abc_ic_ab_back_material 0x7f080016
-int drawable abc_ic_arrow_drop_right_black_24dp 0x7f080017
-int drawable abc_ic_clear_material 0x7f080018
-int drawable abc_ic_commit_search_api_mtrl_alpha 0x7f080019
-int drawable abc_ic_go_search_api_material 0x7f08001a
-int drawable abc_ic_menu_copy_mtrl_am_alpha 0x7f08001b
-int drawable abc_ic_menu_cut_mtrl_alpha 0x7f08001c
-int drawable abc_ic_menu_overflow_material 0x7f08001d
-int drawable abc_ic_menu_paste_mtrl_am_alpha 0x7f08001e
-int drawable abc_ic_menu_selectall_mtrl_alpha 0x7f08001f
-int drawable abc_ic_menu_share_mtrl_alpha 0x7f080020
-int drawable abc_ic_search_api_material 0x7f080021
-int drawable abc_ic_star_black_16dp 0x7f080022
-int drawable abc_ic_star_black_36dp 0x7f080023
-int drawable abc_ic_star_black_48dp 0x7f080024
-int drawable abc_ic_star_half_black_16dp 0x7f080025
-int drawable abc_ic_star_half_black_36dp 0x7f080026
-int drawable abc_ic_star_half_black_48dp 0x7f080027
-int drawable abc_ic_voice_search_api_material 0x7f080028
-int drawable abc_item_background_holo_dark 0x7f080029
-int drawable abc_item_background_holo_light 0x7f08002a
-int drawable abc_list_divider_material 0x7f08002b
-int drawable abc_list_divider_mtrl_alpha 0x7f08002c
-int drawable abc_list_focused_holo 0x7f08002d
-int drawable abc_list_longpressed_holo 0x7f08002e
-int drawable abc_list_pressed_holo_dark 0x7f08002f
-int drawable abc_list_pressed_holo_light 0x7f080030
-int drawable abc_list_selector_background_transition_holo_dark 0x7f080031
-int drawable abc_list_selector_background_transition_holo_light 0x7f080032
-int drawable abc_list_selector_disabled_holo_dark 0x7f080033
-int drawable abc_list_selector_disabled_holo_light 0x7f080034
-int drawable abc_list_selector_holo_dark 0x7f080035
-int drawable abc_list_selector_holo_light 0x7f080036
-int drawable abc_menu_hardkey_panel_mtrl_mult 0x7f080037
-int drawable abc_popup_background_mtrl_mult 0x7f080038
-int drawable abc_ratingbar_indicator_material 0x7f080039
-int drawable abc_ratingbar_material 0x7f08003a
-int drawable abc_ratingbar_small_material 0x7f08003b
-int drawable abc_scrubber_control_off_mtrl_alpha 0x7f08003c
-int drawable abc_scrubber_control_to_pressed_mtrl_000 0x7f08003d
-int drawable abc_scrubber_control_to_pressed_mtrl_005 0x7f08003e
-int drawable abc_scrubber_primary_mtrl_alpha 0x7f08003f
-int drawable abc_scrubber_track_mtrl_alpha 0x7f080040
-int drawable abc_seekbar_thumb_material 0x7f080041
-int drawable abc_seekbar_tick_mark_material 0x7f080042
-int drawable abc_seekbar_track_material 0x7f080043
-int drawable abc_spinner_mtrl_am_alpha 0x7f080044
-int drawable abc_spinner_textfield_background_material 0x7f080045
-int drawable abc_switch_thumb_material 0x7f080046
-int drawable abc_switch_track_mtrl_alpha 0x7f080047
-int drawable abc_tab_indicator_material 0x7f080048
-int drawable abc_tab_indicator_mtrl_alpha 0x7f080049
-int drawable abc_text_cursor_material 0x7f08004a
-int drawable abc_text_select_handle_left_mtrl_dark 0x7f08004b
-int drawable abc_text_select_handle_left_mtrl_light 0x7f08004c
-int drawable abc_text_select_handle_middle_mtrl_dark 0x7f08004d
-int drawable abc_text_select_handle_middle_mtrl_light 0x7f08004e
-int drawable abc_text_select_handle_right_mtrl_dark 0x7f08004f
-int drawable abc_text_select_handle_right_mtrl_light 0x7f080050
-int drawable abc_textfield_activated_mtrl_alpha 0x7f080051
-int drawable abc_textfield_default_mtrl_alpha 0x7f080052
-int drawable abc_textfield_search_activated_mtrl_alpha 0x7f080053
-int drawable abc_textfield_search_default_mtrl_alpha 0x7f080054
-int drawable abc_textfield_search_material 0x7f080055
-int drawable abc_vector_test 0x7f080056
-int drawable btn_checkbox_checked_mtrl 0x7f080057
-int drawable btn_checkbox_checked_to_unchecked_mtrl_animation 0x7f080058
-int drawable btn_checkbox_unchecked_mtrl 0x7f080059
-int drawable btn_checkbox_unchecked_to_checked_mtrl_animation 0x7f08005a
-int drawable btn_radio_off_mtrl 0x7f08005b
-int drawable btn_radio_off_to_on_mtrl_animation 0x7f08005c
-int drawable btn_radio_on_mtrl 0x7f08005d
-int drawable btn_radio_on_to_off_mtrl_animation 0x7f08005e
-int drawable byd_count_down_bg 0x7f08005f
-int drawable byd_enter_btn_bg 0x7f080060
-int drawable module_byd_splash 0x7f080061
-int drawable notification_action_background 0x7f080062
-int drawable notification_bg 0x7f080063
-int drawable notification_bg_low 0x7f080064
-int drawable notification_bg_low_normal 0x7f080065
-int drawable notification_bg_low_pressed 0x7f080066
-int drawable notification_bg_normal 0x7f080067
-int drawable notification_bg_normal_pressed 0x7f080068
-int drawable notification_icon_background 0x7f080069
-int drawable notification_template_icon_bg 0x7f08006a
-int drawable notification_template_icon_low_bg 0x7f08006b
-int drawable notification_tile_bg 0x7f08006c
-int drawable notify_panel_notification_icon_bg 0x7f08006d
-int drawable tooltip_frame_dark 0x7f08006e
-int drawable tooltip_frame_light 0x7f08006f
-int id accessibility_action_clickable_span 0x7f0b0001
-int id accessibility_custom_action_0 0x7f0b0002
-int id accessibility_custom_action_1 0x7f0b0003
-int id accessibility_custom_action_10 0x7f0b0004
-int id accessibility_custom_action_11 0x7f0b0005
-int id accessibility_custom_action_12 0x7f0b0006
-int id accessibility_custom_action_13 0x7f0b0007
-int id accessibility_custom_action_14 0x7f0b0008
-int id accessibility_custom_action_15 0x7f0b0009
-int id accessibility_custom_action_16 0x7f0b000a
-int id accessibility_custom_action_17 0x7f0b000b
-int id accessibility_custom_action_18 0x7f0b000c
-int id accessibility_custom_action_19 0x7f0b000d
-int id accessibility_custom_action_2 0x7f0b000e
-int id accessibility_custom_action_20 0x7f0b000f
-int id accessibility_custom_action_21 0x7f0b0010
-int id accessibility_custom_action_22 0x7f0b0011
-int id accessibility_custom_action_23 0x7f0b0012
-int id accessibility_custom_action_24 0x7f0b0013
-int id accessibility_custom_action_25 0x7f0b0014
-int id accessibility_custom_action_26 0x7f0b0015
-int id accessibility_custom_action_27 0x7f0b0016
-int id accessibility_custom_action_28 0x7f0b0017
-int id accessibility_custom_action_29 0x7f0b0018
-int id accessibility_custom_action_3 0x7f0b0019
-int id accessibility_custom_action_30 0x7f0b001a
-int id accessibility_custom_action_31 0x7f0b001b
-int id accessibility_custom_action_4 0x7f0b001c
-int id accessibility_custom_action_5 0x7f0b001d
-int id accessibility_custom_action_6 0x7f0b001e
-int id accessibility_custom_action_7 0x7f0b001f
-int id accessibility_custom_action_8 0x7f0b0020
-int id accessibility_custom_action_9 0x7f0b0021
-int id action0 0x7f0b0022
-int id action_bar 0x7f0b0023
-int id action_bar_activity_content 0x7f0b0024
-int id action_bar_container 0x7f0b0025
-int id action_bar_root 0x7f0b0026
-int id action_bar_spinner 0x7f0b0027
-int id action_bar_subtitle 0x7f0b0028
-int id action_bar_title 0x7f0b0029
-int id action_container 0x7f0b002a
-int id action_context_bar 0x7f0b002b
-int id action_divider 0x7f0b002c
-int id action_image 0x7f0b002d
-int id action_menu_divider 0x7f0b002e
-int id action_menu_presenter 0x7f0b002f
-int id action_mode_bar 0x7f0b0030
-int id action_mode_bar_stub 0x7f0b0031
-int id action_mode_close_button 0x7f0b0032
-int id action_text 0x7f0b0033
-int id actions 0x7f0b0034
-int id activity_chooser_view_content 0x7f0b0035
-int id add 0x7f0b0036
-int id alertTitle 0x7f0b0037
-int id async 0x7f0b0038
-int id blocking 0x7f0b0039
-int id bottom 0x7f0b003a
-int id buttonPanel 0x7f0b003b
-int id cancel_action 0x7f0b003c
-int id checkbox 0x7f0b003d
-int id checked 0x7f0b003e
-int id chronometer 0x7f0b003f
-int id content 0x7f0b0040
-int id contentPanel 0x7f0b0041
-int id custom 0x7f0b0042
-int id customPanel 0x7f0b0043
-int id decor_content_parent 0x7f0b0044
-int id default_activity_button 0x7f0b0045
-int id dialog_button 0x7f0b0046
-int id edit_query 0x7f0b0047
-int id end 0x7f0b0048
-int id end_padder 0x7f0b0049
-int id expand_activities_button 0x7f0b004a
-int id expanded_menu 0x7f0b004b
-int id forever 0x7f0b004c
-int id gone 0x7f0b004d
-int id group_divider 0x7f0b004e
-int id home 0x7f0b004f
-int id icon 0x7f0b0050
-int id icon_group 0x7f0b0051
-int id image 0x7f0b0052
-int id info 0x7f0b0053
-int id invisible 0x7f0b0054
-int id italic 0x7f0b0055
-int id left 0x7f0b0056
-int id line1 0x7f0b0057
-int id line3 0x7f0b0058
-int id listMode 0x7f0b0059
-int id list_item 0x7f0b005a
-int id media_actions 0x7f0b005b
-int id message 0x7f0b005c
-int id multiply 0x7f0b005d
-int id none 0x7f0b005e
-int id normal 0x7f0b005f
-int id notification_background 0x7f0b0060
-int id notification_main_column 0x7f0b0061
-int id notification_main_column_container 0x7f0b0062
-int id off 0x7f0b0063
-int id on 0x7f0b0064
-int id packed 0x7f0b0065
-int id parent 0x7f0b0066
-int id parentPanel 0x7f0b0067
-int id percent 0x7f0b0068
-int id progress_circular 0x7f0b0069
-int id progress_horizontal 0x7f0b006a
-int id radio 0x7f0b006b
-int id right 0x7f0b006c
-int id right_icon 0x7f0b006d
-int id right_side 0x7f0b006e
-int id screen 0x7f0b006f
-int id scrollIndicatorDown 0x7f0b0070
-int id scrollIndicatorUp 0x7f0b0071
-int id scrollView 0x7f0b0072
-int id search_badge 0x7f0b0073
-int id search_bar 0x7f0b0074
-int id search_button 0x7f0b0075
-int id search_close_btn 0x7f0b0076
-int id search_edit_frame 0x7f0b0077
-int id search_go_btn 0x7f0b0078
-int id search_mag_icon 0x7f0b0079
-int id search_plate 0x7f0b007a
-int id search_src_text 0x7f0b007b
-int id search_voice_btn 0x7f0b007c
-int id select_dialog_listview 0x7f0b007d
-int id shortcut 0x7f0b007e
-int id spacer 0x7f0b007f
-int id split_action_bar 0x7f0b0080
-int id spread 0x7f0b0081
-int id spread_inside 0x7f0b0082
-int id src_atop 0x7f0b0083
-int id src_in 0x7f0b0084
-int id src_over 0x7f0b0085
-int id start 0x7f0b0086
-int id status_bar_latest_event_content 0x7f0b0087
-int id submenuarrow 0x7f0b0088
-int id submit_area 0x7f0b0089
-int id tabMode 0x7f0b008a
-int id tag_accessibility_actions 0x7f0b008b
-int id tag_accessibility_clickable_spans 0x7f0b008c
-int id tag_accessibility_heading 0x7f0b008d
-int id tag_accessibility_pane_title 0x7f0b008e
-int id tag_screen_reader_focusable 0x7f0b008f
-int id tag_transition_group 0x7f0b0090
-int id tag_unhandled_key_event_manager 0x7f0b0091
-int id tag_unhandled_key_listeners 0x7f0b0092
-int id text 0x7f0b0093
-int id text2 0x7f0b0094
-int id textSpacerNoButtons 0x7f0b0095
-int id textSpacerNoTitle 0x7f0b0096
-int id time 0x7f0b0097
-int id title 0x7f0b0098
-int id titleDividerNoCustom 0x7f0b0099
-int id title_template 0x7f0b009a
-int id top 0x7f0b009b
-int id topPanel 0x7f0b009c
-int id tvByd 0x7f0b009d
-int id tvCountDown 0x7f0b009e
-int id unchecked 0x7f0b009f
-int id uniform 0x7f0b00a0
-int id up 0x7f0b00a1
-int id wrap 0x7f0b00a2
-int id wrap_content 0x7f0b00a3
-int integer abc_config_activityDefaultDur 0x7f0c0001
-int integer abc_config_activityShortDur 0x7f0c0002
-int integer cancel_button_image_alpha 0x7f0c0003
-int integer config_tooltipAnimTime 0x7f0c0004
-int integer status_bar_notification_info_maxnum 0x7f0c0005
-int interpolator btn_checkbox_checked_mtrl_animation_interpolator_0 0x7f0d0001
-int interpolator btn_checkbox_checked_mtrl_animation_interpolator_1 0x7f0d0002
-int interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_0 0x7f0d0003
-int interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_1 0x7f0d0004
-int interpolator btn_radio_to_off_mtrl_animation_interpolator_0 0x7f0d0005
-int interpolator btn_radio_to_on_mtrl_animation_interpolator_0 0x7f0d0006
-int interpolator fast_out_slow_in 0x7f0d0007
-int layout abc_action_bar_title_item 0x7f0e0001
-int layout abc_action_bar_up_container 0x7f0e0002
-int layout abc_action_menu_item_layout 0x7f0e0003
-int layout abc_action_menu_layout 0x7f0e0004
-int layout abc_action_mode_bar 0x7f0e0005
-int layout abc_action_mode_close_item_material 0x7f0e0006
-int layout abc_activity_chooser_view 0x7f0e0007
-int layout abc_activity_chooser_view_list_item 0x7f0e0008
-int layout abc_alert_dialog_button_bar_material 0x7f0e0009
-int layout abc_alert_dialog_material 0x7f0e000a
-int layout abc_alert_dialog_title_material 0x7f0e000b
-int layout abc_cascading_menu_item_layout 0x7f0e000c
-int layout abc_dialog_title_material 0x7f0e000d
-int layout abc_expanded_menu_layout 0x7f0e000e
-int layout abc_list_menu_item_checkbox 0x7f0e000f
-int layout abc_list_menu_item_icon 0x7f0e0010
-int layout abc_list_menu_item_layout 0x7f0e0011
-int layout abc_list_menu_item_radio 0x7f0e0012
-int layout abc_popup_menu_header_item_layout 0x7f0e0013
-int layout abc_popup_menu_item_layout 0x7f0e0014
-int layout abc_screen_content_include 0x7f0e0015
-int layout abc_screen_simple 0x7f0e0016
-int layout abc_screen_simple_overlay_action_mode 0x7f0e0017
-int layout abc_screen_toolbar 0x7f0e0018
-int layout abc_search_dropdown_item_icons_2line 0x7f0e0019
-int layout abc_search_view 0x7f0e001a
-int layout abc_select_dialog_material 0x7f0e001b
-int layout abc_tooltip 0x7f0e001c
-int layout custom_dialog 0x7f0e001d
-int layout fragment_byd_splash 0x7f0e001e
-int layout notification_action 0x7f0e001f
-int layout notification_action_tombstone 0x7f0e0020
-int layout notification_media_action 0x7f0e0021
-int layout notification_media_cancel_action 0x7f0e0022
-int layout notification_template_big_media 0x7f0e0023
-int layout notification_template_big_media_custom 0x7f0e0024
-int layout notification_template_big_media_narrow 0x7f0e0025
-int layout notification_template_big_media_narrow_custom 0x7f0e0026
-int layout notification_template_custom_big 0x7f0e0027
-int layout notification_template_icon_group 0x7f0e0028
-int layout notification_template_lines_media 0x7f0e0029
-int layout notification_template_media 0x7f0e002a
-int layout notification_template_media_custom 0x7f0e002b
-int layout notification_template_part_chronometer 0x7f0e002c
-int layout notification_template_part_time 0x7f0e002d
-int layout select_dialog_item_material 0x7f0e002e
-int layout select_dialog_multichoice_material 0x7f0e002f
-int layout select_dialog_singlechoice_material 0x7f0e0030
-int layout support_simple_spinner_dropdown_item 0x7f0e0031
-int string abc_action_bar_home_description 0x7f140001
-int string abc_action_bar_up_description 0x7f140002
-int string abc_action_menu_overflow_description 0x7f140003
-int string abc_action_mode_done 0x7f140004
-int string abc_activity_chooser_view_see_all 0x7f140005
-int string abc_activitychooserview_choose_application 0x7f140006
-int string abc_capital_off 0x7f140007
-int string abc_capital_on 0x7f140008
-int string abc_menu_alt_shortcut_label 0x7f140009
-int string abc_menu_ctrl_shortcut_label 0x7f14000a
-int string abc_menu_delete_shortcut_label 0x7f14000b
-int string abc_menu_enter_shortcut_label 0x7f14000c
-int string abc_menu_function_shortcut_label 0x7f14000d
-int string abc_menu_meta_shortcut_label 0x7f14000e
-int string abc_menu_shift_shortcut_label 0x7f14000f
-int string abc_menu_space_shortcut_label 0x7f140010
-int string abc_menu_sym_shortcut_label 0x7f140011
-int string abc_prepend_shortcut_label 0x7f140012
-int string abc_search_hint 0x7f140013
-int string abc_searchview_description_clear 0x7f140014
-int string abc_searchview_description_query 0x7f140015
-int string abc_searchview_description_search 0x7f140016
-int string abc_searchview_description_submit 0x7f140017
-int string abc_searchview_description_voice 0x7f140018
-int string abc_shareactionprovider_share_with 0x7f140019
-int string abc_shareactionprovider_share_with_application 0x7f14001a
-int string abc_toolbar_collapse_description 0x7f14001b
-int string search_menu_title 0x7f14001c
-int string status_bar_notification_info_overflow 0x7f14001d
-int style AlertDialog_AppCompat 0x7f150001
-int style AlertDialog_AppCompat_Light 0x7f150002
-int style Animation_AppCompat_Dialog 0x7f150003
-int style Animation_AppCompat_DropDownUp 0x7f150004
-int style Animation_AppCompat_Tooltip 0x7f150005
-int style Base_AlertDialog_AppCompat 0x7f150006
-int style Base_AlertDialog_AppCompat_Light 0x7f150007
-int style Base_Animation_AppCompat_Dialog 0x7f150008
-int style Base_Animation_AppCompat_DropDownUp 0x7f150009
-int style Base_Animation_AppCompat_Tooltip 0x7f15000a
-int style Base_DialogWindowTitleBackground_AppCompat 0x7f15000b
-int style Base_DialogWindowTitle_AppCompat 0x7f15000c
-int style Base_TextAppearance_AppCompat 0x7f15000d
-int style Base_TextAppearance_AppCompat_Body1 0x7f15000e
-int style Base_TextAppearance_AppCompat_Body2 0x7f15000f
-int style Base_TextAppearance_AppCompat_Button 0x7f150010
-int style Base_TextAppearance_AppCompat_Caption 0x7f150011
-int style Base_TextAppearance_AppCompat_Display1 0x7f150012
-int style Base_TextAppearance_AppCompat_Display2 0x7f150013
-int style Base_TextAppearance_AppCompat_Display3 0x7f150014
-int style Base_TextAppearance_AppCompat_Display4 0x7f150015
-int style Base_TextAppearance_AppCompat_Headline 0x7f150016
-int style Base_TextAppearance_AppCompat_Inverse 0x7f150017
-int style Base_TextAppearance_AppCompat_Large 0x7f150018
-int style Base_TextAppearance_AppCompat_Large_Inverse 0x7f150019
-int style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large 0x7f15001a
-int style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small 0x7f15001b
-int style Base_TextAppearance_AppCompat_Medium 0x7f15001c
-int style Base_TextAppearance_AppCompat_Medium_Inverse 0x7f15001d
-int style Base_TextAppearance_AppCompat_Menu 0x7f15001e
-int style Base_TextAppearance_AppCompat_SearchResult 0x7f15001f
-int style Base_TextAppearance_AppCompat_SearchResult_Subtitle 0x7f150020
-int style Base_TextAppearance_AppCompat_SearchResult_Title 0x7f150021
-int style Base_TextAppearance_AppCompat_Small 0x7f150022
-int style Base_TextAppearance_AppCompat_Small_Inverse 0x7f150023
-int style Base_TextAppearance_AppCompat_Subhead 0x7f150024
-int style Base_TextAppearance_AppCompat_Subhead_Inverse 0x7f150025
-int style Base_TextAppearance_AppCompat_Title 0x7f150026
-int style Base_TextAppearance_AppCompat_Title_Inverse 0x7f150027
-int style Base_TextAppearance_AppCompat_Tooltip 0x7f150028
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Menu 0x7f150029
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle 0x7f15002a
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse 0x7f15002b
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Title 0x7f15002c
-int style Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse 0x7f15002d
-int style Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle 0x7f15002e
-int style Base_TextAppearance_AppCompat_Widget_ActionMode_Title 0x7f15002f
-int style Base_TextAppearance_AppCompat_Widget_Button 0x7f150030
-int style Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored 0x7f150031
-int style Base_TextAppearance_AppCompat_Widget_Button_Colored 0x7f150032
-int style Base_TextAppearance_AppCompat_Widget_Button_Inverse 0x7f150033
-int style Base_TextAppearance_AppCompat_Widget_DropDownItem 0x7f150034
-int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Header 0x7f150035
-int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Large 0x7f150036
-int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Small 0x7f150037
-int style Base_TextAppearance_AppCompat_Widget_Switch 0x7f150038
-int style Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem 0x7f150039
-int style Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item 0x7f15003a
-int style Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle 0x7f15003b
-int style Base_TextAppearance_Widget_AppCompat_Toolbar_Title 0x7f15003c
-int style Base_ThemeOverlay_AppCompat 0x7f15003d
-int style Base_ThemeOverlay_AppCompat_ActionBar 0x7f15003e
-int style Base_ThemeOverlay_AppCompat_Dark 0x7f15003f
-int style Base_ThemeOverlay_AppCompat_Dark_ActionBar 0x7f150040
-int style Base_ThemeOverlay_AppCompat_Dialog 0x7f150041
-int style Base_ThemeOverlay_AppCompat_Dialog_Alert 0x7f150042
-int style Base_ThemeOverlay_AppCompat_Light 0x7f150043
-int style Base_Theme_AppCompat 0x7f150044
-int style Base_Theme_AppCompat_CompactMenu 0x7f150045
-int style Base_Theme_AppCompat_Dialog 0x7f150046
-int style Base_Theme_AppCompat_DialogWhenLarge 0x7f150047
-int style Base_Theme_AppCompat_Dialog_Alert 0x7f150048
-int style Base_Theme_AppCompat_Dialog_FixedSize 0x7f150049
-int style Base_Theme_AppCompat_Dialog_MinWidth 0x7f15004a
-int style Base_Theme_AppCompat_Light 0x7f15004b
-int style Base_Theme_AppCompat_Light_DarkActionBar 0x7f15004c
-int style Base_Theme_AppCompat_Light_Dialog 0x7f15004d
-int style Base_Theme_AppCompat_Light_DialogWhenLarge 0x7f15004e
-int style Base_Theme_AppCompat_Light_Dialog_Alert 0x7f15004f
-int style Base_Theme_AppCompat_Light_Dialog_FixedSize 0x7f150050
-int style Base_Theme_AppCompat_Light_Dialog_MinWidth 0x7f150051
-int style Base_V21_ThemeOverlay_AppCompat_Dialog 0x7f150052
-int style Base_V21_Theme_AppCompat 0x7f150053
-int style Base_V21_Theme_AppCompat_Dialog 0x7f150054
-int style Base_V21_Theme_AppCompat_Light 0x7f150055
-int style Base_V21_Theme_AppCompat_Light_Dialog 0x7f150056
-int style Base_V22_Theme_AppCompat 0x7f150057
-int style Base_V22_Theme_AppCompat_Light 0x7f150058
-int style Base_V23_Theme_AppCompat 0x7f150059
-int style Base_V23_Theme_AppCompat_Light 0x7f15005a
-int style Base_V26_Theme_AppCompat 0x7f15005b
-int style Base_V26_Theme_AppCompat_Light 0x7f15005c
-int style Base_V26_Widget_AppCompat_Toolbar 0x7f15005d
-int style Base_V28_Theme_AppCompat 0x7f15005e
-int style Base_V28_Theme_AppCompat_Light 0x7f15005f
-int style Base_V7_ThemeOverlay_AppCompat_Dialog 0x7f150060
-int style Base_V7_Theme_AppCompat 0x7f150061
-int style Base_V7_Theme_AppCompat_Dialog 0x7f150062
-int style Base_V7_Theme_AppCompat_Light 0x7f150063
-int style Base_V7_Theme_AppCompat_Light_Dialog 0x7f150064
-int style Base_V7_Widget_AppCompat_AutoCompleteTextView 0x7f150065
-int style Base_V7_Widget_AppCompat_EditText 0x7f150066
-int style Base_V7_Widget_AppCompat_Toolbar 0x7f150067
-int style Base_Widget_AppCompat_ActionBar 0x7f150068
-int style Base_Widget_AppCompat_ActionBar_Solid 0x7f150069
-int style Base_Widget_AppCompat_ActionBar_TabBar 0x7f15006a
-int style Base_Widget_AppCompat_ActionBar_TabText 0x7f15006b
-int style Base_Widget_AppCompat_ActionBar_TabView 0x7f15006c
-int style Base_Widget_AppCompat_ActionButton 0x7f15006d
-int style Base_Widget_AppCompat_ActionButton_CloseMode 0x7f15006e
-int style Base_Widget_AppCompat_ActionButton_Overflow 0x7f15006f
-int style Base_Widget_AppCompat_ActionMode 0x7f150070
-int style Base_Widget_AppCompat_ActivityChooserView 0x7f150071
-int style Base_Widget_AppCompat_AutoCompleteTextView 0x7f150072
-int style Base_Widget_AppCompat_Button 0x7f150073
-int style Base_Widget_AppCompat_ButtonBar 0x7f150074
-int style Base_Widget_AppCompat_ButtonBar_AlertDialog 0x7f150075
-int style Base_Widget_AppCompat_Button_Borderless 0x7f150076
-int style Base_Widget_AppCompat_Button_Borderless_Colored 0x7f150077
-int style Base_Widget_AppCompat_Button_ButtonBar_AlertDialog 0x7f150078
-int style Base_Widget_AppCompat_Button_Colored 0x7f150079
-int style Base_Widget_AppCompat_Button_Small 0x7f15007a
-int style Base_Widget_AppCompat_CompoundButton_CheckBox 0x7f15007b
-int style Base_Widget_AppCompat_CompoundButton_RadioButton 0x7f15007c
-int style Base_Widget_AppCompat_CompoundButton_Switch 0x7f15007d
-int style Base_Widget_AppCompat_DrawerArrowToggle 0x7f15007e
-int style Base_Widget_AppCompat_DrawerArrowToggle_Common 0x7f15007f
-int style Base_Widget_AppCompat_DropDownItem_Spinner 0x7f150080
-int style Base_Widget_AppCompat_EditText 0x7f150081
-int style Base_Widget_AppCompat_ImageButton 0x7f150082
-int style Base_Widget_AppCompat_Light_ActionBar 0x7f150083
-int style Base_Widget_AppCompat_Light_ActionBar_Solid 0x7f150084
-int style Base_Widget_AppCompat_Light_ActionBar_TabBar 0x7f150085
-int style Base_Widget_AppCompat_Light_ActionBar_TabText 0x7f150086
-int style Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse 0x7f150087
-int style Base_Widget_AppCompat_Light_ActionBar_TabView 0x7f150088
-int style Base_Widget_AppCompat_Light_PopupMenu 0x7f150089
-int style Base_Widget_AppCompat_Light_PopupMenu_Overflow 0x7f15008a
-int style Base_Widget_AppCompat_ListMenuView 0x7f15008b
-int style Base_Widget_AppCompat_ListPopupWindow 0x7f15008c
-int style Base_Widget_AppCompat_ListView 0x7f15008d
-int style Base_Widget_AppCompat_ListView_DropDown 0x7f15008e
-int style Base_Widget_AppCompat_ListView_Menu 0x7f15008f
-int style Base_Widget_AppCompat_PopupMenu 0x7f150090
-int style Base_Widget_AppCompat_PopupMenu_Overflow 0x7f150091
-int style Base_Widget_AppCompat_PopupWindow 0x7f150092
-int style Base_Widget_AppCompat_ProgressBar 0x7f150093
-int style Base_Widget_AppCompat_ProgressBar_Horizontal 0x7f150094
-int style Base_Widget_AppCompat_RatingBar 0x7f150095
-int style Base_Widget_AppCompat_RatingBar_Indicator 0x7f150096
-int style Base_Widget_AppCompat_RatingBar_Small 0x7f150097
-int style Base_Widget_AppCompat_SearchView 0x7f150098
-int style Base_Widget_AppCompat_SearchView_ActionBar 0x7f150099
-int style Base_Widget_AppCompat_SeekBar 0x7f15009a
-int style Base_Widget_AppCompat_SeekBar_Discrete 0x7f15009b
-int style Base_Widget_AppCompat_Spinner 0x7f15009c
-int style Base_Widget_AppCompat_Spinner_Underlined 0x7f15009d
-int style Base_Widget_AppCompat_TextView 0x7f15009e
-int style Base_Widget_AppCompat_TextView_SpinnerItem 0x7f15009f
-int style Base_Widget_AppCompat_Toolbar 0x7f1500a0
-int style Base_Widget_AppCompat_Toolbar_Button_Navigation 0x7f1500a1
-int style Platform_AppCompat 0x7f1500a2
-int style Platform_AppCompat_Light 0x7f1500a3
-int style Platform_ThemeOverlay_AppCompat 0x7f1500a4
-int style Platform_ThemeOverlay_AppCompat_Dark 0x7f1500a5
-int style Platform_ThemeOverlay_AppCompat_Light 0x7f1500a6
-int style Platform_V21_AppCompat 0x7f1500a7
-int style Platform_V21_AppCompat_Light 0x7f1500a8
-int style Platform_V25_AppCompat 0x7f1500a9
-int style Platform_V25_AppCompat_Light 0x7f1500aa
-int style Platform_Widget_AppCompat_Spinner 0x7f1500ab
-int style RtlOverlay_DialogWindowTitle_AppCompat 0x7f1500ac
-int style RtlOverlay_Widget_AppCompat_ActionBar_TitleItem 0x7f1500ad
-int style RtlOverlay_Widget_AppCompat_DialogTitle_Icon 0x7f1500ae
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem 0x7f1500af
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup 0x7f1500b0
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut 0x7f1500b1
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow 0x7f1500b2
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Text 0x7f1500b3
-int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Title 0x7f1500b4
-int style RtlOverlay_Widget_AppCompat_SearchView_MagIcon 0x7f1500b5
-int style RtlOverlay_Widget_AppCompat_Search_DropDown 0x7f1500b6
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 0x7f1500b7
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 0x7f1500b8
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Query 0x7f1500b9
-int style RtlOverlay_Widget_AppCompat_Search_DropDown_Text 0x7f1500ba
-int style RtlUnderlay_Widget_AppCompat_ActionButton 0x7f1500bb
-int style RtlUnderlay_Widget_AppCompat_ActionButton_Overflow 0x7f1500bc
-int style TextAppearance_AppCompat 0x7f1500bd
-int style TextAppearance_AppCompat_Body1 0x7f1500be
-int style TextAppearance_AppCompat_Body2 0x7f1500bf
-int style TextAppearance_AppCompat_Button 0x7f1500c0
-int style TextAppearance_AppCompat_Caption 0x7f1500c1
-int style TextAppearance_AppCompat_Display1 0x7f1500c2
-int style TextAppearance_AppCompat_Display2 0x7f1500c3
-int style TextAppearance_AppCompat_Display3 0x7f1500c4
-int style TextAppearance_AppCompat_Display4 0x7f1500c5
-int style TextAppearance_AppCompat_Headline 0x7f1500c6
-int style TextAppearance_AppCompat_Inverse 0x7f1500c7
-int style TextAppearance_AppCompat_Large 0x7f1500c8
-int style TextAppearance_AppCompat_Large_Inverse 0x7f1500c9
-int style TextAppearance_AppCompat_Light_SearchResult_Subtitle 0x7f1500ca
-int style TextAppearance_AppCompat_Light_SearchResult_Title 0x7f1500cb
-int style TextAppearance_AppCompat_Light_Widget_PopupMenu_Large 0x7f1500cc
-int style TextAppearance_AppCompat_Light_Widget_PopupMenu_Small 0x7f1500cd
-int style TextAppearance_AppCompat_Medium 0x7f1500ce
-int style TextAppearance_AppCompat_Medium_Inverse 0x7f1500cf
-int style TextAppearance_AppCompat_Menu 0x7f1500d0
-int style TextAppearance_AppCompat_SearchResult_Subtitle 0x7f1500d1
-int style TextAppearance_AppCompat_SearchResult_Title 0x7f1500d2
-int style TextAppearance_AppCompat_Small 0x7f1500d3
-int style TextAppearance_AppCompat_Small_Inverse 0x7f1500d4
-int style TextAppearance_AppCompat_Subhead 0x7f1500d5
-int style TextAppearance_AppCompat_Subhead_Inverse 0x7f1500d6
-int style TextAppearance_AppCompat_Title 0x7f1500d7
-int style TextAppearance_AppCompat_Title_Inverse 0x7f1500d8
-int style TextAppearance_AppCompat_Tooltip 0x7f1500d9
-int style TextAppearance_AppCompat_Widget_ActionBar_Menu 0x7f1500da
-int style TextAppearance_AppCompat_Widget_ActionBar_Subtitle 0x7f1500db
-int style TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse 0x7f1500dc
-int style TextAppearance_AppCompat_Widget_ActionBar_Title 0x7f1500dd
-int style TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse 0x7f1500de
-int style TextAppearance_AppCompat_Widget_ActionMode_Subtitle 0x7f1500df
-int style TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse 0x7f1500e0
-int style TextAppearance_AppCompat_Widget_ActionMode_Title 0x7f1500e1
-int style TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse 0x7f1500e2
-int style TextAppearance_AppCompat_Widget_Button 0x7f1500e3
-int style TextAppearance_AppCompat_Widget_Button_Borderless_Colored 0x7f1500e4
-int style TextAppearance_AppCompat_Widget_Button_Colored 0x7f1500e5
-int style TextAppearance_AppCompat_Widget_Button_Inverse 0x7f1500e6
-int style TextAppearance_AppCompat_Widget_DropDownItem 0x7f1500e7
-int style TextAppearance_AppCompat_Widget_PopupMenu_Header 0x7f1500e8
-int style TextAppearance_AppCompat_Widget_PopupMenu_Large 0x7f1500e9
-int style TextAppearance_AppCompat_Widget_PopupMenu_Small 0x7f1500ea
-int style TextAppearance_AppCompat_Widget_Switch 0x7f1500eb
-int style TextAppearance_AppCompat_Widget_TextView_SpinnerItem 0x7f1500ec
-int style TextAppearance_Compat_Notification 0x7f1500ed
-int style TextAppearance_Compat_Notification_Info 0x7f1500ee
-int style TextAppearance_Compat_Notification_Info_Media 0x7f1500ef
-int style TextAppearance_Compat_Notification_Line2 0x7f1500f0
-int style TextAppearance_Compat_Notification_Line2_Media 0x7f1500f1
-int style TextAppearance_Compat_Notification_Media 0x7f1500f2
-int style TextAppearance_Compat_Notification_Time 0x7f1500f3
-int style TextAppearance_Compat_Notification_Time_Media 0x7f1500f4
-int style TextAppearance_Compat_Notification_Title 0x7f1500f5
-int style TextAppearance_Compat_Notification_Title_Media 0x7f1500f6
-int style TextAppearance_Widget_AppCompat_ExpandedMenu_Item 0x7f1500f7
-int style TextAppearance_Widget_AppCompat_Toolbar_Subtitle 0x7f1500f8
-int style TextAppearance_Widget_AppCompat_Toolbar_Title 0x7f1500f9
-int style ThemeOverlay_AppCompat 0x7f1500fa
-int style ThemeOverlay_AppCompat_ActionBar 0x7f1500fb
-int style ThemeOverlay_AppCompat_Dark 0x7f1500fc
-int style ThemeOverlay_AppCompat_Dark_ActionBar 0x7f1500fd
-int style ThemeOverlay_AppCompat_DayNight 0x7f1500fe
-int style ThemeOverlay_AppCompat_DayNight_ActionBar 0x7f1500ff
-int style ThemeOverlay_AppCompat_Dialog 0x7f150100
-int style ThemeOverlay_AppCompat_Dialog_Alert 0x7f150101
-int style ThemeOverlay_AppCompat_Light 0x7f150102
-int style Theme_AppCompat 0x7f150103
-int style Theme_AppCompat_CompactMenu 0x7f150104
-int style Theme_AppCompat_DayNight 0x7f150105
-int style Theme_AppCompat_DayNight_DarkActionBar 0x7f150106
-int style Theme_AppCompat_DayNight_Dialog 0x7f150107
-int style Theme_AppCompat_DayNight_DialogWhenLarge 0x7f150108
-int style Theme_AppCompat_DayNight_Dialog_Alert 0x7f150109
-int style Theme_AppCompat_DayNight_Dialog_MinWidth 0x7f15010a
-int style Theme_AppCompat_DayNight_NoActionBar 0x7f15010b
-int style Theme_AppCompat_Dialog 0x7f15010c
-int style Theme_AppCompat_DialogWhenLarge 0x7f15010d
-int style Theme_AppCompat_Dialog_Alert 0x7f15010e
-int style Theme_AppCompat_Dialog_MinWidth 0x7f15010f
-int style Theme_AppCompat_Light 0x7f150110
-int style Theme_AppCompat_Light_DarkActionBar 0x7f150111
-int style Theme_AppCompat_Light_Dialog 0x7f150112
-int style Theme_AppCompat_Light_DialogWhenLarge 0x7f150113
-int style Theme_AppCompat_Light_Dialog_Alert 0x7f150114
-int style Theme_AppCompat_Light_Dialog_MinWidth 0x7f150115
-int style Theme_AppCompat_Light_NoActionBar 0x7f150116
-int style Theme_AppCompat_NoActionBar 0x7f150117
-int style Widget_AppCompat_ActionBar 0x7f150118
-int style Widget_AppCompat_ActionBar_Solid 0x7f150119
-int style Widget_AppCompat_ActionBar_TabBar 0x7f15011a
-int style Widget_AppCompat_ActionBar_TabText 0x7f15011b
-int style Widget_AppCompat_ActionBar_TabView 0x7f15011c
-int style Widget_AppCompat_ActionButton 0x7f15011d
-int style Widget_AppCompat_ActionButton_CloseMode 0x7f15011e
-int style Widget_AppCompat_ActionButton_Overflow 0x7f15011f
-int style Widget_AppCompat_ActionMode 0x7f150120
-int style Widget_AppCompat_ActivityChooserView 0x7f150121
-int style Widget_AppCompat_AutoCompleteTextView 0x7f150122
-int style Widget_AppCompat_Button 0x7f150123
-int style Widget_AppCompat_ButtonBar 0x7f150124
-int style Widget_AppCompat_ButtonBar_AlertDialog 0x7f150125
-int style Widget_AppCompat_Button_Borderless 0x7f150126
-int style Widget_AppCompat_Button_Borderless_Colored 0x7f150127
-int style Widget_AppCompat_Button_ButtonBar_AlertDialog 0x7f150128
-int style Widget_AppCompat_Button_Colored 0x7f150129
-int style Widget_AppCompat_Button_Small 0x7f15012a
-int style Widget_AppCompat_CompoundButton_CheckBox 0x7f15012b
-int style Widget_AppCompat_CompoundButton_RadioButton 0x7f15012c
-int style Widget_AppCompat_CompoundButton_Switch 0x7f15012d
-int style Widget_AppCompat_DrawerArrowToggle 0x7f15012e
-int style Widget_AppCompat_DropDownItem_Spinner 0x7f15012f
-int style Widget_AppCompat_EditText 0x7f150130
-int style Widget_AppCompat_ImageButton 0x7f150131
-int style Widget_AppCompat_Light_ActionBar 0x7f150132
-int style Widget_AppCompat_Light_ActionBar_Solid 0x7f150133
-int style Widget_AppCompat_Light_ActionBar_Solid_Inverse 0x7f150134
-int style Widget_AppCompat_Light_ActionBar_TabBar 0x7f150135
-int style Widget_AppCompat_Light_ActionBar_TabBar_Inverse 0x7f150136
-int style Widget_AppCompat_Light_ActionBar_TabText 0x7f150137
-int style Widget_AppCompat_Light_ActionBar_TabText_Inverse 0x7f150138
-int style Widget_AppCompat_Light_ActionBar_TabView 0x7f150139
-int style Widget_AppCompat_Light_ActionBar_TabView_Inverse 0x7f15013a
-int style Widget_AppCompat_Light_ActionButton 0x7f15013b
-int style Widget_AppCompat_Light_ActionButton_CloseMode 0x7f15013c
-int style Widget_AppCompat_Light_ActionButton_Overflow 0x7f15013d
-int style Widget_AppCompat_Light_ActionMode_Inverse 0x7f15013e
-int style Widget_AppCompat_Light_ActivityChooserView 0x7f15013f
-int style Widget_AppCompat_Light_AutoCompleteTextView 0x7f150140
-int style Widget_AppCompat_Light_DropDownItem_Spinner 0x7f150141
-int style Widget_AppCompat_Light_ListPopupWindow 0x7f150142
-int style Widget_AppCompat_Light_ListView_DropDown 0x7f150143
-int style Widget_AppCompat_Light_PopupMenu 0x7f150144
-int style Widget_AppCompat_Light_PopupMenu_Overflow 0x7f150145
-int style Widget_AppCompat_Light_SearchView 0x7f150146
-int style Widget_AppCompat_Light_Spinner_DropDown_ActionBar 0x7f150147
-int style Widget_AppCompat_ListMenuView 0x7f150148
-int style Widget_AppCompat_ListPopupWindow 0x7f150149
-int style Widget_AppCompat_ListView 0x7f15014a
-int style Widget_AppCompat_ListView_DropDown 0x7f15014b
-int style Widget_AppCompat_ListView_Menu 0x7f15014c
-int style Widget_AppCompat_PopupMenu 0x7f15014d
-int style Widget_AppCompat_PopupMenu_Overflow 0x7f15014e
-int style Widget_AppCompat_PopupWindow 0x7f15014f
-int style Widget_AppCompat_ProgressBar 0x7f150150
-int style Widget_AppCompat_ProgressBar_Horizontal 0x7f150151
-int style Widget_AppCompat_RatingBar 0x7f150152
-int style Widget_AppCompat_RatingBar_Indicator 0x7f150153
-int style Widget_AppCompat_RatingBar_Small 0x7f150154
-int style Widget_AppCompat_SearchView 0x7f150155
-int style Widget_AppCompat_SearchView_ActionBar 0x7f150156
-int style Widget_AppCompat_SeekBar 0x7f150157
-int style Widget_AppCompat_SeekBar_Discrete 0x7f150158
-int style Widget_AppCompat_Spinner 0x7f150159
-int style Widget_AppCompat_Spinner_DropDown 0x7f15015a
-int style Widget_AppCompat_Spinner_DropDown_ActionBar 0x7f15015b
-int style Widget_AppCompat_Spinner_Underlined 0x7f15015c
-int style Widget_AppCompat_TextView 0x7f15015d
-int style Widget_AppCompat_TextView_SpinnerItem 0x7f15015e
-int style Widget_AppCompat_Toolbar 0x7f15015f
-int style Widget_AppCompat_Toolbar_Button_Navigation 0x7f150160
-int style Widget_Compat_NotificationActionContainer 0x7f150161
-int style Widget_Compat_NotificationActionText 0x7f150162
-int style Widget_Support_CoordinatorLayout 0x7f150163
-int[] styleable ActionBar { 0x7f040032, 0x7f040033, 0x7f040034, 0x7f04005f, 0x7f040060, 0x7f040061, 0x7f040062, 0x7f040063, 0x7f040064, 0x7f040067, 0x7f04006c, 0x7f04006d, 0x7f040080, 0x7f040091, 0x7f040092, 0x7f040093, 0x7f040094, 0x7f040095, 0x7f04009a, 0x7f04009d, 0x7f0400e9, 0x7f0400f1, 0x7f0400fc, 0x7f0400ff, 0x7f040100, 0x7f04011b, 0x7f04011e, 0x7f04013a, 0x7f040143 }
-int styleable ActionBar_background 0
-int styleable ActionBar_backgroundSplit 1
-int styleable ActionBar_backgroundStacked 2
-int styleable ActionBar_contentInsetEnd 3
-int styleable ActionBar_contentInsetEndWithActions 4
-int styleable ActionBar_contentInsetLeft 5
-int styleable ActionBar_contentInsetRight 6
-int styleable ActionBar_contentInsetStart 7
-int styleable ActionBar_contentInsetStartWithNavigation 8
-int styleable ActionBar_customNavigationLayout 9
-int styleable ActionBar_displayOptions 10
-int styleable ActionBar_divider 11
-int styleable ActionBar_elevation 12
-int styleable ActionBar_height 13
-int styleable ActionBar_hideOnContentScroll 14
-int styleable ActionBar_homeAsUpIndicator 15
-int styleable ActionBar_homeLayout 16
-int styleable ActionBar_icon 17
-int styleable ActionBar_indeterminateProgressStyle 18
-int styleable ActionBar_itemPadding 19
-int styleable ActionBar_logo 20
-int styleable ActionBar_navigationMode 21
-int styleable ActionBar_popupTheme 22
-int styleable ActionBar_progressBarPadding 23
-int styleable ActionBar_progressBarStyle 24
-int styleable ActionBar_subtitle 25
-int styleable ActionBar_subtitleTextStyle 26
-int styleable ActionBar_title 27
-int styleable ActionBar_titleTextStyle 28
-int[] styleable ActionBarLayout { 0x10100b3 }
-int styleable ActionBarLayout_android_layout_gravity 0
-int[] styleable ActionMenuItemView { 0x101013f }
-int styleable ActionMenuItemView_android_minWidth 0
-int[] styleable ActionMenuView { }
-int[] styleable ActionMode { 0x7f040032, 0x7f040033, 0x7f04004c, 0x7f040091, 0x7f04011e, 0x7f040143 }
-int styleable ActionMode_background 0
-int styleable ActionMode_backgroundSplit 1
-int styleable ActionMode_closeItemLayout 2
-int styleable ActionMode_height 3
-int styleable ActionMode_subtitleTextStyle 4
-int styleable ActionMode_titleTextStyle 5
-int[] styleable ActivityChooserView { 0x7f040082, 0x7f04009b }
-int styleable ActivityChooserView_expandActivityOverflowButtonDrawable 0
-int styleable ActivityChooserView_initialActivityCount 1
-int[] styleable AlertDialog { 0x10100f2, 0x7f040042, 0x7f040043, 0x7f0400de, 0x7f0400df, 0x7f0400ee, 0x7f040110, 0x7f040111 }
-int styleable AlertDialog_android_layout 0
-int styleable AlertDialog_buttonIconDimen 1
-int styleable AlertDialog_buttonPanelSideLayout 2
-int styleable AlertDialog_listItemLayout 3
-int styleable AlertDialog_listLayout 4
-int styleable AlertDialog_multiChoiceItemLayout 5
-int styleable AlertDialog_showTitle 6
-int styleable AlertDialog_singleChoiceItemLayout 7
-int[] styleable AnimatedStateListDrawableCompat { 0x1010196, 0x101011c, 0x101030c, 0x101030d, 0x1010195, 0x1010194 }
-int styleable AnimatedStateListDrawableCompat_android_constantSize 0
-int styleable AnimatedStateListDrawableCompat_android_dither 1
-int styleable AnimatedStateListDrawableCompat_android_enterFadeDuration 2
-int styleable AnimatedStateListDrawableCompat_android_exitFadeDuration 3
-int styleable AnimatedStateListDrawableCompat_android_variablePadding 4
-int styleable AnimatedStateListDrawableCompat_android_visible 5
-int[] styleable AnimatedStateListDrawableItem { 0x1010199, 0x10100d0 }
-int styleable AnimatedStateListDrawableItem_android_drawable 0
-int styleable AnimatedStateListDrawableItem_android_id 1
-int[] styleable AnimatedStateListDrawableTransition { 0x1010199, 0x101044a, 0x101044b, 0x1010449 }
-int styleable AnimatedStateListDrawableTransition_android_drawable 0
-int styleable AnimatedStateListDrawableTransition_android_fromId 1
-int styleable AnimatedStateListDrawableTransition_android_reversible 2
-int styleable AnimatedStateListDrawableTransition_android_toId 3
-int[] styleable AppCompatImageView { 0x1010119, 0x7f040116, 0x7f040138, 0x7f040139 }
-int styleable AppCompatImageView_android_src 0
-int styleable AppCompatImageView_srcCompat 1
-int styleable AppCompatImageView_tint 2
-int styleable AppCompatImageView_tintMode 3
-int[] styleable AppCompatSeekBar { 0x1010142, 0x7f040135, 0x7f040136, 0x7f040137 }
-int styleable AppCompatSeekBar_android_thumb 0
-int styleable AppCompatSeekBar_tickMark 1
-int styleable AppCompatSeekBar_tickMarkTint 2
-int styleable AppCompatSeekBar_tickMarkTintMode 3
-int[] styleable AppCompatTextHelper { 0x101016e, 0x1010393, 0x101016f, 0x1010170, 0x1010392, 0x101016d, 0x1010034 }
-int styleable AppCompatTextHelper_android_drawableBottom 0
-int styleable AppCompatTextHelper_android_drawableEnd 1
-int styleable AppCompatTextHelper_android_drawableLeft 2
-int styleable AppCompatTextHelper_android_drawableRight 3
-int styleable AppCompatTextHelper_android_drawableStart 4
-int styleable AppCompatTextHelper_android_drawableTop 5
-int styleable AppCompatTextHelper_android_textAppearance 6
-int[] styleable AppCompatTextView { 0x1010034, 0x7f04002d, 0x7f04002e, 0x7f04002f, 0x7f040030, 0x7f040031, 0x7f040071, 0x7f040072, 0x7f040073, 0x7f040074, 0x7f040076, 0x7f040077, 0x7f040078, 0x7f040079, 0x7f040083, 0x7f040085, 0x7f04008d, 0x7f04009f, 0x7f0400d9, 0x7f040124, 0x7f04012f }
-int styleable AppCompatTextView_android_textAppearance 0
-int styleable AppCompatTextView_autoSizeMaxTextSize 1
-int styleable AppCompatTextView_autoSizeMinTextSize 2
-int styleable AppCompatTextView_autoSizePresetSizes 3
-int styleable AppCompatTextView_autoSizeStepGranularity 4
-int styleable AppCompatTextView_autoSizeTextType 5
-int styleable AppCompatTextView_drawableBottomCompat 6
-int styleable AppCompatTextView_drawableEndCompat 7
-int styleable AppCompatTextView_drawableLeftCompat 8
-int styleable AppCompatTextView_drawableRightCompat 9
-int styleable AppCompatTextView_drawableStartCompat 10
-int styleable AppCompatTextView_drawableTint 11
-int styleable AppCompatTextView_drawableTintMode 12
-int styleable AppCompatTextView_drawableTopCompat 13
-int styleable AppCompatTextView_firstBaselineToTopHeight 14
-int styleable AppCompatTextView_fontFamily 15
-int styleable AppCompatTextView_fontVariationSettings 16
-int styleable AppCompatTextView_lastBaselineToBottomHeight 17
-int styleable AppCompatTextView_lineHeight 18
-int styleable AppCompatTextView_textAllCaps 19
-int styleable AppCompatTextView_textLocale 20
-int[] styleable AppCompatTheme { 0x7f040001, 0x7f040002, 0x7f040003, 0x7f040004, 0x7f040005, 0x7f040006, 0x7f040007, 0x7f040008, 0x7f040009, 0x7f04000a, 0x7f04000b, 0x7f04000c, 0x7f04000d, 0x7f04000f, 0x7f040010, 0x7f040011, 0x7f040012, 0x7f040013, 0x7f040014, 0x7f040015, 0x7f040016, 0x7f040017, 0x7f040018, 0x7f040019, 0x7f04001a, 0x7f04001b, 0x7f04001c, 0x7f04001d, 0x7f04001e, 0x7f04001f, 0x7f040022, 0x7f040023, 0x7f040024, 0x7f040025, 0x7f040026, 0x10100ae, 0x1010057, 0x7f04002c, 0x7f04003a, 0x7f04003b, 0x7f04003c, 0x7f04003d, 0x7f04003e, 0x7f04003f, 0x7f040044, 0x7f040045, 0x7f040049, 0x7f04004a, 0x7f040050, 0x7f040051, 0x7f040052, 0x7f040053, 0x7f040054, 0x7f040055, 0x7f040056, 0x7f040057, 0x7f040058, 0x7f040059, 0x7f040065, 0x7f040069, 0x7f04006a, 0x7f04006b, 0x7f04006e, 0x7f040070, 0x7f04007b, 0x7f04007c, 0x7f04007d, 0x7f04007e, 0x7f04007f, 0x7f040093, 0x7f040099, 0x7f0400da, 0x7f0400db, 0x7f0400dc, 0x7f0400dd, 0x7f0400e0, 0x7f0400e1, 0x7f0400e2, 0x7f0400e3, 0x7f0400e4, 0x7f0400e5, 0x7f0400e6, 0x7f0400e7, 0x7f0400e8, 0x7f0400f8, 0x7f0400f9, 0x7f0400fa, 0x7f0400fb, 0x7f0400fd, 0x7f040103, 0x7f040104, 0x7f040105, 0x7f040106, 0x7f040109, 0x7f04010a, 0x7f04010b, 0x7f04010c, 0x7f040113, 0x7f040114, 0x7f040122, 0x7f040125, 0x7f040126, 0x7f040127, 0x7f040128, 0x7f040129, 0x7f04012a, 0x7f04012b, 0x7f04012c, 0x7f04012d, 0x7f04012e, 0x7f040144, 0x7f040145, 0x7f040146, 0x7f040147, 0x7f04014d, 0x7f04014f, 0x7f040150, 0x7f040151, 0x7f040152, 0x7f040153, 0x7f040154, 0x7f040155, 0x7f040156, 0x7f040157, 0x7f040158 }
-int styleable AppCompatTheme_actionBarDivider 0
-int styleable AppCompatTheme_actionBarItemBackground 1
-int styleable AppCompatTheme_actionBarPopupTheme 2
-int styleable AppCompatTheme_actionBarSize 3
-int styleable AppCompatTheme_actionBarSplitStyle 4
-int styleable AppCompatTheme_actionBarStyle 5
-int styleable AppCompatTheme_actionBarTabBarStyle 6
-int styleable AppCompatTheme_actionBarTabStyle 7
-int styleable AppCompatTheme_actionBarTabTextStyle 8
-int styleable AppCompatTheme_actionBarTheme 9
-int styleable AppCompatTheme_actionBarWidgetTheme 10
-int styleable AppCompatTheme_actionButtonStyle 11
-int styleable AppCompatTheme_actionDropDownStyle 12
-int styleable AppCompatTheme_actionMenuTextAppearance 13
-int styleable AppCompatTheme_actionMenuTextColor 14
-int styleable AppCompatTheme_actionModeBackground 15
-int styleable AppCompatTheme_actionModeCloseButtonStyle 16
-int styleable AppCompatTheme_actionModeCloseDrawable 17
-int styleable AppCompatTheme_actionModeCopyDrawable 18
-int styleable AppCompatTheme_actionModeCutDrawable 19
-int styleable AppCompatTheme_actionModeFindDrawable 20
-int styleable AppCompatTheme_actionModePasteDrawable 21
-int styleable AppCompatTheme_actionModePopupWindowStyle 22
-int styleable AppCompatTheme_actionModeSelectAllDrawable 23
-int styleable AppCompatTheme_actionModeShareDrawable 24
-int styleable AppCompatTheme_actionModeSplitBackground 25
-int styleable AppCompatTheme_actionModeStyle 26
-int styleable AppCompatTheme_actionModeWebSearchDrawable 27
-int styleable AppCompatTheme_actionOverflowButtonStyle 28
-int styleable AppCompatTheme_actionOverflowMenuStyle 29
-int styleable AppCompatTheme_activityChooserViewStyle 30
-int styleable AppCompatTheme_alertDialogButtonGroupStyle 31
-int styleable AppCompatTheme_alertDialogCenterButtons 32
-int styleable AppCompatTheme_alertDialogStyle 33
-int styleable AppCompatTheme_alertDialogTheme 34
-int styleable AppCompatTheme_android_windowAnimationStyle 35
-int styleable AppCompatTheme_android_windowIsFloating 36
-int styleable AppCompatTheme_autoCompleteTextViewStyle 37
-int styleable AppCompatTheme_borderlessButtonStyle 38
-int styleable AppCompatTheme_buttonBarButtonStyle 39
-int styleable AppCompatTheme_buttonBarNegativeButtonStyle 40
-int styleable AppCompatTheme_buttonBarNeutralButtonStyle 41
-int styleable AppCompatTheme_buttonBarPositiveButtonStyle 42
-int styleable AppCompatTheme_buttonBarStyle 43
-int styleable AppCompatTheme_buttonStyle 44
-int styleable AppCompatTheme_buttonStyleSmall 45
-int styleable AppCompatTheme_checkboxStyle 46
-int styleable AppCompatTheme_checkedTextViewStyle 47
-int styleable AppCompatTheme_colorAccent 48
-int styleable AppCompatTheme_colorBackgroundFloating 49
-int styleable AppCompatTheme_colorButtonNormal 50
-int styleable AppCompatTheme_colorControlActivated 51
-int styleable AppCompatTheme_colorControlHighlight 52
-int styleable AppCompatTheme_colorControlNormal 53
-int styleable AppCompatTheme_colorError 54
-int styleable AppCompatTheme_colorPrimary 55
-int styleable AppCompatTheme_colorPrimaryDark 56
-int styleable AppCompatTheme_colorSwitchThumbNormal 57
-int styleable AppCompatTheme_controlBackground 58
-int styleable AppCompatTheme_dialogCornerRadius 59
-int styleable AppCompatTheme_dialogPreferredPadding 60
-int styleable AppCompatTheme_dialogTheme 61
-int styleable AppCompatTheme_dividerHorizontal 62
-int styleable AppCompatTheme_dividerVertical 63
-int styleable AppCompatTheme_dropDownListViewStyle 64
-int styleable AppCompatTheme_dropdownListPreferredItemHeight 65
-int styleable AppCompatTheme_editTextBackground 66
-int styleable AppCompatTheme_editTextColor 67
-int styleable AppCompatTheme_editTextStyle 68
-int styleable AppCompatTheme_homeAsUpIndicator 69
-int styleable AppCompatTheme_imageButtonStyle 70
-int styleable AppCompatTheme_listChoiceBackgroundIndicator 71
-int styleable AppCompatTheme_listChoiceIndicatorMultipleAnimated 72
-int styleable AppCompatTheme_listChoiceIndicatorSingleAnimated 73
-int styleable AppCompatTheme_listDividerAlertDialog 74
-int styleable AppCompatTheme_listMenuViewStyle 75
-int styleable AppCompatTheme_listPopupWindowStyle 76
-int styleable AppCompatTheme_listPreferredItemHeight 77
-int styleable AppCompatTheme_listPreferredItemHeightLarge 78
-int styleable AppCompatTheme_listPreferredItemHeightSmall 79
-int styleable AppCompatTheme_listPreferredItemPaddingEnd 80
-int styleable AppCompatTheme_listPreferredItemPaddingLeft 81
-int styleable AppCompatTheme_listPreferredItemPaddingRight 82
-int styleable AppCompatTheme_listPreferredItemPaddingStart 83
-int styleable AppCompatTheme_panelBackground 84
-int styleable AppCompatTheme_panelMenuListTheme 85
-int styleable AppCompatTheme_panelMenuListWidth 86
-int styleable AppCompatTheme_popupMenuStyle 87
-int styleable AppCompatTheme_popupWindowStyle 88
-int styleable AppCompatTheme_radioButtonStyle 89
-int styleable AppCompatTheme_ratingBarStyle 90
-int styleable AppCompatTheme_ratingBarStyleIndicator 91
-int styleable AppCompatTheme_ratingBarStyleSmall 92
-int styleable AppCompatTheme_searchViewStyle 93
-int styleable AppCompatTheme_seekBarStyle 94
-int styleable AppCompatTheme_selectableItemBackground 95
-int styleable AppCompatTheme_selectableItemBackgroundBorderless 96
-int styleable AppCompatTheme_spinnerDropDownItemStyle 97
-int styleable AppCompatTheme_spinnerStyle 98
-int styleable AppCompatTheme_switchStyle 99
-int styleable AppCompatTheme_textAppearanceLargePopupMenu 100
-int styleable AppCompatTheme_textAppearanceListItem 101
-int styleable AppCompatTheme_textAppearanceListItemSecondary 102
-int styleable AppCompatTheme_textAppearanceListItemSmall 103
-int styleable AppCompatTheme_textAppearancePopupMenuHeader 104
-int styleable AppCompatTheme_textAppearanceSearchResultSubtitle 105
-int styleable AppCompatTheme_textAppearanceSearchResultTitle 106
-int styleable AppCompatTheme_textAppearanceSmallPopupMenu 107
-int styleable AppCompatTheme_textColorAlertDialogListItem 108
-int styleable AppCompatTheme_textColorSearchUrl 109
-int styleable AppCompatTheme_toolbarNavigationButtonStyle 110
-int styleable AppCompatTheme_toolbarStyle 111
-int styleable AppCompatTheme_tooltipForegroundColor 112
-int styleable AppCompatTheme_tooltipFrameBackground 113
-int styleable AppCompatTheme_viewInflaterClass 114
-int styleable AppCompatTheme_windowActionBar 115
-int styleable AppCompatTheme_windowActionBarOverlay 116
-int styleable AppCompatTheme_windowActionModeOverlay 117
-int styleable AppCompatTheme_windowFixedHeightMajor 118
-int styleable AppCompatTheme_windowFixedHeightMinor 119
-int styleable AppCompatTheme_windowFixedWidthMajor 120
-int styleable AppCompatTheme_windowFixedWidthMinor 121
-int styleable AppCompatTheme_windowMinWidthMajor 122
-int styleable AppCompatTheme_windowMinWidthMinor 123
-int styleable AppCompatTheme_windowNoTitle 124
-int[] styleable ButtonBarLayout { 0x7f040027 }
-int styleable ButtonBarLayout_allowStacking 0
-int[] styleable ColorStateListItem { 0x7f040028, 0x101031f, 0x10101a5 }
-int styleable ColorStateListItem_alpha 0
-int styleable ColorStateListItem_android_alpha 1
-int styleable ColorStateListItem_android_color 2
-int[] styleable CompoundButton { 0x1010107, 0x7f040040, 0x7f040046, 0x7f040047 }
-int styleable CompoundButton_android_button 0
-int styleable CompoundButton_buttonCompat 1
-int styleable CompoundButton_buttonTint 2
-int styleable CompoundButton_buttonTintMode 3
-int[] styleable ConstraintLayout_Layout { 0x1010120, 0x101011f, 0x1010140, 0x101013f, 0x10100c4, 0x7f040038, 0x7f040039, 0x7f040048, 0x7f04005b, 0x7f04005c, 0x7f0400a4, 0x7f0400a5, 0x7f0400a6, 0x7f0400a7, 0x7f0400a8, 0x7f0400a9, 0x7f0400aa, 0x7f0400ab, 0x7f0400ac, 0x7f0400ad, 0x7f0400ae, 0x7f0400af, 0x7f0400b0, 0x7f0400b1, 0x7f0400b2, 0x7f0400b3, 0x7f0400b4, 0x7f0400b5, 0x7f0400b6, 0x7f0400b7, 0x7f0400b8, 0x7f0400b9, 0x7f0400ba, 0x7f0400bb, 0x7f0400bc, 0x7f0400bd, 0x7f0400be, 0x7f0400bf, 0x7f0400c0, 0x7f0400c1, 0x7f0400c2, 0x7f0400c3, 0x7f0400c4, 0x7f0400c5, 0x7f0400c6, 0x7f0400c7, 0x7f0400c8, 0x7f0400c9, 0x7f0400ca, 0x7f0400cb, 0x7f0400cc, 0x7f0400ce, 0x7f0400cf, 0x7f0400d0, 0x7f0400d1, 0x7f0400d2, 0x7f0400d3, 0x7f0400d4, 0x7f0400d5, 0x7f0400d8 }
-int styleable ConstraintLayout_Layout_android_maxHeight 0
-int styleable ConstraintLayout_Layout_android_maxWidth 1
-int styleable ConstraintLayout_Layout_android_minHeight 2
-int styleable ConstraintLayout_Layout_android_minWidth 3
-int styleable ConstraintLayout_Layout_android_orientation 4
-int styleable ConstraintLayout_Layout_barrierAllowsGoneWidgets 5
-int styleable ConstraintLayout_Layout_barrierDirection 6
-int styleable ConstraintLayout_Layout_chainUseRtl 7
-int styleable ConstraintLayout_Layout_constraintSet 8
-int styleable ConstraintLayout_Layout_constraint_referenced_ids 9
-int styleable ConstraintLayout_Layout_layout_constrainedHeight 10
-int styleable ConstraintLayout_Layout_layout_constrainedWidth 11
-int styleable ConstraintLayout_Layout_layout_constraintBaseline_creator 12
-int styleable ConstraintLayout_Layout_layout_constraintBaseline_toBaselineOf 13
-int styleable ConstraintLayout_Layout_layout_constraintBottom_creator 14
-int styleable ConstraintLayout_Layout_layout_constraintBottom_toBottomOf 15
-int styleable ConstraintLayout_Layout_layout_constraintBottom_toTopOf 16
-int styleable ConstraintLayout_Layout_layout_constraintCircle 17
-int styleable ConstraintLayout_Layout_layout_constraintCircleAngle 18
-int styleable ConstraintLayout_Layout_layout_constraintCircleRadius 19
-int styleable ConstraintLayout_Layout_layout_constraintDimensionRatio 20
-int styleable ConstraintLayout_Layout_layout_constraintEnd_toEndOf 21
-int styleable ConstraintLayout_Layout_layout_constraintEnd_toStartOf 22
-int styleable ConstraintLayout_Layout_layout_constraintGuide_begin 23
-int styleable ConstraintLayout_Layout_layout_constraintGuide_end 24
-int styleable ConstraintLayout_Layout_layout_constraintGuide_percent 25
-int styleable ConstraintLayout_Layout_layout_constraintHeight_default 26
-int styleable ConstraintLayout_Layout_layout_constraintHeight_max 27
-int styleable ConstraintLayout_Layout_layout_constraintHeight_min 28
-int styleable ConstraintLayout_Layout_layout_constraintHeight_percent 29
-int styleable ConstraintLayout_Layout_layout_constraintHorizontal_bias 30
-int styleable ConstraintLayout_Layout_layout_constraintHorizontal_chainStyle 31
-int styleable ConstraintLayout_Layout_layout_constraintHorizontal_weight 32
-int styleable ConstraintLayout_Layout_layout_constraintLeft_creator 33
-int styleable ConstraintLayout_Layout_layout_constraintLeft_toLeftOf 34
-int styleable ConstraintLayout_Layout_layout_constraintLeft_toRightOf 35
-int styleable ConstraintLayout_Layout_layout_constraintRight_creator 36
-int styleable ConstraintLayout_Layout_layout_constraintRight_toLeftOf 37
-int styleable ConstraintLayout_Layout_layout_constraintRight_toRightOf 38
-int styleable ConstraintLayout_Layout_layout_constraintStart_toEndOf 39
-int styleable ConstraintLayout_Layout_layout_constraintStart_toStartOf 40
-int styleable ConstraintLayout_Layout_layout_constraintTop_creator 41
-int styleable ConstraintLayout_Layout_layout_constraintTop_toBottomOf 42
-int styleable ConstraintLayout_Layout_layout_constraintTop_toTopOf 43
-int styleable ConstraintLayout_Layout_layout_constraintVertical_bias 44
-int styleable ConstraintLayout_Layout_layout_constraintVertical_chainStyle 45
-int styleable ConstraintLayout_Layout_layout_constraintVertical_weight 46
-int styleable ConstraintLayout_Layout_layout_constraintWidth_default 47
-int styleable ConstraintLayout_Layout_layout_constraintWidth_max 48
-int styleable ConstraintLayout_Layout_layout_constraintWidth_min 49
-int styleable ConstraintLayout_Layout_layout_constraintWidth_percent 50
-int styleable ConstraintLayout_Layout_layout_editor_absoluteX 51
-int styleable ConstraintLayout_Layout_layout_editor_absoluteY 52
-int styleable ConstraintLayout_Layout_layout_goneMarginBottom 53
-int styleable ConstraintLayout_Layout_layout_goneMarginEnd 54
-int styleable ConstraintLayout_Layout_layout_goneMarginLeft 55
-int styleable ConstraintLayout_Layout_layout_goneMarginRight 56
-int styleable ConstraintLayout_Layout_layout_goneMarginStart 57
-int styleable ConstraintLayout_Layout_layout_goneMarginTop 58
-int styleable ConstraintLayout_Layout_layout_optimizationLevel 59
-int[] styleable ConstraintLayout_placeholder { 0x7f04005d, 0x7f040081 }
-int styleable ConstraintLayout_placeholder_content 0
-int styleable ConstraintLayout_placeholder_emptyVisibility 1
-int[] styleable ConstraintSet { 0x101031f, 0x1010440, 0x10100d0, 0x10100f5, 0x10100fa, 0x10103b6, 0x10100f7, 0x10100f9, 0x10103b5, 0x10100f8, 0x10100f4, 0x1010120, 0x101011f, 0x1010140, 0x101013f, 0x10100c4, 0x1010326, 0x1010327, 0x1010328, 0x1010324, 0x1010325, 0x1010320, 0x1010321, 0x1010322, 0x1010323, 0x10103fa, 0x10100dc, 0x7f040038, 0x7f040039, 0x7f040048, 0x7f04005c, 0x7f0400a4, 0x7f0400a5, 0x7f0400a6, 0x7f0400a7, 0x7f0400a8, 0x7f0400a9, 0x7f0400aa, 0x7f0400ab, 0x7f0400ac, 0x7f0400ad, 0x7f0400ae, 0x7f0400af, 0x7f0400b0, 0x7f0400b1, 0x7f0400b2, 0x7f0400b3, 0x7f0400b4, 0x7f0400b5, 0x7f0400b6, 0x7f0400b7, 0x7f0400b8, 0x7f0400b9, 0x7f0400ba, 0x7f0400bb, 0x7f0400bc, 0x7f0400bd, 0x7f0400be, 0x7f0400bf, 0x7f0400c0, 0x7f0400c1, 0x7f0400c2, 0x7f0400c3, 0x7f0400c4, 0x7f0400c5, 0x7f0400c6, 0x7f0400c7, 0x7f0400c8, 0x7f0400c9, 0x7f0400ca, 0x7f0400cb, 0x7f0400cc, 0x7f0400ce, 0x7f0400cf, 0x7f0400d0, 0x7f0400d1, 0x7f0400d2, 0x7f0400d3, 0x7f0400d4, 0x7f0400d5 }
-int styleable ConstraintSet_android_alpha 0
-int styleable ConstraintSet_android_elevation 1
-int styleable ConstraintSet_android_id 2
-int styleable ConstraintSet_android_layout_height 3
-int styleable ConstraintSet_android_layout_marginBottom 4
-int styleable ConstraintSet_android_layout_marginEnd 5
-int styleable ConstraintSet_android_layout_marginLeft 6
-int styleable ConstraintSet_android_layout_marginRight 7
-int styleable ConstraintSet_android_layout_marginStart 8
-int styleable ConstraintSet_android_layout_marginTop 9
-int styleable ConstraintSet_android_layout_width 10
-int styleable ConstraintSet_android_maxHeight 11
-int styleable ConstraintSet_android_maxWidth 12
-int styleable ConstraintSet_android_minHeight 13
-int styleable ConstraintSet_android_minWidth 14
-int styleable ConstraintSet_android_orientation 15
-int styleable ConstraintSet_android_rotation 16
-int styleable ConstraintSet_android_rotationX 17
-int styleable ConstraintSet_android_rotationY 18
-int styleable ConstraintSet_android_scaleX 19
-int styleable ConstraintSet_android_scaleY 20
-int styleable ConstraintSet_android_transformPivotX 21
-int styleable ConstraintSet_android_transformPivotY 22
-int styleable ConstraintSet_android_translationX 23
-int styleable ConstraintSet_android_translationY 24
-int styleable ConstraintSet_android_translationZ 25
-int styleable ConstraintSet_android_visibility 26
-int styleable ConstraintSet_barrierAllowsGoneWidgets 27
-int styleable ConstraintSet_barrierDirection 28
-int styleable ConstraintSet_chainUseRtl 29
-int styleable ConstraintSet_constraint_referenced_ids 30
-int styleable ConstraintSet_layout_constrainedHeight 31
-int styleable ConstraintSet_layout_constrainedWidth 32
-int styleable ConstraintSet_layout_constraintBaseline_creator 33
-int styleable ConstraintSet_layout_constraintBaseline_toBaselineOf 34
-int styleable ConstraintSet_layout_constraintBottom_creator 35
-int styleable ConstraintSet_layout_constraintBottom_toBottomOf 36
-int styleable ConstraintSet_layout_constraintBottom_toTopOf 37
-int styleable ConstraintSet_layout_constraintCircle 38
-int styleable ConstraintSet_layout_constraintCircleAngle 39
-int styleable ConstraintSet_layout_constraintCircleRadius 40
-int styleable ConstraintSet_layout_constraintDimensionRatio 41
-int styleable ConstraintSet_layout_constraintEnd_toEndOf 42
-int styleable ConstraintSet_layout_constraintEnd_toStartOf 43
-int styleable ConstraintSet_layout_constraintGuide_begin 44
-int styleable ConstraintSet_layout_constraintGuide_end 45
-int styleable ConstraintSet_layout_constraintGuide_percent 46
-int styleable ConstraintSet_layout_constraintHeight_default 47
-int styleable ConstraintSet_layout_constraintHeight_max 48
-int styleable ConstraintSet_layout_constraintHeight_min 49
-int styleable ConstraintSet_layout_constraintHeight_percent 50
-int styleable ConstraintSet_layout_constraintHorizontal_bias 51
-int styleable ConstraintSet_layout_constraintHorizontal_chainStyle 52
-int styleable ConstraintSet_layout_constraintHorizontal_weight 53
-int styleable ConstraintSet_layout_constraintLeft_creator 54
-int styleable ConstraintSet_layout_constraintLeft_toLeftOf 55
-int styleable ConstraintSet_layout_constraintLeft_toRightOf 56
-int styleable ConstraintSet_layout_constraintRight_creator 57
-int styleable ConstraintSet_layout_constraintRight_toLeftOf 58
-int styleable ConstraintSet_layout_constraintRight_toRightOf 59
-int styleable ConstraintSet_layout_constraintStart_toEndOf 60
-int styleable ConstraintSet_layout_constraintStart_toStartOf 61
-int styleable ConstraintSet_layout_constraintTop_creator 62
-int styleable ConstraintSet_layout_constraintTop_toBottomOf 63
-int styleable ConstraintSet_layout_constraintTop_toTopOf 64
-int styleable ConstraintSet_layout_constraintVertical_bias 65
-int styleable ConstraintSet_layout_constraintVertical_chainStyle 66
-int styleable ConstraintSet_layout_constraintVertical_weight 67
-int styleable ConstraintSet_layout_constraintWidth_default 68
-int styleable ConstraintSet_layout_constraintWidth_max 69
-int styleable ConstraintSet_layout_constraintWidth_min 70
-int styleable ConstraintSet_layout_constraintWidth_percent 71
-int styleable ConstraintSet_layout_editor_absoluteX 72
-int styleable ConstraintSet_layout_editor_absoluteY 73
-int styleable ConstraintSet_layout_goneMarginBottom 74
-int styleable ConstraintSet_layout_goneMarginEnd 75
-int styleable ConstraintSet_layout_goneMarginLeft 76
-int styleable ConstraintSet_layout_goneMarginRight 77
-int styleable ConstraintSet_layout_goneMarginStart 78
-int styleable ConstraintSet_layout_goneMarginTop 79
-int[] styleable CoordinatorLayout { 0x7f04009e, 0x7f040118 }
-int styleable CoordinatorLayout_keylines 0
-int styleable CoordinatorLayout_statusBarBackground 1
-int[] styleable CoordinatorLayout_Layout { 0x10100b3, 0x7f0400a1, 0x7f0400a2, 0x7f0400a3, 0x7f0400cd, 0x7f0400d6, 0x7f0400d7 }
-int styleable CoordinatorLayout_Layout_android_layout_gravity 0
-int styleable CoordinatorLayout_Layout_layout_anchor 1
-int styleable CoordinatorLayout_Layout_layout_anchorGravity 2
-int styleable CoordinatorLayout_Layout_layout_behavior 3
-int styleable CoordinatorLayout_Layout_layout_dodgeInsetEdges 4
-int styleable CoordinatorLayout_Layout_layout_insetEdge 5
-int styleable CoordinatorLayout_Layout_layout_keyline 6
-int[] styleable DrawerArrowToggle { 0x7f04002a, 0x7f04002b, 0x7f040037, 0x7f04004f, 0x7f040075, 0x7f04008f, 0x7f040112, 0x7f040131 }
-int styleable DrawerArrowToggle_arrowHeadLength 0
-int styleable DrawerArrowToggle_arrowShaftLength 1
-int styleable DrawerArrowToggle_barLength 2
-int styleable DrawerArrowToggle_color 3
-int styleable DrawerArrowToggle_drawableSize 4
-int styleable DrawerArrowToggle_gapBetweenBars 5
-int styleable DrawerArrowToggle_spinBars 6
-int styleable DrawerArrowToggle_thickness 7
-int[] styleable FontFamily { 0x7f040086, 0x7f040087, 0x7f040088, 0x7f040089, 0x7f04008a, 0x7f04008b }
-int styleable FontFamily_fontProviderAuthority 0
-int styleable FontFamily_fontProviderCerts 1
-int styleable FontFamily_fontProviderFetchStrategy 2
-int styleable FontFamily_fontProviderFetchTimeout 3
-int styleable FontFamily_fontProviderPackage 4
-int styleable FontFamily_fontProviderQuery 5
-int[] styleable FontFamilyFont { 0x1010532, 0x101053f, 0x1010570, 0x1010533, 0x101056f, 0x7f040084, 0x7f04008c, 0x7f04008d, 0x7f04008e, 0x7f04014c }
-int styleable FontFamilyFont_android_font 0
-int styleable FontFamilyFont_android_fontStyle 1
-int styleable FontFamilyFont_android_fontVariationSettings 2
-int styleable FontFamilyFont_android_fontWeight 3
-int styleable FontFamilyFont_android_ttcIndex 4
-int styleable FontFamilyFont_font 5
-int styleable FontFamilyFont_fontStyle 6
-int styleable FontFamilyFont_fontVariationSettings 7
-int styleable FontFamilyFont_fontWeight 8
-int styleable FontFamilyFont_ttcIndex 9
-int[] styleable GradientColor { 0x101020b, 0x10101a2, 0x10101a3, 0x101019e, 0x1010512, 0x1010513, 0x10101a4, 0x101019d, 0x1010510, 0x1010511, 0x1010201, 0x10101a1 }
-int styleable GradientColor_android_centerColor 0
-int styleable GradientColor_android_centerX 1
-int styleable GradientColor_android_centerY 2
-int styleable GradientColor_android_endColor 3
-int styleable GradientColor_android_endX 4
-int styleable GradientColor_android_endY 5
-int styleable GradientColor_android_gradientRadius 6
-int styleable GradientColor_android_startColor 7
-int styleable GradientColor_android_startX 8
-int styleable GradientColor_android_startY 9
-int styleable GradientColor_android_tileMode 10
-int styleable GradientColor_android_type 11
-int[] styleable GradientColorItem { 0x10101a5, 0x1010514 }
-int styleable GradientColorItem_android_color 0
-int styleable GradientColorItem_android_offset 1
-int[] styleable LinearConstraintLayout { 0x10100c4 }
-int styleable LinearConstraintLayout_android_orientation 0
-int[] styleable LinearLayoutCompat { 0x1010126, 0x1010127, 0x10100af, 0x10100c4, 0x1010128, 0x7f04006d, 0x7f04006f, 0x7f0400ec, 0x7f04010e }
-int styleable LinearLayoutCompat_android_baselineAligned 0
-int styleable LinearLayoutCompat_android_baselineAlignedChildIndex 1
-int styleable LinearLayoutCompat_android_gravity 2
-int styleable LinearLayoutCompat_android_orientation 3
-int styleable LinearLayoutCompat_android_weightSum 4
-int styleable LinearLayoutCompat_divider 5
-int styleable LinearLayoutCompat_dividerPadding 6
-int styleable LinearLayoutCompat_measureWithLargestChild 7
-int styleable LinearLayoutCompat_showDividers 8
-int[] styleable LinearLayoutCompat_Layout { 0x10100b3, 0x10100f5, 0x1010181, 0x10100f4 }
-int styleable LinearLayoutCompat_Layout_android_layout_gravity 0
-int styleable LinearLayoutCompat_Layout_android_layout_height 1
-int styleable LinearLayoutCompat_Layout_android_layout_weight 2
-int styleable LinearLayoutCompat_Layout_android_layout_width 3
-int[] styleable ListPopupWindow { 0x10102ac, 0x10102ad }
-int styleable ListPopupWindow_android_dropDownHorizontalOffset 0
-int styleable ListPopupWindow_android_dropDownVerticalOffset 1
-int[] styleable MenuGroup { 0x10101e0, 0x101000e, 0x10100d0, 0x10101de, 0x10101df, 0x1010194 }
-int styleable MenuGroup_android_checkableBehavior 0
-int styleable MenuGroup_android_enabled 1
-int styleable MenuGroup_android_id 2
-int styleable MenuGroup_android_menuCategory 3
-int styleable MenuGroup_android_orderInCategory 4
-int styleable MenuGroup_android_visible 5
-int[] styleable MenuItem { 0x7f04000e, 0x7f040020, 0x7f040021, 0x7f040029, 0x10101e3, 0x10101e5, 0x1010106, 0x101000e, 0x1010002, 0x10100d0, 0x10101de, 0x10101e4, 0x101026f, 0x10101df, 0x10101e1, 0x10101e2, 0x1010194, 0x7f04005e, 0x7f040096, 0x7f040097, 0x7f0400f2, 0x7f04010d, 0x7f040148 }
-int styleable MenuItem_actionLayout 0
-int styleable MenuItem_actionProviderClass 1
-int styleable MenuItem_actionViewClass 2
-int styleable MenuItem_alphabeticModifiers 3
-int styleable MenuItem_android_alphabeticShortcut 4
-int styleable MenuItem_android_checkable 5
-int styleable MenuItem_android_checked 6
-int styleable MenuItem_android_enabled 7
-int styleable MenuItem_android_icon 8
-int styleable MenuItem_android_id 9
-int styleable MenuItem_android_menuCategory 10
-int styleable MenuItem_android_numericShortcut 11
-int styleable MenuItem_android_onClick 12
-int styleable MenuItem_android_orderInCategory 13
-int styleable MenuItem_android_title 14
-int styleable MenuItem_android_titleCondensed 15
-int styleable MenuItem_android_visible 16
-int styleable MenuItem_contentDescription 17
-int styleable MenuItem_iconTint 18
-int styleable MenuItem_iconTintMode 19
-int styleable MenuItem_numericModifiers 20
-int styleable MenuItem_showAsAction 21
-int styleable MenuItem_tooltipText 22
-int[] styleable MenuView { 0x101012f, 0x101012d, 0x1010130, 0x1010131, 0x101012c, 0x101012e, 0x10100ae, 0x7f0400fe, 0x7f040119 }
-int styleable MenuView_android_headerBackground 0
-int styleable MenuView_android_horizontalDivider 1
-int styleable MenuView_android_itemBackground 2
-int styleable MenuView_android_itemIconDisabledAlpha 3
-int styleable MenuView_android_itemTextAppearance 4
-int styleable MenuView_android_verticalDivider 5
-int styleable MenuView_android_windowAnimationStyle 6
-int styleable MenuView_preserveIconSpacing 7
-int styleable MenuView_subMenuArrow 8
-int[] styleable PopupWindow { 0x10102c9, 0x1010176, 0x7f0400f3 }
-int styleable PopupWindow_android_popupAnimationStyle 0
-int styleable PopupWindow_android_popupBackground 1
-int styleable PopupWindow_overlapAnchor 2
-int[] styleable PopupWindowBackgroundState { 0x7f040117 }
-int styleable PopupWindowBackgroundState_state_above_anchor 0
-int[] styleable RecycleListView { 0x7f0400f4, 0x7f0400f7 }
-int styleable RecycleListView_paddingBottomNoButtons 0
-int styleable RecycleListView_paddingTopNoTitle 1
-int[] styleable SearchView { 0x10100da, 0x1010264, 0x1010220, 0x101011f, 0x7f04004b, 0x7f04005a, 0x7f040068, 0x7f040090, 0x7f040098, 0x7f0400a0, 0x7f040101, 0x7f040102, 0x7f040107, 0x7f040108, 0x7f04011a, 0x7f04011f, 0x7f04014e }
-int styleable SearchView_android_focusable 0
-int styleable SearchView_android_imeOptions 1
-int styleable SearchView_android_inputType 2
-int styleable SearchView_android_maxWidth 3
-int styleable SearchView_closeIcon 4
-int styleable SearchView_commitIcon 5
-int styleable SearchView_defaultQueryHint 6
-int styleable SearchView_goIcon 7
-int styleable SearchView_iconifiedByDefault 8
-int styleable SearchView_layout 9
-int styleable SearchView_queryBackground 10
-int styleable SearchView_queryHint 11
-int styleable SearchView_searchHintIcon 12
-int styleable SearchView_searchIcon 13
-int styleable SearchView_submitBackground 14
-int styleable SearchView_suggestionRowLayout 15
-int styleable SearchView_voiceIcon 16
-int[] styleable Spinner { 0x1010262, 0x10100b2, 0x1010176, 0x101017b, 0x7f0400fc }
-int styleable Spinner_android_dropDownWidth 0
-int styleable Spinner_android_entries 1
-int styleable Spinner_android_popupBackground 2
-int styleable Spinner_android_prompt 3
-int styleable Spinner_popupTheme 4
-int[] styleable StateListDrawable { 0x1010196, 0x101011c, 0x101030c, 0x101030d, 0x1010195, 0x1010194 }
-int styleable StateListDrawable_android_constantSize 0
-int styleable StateListDrawable_android_dither 1
-int styleable StateListDrawable_android_enterFadeDuration 2
-int styleable StateListDrawable_android_exitFadeDuration 3
-int styleable StateListDrawable_android_variablePadding 4
-int styleable StateListDrawable_android_visible 5
-int[] styleable StateListDrawableItem { 0x1010199 }
-int styleable StateListDrawableItem_android_drawable 0
-int[] styleable SwitchCompat { 0x1010125, 0x1010124, 0x1010142, 0x7f04010f, 0x7f040115, 0x7f040120, 0x7f040121, 0x7f040123, 0x7f040132, 0x7f040133, 0x7f040134, 0x7f040149, 0x7f04014a, 0x7f04014b }
-int styleable SwitchCompat_android_textOff 0
-int styleable SwitchCompat_android_textOn 1
-int styleable SwitchCompat_android_thumb 2
-int styleable SwitchCompat_showText 3
-int styleable SwitchCompat_splitTrack 4
-int styleable SwitchCompat_switchMinWidth 5
-int styleable SwitchCompat_switchPadding 6
-int styleable SwitchCompat_switchTextAppearance 7
-int styleable SwitchCompat_thumbTextPadding 8
-int styleable SwitchCompat_thumbTint 9
-int styleable SwitchCompat_thumbTintMode 10
-int styleable SwitchCompat_track 11
-int styleable SwitchCompat_trackTint 12
-int styleable SwitchCompat_trackTintMode 13
-int[] styleable TextAppearance { 0x10103ac, 0x1010161, 0x1010162, 0x1010163, 0x1010164, 0x1010098, 0x101009a, 0x101009b, 0x1010585, 0x1010095, 0x1010097, 0x1010096, 0x7f040085, 0x7f04008d, 0x7f040124, 0x7f04012f }
-int styleable TextAppearance_android_fontFamily 0
-int styleable TextAppearance_android_shadowColor 1
-int styleable TextAppearance_android_shadowDx 2
-int styleable TextAppearance_android_shadowDy 3
-int styleable TextAppearance_android_shadowRadius 4
-int styleable TextAppearance_android_textColor 5
-int styleable TextAppearance_android_textColorHint 6
-int styleable TextAppearance_android_textColorLink 7
-int styleable TextAppearance_android_textFontWeight 8
-int styleable TextAppearance_android_textSize 9
-int styleable TextAppearance_android_textStyle 10
-int styleable TextAppearance_android_typeface 11
-int styleable TextAppearance_fontFamily 12
-int styleable TextAppearance_fontVariationSettings 13
-int styleable TextAppearance_textAllCaps 14
-int styleable TextAppearance_textLocale 15
-int[] styleable Toolbar { 0x10100af, 0x1010140, 0x7f040041, 0x7f04004d, 0x7f04004e, 0x7f04005f, 0x7f040060, 0x7f040061, 0x7f040062, 0x7f040063, 0x7f040064, 0x7f0400e9, 0x7f0400ea, 0x7f0400eb, 0x7f0400ed, 0x7f0400ef, 0x7f0400f0, 0x7f0400fc, 0x7f04011b, 0x7f04011c, 0x7f04011d, 0x7f04013a, 0x7f04013b, 0x7f04013c, 0x7f04013d, 0x7f04013e, 0x7f04013f, 0x7f040140, 0x7f040141, 0x7f040142 }
-int styleable Toolbar_android_gravity 0
-int styleable Toolbar_android_minHeight 1
-int styleable Toolbar_buttonGravity 2
-int styleable Toolbar_collapseContentDescription 3
-int styleable Toolbar_collapseIcon 4
-int styleable Toolbar_contentInsetEnd 5
-int styleable Toolbar_contentInsetEndWithActions 6
-int styleable Toolbar_contentInsetLeft 7
-int styleable Toolbar_contentInsetRight 8
-int styleable Toolbar_contentInsetStart 9
-int styleable Toolbar_contentInsetStartWithNavigation 10
-int styleable Toolbar_logo 11
-int styleable Toolbar_logoDescription 12
-int styleable Toolbar_maxButtonHeight 13
-int styleable Toolbar_menu 14
-int styleable Toolbar_navigationContentDescription 15
-int styleable Toolbar_navigationIcon 16
-int styleable Toolbar_popupTheme 17
-int styleable Toolbar_subtitle 18
-int styleable Toolbar_subtitleTextAppearance 19
-int styleable Toolbar_subtitleTextColor 20
-int styleable Toolbar_title 21
-int styleable Toolbar_titleMargin 22
-int styleable Toolbar_titleMarginBottom 23
-int styleable Toolbar_titleMarginEnd 24
-int styleable Toolbar_titleMarginStart 25
-int styleable Toolbar_titleMarginTop 26
-int styleable Toolbar_titleMargins 27
-int styleable Toolbar_titleTextAppearance 28
-int styleable Toolbar_titleTextColor 29
-int[] styleable View { 0x10100da, 0x1010000, 0x7f0400f5, 0x7f0400f6, 0x7f040130 }
-int styleable View_android_focusable 0
-int styleable View_android_theme 1
-int styleable View_paddingEnd 2
-int styleable View_paddingStart 3
-int styleable View_theme 4
-int[] styleable ViewBackgroundHelper { 0x10100d4, 0x7f040035, 0x7f040036 }
-int styleable ViewBackgroundHelper_android_background 0
-int styleable ViewBackgroundHelper_backgroundTint 1
-int styleable ViewBackgroundHelper_backgroundTintMode 2
-int[] styleable ViewStubCompat { 0x10100d0, 0x10100f3, 0x10100f2 }
-int styleable ViewStubCompat_android_id 0
-int styleable ViewStubCompat_android_inflatedId 1
-int styleable ViewStubCompat_android_layout 2
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/build-history.bin b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/build-history.bin
deleted file mode 100644
index 4860dfefc3..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/build-history.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab
deleted file mode 100644
index 5b22892c63..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream
deleted file mode 100644
index bdb834a9da..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
deleted file mode 100644
index 15b7d8d8c2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at
deleted file mode 100644
index 2cf755fe9e..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i
deleted file mode 100644
index 908235ad1f..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
deleted file mode 100644
index afb907baf2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
deleted file mode 100644
index a0712e7221..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
deleted file mode 100644
index b6ef7e2a11..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
deleted file mode 100644
index 2ed519435e..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
deleted file mode 100644
index 5e6443d8c3..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
deleted file mode 100644
index fcf9b4ea3a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream
deleted file mode 100644
index 140d1432c4..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len
deleted file mode 100644
index f69038b49f..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
deleted file mode 100644
index 97aa56de38..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i
deleted file mode 100644
index c82ab66c23..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
deleted file mode 100644
index f6d5265e8c..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
deleted file mode 100644
index 3d1cf19c45..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
deleted file mode 100644
index 1b6e45bda2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
deleted file mode 100644
index 9e27f732fe..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
deleted file mode 100644
index 1f97236d41..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
deleted file mode 100644
index c4acfa6393..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab
deleted file mode 100644
index bdf584a84b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream
deleted file mode 100644
index dfd78da36a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len
deleted file mode 100644
index 130ab28813..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
deleted file mode 100644
index 46d6744972..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i
deleted file mode 100644
index 76affe85cf..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
deleted file mode 100644
index e2c9fdd56a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
deleted file mode 100644
index 00b0511f54..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len
deleted file mode 100644
index 9e27f732fe..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
deleted file mode 100644
index 1f6bd360b0..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i
deleted file mode 100644
index df5586336b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
deleted file mode 100644
index 22280ff3a9..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
deleted file mode 100644
index 87a2206ed9..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
deleted file mode 100644
index 15b7d8d8c2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
deleted file mode 100644
index 1e089e501a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
deleted file mode 100644
index c17f8a9d61..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
deleted file mode 100644
index fe9ac132c6..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
deleted file mode 100644
index 0f2c884299..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
deleted file mode 100644
index 4436d3dd58..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
deleted file mode 100644
index 6facc5d276..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
deleted file mode 100644
index c7adb89d41..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
deleted file mode 100644
index 7763ebbcbb..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
deleted file mode 100644
index 86d2a83a16..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
deleted file mode 100644
index a9f80ae024..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
deleted file mode 100644
index 34f670f151..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
deleted file mode 100644
index 46aac23bbf..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab
deleted file mode 100644
index 26d3b09405..0000000000
--- a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab
+++ /dev/null
@@ -1,2 +0,0 @@
-4
-0
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab
deleted file mode 100644
index 7ea0db3258..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream
deleted file mode 100644
index 87a2206ed9..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
deleted file mode 100644
index 15b7d8d8c2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at
deleted file mode 100644
index 3e23c2afbb..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i
deleted file mode 100644
index 835a492c81..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab
deleted file mode 100644
index 6c08511549..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream
deleted file mode 100644
index 6e7a926428..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
deleted file mode 100644
index eb529631c5..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at
deleted file mode 100644
index 2ed519435e..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i
deleted file mode 100644
index 6936967cac..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab
deleted file mode 100644
index 0558338300..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream
deleted file mode 100644
index 800475bb79..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len
deleted file mode 100644
index b5bfefdee3..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len
deleted file mode 100644
index 409f6fcbda..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at
deleted file mode 100644
index c62a4f3dc0..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i
deleted file mode 100644
index c69e8e1f91..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/last-build.bin b/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/last-build.bin
deleted file mode 100644
index fb1baa4810..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/compileDebugKotlin/last-build.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/build-history.bin b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/build-history.bin
deleted file mode 100644
index 1560e06c9a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/build-history.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab
deleted file mode 100644
index 265ae95750..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream
deleted file mode 100644
index bdb834a9da..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
deleted file mode 100644
index 15b7d8d8c2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at
deleted file mode 100644
index 9f42162abf..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i
deleted file mode 100644
index 908235ad1f..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/inputs/source-to-output.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
deleted file mode 100644
index afb907baf2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
deleted file mode 100644
index a0712e7221..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
deleted file mode 100644
index b6ef7e2a11..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
deleted file mode 100644
index 2ed519435e..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
deleted file mode 100644
index 5e6443d8c3..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab
deleted file mode 100644
index fcf9b4ea3a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream
deleted file mode 100644
index 140d1432c4..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len
deleted file mode 100644
index f69038b49f..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len
deleted file mode 100644
index 01bdaa1da7..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
deleted file mode 100644
index 97aa56de38..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i
deleted file mode 100644
index c82ab66c23..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
deleted file mode 100644
index 83b4705f69..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
deleted file mode 100644
index 88a56181d0..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
deleted file mode 100644
index 12932448a7..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
deleted file mode 100644
index ec8f944c8a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
deleted file mode 100644
index 7c0e94ed42..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
deleted file mode 100644
index 2b65f98912..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab
deleted file mode 100644
index bdf584a84b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream
deleted file mode 100644
index dfd78da36a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len
deleted file mode 100644
index 130ab28813..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
deleted file mode 100644
index 46d6744972..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i
deleted file mode 100644
index 76affe85cf..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab
deleted file mode 100644
index e2c9fdd56a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
deleted file mode 100644
index 00b0511f54..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
deleted file mode 100644
index d897d44a32..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len
deleted file mode 100644
index 9e27f732fe..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
deleted file mode 100644
index 1f6bd360b0..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i
deleted file mode 100644
index df5586336b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
deleted file mode 100644
index 9c8eb06abe..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
deleted file mode 100644
index 87a2206ed9..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
deleted file mode 100644
index 15b7d8d8c2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
deleted file mode 100644
index 162f8c61a5..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
deleted file mode 100644
index c17f8a9d61..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab
deleted file mode 100644
index fe9ac132c6..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream
deleted file mode 100644
index 0f2c884299..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
deleted file mode 100644
index 2a17e6e5bd..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
deleted file mode 100644
index 4436d3dd58..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i
deleted file mode 100644
index 6facc5d276..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/subtypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab
deleted file mode 100644
index c7adb89d41..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream
deleted file mode 100644
index 7763ebbcbb..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
deleted file mode 100644
index 86d2a83a16..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len
deleted file mode 100644
index a9f80ae024..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
deleted file mode 100644
index 34f670f151..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i
deleted file mode 100644
index 46aac23bbf..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/jvm/kotlin/supertypes.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/counters.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/counters.tab
deleted file mode 100644
index 26d3b09405..0000000000
--- a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/counters.tab
+++ /dev/null
@@ -1,2 +0,0 @@
-4
-0
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab
deleted file mode 100644
index 7ea0db3258..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream
deleted file mode 100644
index 87a2206ed9..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
deleted file mode 100644
index 15b7d8d8c2..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at
deleted file mode 100644
index 3e23c2afbb..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i
deleted file mode 100644
index 835a492c81..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/file-to-id.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab
deleted file mode 100644
index 6c08511549..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream
deleted file mode 100644
index 6e7a926428..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
deleted file mode 100644
index eb529631c5..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.len
deleted file mode 100644
index 93a595bd1b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at
deleted file mode 100644
index 2ed519435e..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i
deleted file mode 100644
index 6936967cac..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/id-to-file.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab
deleted file mode 100644
index 2025dd68a8..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream
deleted file mode 100644
index ce4a6ca91a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len
deleted file mode 100644
index e5d59a21fb..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.keystream.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.len
deleted file mode 100644
index b4beefbd8b..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.values.at b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.values.at
deleted file mode 100644
index cf326e065e..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab.values.at and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i
deleted file mode 100644
index 4bc3df179a..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i.len b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i.len
deleted file mode 100644
index 131e265740..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/caches-jvm/lookups/lookups.tab_i.len and /dev/null differ
diff --git a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/last-build.bin b/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/last-build.bin
deleted file mode 100644
index 2325c336ea..0000000000
Binary files a/modules/mogo-module-splash/build/kotlin/kaptGenerateStubsDebugKotlin/last-build.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/outputs/aar/mogo-module-splash-debug.aar b/modules/mogo-module-splash/build/outputs/aar/mogo-module-splash-debug.aar
deleted file mode 100644
index 0b289052bc..0000000000
Binary files a/modules/mogo-module-splash/build/outputs/aar/mogo-module-splash-debug.aar and /dev/null differ
diff --git a/modules/mogo-module-splash/build/outputs/logs/manifest-merger-debug-report.txt b/modules/mogo-module-splash/build/outputs/logs/manifest-merger-debug-report.txt
deleted file mode 100644
index c1b06787f0..0000000000
--- a/modules/mogo-module-splash/build/outputs/logs/manifest-merger-debug-report.txt
+++ /dev/null
@@ -1,37 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
- package
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:2:5-44
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:versionName
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:versionCode
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:1-3:12
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- xmlns:android
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml:1:11-69
-uses-sdk
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
-INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:targetSdkVersion
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- android:minSdkVersion
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
- INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-splash/src/main/AndroidManifest.xml
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin b/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin
deleted file mode 100644
index aae35e6ec9..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/apt-cache.bin b/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/apt-cache.bin
deleted file mode 100644
index 9983310f1d..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/apt-cache.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/classpath-entries.bin b/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/classpath-entries.bin
deleted file mode 100644
index 3a0a2babf5..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/classpath-entries.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/classpath-structure.bin b/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/classpath-structure.bin
deleted file mode 100644
index 7544d63d90..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/classpath-structure.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/java-cache.bin b/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/java-cache.bin
deleted file mode 100644
index 64bae7c8d2..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incApCache/debug/java-cache.bin and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/META-INF/mogo-module-splash_debug.kotlin_module b/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/META-INF/mogo-module-splash_debug.kotlin_module
deleted file mode 100644
index 56b6730042..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/META-INF/mogo-module-splash_debug.kotlin_module and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/SplashConst.class b/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/SplashConst.class
deleted file mode 100644
index fa8db6ad16..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/SplashConst.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/SplashProvider.class b/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/SplashProvider.class
deleted file mode 100644
index 399ba0edfa..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/SplashProvider.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.class b/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.class
deleted file mode 100644
index 6c380f541b..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.class b/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.class
deleted file mode 100644
index 8680b170c1..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.class b/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.class
deleted file mode 100644
index 64f9842dcd..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/incrementalData/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashConst.java b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashConst.java
deleted file mode 100644
index 4a25ce16b6..0000000000
--- a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashConst.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zhidao.mogo.module.splash;
-
-import java.lang.System;
-
-@kotlin.Metadata(mv = {1, 4, 1}, bv = {1, 0, 3}, k = 1, d1 = {"\u0000\u0014\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u000e\n\u0002\b\u0002\b\u00c6\u0002\u0018\u00002\u00020\u0001B\u0007\b\u0002\u00a2\u0006\u0002\u0010\u0002R\u000e\u0010\u0003\u001a\u00020\u0004X\u0086T\u00a2\u0006\u0002\n\u0000R\u000e\u0010\u0005\u001a\u00020\u0004X\u0086T\u00a2\u0006\u0002\n\u0000\u00a8\u0006\u0006"}, d2 = {"Lcom/zhidao/mogo/module/splash/SplashConst;", "", "()V", "MODULE_NAME", "", "PATH_NAME", "mogo-module-splash_debug"})
-public final class SplashConst {
- @org.jetbrains.annotations.NotNull()
- public static final java.lang.String MODULE_NAME = "MODULE_SPLASH";
- @org.jetbrains.annotations.NotNull()
- public static final java.lang.String PATH_NAME = "/splash/api";
- @org.jetbrains.annotations.NotNull()
- public static final com.zhidao.mogo.module.splash.SplashConst INSTANCE = null;
-
- private SplashConst() {
- super();
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashConst.kapt_metadata b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashConst.kapt_metadata
deleted file mode 100644
index ad91ac84cb..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashConst.kapt_metadata and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashProvider.java b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashProvider.java
deleted file mode 100644
index 470184b7e4..0000000000
--- a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.zhidao.mogo.module.splash;
-
-import java.lang.System;
-
-/**
- * 比亚迪车机provider
- *
- * @author tongchenfei
- */
-@com.alibaba.android.arouter.facade.annotation.Route(path = "/splash/api")
-@kotlin.Metadata(mv = {1, 4, 1}, bv = {1, 0, 3}, k = 1, d1 = {"\u0000X\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u000e\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\b\n\u0000\n\u0002\u0010\u0002\n\u0000\b\u0007\u0018\u00002\u00020\u0001B\u0005\u00a2\u0006\u0002\u0010\u0002J\u001e\u0010\u0003\u001a\u0004\u0018\u00010\u00042\b\u0010\u0005\u001a\u0004\u0018\u00010\u00062\b\u0010\u0007\u001a\u0004\u0018\u00010\bH\u0016J\u0014\u0010\t\u001a\u0004\u0018\u00010\n2\b\u0010\u0005\u001a\u0004\u0018\u00010\u0006H\u0016J\b\u0010\u000b\u001a\u00020\fH\u0016J\b\u0010\r\u001a\u00020\fH\u0016J\n\u0010\u000e\u001a\u0004\u0018\u00010\u000fH\u0016J\n\u0010\u0010\u001a\u0004\u0018\u00010\u0011H\u0016J\n\u0010\u0012\u001a\u0004\u0018\u00010\u0013H\u0016J\n\u0010\u0014\u001a\u0004\u0018\u00010\u0015H\u0016J\b\u0010\u0016\u001a\u00020\fH\u0016J\n\u0010\u0017\u001a\u0004\u0018\u00010\u0018H\u0016J\b\u0010\u0019\u001a\u00020\u001aH\u0016J\u0012\u0010\u001b\u001a\u00020\u001c2\b\u0010\u0005\u001a\u0004\u0018\u00010\u0006H\u0016\u00a8\u0006\u001d"}, d2 = {"Lcom/zhidao/mogo/module/splash/SplashProvider;", "Lcom/mogo/service/module/IMogoModuleProvider;", "()V", "createFragment", "Landroidx/fragment/app/Fragment;", "context", "Landroid/content/Context;", "data", "Landroid/os/Bundle;", "createView", "Landroid/view/View;", "getAppName", "", "getAppPackage", "getCardLifecycle", "Lcom/mogo/service/module/IMogoModuleLifecycle;", "getLocationListener", "Lcom/mogo/map/location/IMogoLocationListener;", "getMapListener", "Lcom/mogo/map/listener/IMogoMapListener;", "getMarkerClickListener", "Lcom/mogo/map/marker/IMogoMarkerClickListener;", "getModuleName", "getNaviListener", "Lcom/mogo/map/navi/IMogoNaviListener;", "getType", "", "init", "", "mogo-module-splash_debug"})
-public final class SplashProvider implements com.mogo.service.module.IMogoModuleProvider {
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.navi.IMogoNaviListener getNaviListener() {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.location.IMogoLocationListener getLocationListener() {
- return null;
- }
-
- @java.lang.Override()
- public int getType() {
- return 0;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.marker.IMogoMarkerClickListener getMarkerClickListener() {
- return null;
- }
-
- @java.lang.Override()
- public void init(@org.jetbrains.annotations.Nullable()
- android.content.Context context) {
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.map.listener.IMogoMapListener getMapListener() {
- return null;
- }
-
- @org.jetbrains.annotations.NotNull()
- @java.lang.Override()
- public java.lang.String getAppPackage() {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public android.view.View createView(@org.jetbrains.annotations.Nullable()
- android.content.Context context) {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public androidx.fragment.app.Fragment createFragment(@org.jetbrains.annotations.Nullable()
- android.content.Context context, @org.jetbrains.annotations.Nullable()
- android.os.Bundle data) {
- return null;
- }
-
- @org.jetbrains.annotations.NotNull()
- @java.lang.Override()
- public java.lang.String getModuleName() {
- return null;
- }
-
- @org.jetbrains.annotations.NotNull()
- @java.lang.Override()
- public java.lang.String getAppName() {
- return null;
- }
-
- @org.jetbrains.annotations.Nullable()
- @java.lang.Override()
- public com.mogo.service.module.IMogoModuleLifecycle getCardLifecycle() {
- return null;
- }
-
- public SplashProvider() {
- super();
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashProvider.kapt_metadata b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashProvider.kapt_metadata
deleted file mode 100644
index 523ca16b20..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/SplashProvider.kapt_metadata and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.java b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.java
deleted file mode 100644
index ef85d3d893..0000000000
--- a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.zhidao.mogo.module.splash.fragment;
-
-import java.lang.System;
-
-@kotlin.Metadata(mv = {1, 4, 1}, bv = {1, 0, 3}, k = 1, d1 = {"\u00006\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0002\n\u0002\u0010\b\n\u0000\n\u0002\u0018\u0002\n\u0002\b\u0003\n\u0002\u0010\u000b\n\u0000\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u0002\n\u0002\b\u0003\u0018\u00002\u000e\u0012\u0004\u0012\u00020\u0000\u0012\u0004\u0012\u00020\u00020\u00012\u00020\u0003B\u0005\u00a2\u0006\u0002\u0010\u0004J\b\u0010\t\u001a\u00020\u0002H\u0014J\b\u0010\n\u001a\u00020\u0006H\u0014J\u0010\u0010\u000b\u001a\u00020\f2\u0006\u0010\r\u001a\u00020\u000eH\u0016J\b\u0010\u000f\u001a\u00020\u0010H\u0002J\b\u0010\u0011\u001a\u00020\u0010H\u0014J\b\u0010\u0012\u001a\u00020\u0010H\u0002R\u000e\u0010\u0005\u001a\u00020\u0006X\u0082\u000e\u00a2\u0006\u0002\n\u0000R\u000e\u0010\u0007\u001a\u00020\bX\u0082\u0004\u00a2\u0006\u0002\n\u0000\u00a8\u0006\u0013"}, d2 = {"Lcom/zhidao/mogo/module/splash/fragment/BydSplashFragment;", "Lcom/mogo/commons/mvp/MvpFragment;", "Lcom/zhidao/mogo/module/splash/presenter/BydSplashPresenter;", "Landroid/os/Handler$Callback;", "()V", "countDownTime", "", "handler", "Landroid/os/Handler;", "createPresenter", "getLayoutId", "handleMessage", "", "msg", "Landroid/os/Message;", "hideSplash", "", "initViews", "startCountDown", "mogo-module-splash_debug"})
-public final class BydSplashFragment extends com.mogo.commons.mvp.MvpFragment implements android.os.Handler.Callback {
- private final android.os.Handler handler = null;
- private int countDownTime = 5;
- private java.util.HashMap _$_findViewCache;
-
- @java.lang.Override()
- protected int getLayoutId() {
- return 0;
- }
-
- @java.lang.Override()
- protected void initViews() {
- }
-
- @org.jetbrains.annotations.NotNull()
- @java.lang.Override()
- protected com.zhidao.mogo.module.splash.presenter.BydSplashPresenter createPresenter() {
- return null;
- }
-
- private final void startCountDown() {
- }
-
- @java.lang.Override()
- public boolean handleMessage(@org.jetbrains.annotations.NotNull()
- android.os.Message msg) {
- return false;
- }
-
- private final void hideSplash() {
- }
-
- public BydSplashFragment() {
- super();
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kapt_metadata b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kapt_metadata
deleted file mode 100644
index bf5a963193..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kapt_metadata and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.java b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.java
deleted file mode 100644
index af0a193cdc..0000000000
--- a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zhidao.mogo.module.splash.fragment;
-
-import java.lang.System;
-
-@kotlin.Metadata(mv = {1, 4, 1}, bv = {1, 0, 3}, k = 2, d1 = {"\u0000\u0010\n\u0000\n\u0002\u0010\t\n\u0000\n\u0002\u0010\b\n\u0002\b\u0002\"\u000e\u0010\u0000\u001a\u00020\u0001X\u0086T\u00a2\u0006\u0002\n\u0000\"\u000e\u0010\u0002\u001a\u00020\u0003X\u0086T\u00a2\u0006\u0002\n\u0000\"\u000e\u0010\u0004\u001a\u00020\u0003X\u0086T\u00a2\u0006\u0002\n\u0000\u00a8\u0006\u0005"}, d2 = {"DEFAULT_COUNT_DOWN_DELAY", "", "DEFAULT_COUNT_DOWN_TIME", "", "MSG_COUNT_DOWN", "mogo-module-splash_debug"})
-public final class BydSplashFragmentKt {
- public static final int DEFAULT_COUNT_DOWN_TIME = 5;
- public static final int MSG_COUNT_DOWN = 1001;
- public static final long DEFAULT_COUNT_DOWN_DELAY = 1000L;
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.kapt_metadata b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.kapt_metadata
deleted file mode 100644
index 2b97a3fb46..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.kapt_metadata and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.java b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.java
deleted file mode 100644
index 63b7e91589..0000000000
--- a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zhidao.mogo.module.splash.presenter;
-
-import java.lang.System;
-
-@kotlin.Metadata(mv = {1, 4, 1}, bv = {1, 0, 3}, k = 1, d1 = {"\u0000\u0010\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\b\u0003\u0018\u00002\b\u0012\u0004\u0012\u00020\u00020\u0001B\r\u0012\u0006\u0010\u0003\u001a\u00020\u0002\u00a2\u0006\u0002\u0010\u0004\u00a8\u0006\u0005"}, d2 = {"Lcom/zhidao/mogo/module/splash/presenter/BydSplashPresenter;", "Lcom/mogo/commons/mvp/Presenter;", "Lcom/zhidao/mogo/module/splash/fragment/BydSplashFragment;", "view", "(Lcom/zhidao/mogo/module/splash/fragment/BydSplashFragment;)V", "mogo-module-splash_debug"})
-public final class BydSplashPresenter extends com.mogo.commons.mvp.Presenter {
-
- public BydSplashPresenter(@org.jetbrains.annotations.NotNull()
- com.zhidao.mogo.module.splash.fragment.BydSplashFragment view) {
- super(null);
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kapt_metadata b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kapt_metadata
deleted file mode 100644
index ee8173f90e..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kapt_metadata and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/error/NonExistentClass.java b/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/error/NonExistentClass.java
deleted file mode 100644
index 73693e1c55..0000000000
--- a/modules/mogo-module-splash/build/tmp/kapt3/stubs/debug/error/NonExistentClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package error;
-
-public final class NonExistentClass {
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/META-INF/mogo-module-splash_debug.kotlin_module b/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/META-INF/mogo-module-splash_debug.kotlin_module
deleted file mode 100644
index 56b6730042..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/META-INF/mogo-module-splash_debug.kotlin_module and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/SplashConst.class b/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/SplashConst.class
deleted file mode 100644
index 1a2df54aac..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/SplashConst.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/SplashProvider.class b/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/SplashProvider.class
deleted file mode 100644
index ea6c74c977..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/SplashProvider.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment$initViews$1.class b/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment$initViews$1.class
deleted file mode 100644
index 10e66de21a..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment$initViews$1.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.class b/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.class
deleted file mode 100644
index 7ca8624810..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.class b/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.class
deleted file mode 100644
index 28f1b45cf7..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/fragment/BydSplashFragmentKt.class and /dev/null differ
diff --git a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.class b/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.class
deleted file mode 100644
index 83bcae04d2..0000000000
Binary files a/modules/mogo-module-splash/build/tmp/kotlin-classes/debug/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.class and /dev/null differ
diff --git a/modules/mogo-module-splash/consumer-rules.pro b/modules/mogo-module-splash/consumer-rules.pro
deleted file mode 100644
index 633730835f..0000000000
--- a/modules/mogo-module-splash/consumer-rules.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-#-----ModuleSplash-----
--keep class com.zhidao.mogo.module.splash.SplashConst{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/gradle.properties b/modules/mogo-module-splash/gradle.properties
deleted file mode 100644
index 4c41034d70..0000000000
--- a/modules/mogo-module-splash/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-splash
-VERSION_CODE=1
diff --git a/modules/mogo-module-splash/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt b/modules/mogo-module-splash/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
deleted file mode 100644
index b0d35cfd07..0000000000
--- a/modules/mogo-module-splash/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zhidao.mogo.module.splash
-
-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.zhidao.mogo.module.byd.test", appContext.packageName)
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/AndroidManifest.xml b/modules/mogo-module-splash/src/main/AndroidManifest.xml
deleted file mode 100644
index 2ace90a42d..0000000000
--- a/modules/mogo-module-splash/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashConst.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashConst.kt
deleted file mode 100644
index a2ffcbd208..0000000000
--- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashConst.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.zhidao.mogo.module.splash
-
-object SplashConst {
- const val MODULE_NAME = "MODULE_SPLASH"
- const val PATH_NAME = "/splash/api"
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt
deleted file mode 100644
index b3f4d9292d..0000000000
--- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package com.zhidao.mogo.module.splash
-
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.mogo.commons.debug.DebugConfig
-import com.mogo.map.listener.IMogoMapListener
-import com.mogo.map.location.IMogoLocationListener
-import com.mogo.map.marker.IMogoMarkerClickListener
-import com.mogo.map.navi.IMogoNaviListener
-import com.mogo.service.module.IMogoModuleLifecycle
-import com.mogo.service.module.IMogoModuleProvider
-import com.mogo.utils.logger.Logger
-import com.zhidao.mogo.module.splash.SplashConst.MODULE_NAME
-import com.zhidao.mogo.module.splash.SplashConst.PATH_NAME
-import com.zhidao.mogo.module.splash.fragment.BydSplashFragment
-
-/**
- * 比亚迪车机provider
- *
- * @author tongchenfei
- */
-@Route(path = PATH_NAME)
-class SplashProvider : IMogoModuleProvider {
- override fun getNaviListener(): IMogoNaviListener? {
- return null
- }
-
- override fun getLocationListener(): IMogoLocationListener? {
- return null
- }
-
- override fun getType(): Int {
- return 0
- }
-
- override fun getMarkerClickListener(): IMogoMarkerClickListener? {
- return null
- }
-
- override fun init(context: Context?) {
- Logger.d(MODULE_NAME, "比亚迪模块初始化===")
- }
-
- override fun getMapListener(): IMogoMapListener? {
- return null
- }
-
- override fun getAppPackage(): String {
- return ""
- }
-
- override fun createView(context: Context?): View? {
- return null
- }
-
- override fun createFragment(context: Context?, data: Bundle?): Fragment? = if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD) {
- BydSplashFragment()
- } else {
- null
- }
-
- override fun getModuleName(): String {
- return MODULE_NAME
- }
-
- override fun getAppName(): String {
- return ""
- }
-
- override fun getCardLifecycle(): IMogoModuleLifecycle? {
- return null
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt
deleted file mode 100644
index 1148d63378..0000000000
--- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.zhidao.mogo.module.splash.fragment
-
-import android.os.Handler
-import android.os.Message
-import com.mogo.commons.mvp.MvpFragment
-import com.zhidao.mogo.module.splash.R
-import com.zhidao.mogo.module.splash.presenter.BydSplashPresenter
-import kotlinx.android.synthetic.main.fragment_byd_splash.*
-
-const val DEFAULT_COUNT_DOWN_TIME = 5
-const val MSG_COUNT_DOWN = 1001
-const val DEFAULT_COUNT_DOWN_DELAY = 1000L
-class BydSplashFragment :MvpFragment(),Handler.Callback{
- private val handler = Handler(this)
- private var countDownTime = DEFAULT_COUNT_DOWN_TIME
-
- override fun getLayoutId(): Int = R.layout.fragment_byd_splash
-
- override fun initViews() {
- startCountDown()
- tvByd.setOnClickListener {
- hideSplash()
- }
- }
-
- override fun createPresenter(): BydSplashPresenter = BydSplashPresenter(this)
-
- private fun startCountDown(){
- handler.removeMessages(MSG_COUNT_DOWN)
- countDownTime = DEFAULT_COUNT_DOWN_TIME
- tvCountDown.text = countDownTime.toString()
- handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY)
- }
-
- override fun handleMessage(msg: Message): Boolean {
- if (msg.what == MSG_COUNT_DOWN) {
- tvCountDown?.also {
- countDownTime--
- if(countDownTime>0) {
- it.text = countDownTime.toString()
- handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY)
- }else{
- hideSplash()
- }
- }
- return true
- }
- return false
- }
-
- private fun hideSplash(){
- handler.removeMessages(MSG_COUNT_DOWN)
- activity!!.supportFragmentManager.beginTransaction().remove(this).commit()
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kt
deleted file mode 100644
index b16df959c7..0000000000
--- a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.zhidao.mogo.module.splash.presenter
-
-import com.mogo.commons.mvp.Presenter
-import com.zhidao.mogo.module.splash.fragment.BydSplashFragment
-
-class BydSplashPresenter(view: BydSplashFragment) : Presenter(view) {
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/res/drawable-xhdpi-1920x1000/module_byd_splash.webp b/modules/mogo-module-splash/src/main/res/drawable-xhdpi-1920x1000/module_byd_splash.webp
deleted file mode 100644
index d39b3abe55..0000000000
Binary files a/modules/mogo-module-splash/src/main/res/drawable-xhdpi-1920x1000/module_byd_splash.webp and /dev/null differ
diff --git a/modules/mogo-module-splash/src/main/res/drawable/byd_count_down_bg.xml b/modules/mogo-module-splash/src/main/res/drawable/byd_count_down_bg.xml
deleted file mode 100644
index 83bc413969..0000000000
--- a/modules/mogo-module-splash/src/main/res/drawable/byd_count_down_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/res/drawable/byd_enter_btn_bg.xml b/modules/mogo-module-splash/src/main/res/drawable/byd_enter_btn_bg.xml
deleted file mode 100644
index e34b2f6181..0000000000
--- a/modules/mogo-module-splash/src/main/res/drawable/byd_enter_btn_bg.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.webp b/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.webp
deleted file mode 100644
index d39b3abe55..0000000000
Binary files a/modules/mogo-module-splash/src/main/res/drawable/module_byd_splash.webp and /dev/null differ
diff --git a/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml b/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
deleted file mode 100644
index bb79601719..0000000000
--- a/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt b/modules/mogo-module-splash/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
deleted file mode 100644
index 35aae2dff8..0000000000
--- a/modules/mogo-module-splash/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zhidao.mogo.module.splash
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
- @Test
- fun addition_isCorrect() {
- assertEquals(4, 2 + 2)
- }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index ead28acbda..89e8fa951f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -4,14 +4,13 @@ import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.RatingBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.common.view.CustomRatingBar;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
@@ -20,7 +19,6 @@ import com.mogo.module.v2x.entity.panel.V2XShareEventItemEnum;
import com.mogo.module.v2x.entity.panel.V2XShareEventLoadMoreItem;
import com.mogo.module.v2x.fragment.V2XEventPanelFragment;
import com.mogo.module.v2x.listener.AdapterCallback;
-import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.utils.DateTimeUtils;
@@ -108,8 +106,8 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter {
if (mNoveltyInfo != null) {
- Object[] ugcTitleStr = EventTypeUtils.getUgcTitleStr(mNoveltyInfo.getPoiType());
+ Object[] ugcTitleStr = EventTypeEnum.getUgcTitleStr(mNoveltyInfo.getPoiType());
if (ugcTitleStr != null) {
tvEventUgcTitle.setText(((String) ugcTitleStr[0]).replace("####", mNoveltyInfo.getAddr()));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
index 50c0aa7ef7..63b3f78363 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
@@ -2,13 +2,11 @@ package com.mogo.module.v2x.adapter.holder;
import android.content.Context;
import android.content.Intent;
-import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
-import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
@@ -17,7 +15,6 @@ import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
-import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.animation.BezierAnimationView;
import com.mogo.module.common.entity.MarkerExploreWay;
@@ -25,8 +22,8 @@ import com.mogo.module.common.entity.MarkerUserInfo;
import com.mogo.module.common.entity.V2XEventShowEntity;
import com.mogo.module.common.entity.V2XLiveCarInfoEntity;
import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.common.wm.WindowManagerView;
import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.receiver.MogoReceiver;
@@ -39,7 +36,6 @@ import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventWindow;
import com.mogo.module.v2x.scenario.scene.road.V2XRoadVideoCarScenario;
import com.mogo.module.v2x.scenario.view.IV2XWindow;
import com.mogo.module.v2x.utils.ChartingUtil;
-import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.module.v2x.view.HeartLikeView;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
@@ -275,16 +271,17 @@ public class V2XRoadEventVH extends V2XBaseViewHolder {
.displayImage(mNoveltyInfo.getUserInfo().getUserHead(), ivReportHead);
}
- String poiType = EventTypeUtils.getPoiTypeStr(mNoveltyInfo.getPoiType());
+ String poiType = EventTypeEnum.getPoiTypeStr(mNoveltyInfo.getPoiType());
if (!TextUtils.isEmpty(poiType)) {
tvEventTypeTitle.setText(poiType);
- tvEventTypeTitle.setBackgroundResource(EventTypeUtils.getPoiTypeBg(mNoveltyInfo.getPoiType()));
+ tvEventTypeTitle.setBackgroundResource(EventTypeEnum.getPoiTypeBg(mNoveltyInfo.getPoiType(),
+ V2XServiceManager.getMoGoStatusManager().isVrMode()));
}
- ivEvent.setImageResource(EventTypeUtils.getPoiTypeSrcVr(mNoveltyInfo.getPoiType()));
- tvEvent.setText(EventTypeUtils.getPoiTypeStrVr(mNoveltyInfo.getPoiType()));
- if (V2XPoiTypeEnum.FOURS_FOG.equals(mNoveltyInfo.getPoiType())) {
- V2XServiceManager.getDisplayEffectsManager().displayEffects(V2XPoiTypeEnum.FOURS_FOG);
+ ivEvent.setImageResource(EventTypeEnum.getPoiTypeSrcVr(mNoveltyInfo.getPoiType()));
+ tvEvent.setText(EventTypeEnum.getPoiTypeStrVr(mNoveltyInfo.getPoiType()));
+ if (EventTypeEnum.FOURS_FOG.equals(mNoveltyInfo.getPoiType())) {
+ V2XServiceManager.getDisplayEffectsManager().displayEffects(EventTypeEnum.FOURS_FOG.getPoiType());
MarkerServiceHandler.getApis().getV2XListenerManager().warningChangedForListenerWithDirection(ALERT_THE_FRONT_CRASH_WARNING_TOP, MogoReceiver.ACTION_V2X_FRONT_WARNING);
}
tvEventAddress.setText(mNoveltyInfo.getAddr());
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
index 8d17a97dfd..964b7c590a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
@@ -8,9 +8,9 @@ import android.widget.TextView;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.V2XHistoryScenarioData;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.module.v2x.utils.RoadConditionUtils;
import com.mogo.module.v2x.utils.TimeUtils;
import com.mogo.module.v2x.utils.V2XSQLiteUtils;
@@ -58,7 +58,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XHistoryBaseViewHolder "封路"
- MarkerPoiTypeEnum.FOURS_ICE -> "道路结冰"
- MarkerPoiTypeEnum.FOURS_FOG -> "浓雾"
- MarkerPoiTypeEnum.TRAFFIC_CHECK -> "交通检查"
- MarkerPoiTypeEnum.FOURS_ACCIDENT -> "交通事故"
- MarkerPoiTypeEnum.FOURS_BLOCK_UP -> "拥堵"
- MarkerPoiTypeEnum.FOURS_ROAD_WORK -> "施工"
- MarkerPoiTypeEnum.FOURS_PONDING -> "道路积水"
- MarkerPoiTypeEnum.FOURS_LIVING -> "实时路况"
- else -> "实时路况"
- }
- }
-
/*
* 语音查询事件面板内容
* */
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index 50584e8dde..c922ca3394 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -6,7 +6,6 @@ import android.view.View;
import android.widget.LinearLayout;
import androidx.annotation.NonNull;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -14,7 +13,7 @@ import com.mogo.commons.mvp.MvpFragment;
import com.mogo.commons.voice.AIAssist;
import com.mogo.module.common.entity.V2XHistoryScenarioData;
import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.SpacesItemDecoration;
+import com.mogo.module.common.view.SpacesItemDecoration;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.adapter.V2XScenarioHistoryAdapter;
import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index b9bf2b244c..36358890b3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -8,13 +8,13 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.commons.voice.AIAssist;
+import com.mogo.module.common.view.LinearLayoutCommonManager;
import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.SpacesItemDecoration;
+import com.mogo.module.common.view.SpacesItemDecoration;
import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
@@ -68,8 +68,8 @@ public class V2XShareEventsFragment extends MvpFragment v2XMessageEntity = new V2XMessageEntity<>();
v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING);
@@ -220,7 +218,7 @@ public class V2XLocationListener
//如果poiType是道路拥堵，则调用接口查询拥堵状态
String poiType = v2XRoadEventEntity.getPoiType();
- if (poiType != null && poiType.equals(FOURS_BLOCK_UP)) {
+ if (poiType != null && poiType.equals(EventTypeEnum.FOURS_BLOCK_UP.getPoiType())) {
V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMarkerClickListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMarkerClickListener.java
index cb79510fc4..06e952100f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMarkerClickListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMarkerClickListener.java
@@ -8,9 +8,9 @@ import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.MarkerOnlineCar;
import com.mogo.module.common.entity.MarkerShowEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.utils.logger.Logger;
@@ -110,7 +110,7 @@ public class V2XMarkerClickListener implements IMogoMarkerClickListener {
V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
v2XRoadEventEntity.setLocation(markerExploreWay.getLocation());
// 探路目前只有上报拥堵
- v2XRoadEventEntity.setPoiType(V2XPoiTypeEnum.FOURS_BLOCK_UP);
+ v2XRoadEventEntity.setPoiType(EventTypeEnum.FOURS_BLOCK_UP.getPoiType());
v2XRoadEventEntity.setDistance(1000);
v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
index 4ca682c262..eadd44a9a4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
@@ -1,7 +1,7 @@
package com.mogo.module.v2x.listener;
import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes;
@@ -67,7 +67,7 @@ public class V2XMessageListener_401005 implements IMogoOnMessageListener properties = new HashMap<>();
- properties.put("warning_id", V2XPoiTypeEnum.ALERT_TRAFFIC_CONTROL);
+ properties.put("warning_id", EventTypeEnum.ALERT_TRAFFIC_CONTROL.getPoiType());
MarkerServiceHandler.getMogoAnalytics().track("v2x_warning", properties);
}
} catch (Exception e) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
index 46ca083ec7..efd1bfa2be 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -21,10 +21,9 @@ import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.MarkerNoveltyInfo;
import com.mogo.module.common.entity.MarkerOnlineCar;
-import com.mogo.module.common.entity.MarkerPoiTypeEnum;
import com.mogo.module.common.entity.MarkerShowEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.common.utils.CarSeries;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.service.Utils;
@@ -35,7 +34,6 @@ import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
import com.mogo.module.v2x.listener.V2XMarkerClickListener;
import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager;
import com.mogo.module.v2x.marker.V2XMarkerAdapter;
-import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.module.v2x.utils.MarkerUtils;
import com.mogo.utils.ViewUtils;
import com.mogo.utils.logger.Logger;
@@ -141,7 +139,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
if (exploreWayList != null) {
for (MarkerExploreWay markerExploreWay : exploreWayList) {
- if (EventTypeUtils.isRoadEvent(markerExploreWay.getPoiType())) {
+ if (EventTypeEnum.isRoadEvent(markerExploreWay.getPoiType())) {
MarkerLocation markerLocation = markerExploreWay.getLocation();
// 记录道路事件
V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
@@ -415,26 +413,21 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
markerShowEntity.setTextContent(noveltyInfo.getLocation().getAddress());
// 这里只绘制道路事件相关
- switch (noveltyInfo.getPoiType()) {
- case V2XPoiTypeEnum.TRAFFIC_CHECK:
- case V2XPoiTypeEnum.ROAD_CLOSED:
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- case V2XPoiTypeEnum.FOURS_PONDING:
- case V2XPoiTypeEnum.FOURS_PARKING:
- case V2XPoiTypeEnum.FOURS_ICE:
- case V2XPoiTypeEnum.FOURS_FOG:
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- drawableMarker(
- V2XServiceManager.getContext(),
- markerShowEntity,
- clickListener);
- break;
+ if (EventTypeEnum.TRAFFIC_CHECK.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.ROAD_CLOSED.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ROAD_WORK.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_BLOCK_UP.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_PONDING.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_PARKING.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ICE.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_FOG.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_01.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_02.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_03.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_04.getPoiType().equals(noveltyInfo.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_05.getPoiType().equals(noveltyInfo.getPoiType())) {
+ drawableMarker(V2XServiceManager.getContext(), markerShowEntity, clickListener);
}
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
index 179a16c80f..a6b1ec811d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
@@ -6,8 +6,8 @@ import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.map.MogoLatLng;
import com.mogo.map.overlay.IMogoPolyline;
import com.mogo.map.overlay.MogoPolylineOptions;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.MoGoV2XServicePaths;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager;
@@ -44,20 +44,16 @@ public class MoGoV2XPolylineManager implements IMoGoV2XPolylineManager {
// 渐变色
List colors = new ArrayList<>();
- switch (roadEventEntity.getPoiType()) {
- case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
- case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
- colors.add(0xFFFFA31A);
- colors.add(0xFFFFA31A);
- break;
- default:
- colors.add(0xFFE32F46);
- colors.add(0xFFE32F46);
- break;
+ if (EventTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(roadEventEntity.getPoiType())
+ || EventTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(roadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_BLOCK_UP.getPoiType().equals(roadEventEntity.getPoiType())
+ || EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(roadEventEntity.getPoiType())) {
+ colors.add(0xFFFFA31A);
+ colors.add(0xFFFFA31A);
+ } else {
+ colors.add(0xFFE32F46);
+ colors.add(0xFFE32F46);
}
-
// 线条粗细，渐变，渐变色值
options.width(10).useGradient(true).colorValues(colors);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XFrontTargetMarkerView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XFrontTargetMarkerView.java
index 89cb6b1283..51c18bdc10 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XFrontTargetMarkerView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XFrontTargetMarkerView.java
@@ -3,7 +3,6 @@ package com.mogo.module.v2x.marker;
import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater;
-import android.widget.ImageView;
import androidx.annotation.Nullable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
index 5b0d412d46..9435f98835 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
@@ -4,11 +4,10 @@ import android.content.Context;
import android.graphics.Bitmap;
import com.mogo.module.common.entity.MarkerShowEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.utils.ImageUtil;
import com.mogo.module.v2x.utils.V2XUtils;
@@ -42,22 +41,19 @@ public class V2XMarkerAdapter {
*/
public static Bitmap getV2XRoadEventViewPng(Context context, V2XRoadEventEntity alarmInfo) {
Bitmap bitmap;
- switch (alarmInfo.getPoiType()) {
- case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
- case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
- bitmap = getV2XRoadEventMarkerView(
- context,
- alarmInfo,
- R.drawable.v_to_x_warning_circle_orange_00040);
- break;
- default:
- bitmap = getV2XRoadEventMarkerView(
- context,
- alarmInfo,
- R.drawable.v_to_x_warning_circle_red_00040);
- break;
+ if (EventTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(alarmInfo.getPoiType())
+ || EventTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(alarmInfo.getPoiType())
+ || EventTypeEnum.FOURS_BLOCK_UP.getPoiType().equals(alarmInfo.getPoiType())
+ || EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(alarmInfo.getPoiType())) {
+ bitmap = getV2XRoadEventMarkerView(
+ context,
+ alarmInfo,
+ R.drawable.v_to_x_warning_circle_orange_00040);
+ } else {
+ bitmap = getV2XRoadEventMarkerView(
+ context,
+ alarmInfo,
+ R.drawable.v_to_x_warning_circle_red_00040);
}
return bitmap;
}
@@ -67,16 +63,13 @@ public class V2XMarkerAdapter {
*/
public static ArrayList getV2XRoadEventViewGif(Context context, V2XRoadEventEntity alarmInfo) {
ArrayList bitmapArrayList;
- switch (alarmInfo.getPoiType()) {
- case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
- case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
- bitmapArrayList = getV2XRoadEventOrangeMarkerView(context, alarmInfo);
- break;
- default:
- bitmapArrayList = getV2XRoadEventRedMarkerView(context, alarmInfo);
- break;
+ if (EventTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST.getPoiType().equals(alarmInfo.getPoiType())
+ || EventTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING.getPoiType().equals(alarmInfo.getPoiType())
+ || EventTypeEnum.FOURS_BLOCK_UP.getPoiType().equals(alarmInfo.getPoiType())
+ || EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(alarmInfo.getPoiType())) {
+ bitmapArrayList = getV2XRoadEventOrangeMarkerView(context, alarmInfo);
+ } else {
+ bitmapArrayList = getV2XRoadEventRedMarkerView(context, alarmInfo);
}
return bitmapArrayList;
}
@@ -132,44 +125,44 @@ public class V2XMarkerAdapter {
*/
public static ArrayList getV2XRoadEventOrangeMarkerView(Context context, V2XRoadEventEntity alarmInfo) {
ArrayList icons = new ArrayList<>();
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00011));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00012));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00013));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00014));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00015));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00016));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00017));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00018));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00019));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00020));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00021));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00022));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00023));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00024));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00025));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00026));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00027));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00028));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00029));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00030));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00031));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00032));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00033));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00034));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00035));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00036));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00037));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00038));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00039));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00040));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00041));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00042));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00043));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00044));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00045));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00046));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00047));
- icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00048));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00011));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00012));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00013));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00014));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00015));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00016));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00017));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00018));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00019));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00020));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00021));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00022));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00023));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00024));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00025));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00026));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00027));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00028));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00029));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00030));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00031));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00032));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00033));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00034));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00035));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00036));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00037));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00038));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00039));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00040));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00041));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00042));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00043));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00044));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00045));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00046));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00047));
+ icons.add(V2XMarkerAdapter.getV2XRoadEventMarkerView(context, alarmInfo, R.drawable.v_to_x_warning_circle_orange_00048));
return icons;
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarInfoView.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarInfoView.kt
index c991f860a6..790366ba24 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarInfoView.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarInfoView.kt
@@ -10,7 +10,6 @@ import com.mogo.module.common.entity.MarkerOnlineCar
import com.mogo.module.common.entity.MarkerShowEntity
import com.mogo.module.v2x.R
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity
-import com.mogo.module.common.entity.V2XPoiTypeEnum
import com.mogo.utils.ViewUtils
import kotlinx.android.synthetic.main.view_marker_car.view.*
import kotlinx.android.synthetic.main.view_marker_car_info.view.*
@@ -130,7 +129,7 @@ class V2XMarkerCarInfoView(context: Context, showEntity: MarkerShowEntity) :
ivCar.setImageResource(R.drawable.v_to_x_warning_car_red)
}
// 故障车
- V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING -> {
+ 20007 -> {
clMarkerContent.visibility = View.GONE
ivReverseTriangle.visibility = View.GONE
ivCar.setImageResource(R.drawable.v_to_x_warning_car_red)
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarView.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarView.kt
index 232c147a5b..26b691b0e7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarView.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerCarView.kt
@@ -9,7 +9,6 @@ import com.mogo.module.common.entity.MarkerOnlineCar
import com.mogo.module.common.entity.MarkerShowEntity
import com.mogo.module.v2x.R
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity
-import com.mogo.module.common.entity.V2XPoiTypeEnum
import com.mogo.utils.ViewUtils
import kotlinx.android.synthetic.main.view_marker_car.view.*
@@ -101,7 +100,7 @@ class V2XMarkerCarView(context: Context, showEntity: MarkerShowEntity) :
ivCar.setImageResource(R.drawable.v_to_x_warning_car_red)
}
// 故障车
- V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING -> {
+ 20007 -> {
ivMarkerTip.visibility = View.GONE
ivCar.setImageResource(R.drawable.v_to_x_warning_car_red)
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt
index fa563f3fb4..da86a0e125 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt
@@ -4,13 +4,10 @@ package com.mogo.module.v2x.marker
import android.content.Context
import android.graphics.Bitmap
import android.view.LayoutInflater
-import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.module.common.entity.MarkerExploreWay
-import com.mogo.module.common.entity.V2XPoiTypeEnum
import com.mogo.module.common.entity.V2XRoadEventEntity
+import com.mogo.module.common.enums.EventTypeEnum
import com.mogo.module.v2x.R
-import com.mogo.module.v2x.V2XServiceManager
import com.mogo.utils.ViewUtils
import kotlinx.android.synthetic.main.view_marker_event_car.view.*
@@ -33,8 +30,8 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) :
}
fun initView(context: Context, alarmInfo: V2XRoadEventEntity) {
- if (alarmInfo.poiType == V2XPoiTypeEnum.ALERT_FRONT_CAR ||
- alarmInfo.poiType == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING.toString()
+ if (alarmInfo.poiType == EventTypeEnum.ALERT_FRONT_CAR.poiType ||
+ alarmInfo.poiType == EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.poiType
) {
LayoutInflater.from(context)
.inflate(R.layout.view_marker_event_car, this)
@@ -46,72 +43,14 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) :
}
/**
- * @see V2XPoiTypeEnum
+ * @see EventTypeEnum
*/
private fun updateIcon(alarmInfo: V2XRoadEventEntity) {
//Logger.d(MODULE_NAME, alarmInfo.toString())
// 道路施工、积水、路面结冰、浓雾、事故、拥堵
- when (alarmInfo.poiType) {
- //交通检查
- V2XPoiTypeEnum.TRAFFIC_CHECK -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_2)
- }
- //封路
- V2XPoiTypeEnum.ROAD_CLOSED -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_16)
- }
- //施工
- V2XPoiTypeEnum.FOURS_ROAD_WORK -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_11)
- }
- //拥堵
- V2XPoiTypeEnum.FOURS_BLOCK_UP -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_5)
- }
- //积水
- V2XPoiTypeEnum.FOURS_PONDING -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_6)
- }
- //浓雾
- V2XPoiTypeEnum.FOURS_FOG -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_9)
- }
- //结冰
- V2XPoiTypeEnum.FOURS_ICE -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_8)
- }
- //事故
- V2XPoiTypeEnum.FOURS_ACCIDENT -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_7)
- }
- //事故
- V2XPoiTypeEnum.FOURS_LIVING -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_1)
- }
- //红绿灯数据
- V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_3)
- }
- //红绿灯数据
- V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_3)
- }
- //前方静止or慢速车辆报警
- V2XPoiTypeEnum.ALERT_FRONT_CAR -> {
- ivCar.setImageResource(R.drawable.v_to_x_warning_car_red)
- }
- // 故障车辆
- V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING.toString() -> {
- ivCar.setImageResource(R.drawable.icon_car_red)
- }
- // 取快递
- V2XPoiTypeEnum.ALERT_TRAFFIC_EXPRESS -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_express)
- }
- // 顺风车
- V2XPoiTypeEnum.ALERT_TRAFFIC_TAXI -> {
- ivCar.setImageResource(R.drawable.v_to_x_marker_taxi)
- }
+ val iconResId = EventTypeEnum.getUpdateIconRes(alarmInfo.poiType)
+ if (iconResId != 0) {
+ ivCar.setImageResource(iconResId)
}
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
index 9615f44b73..6cb0686d64 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
@@ -6,24 +6,21 @@ import android.text.TextUtils;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
import com.mogo.commons.voice.AIAssist;
import com.mogo.map.MogoLatLng;
import com.mogo.map.location.MogoLocation;
import com.mogo.map.search.geo.IMogoGeoSearchListener;
-import com.mogo.map.search.geo.MogoGeocodeResult;
import com.mogo.map.search.geo.MogoRegeocodeResult;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.common.entity.V2XRecommendRouteEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.service.network.RefreshBody;
import com.mogo.module.v2x.V2XConst;
@@ -39,8 +36,6 @@ import com.mogo.module.v2x.entity.net.V2XStrategyPushRes;
import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
import com.mogo.module.v2x.utils.LocationUtils;
import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.service.network.IMogoNetwork;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.GsonUtil;
@@ -48,12 +43,9 @@ import com.mogo.utils.network.utils.GsonUtil;
import java.util.Map;
import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
-import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
import static com.mogo.module.v2x.V2XServiceManager.getContext;
@@ -704,7 +696,7 @@ public class V2XRefreshModel {
boolean isSendRecommendRoute = false;
if (v2XRoadDataRes.getResult().getPoiData() != null && v2XRoadDataRes.getResult().getPoiData().size() > 0) {
for (V2XRoadDataRes.ResultDTO.PoiDataDTO poiDataDTO : v2XRoadDataRes.getResult().getPoiData()) {
- if (!V2XPoiTypeEnum.FOURS_LIVING.equals(poiDataDTO.getPoiType())) {
+ if (!EventTypeEnum.FOURS_LIVING.getPoiType().equals(poiDataDTO.getPoiType())) {
isSendRecommendRoute = true;
break;
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
index ad499bdbc6..0787ad38f8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
@@ -4,8 +4,8 @@ import androidx.annotation.Nullable;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.V2XStatusManager;
import com.mogo.module.v2x.alarm.V2XAlarmServer;
@@ -65,14 +65,14 @@ public class V2XIllegalParkScenario extends AbsV2XScenario {
V2XRoadEventEntity v2XRoadEventEntity = new V2XRoadEventEntity();
v2XRoadEventEntity.setLocation(markerLocation);
// 探路目前只有上报拥堵
- v2XRoadEventEntity.setPoiType(V2XPoiTypeEnum.ALERT_TRAFFIC_EXPRESS);
+ v2XRoadEventEntity.setPoiType(EventTypeEnum.ALERT_TRAFFIC_EXPRESS.getPoiType());
MarkerExploreWay markerNoveltyInfo = new MarkerExploreWay();
@@ -46,7 +46,7 @@ public class V2XPushEventMarker implements IV2XMarker {
MarkerExploreWayItem exploreWayItem = new MarkerExploreWayItem();
exploreWayItem.setThumbnail(entity.getMsgImgUrl());
items.add(exploreWayItem);
- markerNoveltyInfo.setPoiType(V2XPoiTypeEnum.ALERT_TRAFFIC_EXPRESS);
+ markerNoveltyInfo.setPoiType(EventTypeEnum.ALERT_TRAFFIC_EXPRESS.getPoiType());
markerNoveltyInfo.setItems(items);
markerNoveltyInfo.setUploadType("1");
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
index d76b2356a3..5b14ea0cdd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java
@@ -12,11 +12,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.PagerSnapHelper;
import androidx.recyclerview.widget.RecyclerView;
-import com.mogo.module.common.entity.MarkerPoiTypeEnum;
import com.mogo.module.common.entity.V2XEventShowEntity;
import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.adapter.V2XRoadEventAdapter;
@@ -33,7 +32,6 @@ import com.mogo.module.v2x.voice.V2XVoicePagingListener;
import java.util.ArrayList;
import java.util.List;
-import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
/**
* author : donghongyu
@@ -171,37 +169,35 @@ public class V2XRoadEventWindow extends V2XBasWindow
//Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity);
// 进行类型分发
- switch (v2XRoadEventEntity.getPoiType()) {
- case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查
- case V2XPoiTypeEnum.ROAD_CLOSED://封路
- case V2XPoiTypeEnum.FOURS_ROAD_WORK://施工
- case FOURS_BLOCK_UP://拥堵
- case V2XPoiTypeEnum.FOURS_PONDING://积水
- case V2XPoiTypeEnum.FOURS_FOG://浓雾
- case V2XPoiTypeEnum.FOURS_ICE://结冰
- case V2XPoiTypeEnum.FOURS_ACCIDENT://事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case MarkerPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- case V2XPoiTypeEnum.FOURS_LIVING://实时路况
- case V2XPoiTypeEnum.FOURS_NEALY://身边
- // 展示道路事件本身详情
- if (mItemList.isEmpty()) {
- V2XEventShowEntity v2XEventShowEntity = new V2XEventShowEntity();
- v2XEventShowEntity.setViewType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING);
- v2XEventShowEntity.setV2XRoadEventEntity(v2XRoadEventEntity);
- mItemList.add(v2XEventShowEntity);
- }
- // 获取道路事件周边的直播车机
- V2XServiceManager
- .getV2XRefreshModel()
- .queryNearbyVehicleLiveByLocation(
- this,
- v2XRoadEventEntity.getLocation().getLon(),
- v2XRoadEventEntity.getLocation().getLat());
- break;
+ if (EventTypeEnum.TRAFFIC_CHECK.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.ROAD_CLOSED.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ROAD_WORK.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_BLOCK_UP.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_PONDING.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_FOG.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ICE.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_01.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_02.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_03.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_04.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_ACCIDENT_05.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_LIVING.getPoiType().equals(v2XRoadEventEntity.getPoiType())
+ || EventTypeEnum.FOURS_NEALY.getPoiType().equals(v2XRoadEventEntity.getPoiType())) {
+ // 展示道路事件本身详情
+ if (mItemList.isEmpty()) {
+ V2XEventShowEntity v2XEventShowEntity = new V2XEventShowEntity();
+ v2XEventShowEntity.setViewType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING);
+ v2XEventShowEntity.setV2XRoadEventEntity(v2XRoadEventEntity);
+ mItemList.add(v2XEventShowEntity);
+ }
+ // 获取道路事件周边的直播车机
+ V2XServiceManager
+ .getV2XRefreshModel()
+ .queryNearbyVehicleLiveByLocation(
+ this,
+ v2XRoadEventEntity.getLocation().getLon(),
+ v2XRoadEventEntity.getLocation().getLat());
}
}
// 刷新列表
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpMarker.java
index 7ccbf06cfa..a5531efdb5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpMarker.java
@@ -2,9 +2,9 @@ package com.mogo.module.v2x.scenario.scene.seek;
import android.content.Context;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.v2x.listener.V2XMarkerClickListener;
import com.mogo.module.v2x.scenario.view.IV2XMarker;
import com.mogo.module.v2x.utils.MarkerUtils;
@@ -31,7 +31,7 @@ public class V2XSeekHelpMarker implements IV2XMarker> {
Context context = V2XServiceManager.getContext();
for (V2XMarkerEntity coordinate : entity) {
//故障车机
- if (coordinate.getTargetId() == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING) {
+ if (EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(coordinate.getTargetId()+"")) {
//绘制
V2XServiceManager
.getMoGoV2XMarkerManager()
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
index 25108d961c..e09242ba13 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
@@ -6,9 +6,9 @@ import android.view.ViewGroup;
import androidx.annotation.Nullable;
import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
@@ -16,14 +16,10 @@ import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
import com.mogo.module.v2x.utils.ADASUtils;
import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.entrance.IMogoEntranceButtonController;
import com.mogo.service.windowview.IMogoTopViewStatusListener;
-import com.mogo.utils.logger.Logger;
import java.util.List;
-import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
-
/**
* author : donghongyu
* e-mail : 1358506549@qq.com
@@ -49,7 +45,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario> i
// 广播给ADAS和Launcher卡片
V2XRoadEventEntity eventEntity = new V2XRoadEventEntity();
- eventEntity.setPoiType(V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "");
+ eventEntity.setPoiType(EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType());
eventEntity.setExpireTime(30000);
eventEntity.setTts("发现其他车主的求助信息");
eventEntity.setAlarmContent("其他车主求助");
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
deleted file mode 100644
index 286f0f32f3..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java
+++ /dev/null
@@ -1,364 +0,0 @@
-package com.mogo.module.v2x.utils;
-
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
-import com.mogo.module.common.marker.PoiWrapper;
-import com.mogo.module.common.utils.CloudPoiManager;
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.voice.V2XVoiceConstants;
-import com.mogo.utils.logger.Logger;
-
-
-/**
- * @ProjectName: MoGoModulSafeDriving
- * @Package: com.mogo.module.v2x.utils
- * @ClassName: EventTypeUtils
- * @Description: java类作用描述
- * @Author: fenghl
- * @CreateDate: 2020/5/20 17:10
- * @UpdateUser: 更新者：
- * @UpdateDate: 2020/5/20 17:10
- * @UpdateRemark: 更新说明：
- * @Version: 1.0
- */
-public class EventTypeUtils {
- public static String getPoiTypeStr(String poiType) {
- // 先获取网络配置的poi对应的名称
- PoiWrapper wrapper = CloudPoiManager.getInstance().getWrapperByPoiType(poiType);
- if (wrapper != null) {
- //Logger.d("EventTypeUtils", "从配置表中拿到了相关数据： " + wrapper.getTitle());
- return wrapper.getTitle();
- }
- // 如果获取不到，那么就用本地默认的
- String str = "其它道路事件";
- switch (poiType) {
- // 停车场
- case V2XPoiTypeEnum.FOURS_PARKING:
- str = "停车场";
- break;
- // 加油站
- case V2XPoiTypeEnum.GAS_STATION:
- str = "加油站";
- break;
- // 交通检查
- case V2XPoiTypeEnum.TRAFFIC_CHECK:
- str = "交通检查";
- break;
- // 封路
- case V2XPoiTypeEnum.ROAD_CLOSED:
- str = "封路";
- break;
- // 施工
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- str = "道路施工";
- break;
- // 拥堵
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- str = "道路拥堵";
- break;
- // 积水
- case V2XPoiTypeEnum.FOURS_PONDING:
- str = "道路积水";
- break;
- // 浓雾
- case V2XPoiTypeEnum.FOURS_FOG:
- str = "出现浓雾";
- break;
- // 结冰
- case V2XPoiTypeEnum.FOURS_ICE:
- str = "路面结冰";
- break;
- // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- str = "交通事故";
- break;
- // 实时路况
- case V2XPoiTypeEnum.FOURS_LIVING:
- str = "实时路况";
- break;
- // 身边
- case V2XPoiTypeEnum.FOURS_NEALY:
- str = "身边事件";
- break;
- default:
- str = "其它道路事件";
- break;
- }
- return str;
- }
-
- public static int getPoiTypeSrcVr(String poiType) {
- int src;
- switch (poiType) {
-
- // 拥堵
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- src = R.drawable.v2x_icon_yongdu_vr;
- break;
- // 积水
- case V2XPoiTypeEnum.FOURS_PONDING:
- src = R.drawable.v2x_icon_jishui_vr;
- break;
- // 浓雾
- case V2XPoiTypeEnum.FOURS_FOG:
- src = R.drawable.v2x_icon_nongwu_vr;
- break;
- // 封路
- case V2XPoiTypeEnum.ROAD_CLOSED:
- src = R.drawable.v2x_icon_fenglu_vr;
- break;
- // 施工
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- src = R.drawable.v2x_icon_daolushigong_vr;
- break;
- // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- src = R.drawable.v2x_icon_jiaotongshigu_vr;
- break;
- // 交通检查
- case V2XPoiTypeEnum.TRAFFIC_CHECK:
- src = R.drawable.v2x_icon_jiaotongjiancha_vr;
- break;
- default:
- src = R.drawable.v2x_icon_live_logo;
- break;
- }
- return src;
- }
-
- public static String getPoiTypeStrVr(String poiType) {
- String str = "其它道路事件";
- switch (poiType) {
- // 拥堵
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- str = "前方拥堵";
- break;
- // 积水
- case V2XPoiTypeEnum.FOURS_PONDING:
- str = "前方道路积水";
- break;
- // 浓雾
- case V2XPoiTypeEnum.FOURS_FOG:
- str = "浓雾预警";
- break;
- // 封路
- case V2XPoiTypeEnum.ROAD_CLOSED:
- str = "前方封路";
- break;
- // 施工
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- str = "前方施工";
- break;
- // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- str = "前方交通事故";
- break;
- // 交通检查
- case V2XPoiTypeEnum.TRAFFIC_CHECK:
- str = "前方交通检查";
- break;
- default:
- str = "其它道路事件";
- break;
- }
- return str;
- }
-
- /**
- * 获取道路事件的背景色
- *
- * @param poiType poi类型
- * @return 背景
- */
- public static int getPoiTypeBg(String poiType) {
- int strBg;
- switch (poiType) {
- case V2XPoiTypeEnum.FOURS_PARKING: // 停车场
- case V2XPoiTypeEnum.GAS_STATION: // 加油站
- strBg = R.drawable.bg_v2x_event_type_blue;
- break;
- case V2XPoiTypeEnum.FOURS_BLOCK_UP: // 拥堵
- case V2XPoiTypeEnum.FOURS_LIVING: // 实时路况
- case V2XPoiTypeEnum.FOURS_NEALY: // 身边
- strBg = V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.drawable.bg_v2x_event_type_orange_vr : R.drawable.bg_v2x_event_type_orange;
- break;
- case V2XPoiTypeEnum.TRAFFIC_CHECK:// 交通检查
- case V2XPoiTypeEnum.ROAD_CLOSED:// 封路
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:// 施工
- case V2XPoiTypeEnum.FOURS_PONDING:// 积水
- case V2XPoiTypeEnum.FOURS_FOG: // 浓雾
- case V2XPoiTypeEnum.FOURS_ICE: // 结冰
- case V2XPoiTypeEnum.FOURS_ACCIDENT: // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- strBg = V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.drawable.bg_v2x_event_type_red_vr : R.drawable.bg_v2x_event_type_read;
- break;
- default:
- strBg = V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.drawable.bg_v2x_event_type_red_vr : R.drawable.bg_v2x_event_type_read;
- break;
- }
- return strBg;
- }
-
- /*
- * VR模式下道路类型影响到分享列表 (VR模式暂时没有事件面板,所以可以删除此方法,公用上边的getPoiTypeBg)
- * */
- public static int getPoiTypeBgForShareItem(String poiType) {
- int strBg;
- switch (poiType) {
- case V2XPoiTypeEnum.FOURS_PARKING: // 停车场
- case V2XPoiTypeEnum.GAS_STATION: // 加油站
- strBg = R.drawable.bg_v2x_event_type_blue;
- break;
- case V2XPoiTypeEnum.FOURS_BLOCK_UP: // 拥堵
- case V2XPoiTypeEnum.FOURS_LIVING: // 实时路况
- case V2XPoiTypeEnum.FOURS_NEALY: // 身边
- strBg = R.drawable.bg_v2x_event_type_orange;
- break;
- case V2XPoiTypeEnum.TRAFFIC_CHECK:// 交通检查
- case V2XPoiTypeEnum.ROAD_CLOSED:// 封路
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:// 施工
- case V2XPoiTypeEnum.FOURS_PONDING:// 积水
- case V2XPoiTypeEnum.FOURS_FOG: // 浓雾
- case V2XPoiTypeEnum.FOURS_ICE: // 结冰
- case V2XPoiTypeEnum.FOURS_ACCIDENT: // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- strBg = R.drawable.bg_v2x_event_type_read;
- break;
- default:
- strBg = R.drawable.bg_v2x_event_type_read;
- break;
- }
- return strBg;
- }
-
- /**
- * 判断是否是道路预警事件
- *
- * @param poiType
- * @return
- */
- public static boolean isRoadEvent(String poiType) {
- boolean isRoadEvent = false;
- // 进行类型分发
- switch (poiType) {
- case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查
- case V2XPoiTypeEnum.ROAD_CLOSED://封路
- case V2XPoiTypeEnum.FOURS_ROAD_WORK://施工
- case V2XPoiTypeEnum.FOURS_BLOCK_UP://拥堵
- case V2XPoiTypeEnum.FOURS_PONDING://积水
- case V2XPoiTypeEnum.FOURS_FOG://浓雾
- case V2XPoiTypeEnum.FOURS_ICE://结冰
- case V2XPoiTypeEnum.FOURS_ACCIDENT://事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- isRoadEvent = true;
- break;
- }
- return isRoadEvent;
- }
-
-
- /**
- * 是否需要UGC预警
- *
- * @param poiType
- * @return
- */
- public static boolean isNeedRoadEventUgc(String poiType) {
- boolean isRoadEvent = false;
- // 进行类型分发
- switch (poiType) {
- case V2XPoiTypeEnum.ROAD_CLOSED://封路
- case V2XPoiTypeEnum.FOURS_ROAD_WORK://施工
- case V2XPoiTypeEnum.FOURS_BLOCK_UP://拥堵
- case V2XPoiTypeEnum.FOURS_ACCIDENT://事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- isRoadEvent = true;
- break;
- }
- return isRoadEvent;
- }
-
- /**
- * 获取 UGC 问答使用的 Title 和 TTS 以及展示图表
- *
- * @param poiType 事件类型
- * @return UGC 文案
- */
- public static Object[] getUgcTitleStr(String poiType) {
- Object[] str = new Object[5];
- switch (poiType) {
- // 封路
- case V2XPoiTypeEnum.ROAD_CLOSED:
- str[0] = "你刚经过 #### \n封路吗？";
- str[1] = "你刚路过的路段封路吗？您可以直接对我说封路、或者不封路。";
- str[2] = R.drawable.v_to_x_event_ugc_fenglu;
- str[3] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP;
- str[4] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP;
- break;
- // 施工
- case V2XPoiTypeEnum.FOURS_ROAD_WORK:
- str[0] = "你刚经过 #### \n有道路施工吗？";
- str[1] = "你刚路过的路段道路施工吗？您可以直接对我说有施工、或者没有施工。";
- str[2] = R.drawable.v_to_x_event_ugc_shigong;
- str[3] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP;
- str[4] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP;
- break;
- // 拥堵
- case V2XPoiTypeEnum.FOURS_BLOCK_UP:
- str[0] = "你刚路过 #### \n堵不堵？";
- str[1] = "你刚路过的路段堵不堵？您可以直接对我说拥赌、或者不堵。";
- str[2] = R.drawable.v_to_x_event_ugc_yongdu;
- str[3] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP;
- str[4] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP;
- break;
- // 事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT:
- case V2XPoiTypeEnum.FOURS_ACCIDENT_01: // 重大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_02: // 特大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_03: // 较大事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_04: // 一般事故
- case V2XPoiTypeEnum.FOURS_ACCIDENT_05: // 轻微事故
- str[0] = "你刚经过 #### \n有事故发生吗？";
- str[1] = "你刚路过的路段有交通事故吗？您可以直接对我说有事故、或者没有事故。";
- str[2] = R.drawable.v_to_x_event_ugc_shigu;
- str[3] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP;
- str[4] = V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP;
- break;
- default:
- return null;
- }
- return str;
- }
-
-}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java
index 93ef3aa774..c41bcf1c71 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java
@@ -7,7 +7,7 @@ import com.mogo.map.MogoLatLng;
import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.MarkerShowEntity;
-import com.mogo.module.common.entity.V2XPoiTypeEnum;
+import com.mogo.module.common.enums.EventTypeEnum;
import com.mogo.module.common.utils.CarSeries;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
@@ -41,7 +41,7 @@ public class MarkerUtils {
V2XServiceManager.getMarkerManager().removeMarkers(V2XConst.V2X_MARKER_SPECIAL_CAR);
// 循环绘制
for (V2XMarkerEntity v2XMarkerEntity : v2XSpecialCarRes.getCoordinates()) {
- if (v2XMarkerEntity.getTargetId() != V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING) {
+ if (!EventTypeEnum.ALERT_CAR_TROUBLE_WARNING.getPoiType().equals(v2XMarkerEntity.getTargetId()+"")) {
MarkerLocation markerLocation = new MarkerLocation();
markerLocation.setLon(v2XMarkerEntity.getLon());
markerLocation.setLat(v2XMarkerEntity.getLat());
diff --git a/modules/mogo-module-v2x/src/main/res/anim/v2x_event_view_in.xml b/modules/mogo-module-v2x/src/main/res/anim/v2x_event_view_in.xml
deleted file mode 100644
index 4eba3e906d..0000000000
--- a/modules/mogo-module-v2x/src/main/res/anim/v2x_event_view_in.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/anim/v2x_event_view_out.xml b/modules/mogo-module-v2x/src/main/res/anim/v2x_event_view_out.xml
deleted file mode 100644
index 545125cb01..0000000000
--- a/modules/mogo-module-v2x/src/main/res/anim/v2x_event_view_out.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/btn_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/btn_parking_nav.png
deleted file mode 100644
index 7bd28e702d..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/btn_parking_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_rescue.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_rescue.png
deleted file mode 100644
index d3020049b6..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_car_rescue.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_unlike_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_unlike_bg.png
deleted file mode 100644
index 66a3d308ca..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_heart_unlike_bg.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_like.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_like.png
deleted file mode 100644
index ba634ecc9e..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_like.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_unlike.png
deleted file mode 100644
index 481ff6dde5..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking_unlike.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_nav.png
deleted file mode 100644
index 5c4ebb8eab..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_nav.png
deleted file mode 100644
index ecb39df8b3..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png
deleted file mode 100644
index dba50d66d0..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_warn.png
deleted file mode 100644
index 2e2013e971..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_warn.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close.png
deleted file mode 100644
index 095574d6e2..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close2.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close2.png
deleted file mode 100644
index e99eeaf974..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close2.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png
deleted file mode 100644
index f46fe492c4..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png
deleted file mode 100644
index a247ac6428..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/panel_shadow_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/panel_shadow_bg.png
deleted file mode 100644
index a3d240de1e..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/panel_shadow_bg.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_video_refresh.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_video_refresh.png
deleted file mode 100644
index 7f021fc1a9..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_event_video_refresh.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_live_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_live_close.png
deleted file mode 100644
index fed1ea3ebc..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_event_live_close.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_fault_help_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_fault_help_warn.png
deleted file mode 100644
index 5c0f928b0f..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_fault_help_warn.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_money.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_money.png
deleted file mode 100644
index c1349cae48..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_money.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_station_refuel.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_station_refuel.png
deleted file mode 100644
index 4425b980cc..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_gas_station_refuel.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_location.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_location.png
deleted file mode 100644
index d0249ce22c..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_location.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_p.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_p.png
deleted file mode 100644
index 7085f178ff..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_p.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan1.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan1.png
deleted file mode 100644
index 77265eff8a..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan1.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan2.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan2.png
deleted file mode 100644
index 3b8baaf431..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_zan2.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_video_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_video_close.png
deleted file mode 100644
index b5a4ad9594..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_video_close.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_gas_default.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_gas_default.jpg
deleted file mode 100644
index 656d97251e..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_gas_default.jpg and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_error.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_error.png
deleted file mode 100644
index c5633f0bc2..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_error.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_blue.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_blue.9.png
deleted file mode 100644
index d8c0e2b4fd..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_blue.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_green.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_green.9.png
deleted file mode 100644
index f145913aa6..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_green.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_red.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_red.9.png
deleted file mode 100644
index 437b49875a..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_marker_car_info_red.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_park_default.jpg b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_park_default.jpg
deleted file mode 100644
index 5886141cb0..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_park_default.jpg and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_blue.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_blue.png
deleted file mode 100644
index 80944127dd..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_car_blue.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_show_live.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_show_live.png
deleted file mode 100644
index efaa805d0b..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_show_live.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_heart_like_select_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_heart_like_select_bg.png
deleted file mode 100644
index 376444c213..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_heart_like_select_bg.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_event_video_refresh.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_event_video_refresh.png
deleted file mode 100644
index 7f021fc1a9..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_event_video_refresh.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_video_close.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_video_close.png
deleted file mode 100644
index b5a4ad9594..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_video_close.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/btn_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/btn_parking_nav.png
deleted file mode 100644
index 5119d9ca09..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/btn_parking_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_rescue.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_rescue.png
deleted file mode 100644
index 1f1400f558..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_car_rescue.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike_bg.png
deleted file mode 100644
index 33becf307e..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_heart_unlike_bg.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_video.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_video.png
deleted file mode 100644
index de6f715096..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_live_video.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_nav.png
deleted file mode 100644
index aa5658a972..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_nav.png
deleted file mode 100644
index 57abc3ccb6..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parking_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parting_icon.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parting_icon.png
deleted file mode 100644
index ad38331b25..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_parting_icon.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_warn.png
deleted file mode 100644
index 1b039bafed..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_warn.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/live_error.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/live_error.png
deleted file mode 100644
index de6f715096..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/live_error.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_qiuzhu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_qiuzhu_small.png
deleted file mode 100644
index 9b9628fc4b..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/mogo_image_qiuzhu_small.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_close.png
deleted file mode 100644
index fb0888da00..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_event_live_close.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_fault_help_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_fault_help_warn.png
deleted file mode 100644
index 7add47d66f..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_fault_help_warn.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_money.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_money.png
deleted file mode 100644
index 318b2820f1..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_money.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_station_refuel.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_station_refuel.png
deleted file mode 100644
index fb50e5483c..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_gas_station_refuel.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_location.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_location.png
deleted file mode 100644
index e6f4f9f577..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_location.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_p.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_p.png
deleted file mode 100644
index 193b7a5c07..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_p.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan1.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan1.png
deleted file mode 100644
index 679347e5ee..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan1.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan2.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan2.png
deleted file mode 100644
index 7c1f3352b2..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_icon_zan2.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_error.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_error.png
deleted file mode 100644
index 82b4283fdc..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_error.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_blue.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_blue.9.png
deleted file mode 100644
index 9c81860194..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_blue.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_green.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_green.9.png
deleted file mode 100644
index f47fb094d9..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_green.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_red.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_red.9.png
deleted file mode 100644
index c830cb274c..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_car_info_red.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_blue.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_blue.png
deleted file mode 100644
index cfeef25e75..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_blue.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_show_live.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_show_live.png
deleted file mode 100644
index 63e1db1181..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_show_live.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
deleted file mode 100644
index 849e627e53..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/btn_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/btn_parking_nav.png
deleted file mode 100644
index 5119d9ca09..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/btn_parking_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_car_rescue.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_car_rescue.png
deleted file mode 100644
index 1f1400f558..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_car_rescue.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_select_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_select_bg.png
deleted file mode 100644
index 39d0f8fb8a..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_select_bg.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_vr.png
deleted file mode 100644
index c74d1b9fe8..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_vr.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_unlike_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_unlike_bg.png
deleted file mode 100644
index 33becf307e..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_unlike_bg.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_live_video.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_live_video.png
deleted file mode 100644
index de6f715096..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_live_video.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_nav.png
deleted file mode 100644
index aa5658a972..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parking_nav.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parking_nav.png
deleted file mode 100644
index 57abc3ccb6..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parking_nav.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parting_icon.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parting_icon.png
deleted file mode 100644
index 80548d676f..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parting_icon.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_warn.png
deleted file mode 100644
index 1b039bafed..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_warn.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/live_error.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/live_error.png
deleted file mode 100644
index de6f715096..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/live_error.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_left_notice_seek_help.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_left_notice_seek_help.png
deleted file mode 100644
index 00c0cab6db..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_left_notice_seek_help.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vip.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vip.png
deleted file mode 100644
index 3d0eb6e1cc..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/module_v2x_vip.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png
deleted file mode 100644
index f46fe492c4..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png
deleted file mode 100644
index 9b9628fc4b..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_bg_simple_obu.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_bg_simple_obu.png
deleted file mode 100644
index cb30283530..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_bg_simple_obu.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_call_normal.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_call_normal.png
deleted file mode 100644
index c597a3f1d0..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_call_normal.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_call_select.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_call_select.png
deleted file mode 100644
index bb366564b9..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_call_select.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_che.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_che.png
deleted file mode 100644
index 28102482f0..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_che.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_che_xian.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_che_xian.png
deleted file mode 100644
index c07da97430..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_che_xian.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_xian.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_xian.png
deleted file mode 100644
index 4d3cc1c5bc..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_duixiang_laiche_xian.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_video_refresh.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_video_refresh.png
deleted file mode 100644
index 7f021fc1a9..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_video_refresh.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_event_live_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_event_live_close.png
deleted file mode 100644
index fb0888da00..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_event_live_close.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_fault_help_warn.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_fault_help_warn.png
deleted file mode 100644
index 7add47d66f..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_fault_help_warn.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_gas_money.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_gas_money.png
deleted file mode 100644
index 318b2820f1..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_gas_money.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_gas_station_refuel.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_gas_station_refuel.png
deleted file mode 100644
index fb50e5483c..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_gas_station_refuel.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_location.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_location.png
deleted file mode 100644
index e6f4f9f577..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_location.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_p.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_p.png
deleted file mode 100644
index 193b7a5c07..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_p.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_zan1.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_zan1.png
deleted file mode 100644
index 679347e5ee..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_zan1.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_zan2.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_zan2.png
deleted file mode 100644
index 7c1f3352b2..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_zan2.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_light.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_light.png
deleted file mode 100644
index cbf14c5566..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_light.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_road_front_dead_zone.png
deleted file mode 100644
index ea444163d2..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_road_front_dead_zone.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_video_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_video_close.png
deleted file mode 100644
index e632d54200..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_video_close.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_vr_ziche.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_vr_ziche.png
deleted file mode 100644
index 01f991d7f7..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_vr_ziche.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigong.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigong.png
deleted file mode 100644
index 174342e8f8..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_event_ugc_shigong.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_error.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_error.png
deleted file mode 100644
index 82b4283fdc..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_error.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_blue.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_blue.9.png
deleted file mode 100644
index 9c81860194..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_blue.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_green.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_green.9.png
deleted file mode 100644
index f47fb094d9..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_green.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_red.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_red.9.png
deleted file mode 100644
index c830cb274c..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_car_info_red.9.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_car_blue.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_car_blue.png
deleted file mode 100644
index cfeef25e75..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_car_blue.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_show_live.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_show_live.png
deleted file mode 100644
index 63e1db1181..0000000000
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_show_live.png and /dev/null differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_live_video.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_live_video.xml
deleted file mode 100644
index 99a40cc3e4..0000000000
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_live_video.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml
deleted file mode 100644
index b92c805da1..0000000000
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml
deleted file mode 100644
index d7ea85c05e..0000000000
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/selector_zan_btn.xml b/modules/mogo-module-v2x/src/main/res/drawable/selector_zan_btn.xml
deleted file mode 100644
index 161b630124..0000000000
--- a/modules/mogo-module-v2x/src/main/res/drawable/selector_zan_btn.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-