diff --git a/Android/doraemonkit-no-op/upload.gradle b/Android/doraemonkit-no-op/upload.gradle index 59cf5ca3090ee0118b0497f28054a76a6a453d99..8aa3c5b59ef6100e2c082f74fbc7c96e13f95591 100644 --- a/Android/doraemonkit-no-op/upload.gradle +++ b/Android/doraemonkit-no-op/upload.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release' publish { def groupProjectID = 'com.didichuxing.doraemonkit' def artifactProjectID = 'doraemonkit-no-op' - def publishVersionID = '1.1.6' + def publishVersionID = '1.1.7' userOrg = 'doraemonkit' repoName = 'DoraemonKit' diff --git a/Android/doraemonkit/build.gradle b/Android/doraemonkit/build.gradle index e8b7f7fbc90e59cdb1b36cd7b4f1a4052db85698..579d2c894e005d12530ec3686c6161e11b836fb7 100644 --- a/Android/doraemonkit/build.gradle +++ b/Android/doraemonkit/build.gradle @@ -12,7 +12,6 @@ android { lintOptions { abortOnError false } - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } } } @@ -42,8 +41,6 @@ dependencies { testImplementation 'junit:junit:4.12' implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.google.zxing:core:3.3.0' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java index 191eb14c85bb5708ba34a65dd9fd4e8d44934ad7..19032c2c0e814b767cb9543bd6bf42999c488397 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java @@ -63,7 +63,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate mBlockListAdapter.setOnItemClickListener(new BlockListAdapter.OnItemClickListener() { @Override public void onClick(BlockInfo info) { - mLogDetail.setText(info.toString() + info.toString() + info.toString()); + mLogDetail.setText(info.toString()); mLogDetail.setVisibility(View.VISIBLE); mBlockList.setVisibility(View.GONE); mTitleBar.setTitle(getResources().getString(R.string.dk_kit_block_monitor_detail), false); diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/MonitorCore.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/MonitorCore.java index a0e16fa3fb4fb3416f20addb0e6d56615080270c..93eea47fe5da0a615bc5aa49c42200b72ca753fb 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/MonitorCore.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/MonitorCore.java @@ -12,7 +12,7 @@ import java.util.ArrayList; */ class MonitorCore implements Printer { private static final String TAG = "MonitorCore"; - private static final int BLOCK_THRESHOLD_MILLIS = 500; + private static final int BLOCK_THRESHOLD_MILLIS = 200; private long mStartTime = 0; private long mStartThreadTime = 0; diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceDataManager.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceDataManager.java index be479ffeee9d29eb664de4806c55a9ccb7a3eb5e..6aee701dd3ebbec90303a0b584ca247fe5feb691 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceDataManager.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceDataManager.java @@ -7,12 +7,13 @@ import android.os.Debug; import android.os.Environment; import android.os.Handler; import android.os.HandlerThread; +import android.os.Looper; import android.os.Message; import android.os.Process; import android.support.annotation.RequiresApi; import android.text.TextUtils; +import android.text.format.DateUtils; import android.view.Choreographer; -import android.widget.Toast; import com.didichuxing.doraemonkit.R; import com.didichuxing.doraemonkit.config.PerformanceInfoConfig; @@ -22,7 +23,6 @@ import com.didichuxing.doraemonkit.util.FileManager; import com.didichuxing.doraemonkit.util.JsonUtil; import com.didichuxing.doraemonkit.util.LogHelper; import com.didichuxing.doraemonkit.util.threadpool.ThreadPoolProxyFactory; -import com.google.gson.JsonObject; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -40,6 +40,7 @@ import java.util.Date; public class PerformanceDataManager { private static final String TAG = "PerformanceDataManager"; private static final float SECOND_IN_NANOS = 1000000000f; + private static final int MAX_FRAME_RATE = 60; private static final int NORMAL_FRAME_RATE = 1; private String filePath; private String memoryFileName = "memory.txt"; @@ -48,12 +49,10 @@ public class PerformanceDataManager { private String customFileName = "custom.txt"; //自定义测试页面保存的文件名称 private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - private long mLastFrameTimeNanos; - private int mLastFrameRate; + private int mLastFrameRate = MAX_FRAME_RATE; private int mLastSkippedFrames; private float mLastCpuRate; private float mLastMemoryInfo; - private String mPackageName; private Handler mHandler; private HandlerThread mHandlerThread; private float mMaxMemory; @@ -69,23 +68,8 @@ public class PerformanceDataManager { private static final int MSG_SAVE_LOCAL = 3; private UploadMonitorInfoBean mUploadMonitorBean; private boolean mUploading; - - @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN) - private Choreographer.FrameCallback mFrameCallback = new Choreographer.FrameCallback() { - @Override - public void doFrame(long frameTimeNanos) { - if (mLastFrameTimeNanos != 0L) { - long temp = frameTimeNanos - mLastFrameTimeNanos; - if (temp != 0) { - mLastFrameRate = Math.round(SECOND_IN_NANOS / (frameTimeNanos - mLastFrameTimeNanos)); - mLastSkippedFrames = 60 - mLastFrameRate; - } - } - mLastFrameTimeNanos = frameTimeNanos; - Choreographer.getInstance().postFrameCallback(this); - writeFpsDataIntoFile(); - } - }; + private Handler mMainHandler = new Handler(Looper.getMainLooper()); + private FrameRateRunnable mRateRunnable = new FrameRateRunnable(); private void executeCpuData() { LogHelper.d(TAG, "current thread name is ==" + Thread.currentThread().getName()); @@ -178,7 +162,6 @@ public class PerformanceDataManager { mActivityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { mAboveAndroidO = true; - mPackageName = context.getPackageName(); } if (mHandlerThread == null) { mHandlerThread = new HandlerThread("handler-thread"); @@ -215,12 +198,14 @@ public class PerformanceDataManager { @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN) public void startMonitorFrameInfo() { - Choreographer.getInstance().postFrameCallback(mFrameCallback); + mMainHandler.postDelayed(mRateRunnable, DateUtils.SECOND_IN_MILLIS); + Choreographer.getInstance().postFrameCallback(mRateRunnable); } @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN) public void stopMonitorFrameInfo() { - Choreographer.getInstance().removeFrameCallback(mFrameCallback); + Choreographer.getInstance().removeFrameCallback(mRateRunnable); + mMainHandler.removeCallbacks(mRateRunnable); } public void startMonitorCPUInfo() { @@ -467,4 +452,26 @@ public class PerformanceDataManager { public float getMaxMemory() { return mMaxMemory; } + + private class FrameRateRunnable implements Runnable, Choreographer.FrameCallback { + private int totalFramesPerSecond; + + @Override + public void run() { + mLastFrameRate = totalFramesPerSecond; + if (mLastFrameRate > MAX_FRAME_RATE) { + mLastFrameRate = MAX_FRAME_RATE; + } + mLastSkippedFrames = MAX_FRAME_RATE - mLastFrameRate; + totalFramesPerSecond = 0; + mMainHandler.postDelayed(this, DateUtils.SECOND_IN_MILLIS); + } + + @Override + public void doFrame(long frameTimeNanos) { + totalFramesPerSecond++; + Choreographer.getInstance().postFrameCallback(this); + writeFpsDataIntoFile(); + } + } } diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java index 0b1d077521665088831ed1ba17ee1ea9ed89aecd..4437b9fc2adbd218be1b4dfc68f065b11e670bc9 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java @@ -15,6 +15,10 @@ import com.didichuxing.doraemonkit.ui.crash.CrashCaptureAdapter; import com.didichuxing.doraemonkit.ui.widget.titlebar.TitleBar; import java.io.File; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; public class CrashCaptureFragment extends BaseFragment { @@ -46,8 +50,15 @@ public class CrashCaptureFragment extends BaseFragment { File file = new File(CrashHandlerManager.getInstance().getFilePath()); if (file.exists()) { ListView crash = findViewById(R.id.lv_crash); - final File[] listFiles = file.listFiles(); - if (listFiles != null && listFiles.length != 0) { + final List listFiles = Arrays.asList(file.listFiles()); + if (listFiles != null && listFiles.size() != 0) { + Collections.sort(listFiles, new Comparator() { + @Override + public int compare(File lhs, File rhs) { + return Long.valueOf(rhs.lastModified()) + .compareTo(lhs.lastModified()); + } + }); crash.setAdapter(new CrashCaptureAdapter(listFiles)); } else { Toast.makeText(getContext(), R.string.dk_crash_capture_no_record, Toast.LENGTH_SHORT).show(); @@ -56,7 +67,7 @@ public class CrashCaptureFragment extends BaseFragment { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { Bundle bundle = new Bundle(); - File listFile = listFiles[position]; + File listFile = listFiles.get(position); bundle.putSerializable(BundleKey.FILE_KEY, listFile); showContent(CrashDetailFragment.class, bundle); } diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java index 39868945b744c2e468ca8e0aec2ff10903fa86db..1ffeb7d034d5d491e3452d9b4b948d604d4f797c 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java @@ -59,6 +59,7 @@ public class CrashDetailFragment extends BaseFragment { String line; while ((line = bufferedReader.readLine()) != null) { stringBuilder.append(line); + stringBuilder.append("\n"); } inputStreamReader.close(); diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashHandlerManager.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashHandlerManager.java index 51c90101e86b32819b51c502816f54dc18cbf3ee..24c150de0f26013dfdce43495cd48ce26737e944 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashHandlerManager.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashHandlerManager.java @@ -155,7 +155,7 @@ public class CrashHandlerManager implements Thread.UncaughtExceptionHandler { String value = entry.getValue(); sb.append(key + "=" + value + "\n"); } - + sb.append("\n"); Writer writer = new StringWriter(); PrintWriter printWriter = new PrintWriter(writer); ex.printStackTrace(printWriter); diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/custom/MonitorDataUploadFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/custom/MonitorDataUploadFragment.java index fbd2f1eed8c564b8a39d65d95ab386c08032f1b8..a22af85ebc7803a890228533826b80556e734f33 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/custom/MonitorDataUploadFragment.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/custom/MonitorDataUploadFragment.java @@ -5,11 +5,8 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.text.Editable; import android.text.TextUtils; -import android.text.TextWatcher; import android.view.View; -import android.widget.EditText; import android.widget.TextView; import com.didichuxing.doraemonkit.R; diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/AopUtils.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/AopUtils.java index d4975332caca89eba45bb37b73f552721d201e6f..09de129374cc886d20daaf0e3e36b3452bff62ae 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/AopUtils.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/AopUtils.java @@ -11,6 +11,7 @@ import java.net.URLConnection; import javax.net.ssl.HttpsURLConnection; +import okhttp3.Interceptor; import okhttp3.OkHttpClient; /** @@ -31,6 +32,12 @@ public class AopUtils { } public static void addInterceptor(OkHttpClient.Builder builder) { + // 判断当前是否已经添加了拦截器，如果已添加则返回 + for (Interceptor interceptor : builder.interceptors()) { + if (interceptor instanceof DoraemonInterceptor) { + return; + } + } builder.addNetworkInterceptor(new DoraemonWeakNetworkInterceptor()) .addInterceptor(new DoraemonInterceptor()); } diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/OkHttpAspect.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/OkHttpAspect.java index 1e4e7f98248b899e571cc68273b05e573d9959c8..d5b966d5e4dd2c8e294bf797ee55059860e62960 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/OkHttpAspect.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/OkHttpAspect.java @@ -12,8 +12,6 @@ public class OkHttpAspect { @After("execution(okhttp3.OkHttpClient.Builder.new(..))") public void addInterceptor(JoinPoint joinPoint) { - if (joinPoint.getArgs() != null && joinPoint.getArgs().length > 0 && joinPoint.getArgs()[0] instanceof OkHttpClient) { - AopUtils.addInterceptor((OkHttpClient.Builder) joinPoint.getTarget()); - } + AopUtils.addInterceptor((OkHttpClient.Builder) joinPoint.getTarget()); } } \ No newline at end of file diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java index 3f9e6ff395eadd2aaed7212142113124dae99317..1c97f68fb953f64cba99ca32f8f64fb03f1a6228 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java @@ -9,22 +9,23 @@ import android.widget.TextView; import com.didichuxing.doraemonkit.R; import java.io.File; +import java.util.List; public class CrashCaptureAdapter extends BaseAdapter { - private File[] files; + private List files; - public CrashCaptureAdapter(File[] files) { + public CrashCaptureAdapter(List files) { this.files = files; } @Override public int getCount() { - return files.length; + return files.size(); } @Override public Object getItem(int position) { - return files[position]; + return files.get(position); } @Override @@ -42,7 +43,7 @@ public class CrashCaptureAdapter extends BaseAdapter { } else { viewHolder = (ViewHolder) convertView.getTag(); } - viewHolder.setData(files[position].getName()); + viewHolder.setData(files.get(position).getName()); return convertView; } diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DoraemonStatisticsUtil.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DoraemonStatisticsUtil.java index 104ba26159cd42774389e0f02ec87b7a8df7f7f1..69087bd479c5da9ac233af225550aa87e8f99304 100644 --- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DoraemonStatisticsUtil.java +++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DoraemonStatisticsUtil.java @@ -38,7 +38,7 @@ public class DoraemonStatisticsUtil { try { jsonObject.put("appId", appId); jsonObject.put("appName", appName); - jsonObject.put("version", "1.1.6"); + jsonObject.put("version", "1.1.7"); jsonObject.put("type", type); jsonObject.put("from", from); } catch (JSONException e) { diff --git a/Android/doraemonkit/src/main/res/drawable-xxhdpi/dk_weak_network.png b/Android/doraemonkit/src/main/res/drawable-xxhdpi/dk_weak_network.png index 071967179594594e7f332b05db691ca882cffdcc..ff49738281e41837ad7fdd5f7a396d3dbf77a1f9 100644 Binary files a/Android/doraemonkit/src/main/res/drawable-xxhdpi/dk_weak_network.png and b/Android/doraemonkit/src/main/res/drawable-xxhdpi/dk_weak_network.png differ diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml index 511533bb54a8074f21d618fdc36cee2b5b4cfbc6..64c6a7a345006455478a93461c325a9821058c0c 100644 --- a/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml +++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml @@ -36,6 +36,7 @@ android:layout_height="match_parent" android:layout_gravity="top|left" android:clickable="true" + android:textSize="@dimen/dk_font_size_14" android:gravity="left" android:visibility="gone"/> diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml index 365b4319d53f14a61ed6669739c46305a74991e2..2d3fb90fe7aa993cdbda72a9e789e86b9a088480 100644 --- a/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml +++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml @@ -1,9 +1,10 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:background="@color/dk_color_FFFFFF" + android:layout_height="match_parent" + android:orientation="vertical"> + app:dkTitle="@string/dk_crash_capture_summary_title"/> + + + android:background="@android:color/white"/> diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml index d19e87d8df49a135ce85aabe03582404fbd543f3..a01c186f974df6525700e691b331dba81f3b7b95 100644 --- a/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml +++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml @@ -1,19 +1,20 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/dk_color_FFFFFF" + android:orientation="vertical"> + app:dkTitle="@string/dk_kit_crash"/> + android:layout_height="match_parent"/> \ No newline at end of file diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml index bbf6020312ee0027c92cbd94a55e9ff16c4ed803..ac4fd1c119162250d7ba0f2caef1ab7a4bedec20 100644 --- a/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml +++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml @@ -17,14 +17,15 @@ app:dkLeftIcon="@drawable/dk_title_back" app:dkLeftText="@string/dk_back" app:dkTitle="@string/dk_crash_capture_summary_title" /> - + + android:textSize="@dimen/dk_font_size_14" /> diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml index 46b3f2092fca551ddbffdf5fcafd81a13ef89fd7..942df27a9ddbb893d11696c8f9b29a1e4cd41174 100644 --- a/Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml +++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml @@ -2,7 +2,8 @@ + android:background="@color/dk_color_FFFFFF" + android:layout_height="match_parent" > + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/dk_color_FFFFFF" + android:orientation="vertical"> + app:dkIcon="@drawable/dk_close_icon_big"/> + android:layout_height="wrap_content"/> + android:layout_height="12dp" + android:background="@color/dk_color_F5F6F7"/> + android:layout_height="match_parent" + android:gravity="bottom|center_horizontal" + android:orientation="vertical"> + android:text="@string/dk_platform_monitor_data_button"/> diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_parameter.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_parameter.xml index b4539773fdc519733c401c92701e31dc3bba9608..ee4df5a76fdafb0650294b9559caa9c022f4a314 100644 --- a/Android/doraemonkit/src/main/res/layout/dk_fragment_parameter.xml +++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_parameter.xml @@ -1,18 +1,19 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/dk_color_FFFFFF" + android:orientation="vertical"> + app:dkIcon="@drawable/dk_close_icon_big"/> + android:layout_height="match_parent"/> \ No newline at end of file diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml index c74de0180cdf7401cd1080d89b6bb2b945c695a5..28c4f8a85f66fac49facc47c6da68a156d683620 100644 --- a/Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml +++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml @@ -13,7 +13,6 @@ app:dkIcon="@drawable/dk_close_icon_big" app:dkTitle="@string/dk_kit_web_door" /> - + android:id="@+id/tv_crash_item" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:drawableRight="@drawable/dk_more_icon" + android:padding="@dimen/dk_dp_15" + android:textColor="@color/dk_color_333333" + android:textSize="@dimen/dk_font_size_14"/> diff --git a/Android/doraemonkit/src/main/res/values/strings.xml b/Android/doraemonkit/src/main/res/values/strings.xml index b5cec38a943c999894c140f6d210c182773db86c..ac5ebc63c47d18b60a2ee94dda0a5cb599d56db1 100644 --- a/Android/doraemonkit/src/main/res/values/strings.xml +++ b/Android/doraemonkit/src/main/res/values/strings.xml @@ -160,7 +160,7 @@ 位置：左%1$d 右%2$d 上%3$d 下%4$d - 请进行授权才可以使用改功能 + 请进行授权才可以使用该功能 //启动、跳转耗时 Activity跳转耗时 查看记录 diff --git a/Android/doraemonkit/upload.gradle b/Android/doraemonkit/upload.gradle index 0bc7079095922cf4308ca3768a8c89b664c0e203..ccc6ee5b1f96feb8487f7d5ab225263df8a33295 100644 --- a/Android/doraemonkit/upload.gradle +++ b/Android/doraemonkit/upload.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release' publish { def groupProjectID = 'com.didichuxing.doraemonkit' def artifactProjectID = 'doraemonkit' - def publishVersionID = '1.1.6' + def publishVersionID = '1.1.7' userOrg = 'doraemonkit' repoName = 'DoraemonKit'