Merge branch 'qa_1.1.5_1' into qa_1.1.5_2
# Conflicts: # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
This commit is contained in:
@@ -190,7 +190,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
|
||||
mainInfoId,
|
||||
mLongitude,
|
||||
mLatitude
|
||||
);
|
||||
)
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import android.content.Intent
|
||||
import android.util.Log
|
||||
import com.google.gson.Gson
|
||||
import com.mogo.commons.AbsMogoApplication
|
||||
import com.mogo.utils.TipToast
|
||||
import com.zhidao.cosupload.DbPriorityConfig
|
||||
import com.zhidao.cosupload.callback.CosStatusCallback
|
||||
import com.zhidao.cosupload.manager.CosUploadManagerImpl
|
||||
@@ -12,10 +13,7 @@ import com.zhidao.roadcondition.event.GetImageSuccessEvent
|
||||
import com.zhidao.roadcondition.event.LatLngStickyEventBus
|
||||
import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG
|
||||
import com.zhidao.roadcondition.model.proxy.INFO_TYPE_VIDEO
|
||||
import com.zhidao.roadcondition.util.CarNet_Cos_Upload
|
||||
import com.zhidao.roadcondition.util.LocationUtil
|
||||
import com.zhidao.roadcondition.util.deletePicFile
|
||||
import com.zhidao.roadcondition.util.trackNormalEvent
|
||||
import com.zhidao.roadcondition.util.*
|
||||
|
||||
/**
|
||||
* @description cos上传操作
|
||||
@@ -25,8 +23,10 @@ import com.zhidao.roadcondition.util.trackNormalEvent
|
||||
*/
|
||||
class CosStatusController : CosStatusCallback {
|
||||
val TAG: String = this.javaClass.simpleName
|
||||
|
||||
//存储单次请求的视频和缩略图url
|
||||
var videoAndThumbMap: MutableMap<String, String> = mutableMapOf()
|
||||
|
||||
//图片上传的eventId
|
||||
lateinit var mPicEventId: String
|
||||
private var isRetry = false //是否重试上传过图片
|
||||
@@ -90,29 +90,32 @@ class CosStatusController : CosStatusCallback {
|
||||
// ) || CarCorderController.mType.equals(TANLU_ROAD_WORK)
|
||||
// ) {
|
||||
// VoiceController.speakVoice("cos上报失败")
|
||||
Log.d(TAG, "uploadCosFailed mType = $mType")
|
||||
if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
|
||||
sendGetInfoFailedReceiver("100")
|
||||
}
|
||||
// }
|
||||
Log.d(TAG, "uploadCosFailed mType = $mType")
|
||||
|
||||
if (!isRetry) {
|
||||
isRetry = true
|
||||
// taskAsync(30_000) { //去掉重试
|
||||
// try {
|
||||
// uploadFile(mutableListOf(localPath as String), entity, mType)
|
||||
// } catch (e: Exception) {
|
||||
// e.printStackTrace()
|
||||
// }
|
||||
// }
|
||||
taskAsync(5_000) {
|
||||
//去掉重试
|
||||
try {
|
||||
uploadFile(mutableListOf(localPath as String), entity, mType, mainInfoId, mFromType, mLongitude, mLatitude)
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//重试一次,如果还失败就提示
|
||||
if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
|
||||
sendGetInfoFailedReceiver("100")
|
||||
}
|
||||
|
||||
if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) {
|
||||
CosCallbackMapController.uploadFailed?.invoke()
|
||||
}
|
||||
CosCallbackMapController.unregisterCallback(localPath)
|
||||
InformationUploadController.release(entity?.id)
|
||||
// deletePicFile(localPath)
|
||||
deletePicFile(localPath)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
override fun uploadCosCompleted(
|
||||
@@ -142,25 +145,23 @@ class CosStatusController : CosStatusCallback {
|
||||
val locationStr: String = Gson().toJson(locationInfo)
|
||||
Log.d(TAG, "locationStr = " + locationStr)
|
||||
//如果失败,需要提示失败弹框
|
||||
if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty()
|
||||
|| locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty()
|
||||
|| locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty()
|
||||
) {
|
||||
if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
|
||||
sendGetInfoFailedReceiver("100")
|
||||
}
|
||||
} else {
|
||||
//分享成功,并打点,如果是上报拥堵,需要takeVideo
|
||||
LatLngStickyEventBus.getInstance()
|
||||
.postSticky(GetImageSuccessEvent(downloadUrl, mType))
|
||||
//上传录像以及缩略图成功
|
||||
sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
|
||||
}
|
||||
// if (locationInfo.address.isNullOrEmpty() || locationInfo.cityName.isNullOrEmpty() || locationInfo.cityCode.isNullOrEmpty()
|
||||
// || locationInfo.latitude == 0.0 || locationInfo.areaName.isNullOrEmpty() || locationInfo.street.isNullOrEmpty()
|
||||
// || locationInfo.areaCode.isNullOrEmpty() || locationInfo.provinceName.isNullOrEmpty()
|
||||
// ) {
|
||||
// if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
|
||||
// sendGetInfoFailedReceiver("100")
|
||||
// }
|
||||
// } else {
|
||||
|
||||
//上传录像以及缩略图成功
|
||||
sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
|
||||
// }
|
||||
} else {
|
||||
trackUploadCos(5)
|
||||
}
|
||||
} else {
|
||||
//上传图片成功, 如果是上报路况,直接上传,TODO
|
||||
//上传图片成功, 如果是上报路况,直接上传
|
||||
Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType")
|
||||
sendInformationDirectly(
|
||||
INFO_TYPE_IMG,
|
||||
@@ -204,20 +205,36 @@ class CosStatusController : CosStatusCallback {
|
||||
//开始上传
|
||||
entity?.isCustom?.let {
|
||||
mainServiceHttpModel.sendInformationMessage(
|
||||
type = type,
|
||||
url = map,
|
||||
isCustom = it,
|
||||
poiType = poiType,
|
||||
mainInfoId = mainInfoId,
|
||||
longitude = longitude,
|
||||
latitude = latitude
|
||||
) { success ->
|
||||
CosCallbackMapController.unregisterCallbacks(map)
|
||||
CosCallbackMapController.mainService?.let {
|
||||
CosCallbackMapController.mainService?.sendCustomResult(success)
|
||||
type = type,
|
||||
url = map,
|
||||
isCustom = it,
|
||||
poiType = poiType,
|
||||
mainInfoId = mainInfoId,
|
||||
longitude = longitude,
|
||||
latitude = latitude
|
||||
) { success ->
|
||||
CosCallbackMapController.unregisterCallbacks(map)
|
||||
CosCallbackMapController.mainService?.let {
|
||||
CosCallbackMapController.mainService?.sendCustomResult(success)
|
||||
}
|
||||
Log.d(TAG, "type = $type ----success = $success")
|
||||
if (success) {
|
||||
//分享成功,并打点,如果是上报拥堵,需要takeVideo
|
||||
if (type == INFO_TYPE_VIDEO) {
|
||||
try {
|
||||
LatLngStickyEventBus.getInstance()
|
||||
.postSticky(GetImageSuccessEvent("", poiType))
|
||||
} catch (e: java.lang.Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (type == INFO_TYPE_VIDEO) {
|
||||
TipToast.shortTip("分享失败,请检查网络")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onProgress(localPath: String?, progress: Float) {
|
||||
@@ -230,6 +247,5 @@ class CosStatusController : CosStatusCallback {
|
||||
AbsMogoApplication.getApp().applicationContext
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ class MainService : Service() {
|
||||
Analytics.getInstance().start(this)
|
||||
//参数说明:appKey: app唯一标识(比如:包名)
|
||||
CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext)
|
||||
.init(BuildConfig.APPLICATION_ID, 2)
|
||||
.init(BuildConfig.APPLICATION_ID, 0)
|
||||
//初始化语音
|
||||
VoiceController.initVoice()
|
||||
|
||||
|
||||
@@ -2,7 +2,10 @@ package com.zhidao.roadcondition.service
|
||||
|
||||
import android.util.Log
|
||||
import com.mogo.commons.AbsMogoApplication
|
||||
import com.zhidao.roadcondition.event.GetImageSuccessEvent
|
||||
import com.zhidao.roadcondition.event.LatLngStickyEventBus
|
||||
import com.zhidao.roadcondition.model.*
|
||||
import com.zhidao.roadcondition.model.proxy.INFO_TYPE_VIDEO
|
||||
import com.zhidao.roadcondition.net.request
|
||||
import com.zhidao.roadcondition.util.*
|
||||
import com.zhidao.roadcondition.util.StrategyPreferenceUtil.Companion.setStrategyFrequency
|
||||
@@ -272,9 +275,13 @@ class MainServiceController {
|
||||
//转换失败的情况下再重试一次
|
||||
geoRetryed = if (!geoRetryed) {
|
||||
geoLocation(type, url, locationInfo, isCustom, trafficInfoType, isShare, customSend, poiType,mainInfoId,longitude,latitude)
|
||||
|
||||
true
|
||||
} else {
|
||||
//如果两次都失败,直接上报服务端
|
||||
postInformationMessage(
|
||||
getInformationBody(type, url, locationInfo, isCustom, trafficInfoType, isShare, poiType,mainInfoId,longitude,latitude),
|
||||
customSend
|
||||
)
|
||||
|
||||
false
|
||||
}
|
||||
@@ -296,7 +303,6 @@ class MainServiceController {
|
||||
trackUploadServer(1)
|
||||
// CosStatusController().videoAndThumbMap.clear()
|
||||
customSend?.invoke(true)
|
||||
|
||||
}
|
||||
onError {
|
||||
Log.i(TAG, "$it upload message ${it.message}")
|
||||
|
||||
@@ -28,7 +28,7 @@ const val CarNet_Get_Strategy:String = "CarNet_Get_Strategy" //策略拉取成
|
||||
const val CarNet_Create_Task:String = "CarNet_Create_Task" //创建定时任务
|
||||
const val CarNet_Get_Picture:String = "CarNet_Get_Picture" //获取图片,type=1 调用, type=2 成功, type=3 失败
|
||||
const val CarNet_Get_Video:String = "CarNet_Get_Video" //获取视频,type=1 调用,type=2 成功,type=3 失败
|
||||
const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始, type=4 成功返回视频和缩略图,type=5 成功没有返回全视频和缩略图
|
||||
const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始, type=4 成功返回视频和缩略图,type=5 成功但没有返回全视频和缩略图
|
||||
const val CarNet_Servers_Upload:String = "CarNet_Servers_Upload" //上传服务端, type=1 成功,type=2 失败, type=3 开始
|
||||
const val CarNet_Voice_Search:String = "CarNet_Voice_Search" //语音搜索路况,type=1 成功,type=2 失败
|
||||
const val CarNet_USER_SHOW:String = "CarNet_user_show" //情报展示时长,showtime 加载列表时长
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package com.mogo.skin.support;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.skin.support";
|
||||
/**
|
||||
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String APPLICATION_ID = "com.mogo.skin.support";
|
||||
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 = "1.0.0";
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.skin.support"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"mogo-skin-support-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.skin.support","split":""}}]
|
||||
@@ -0,0 +1 @@
|
||||
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\debug\jniLibs"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\debug\shaders"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\assets"/><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\debug\assets"/></dataSet></merger>
|
||||
@@ -0,0 +1 @@
|
||||
#Fri Sep 11 11:34:40 CST 2020
|
||||
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<declare-styleable name="MogoSkinBackgroundHelper">
|
||||
<attr name="android:background"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="MogoSkinCompatImageView">
|
||||
<attr name="android:src"/>
|
||||
<attr name="srcCompat"/>
|
||||
<attr format="color" name="android:tint"/>
|
||||
<attr format="color" name="tint"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="MogoSkinCompatTextHelper">
|
||||
<attr name="android:drawableLeft"/>
|
||||
<attr name="android:drawableTop"/>
|
||||
<attr name="android:drawableRight"/>
|
||||
<attr name="android:drawableBottom"/>
|
||||
<attr name="android:drawableStart"/>
|
||||
<attr name="android:drawableEnd"/>
|
||||
<attr name="android:textAppearance"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="MogoSkinTextAppearance">
|
||||
<attr name="android:textSize"/>
|
||||
<attr name="android:textColor"/>
|
||||
<attr name="android:textColorHint"/>
|
||||
<attr name="android:textStyle"/>
|
||||
<attr name="android:typeface"/>
|
||||
<attr name="textAllCaps"/>
|
||||
<attr name="android:shadowColor"/>
|
||||
<attr name="android:shadowDy"/>
|
||||
<attr name="android:shadowDx"/>
|
||||
<attr name="android:shadowRadius"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="SkinCompatProgressBar">
|
||||
<attr name="android:indeterminateDrawable"/>
|
||||
<attr name="android:progressDrawable"/>
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
@@ -0,0 +1,60 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\res"><file path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="MogoSkinBackgroundHelper">
|
||||
<attr name="android:background"/>
|
||||
</declare-styleable><declare-styleable name="MogoSkinCompatImageView">
|
||||
<attr name="android:src"/>
|
||||
<attr name="srcCompat"/>
|
||||
<attr format="color" name="android:tint"/>
|
||||
<attr format="color" name="tint"/>
|
||||
</declare-styleable><declare-styleable name="MogoSkinCompatTextHelper">
|
||||
<attr name="android:drawableLeft"/>
|
||||
<attr name="android:drawableTop"/>
|
||||
<attr name="android:drawableRight"/>
|
||||
<attr name="android:drawableBottom"/>
|
||||
<attr name="android:drawableStart"/>
|
||||
<attr name="android:drawableEnd"/>
|
||||
<attr name="android:textAppearance"/>
|
||||
</declare-styleable><declare-styleable name="MogoSkinTextAppearance">
|
||||
<attr name="android:textSize"/>
|
||||
<attr name="android:textColor"/>
|
||||
<attr name="android:textColorHint"/>
|
||||
<attr name="android:textStyle"/>
|
||||
<attr name="android:typeface"/>
|
||||
<attr name="textAllCaps"/>
|
||||
<attr name="android:shadowColor"/>
|
||||
<attr name="android:shadowDy"/>
|
||||
<attr name="android:shadowDx"/>
|
||||
<attr name="android:shadowRadius"/>
|
||||
</declare-styleable><declare-styleable name="SkinCompatProgressBar">
|
||||
<attr name="android:indeterminateDrawable"/>
|
||||
<attr name="android:progressDrawable"/>
|
||||
</declare-styleable></file></source><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="MogoSkinTextAppearance">
|
||||
<attr name="android:textSize"/>
|
||||
<attr name="android:textColor"/>
|
||||
<attr name="android:textColorHint"/>
|
||||
<attr name="android:textStyle"/>
|
||||
<attr name="android:typeface"/>
|
||||
<attr name="textAllCaps"/>
|
||||
<attr name="android:shadowColor"/>
|
||||
<attr name="android:shadowDy"/>
|
||||
<attr name="android:shadowDx"/>
|
||||
<attr name="android:shadowRadius"/>
|
||||
</declare-styleable><declare-styleable name="MogoSkinBackgroundHelper">
|
||||
<attr name="android:background"/>
|
||||
</declare-styleable><declare-styleable name="MogoSkinCompatTextHelper">
|
||||
<attr name="android:drawableLeft"/>
|
||||
<attr name="android:drawableTop"/>
|
||||
<attr name="android:drawableRight"/>
|
||||
<attr name="android:drawableBottom"/>
|
||||
<attr name="android:drawableStart"/>
|
||||
<attr name="android:drawableEnd"/>
|
||||
<attr name="android:textAppearance"/>
|
||||
</declare-styleable><declare-styleable name="SkinCompatProgressBar">
|
||||
<attr name="android:indeterminateDrawable"/>
|
||||
<attr name="android:progressDrawable"/>
|
||||
</declare-styleable><declare-styleable name="MogoSkinCompatImageView">
|
||||
<attr name="android:src"/>
|
||||
<attr name="srcCompat"/>
|
||||
<attr format="color" name="android:tint"/>
|
||||
<attr format="color" name="tint"/>
|
||||
</declare-styleable></configuration></mergedItems></merger>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.skin.support"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1,10 @@
|
||||
R_DEF: Internal format may change without notice
|
||||
local
|
||||
attr? srcCompat
|
||||
attr? textAllCaps
|
||||
attr? tint
|
||||
styleable MogoSkinBackgroundHelper android:background
|
||||
styleable MogoSkinCompatImageView android:src srcCompat android:tint tint
|
||||
styleable MogoSkinCompatTextHelper android:drawableLeft android:drawableTop android:drawableRight android:drawableBottom android:drawableStart android:drawableEnd android:textAppearance
|
||||
styleable MogoSkinTextAppearance android:textSize android:textColor android:textColorHint android:textStyle android:typeface textAllCaps android:shadowColor android:shadowDy android:shadowDx android:shadowRadius
|
||||
styleable SkinCompatProgressBar android:indeterminateDrawable android:progressDrawable
|
||||
@@ -0,0 +1,14 @@
|
||||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.mogo.skin.support"
|
||||
4 android:versionCode="1"
|
||||
5 android:versionName="1.0.0" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="19"
|
||||
8-->D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
9 android:targetSdkVersion="22" />
|
||||
9-->D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
10 /
|
||||
11
|
||||
12</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"mogo-skin-support-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.mogo.skin.support","split":""}}]
|
||||
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<declare-styleable name="MogoSkinBackgroundHelper">
|
||||
<attr name="android:background"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="MogoSkinCompatImageView">
|
||||
<attr name="android:src"/>
|
||||
<attr name="srcCompat"/>
|
||||
<attr format="color" name="android:tint"/>
|
||||
<attr format="color" name="tint"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="MogoSkinCompatTextHelper">
|
||||
<attr name="android:drawableLeft"/>
|
||||
<attr name="android:drawableTop"/>
|
||||
<attr name="android:drawableRight"/>
|
||||
<attr name="android:drawableBottom"/>
|
||||
<attr name="android:drawableStart"/>
|
||||
<attr name="android:drawableEnd"/>
|
||||
<attr name="android:textAppearance"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="MogoSkinTextAppearance">
|
||||
<attr name="android:textSize"/>
|
||||
<attr name="android:textColor"/>
|
||||
<attr name="android:textColorHint"/>
|
||||
<attr name="android:textStyle"/>
|
||||
<attr name="android:typeface"/>
|
||||
<attr name="textAllCaps"/>
|
||||
<attr name="android:shadowColor"/>
|
||||
<attr name="android:shadowDy"/>
|
||||
<attr name="android:shadowDx"/>
|
||||
<attr name="android:shadowRadius"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="SkinCompatProgressBar">
|
||||
<attr name="android:indeterminateDrawable"/>
|
||||
<attr name="android:progressDrawable"/>
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
1732
skin/mogo-skin-support/build/intermediates/symbols/debug/R.txt
Normal file
1732
skin/mogo-skin-support/build/intermediates/symbols/debug/R.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,37 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
package
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:2:5-36
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
android:versionName
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml:1:11-69
|
||||
uses-sdk
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\skin\mogo-skin-support\src\main\AndroidManifest.xml
|
||||
@@ -0,0 +1,18 @@
|
||||
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.mogo.test.crashreport.bugly.BuglyCrashReportProvider;
|
||||
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$$crashreport implements IRouteGroup {
|
||||
@Override
|
||||
public void loadInto(Map<String, RouteMeta> atlas) {
|
||||
atlas.put("/crashreport/api", RouteMeta.build(RouteType.PROVIDER, BuglyCrashReportProvider.class, "/crashreport/api", "crashreport", null, -1, -2147483648));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
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.mogo.test.crashreport.bugly.BuglyCrashReportProvider;
|
||||
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$$crashreportbugly implements IProviderGroup {
|
||||
@Override
|
||||
public void loadInto(Map<String, RouteMeta> providers) {
|
||||
providers.put("com.mogo.test.crashreport.ITestCrashReportProvider", RouteMeta.build(RouteType.PROVIDER, BuglyCrashReportProvider.class, "/crashreport/api", "crashreport", null, -1, -2147483648));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
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$$crashreportbugly implements IRouteRoot {
|
||||
@Override
|
||||
public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
|
||||
routes.put("crashreport", ARouter$$Group$$crashreport.class);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package com.mogo.test.crashreport.bugly;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.test.crashreport.bugly";
|
||||
/**
|
||||
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String APPLICATION_ID = "com.mogo.test.crashreport.bugly";
|
||||
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 = "1.0.0";
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport.bugly"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-bugly-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport.bugly","split":""}}]
|
||||
@@ -0,0 +1 @@
|
||||
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\jniLibs"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\shaders"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\assets"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\assets"/></dataSet></merger>
|
||||
@@ -0,0 +1 @@
|
||||
#Fri Sep 11 11:34:40 CST 2020
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport.bugly"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1,2 @@
|
||||
R_DEF: Internal format may change without notice
|
||||
local
|
||||
@@ -0,0 +1,14 @@
|
||||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.mogo.test.crashreport.bugly"
|
||||
4 android:versionCode="1"
|
||||
5 android:versionName="1.0.0" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="19"
|
||||
8-->D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
9 android:targetSdkVersion="22" />
|
||||
9-->D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
10 /
|
||||
11
|
||||
12</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-bugly-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport.bugly","split":""}}]
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
1768
test/crashreport-bugly/build/intermediates/symbols/debug/R.txt
Normal file
1768
test/crashreport-bugly/build/intermediates/symbols/debug/R.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,37 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
package
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:2:5-46
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:versionName
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml:1:11-69
|
||||
uses-sdk
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\AndroidManifest.xml
|
||||
@@ -0,0 +1,18 @@
|
||||
/**
|
||||
* Automatically generated file. DO NOT MODIFY
|
||||
*/
|
||||
package com.mogo.test.crashreport;
|
||||
|
||||
public final class BuildConfig {
|
||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||
public static final String LIBRARY_PACKAGE_NAME = "com.mogo.test.crashreport";
|
||||
/**
|
||||
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String APPLICATION_ID = "com.mogo.test.crashreport";
|
||||
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 = "1.0.0";
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport","split":""}}]
|
||||
@@ -0,0 +1 @@
|
||||
{"jetified-arouter-compiler-1.2.2.jar (com.alibaba:arouter-compiler:1.2.2)":false,"auto-service-1.0-rc2.jar (com.google.auto.service:auto-service:1.0-rc2)":false}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\jniLibs"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\shaders"/></dataSet></merger>
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\assets"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\assets"/></dataSet></merger>
|
||||
@@ -0,0 +1 @@
|
||||
#Fri Sep 11 11:34:40 CST 2020
|
||||
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.mogo.test.crashreport"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0.0" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="19"
|
||||
android:targetSdkVersion="22" />
|
||||
/
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1,2 @@
|
||||
R_DEF: Internal format may change without notice
|
||||
local
|
||||
@@ -0,0 +1,14 @@
|
||||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
3 package="com.mogo.test.crashreport"
|
||||
4 android:versionCode="1"
|
||||
5 android:versionName="1.0.0" >
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="19"
|
||||
8-->D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
9 android:targetSdkVersion="22" />
|
||||
9-->D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
10 /
|
||||
11
|
||||
12</manifest>
|
||||
@@ -0,0 +1 @@
|
||||
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"crashreport-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"com.mogo.test.crashreport","split":""}}]
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
1768
test/crashreport/build/intermediates/symbols/debug/R.txt
Normal file
1768
test/crashreport/build/intermediates/symbols/debug/R.txt
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,37 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
package
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:2:5-40
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:versionName
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:1-5:12
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml:1:11-69
|
||||
uses-sdk
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
ADDED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
INJECTED from D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\AndroidManifest.xml
|
||||
Reference in New Issue
Block a user