diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/commom/src/main/res/layout/commom_layout_view.xml b/commom/src/main/res/layout/commom_layout_view.xml new file mode 100644 index 0000000000000000000000000000000000000000..3cf0b6d621ca48ad468c88d468d91c37b4e134b7 --- /dev/null +++ b/commom/src/main/res/layout/commom_layout_view.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/host/Host_R.txt b/host/Host_R.txt index ae56716104a7e044f3a6f8c9b9cbb82a105f747b..333bd4296ab8ada63c1d0f6bee0d02f2209014b1 100644 --- a/host/Host_R.txt +++ b/host/Host_R.txt @@ -758,12 +758,13 @@ int id titleDividerNoCustom 0x7f070082 int id title_template 0x7f070083 int id top 0x7f070084 int id topPanel 0x7f070085 -int id uniform 0x7f070086 -int id up 0x7f070087 -int id useLogo 0x7f070088 -int id withText 0x7f070089 -int id wrap 0x7f07008a -int id wrap_content 0x7f07008b +int id tv_commom 0x7f070086 +int id uniform 0x7f070087 +int id up 0x7f070088 +int id useLogo 0x7f070089 +int id withText 0x7f07008a +int id wrap 0x7f07008b +int id wrap_content 0x7f07008c int integer abc_config_activityDefaultDur 0x7f080000 int integer abc_config_activityShortDur 0x7f080001 int integer cancel_button_image_alpha 0x7f080002 @@ -797,28 +798,27 @@ int layout abc_search_dropdown_item_icons_2line 0x7f090018 int layout abc_search_view 0x7f090019 int layout abc_select_dialog_material 0x7f09001a int layout activity_main 0x7f09001b -int layout activity_plugin_one 0x7f09001c -int layout activity_plugin_two 0x7f09001d -int layout notification_action 0x7f09001e -int layout notification_action_tombstone 0x7f09001f -int layout notification_media_action 0x7f090020 -int layout notification_media_cancel_action 0x7f090021 -int layout notification_template_big_media 0x7f090022 -int layout notification_template_big_media_custom 0x7f090023 -int layout notification_template_big_media_narrow 0x7f090024 -int layout notification_template_big_media_narrow_custom 0x7f090025 -int layout notification_template_custom_big 0x7f090026 -int layout notification_template_icon_group 0x7f090027 -int layout notification_template_lines_media 0x7f090028 -int layout notification_template_media 0x7f090029 -int layout notification_template_media_custom 0x7f09002a -int layout notification_template_part_chronometer 0x7f09002b -int layout notification_template_part_time 0x7f09002c -int layout select_dialog_item_material 0x7f09002d -int layout select_dialog_multichoice_material 0x7f09002e -int layout select_dialog_singlechoice_material 0x7f09002f -int layout support_simple_spinner_dropdown_item 0x7f090030 -int layout tooltip 0x7f090031 +int layout commom_layout_view 0x7f09001c +int layout notification_action 0x7f09001d +int layout notification_action_tombstone 0x7f09001e +int layout notification_media_action 0x7f09001f +int layout notification_media_cancel_action 0x7f090020 +int layout notification_template_big_media 0x7f090021 +int layout notification_template_big_media_custom 0x7f090022 +int layout notification_template_big_media_narrow 0x7f090023 +int layout notification_template_big_media_narrow_custom 0x7f090024 +int layout notification_template_custom_big 0x7f090025 +int layout notification_template_icon_group 0x7f090026 +int layout notification_template_lines_media 0x7f090027 +int layout notification_template_media 0x7f090028 +int layout notification_template_media_custom 0x7f090029 +int layout notification_template_part_chronometer 0x7f09002a +int layout notification_template_part_time 0x7f09002b +int layout select_dialog_item_material 0x7f09002c +int layout select_dialog_multichoice_material 0x7f09002d +int layout select_dialog_singlechoice_material 0x7f09002e +int layout support_simple_spinner_dropdown_item 0x7f09002f +int layout tooltip 0x7f090030 int mipmap ic_launcher 0x7f0a0000 int mipmap ic_launcher_round 0x7f0a0001 int string abc_action_bar_home_description 0x7f0b0000 diff --git a/plugin_one/src/main/AndroidManifest.xml b/plugin_one/src/main/AndroidManifest.xml index b2a12115de896c86757857b74c5a651586f8bf5e..57a1d1f1e63d2fa53b0bce299c27ac30902eebdf 100644 --- a/plugin_one/src/main/AndroidManifest.xml +++ b/plugin_one/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - + diff --git a/plugin_one/src/main/java/com/jason/plugin/plugin_one/TestCommonActivity.kt b/plugin_one/src/main/java/com/jason/plugin/plugin_one/TestCommonActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..e3e389bb6fd3a480ef1138f19de287ec31f80124 --- /dev/null +++ b/plugin_one/src/main/java/com/jason/plugin/plugin_one/TestCommonActivity.kt @@ -0,0 +1,18 @@ +package com.jason.plugin.plugin_one + +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import com.jason.plugin.commom.R + +/** + * @author Liu + * @Date 2019-12-06 + * @mobile 18711832023 + */ +class TestCommonActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.commom_layout_view) + } +} \ No newline at end of file diff --git a/plugin_one/src/main/java/com/jason/plugin/plugin_one/PluginOneActivity.kt b/plugin_one/src/main/java/com/jason/plugin/plugin_one/activitis/PluginOneActivity.kt similarity index 73% rename from plugin_one/src/main/java/com/jason/plugin/plugin_one/PluginOneActivity.kt rename to plugin_one/src/main/java/com/jason/plugin/plugin_one/activitis/PluginOneActivity.kt index eb3eca0483cb1b3393c300a2caa5cfad81d2e2ce..ced25fafc38fc4d2357626108e745a8dd84f923e 100644 --- a/plugin_one/src/main/java/com/jason/plugin/plugin_one/PluginOneActivity.kt +++ b/plugin_one/src/main/java/com/jason/plugin/plugin_one/activitis/PluginOneActivity.kt @@ -1,4 +1,4 @@ -package com.jason.plugin.plugin_one +package com.jason.plugin.plugin_one.activitis import android.os.Bundle import android.support.v7.app.AppCompatActivity @@ -8,6 +8,6 @@ class PluginOneActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_plugin_one) + setContentView(R.layout.commom_layout_view) } } diff --git a/commom/src/main/res/layout/activity_plugin_one.xml b/plugin_one/src/main/res/layout/activity_plugin_one.xml similarity index 95% rename from commom/src/main/res/layout/activity_plugin_one.xml rename to plugin_one/src/main/res/layout/activity_plugin_one.xml index 5d95a723d976dfee2d429963cdcd4eb0546167c2..423b60b1f3ee4391b645889d94f4861f7e1c61f4 100644 --- a/commom/src/main/res/layout/activity_plugin_one.xml +++ b/plugin_one/src/main/res/layout/activity_plugin_one.xml @@ -7,6 +7,7 @@ android:layout_height="match_parent"> - - #008577 - #00574B - #D81B60 - diff --git a/plugin_one/src/main/res/values/styles.xml b/plugin_one/src/main/res/values/styles.xml deleted file mode 100644 index 5885930df6d10edf3d6df40d6556297d11f953da..0000000000000000000000000000000000000000 --- a/plugin_one/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/plugin_two/src/main/AndroidManifest.xml b/plugin_two/src/main/AndroidManifest.xml index 208524147259d700e18a0c43997294f609645c77..3ed73c9ec6d4eb2299c5af48f68d031faf58e309 100644 --- a/plugin_two/src/main/AndroidManifest.xml +++ b/plugin_two/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - + diff --git a/plugin_two/src/main/java/com/jason/plugin/plugin_two/TestTwoCommonActivity.kt b/plugin_two/src/main/java/com/jason/plugin/plugin_two/TestTwoCommonActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..03fc9c83f0b82ed97efe0c0fe3ef3f23027898c4 --- /dev/null +++ b/plugin_two/src/main/java/com/jason/plugin/plugin_two/TestTwoCommonActivity.kt @@ -0,0 +1,17 @@ +package com.jason.plugin.plugin_two + +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import com.jason.plugin.commom.R +/** + * @author Liu + * @Date 2019-12-06 + * @mobile 18711832023 + */ +class TestTwoCommonActivity: AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.commom_layout_view) + } +} \ No newline at end of file diff --git a/plugin_two/src/main/java/com/jason/plugin/plugin_two/PluginTwoActivity.kt b/plugin_two/src/main/java/com/jason/plugin/plugin_two/activitis/PluginTwoActivity.kt similarity index 72% rename from plugin_two/src/main/java/com/jason/plugin/plugin_two/PluginTwoActivity.kt rename to plugin_two/src/main/java/com/jason/plugin/plugin_two/activitis/PluginTwoActivity.kt index 0d7efc631a6b8c74492539fcec50db10f677bbcd..2c4cec0a73f8c14bc509dccace3ee8bdd7878358 100644 --- a/plugin_two/src/main/java/com/jason/plugin/plugin_two/PluginTwoActivity.kt +++ b/plugin_two/src/main/java/com/jason/plugin/plugin_two/activitis/PluginTwoActivity.kt @@ -1,13 +1,15 @@ -package com.jason.plugin.plugin_two +package com.jason.plugin.plugin_two.activitis import android.os.Bundle import android.support.v7.app.AppCompatActivity import com.jason.plugin.commom.R + class PluginTwoActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_plugin_two) + + setContentView(R.layout.commom_layout_view) } } diff --git a/commom/src/main/res/layout/activity_plugin_two.xml b/plugin_two/src/main/res/layout/activity_plugin_two.xml similarity index 95% rename from commom/src/main/res/layout/activity_plugin_two.xml rename to plugin_two/src/main/res/layout/activity_plugin_two.xml index 39201b22ab3a7d940d89216e56180ce29591d867..023447a03ee08e8743f9dfb6beb5acf9b125efba 100644 --- a/commom/src/main/res/layout/activity_plugin_two.xml +++ b/plugin_two/src/main/res/layout/activity_plugin_two.xml @@ -7,6 +7,7 @@ android:layout_height="match_parent">