merge from 1.1.8

This commit is contained in:
wangcongtao
2020-12-07 15:57:01 +08:00
870 changed files with 43037 additions and 41 deletions

View File

@@ -0,0 +1,2 @@
#Mon Dec 07 12:00:02 CST 2020
/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/src/main/res/layout/module_mvision_layout_view.xml=/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/build/intermediates/packaged_res/debug/layout/module_mvision_layout_view.xml

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_mvision_big_view_height">1080px</dimen>
<dimen name="module_mvision_big_view_width">1920px</dimen>
<dimen name="module_mvision_big_view_x">0px</dimen>
<dimen name="module_mvision_big_view_y">0px</dimen>
<dimen name="module_mvision_view_height">460px</dimen>
<dimen name="module_mvision_view_width">460px</dimen>
<dimen name="module_mvision_view_x">204px</dimen>
<dimen name="module_mvision_view_y">368px</dimen>
</resources>

View File

@@ -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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/src/main/res"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/build/generated/res/rs/debug"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/src/main/res"><file path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/src/main/res/values-xhdpi/dimens.xml" qualifiers="xhdpi-v4"><dimen name="module_mvision_view_width">460px</dimen><dimen name="module_mvision_view_height">460px</dimen><dimen name="module_mvision_view_x">204px</dimen><dimen name="module_mvision_view_y">368px</dimen><dimen name="module_mvision_big_view_x">0px</dimen><dimen name="module_mvision_big_view_y">0px</dimen><dimen name="module_mvision_big_view_width">1920px</dimen><dimen name="module_mvision_big_view_height">1080px</dimen></file><file name="module_mvision_layout_view" path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/src/main/res/layout/module_mvision_layout_view.xml" qualifiers="" type="layout"/></source><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/build/generated/res/rs/debug"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-modules-mvision/src/debug/res"/></dataSet><mergedItems/></merger>