diff --git a/app-catalog/samples/foundation/src/main/AndroidManifest.xml b/app-catalog/samples/foundation/src/main/AndroidManifest.xml
index 42cf878..eec4100 100644
--- a/app-catalog/samples/foundation/src/main/AndroidManifest.xml
+++ b/app-catalog/samples/foundation/src/main/AndroidManifest.xml
@@ -19,6 +19,8 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
 
     <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -226,6 +228,80 @@
             android:exported="true"
             android:theme="@style/Theme.AppCompat.DayNight" />
 
+        <activity android:name=".prejob.extDemo.ep4_1"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep4_1second"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep4_2"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep4_3"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep4_3second"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" >
+            <intent-filter>
+                <!--<action android:name="android.intent.action.VIEW"/>-->
+                <action android:name="test_action"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".prejob.extDemo.ep4_5"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep4_6"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep5_1"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep5_2"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep5_4"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep5_5"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep5_6"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep5_7"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep6_1"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep6_2"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep6_3"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
+        <activity android:name=".prejob.extDemo.ep5_10"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight" />
+
         <activity
             android:name=".job.DbEntryActivity"
             android:exported="true"
@@ -262,32 +338,6 @@
         <!--                <action android:name="com.android.brocasttest.MY_BROADCAST"/>-->
         <!--            </intent-filter>-->
         <!--        </receiver>-->
-
-
-        <!--        <activity-->
-        <!--            android:name=".ep5_9"-->
-        <!--            android:exported="true"-->
-        <!--            android:theme="@style/Theme.Translucent"-->
-        <!--            tools:ignore="MissingClass">-->
-        <!--            <intent-filter>-->
-        <!--                <action android:name="android.intent.action.MAIN" />-->
-
-        <!--                <category android:name="android.intent.category.LAUNCHER" />-->
-        <!--            </intent-filter>-->
-        <!--        </activity>-->
-        <!--        ep4_1注释-->
-        <!--        <activity android:name=".ep4_1second"></activity>-->
-
-
-        <!--    ep4_3,ep4_4注释    -->
-        <!--        <activity android:name=".ep4_3second"-->
-        <!--            android:exported="true">-->
-        <!--            <intent-filter>-->
-        <!--&lt;!&ndash;                <action android:name="android.intent.action.VIEW"/>&ndash;&gt;-->
-        <!--                <action android:name="test_action"/>-->
-        <!--                <category android:name="android.intent.category.DEFAULT"/>-->
-        <!--            </intent-filter>-->
-        <!--        </activity>-->
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ContactListAdapter.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ContactListAdapter.java
deleted file mode 100644
index 08ae119..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ContactListAdapter.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.FilterQueryProvider;
-import android.widget.Filterable;
-import android.widget.TextView;
-
-public class ContactListAdapter extends CursorAdapter implements Filterable {
-    private ContentResolver resolver;
-    private String[] columns =
-            new String[]{ContactsContract.Contacts._ID, ContactsContract.Contacts.DISPLAY_NAME};
-
-    public ContactListAdapter(Context context, Cursor c) {
-        super(context, c); // 调用父类构造方法
-        resolver = context.getContentResolver(); // 初始化
-    }
-
-    @Override
-    public CharSequence convertToString(Cursor cursor) {
-        return cursor.getString(1);
-    }
-
-    @Override
-    public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
-        FilterQueryProvider filter = getFilterQueryProvider();
-        if (filter != null) {
-            return filter.runQuery(constraint);
-        }
-        Uri uri =
-                Uri.withAppendedPath(
-                        ContactsContract.Contacts.CONTENT_FILTER_URI,
-                        Uri.encode(constraint.toString()));
-        return resolver.query(uri, columns, null, null, null);
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup viewGroup) {
-        LayoutInflater inflater = LayoutInflater.from(context);
-        TextView view =
-                (TextView)
-                        inflater.inflate(
-                                android.R.layout.simple_dropdown_item_1line, viewGroup, false);
-        view.setText(cursor.getString(1));
-        return view;
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        ((TextView) view).setText(cursor.getString(1));
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep4_Intent.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep4_Intent.kt
new file mode 100644
index 0000000..aa12df7
--- /dev/null
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep4_Intent.kt
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2023-2024 wintmain
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.wintmain.foundation.prejob.extDemo
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.widget.Button
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.catalog.framework.annotations.Sample
+import com.wintmain.foundation.R
+
+@Sample(name = "Intent", description = "意图示例", tags = ["A-Self_demos"])
+class ep4_1 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.ep4_1)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val ok = findViewById<Button>(R.id.ok)
+        ok.setOnClickListener {
+            val username = findViewById<EditText>(R.id.username)
+            val password = findViewById<EditText>(R.id.password) // 获得用户名和密码
+
+            val intent = Intent() // 创建一个Intent对象
+            intent.putExtra("com.android.USERNAME", username.text.toString())
+            intent.putExtra("com.android.PASSWORD", password.text.toString()) // 封装信息
+            intent.setClass(this@ep4_1, ep4_1second::class.java) // 指定传递对象
+            startActivity(intent) // 将Intent传递给Activity
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+class ep4_1second : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.ep4_1second) // 设置页面布局
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val intent = intent // 获得Intent
+        val username = intent.getStringExtra("com.android.USERNAME")
+        val password = intent.getStringExtra("com.android.PASSWORD")
+
+        val usernameTV = findViewById<TextView>(R.id.usr)
+        val passwordTV = findViewById<TextView>(R.id.pwd)
+
+        // 设置文本框内容，首先获取控件
+        usernameTV.text = "用户名$username"
+        passwordTV.text = "密码$password"
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "IntentExt", description = "意图示例", tags = ["A-Self_demos"])
+class ep4_2 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this) // 设置页面布局
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val button = Button(this)
+        button.text = "Home"
+        linearLayout.addView(button)
+
+        button.setOnClickListener {
+            val intent = Intent()
+            intent.setAction(Intent.ACTION_MAIN) // 设置Intent动作
+            intent.addCategory(Intent.CATEGORY_HOME) // 设置Intent种类
+            startActivity(intent) // 将Intent传递给Activity
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "IntentExt", description = "意图示例", tags = ["A-Self_demos"])
+class ep4_3 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this)
+        val button = Button(this)
+        button.text = "预定义intent点击"
+        linearLayout.addView(button)
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        button.setOnClickListener {
+            val intent = Intent()
+//            intent.setAction(Intent.ACTION_VIEW)
+            intent.setAction("test_action")
+            startActivity(intent)
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+class ep4_3second : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this)
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val textView = TextView(this)
+        textView.text = "使用预定义动作的隐式intent"
+        linearLayout.addView(textView)
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "Intent-setAction", description = "意图示例", tags = ["A-Self_demos"])
+class ep4_5 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this)
+        val editText = EditText(this)
+        editText.hint = "输入电话号码"
+        val s = editText.text.toString()
+        val button = Button(this)
+        button.text = "拨打"
+        linearLayout.addView(editText)
+        linearLayout.addView(button)
+        linearLayout.orientation = LinearLayout.VERTICAL
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        button.setOnClickListener {
+            val intent = Intent()
+            intent.setAction(Intent.ACTION_CALL)
+            intent.setData(Uri.parse("tel:$s"))
+            startActivity(intent)
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "Intent-setData", description = "意图示例", tags = ["A-Self_demos"])
+class ep4_6 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this)
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val button = Button(this)
+        button.text = "start uri test"
+        linearLayout.addView(button)
+
+        button.setOnClickListener {
+            val parse = Uri.parse("http://www.baidu.com")
+            val intent = Intent()
+            intent.setAction(Intent.ACTION_VIEW)
+            intent.setData(parse)
+            startActivity(intent)
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep5_Menu.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep5_Menu.kt
new file mode 100644
index 0000000..100af68
--- /dev/null
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep5_Menu.kt
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2023-2024 wintmain
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.wintmain.foundation.prejob.extDemo
+
+import android.content.res.XmlResourceParser
+import android.graphics.Color
+import android.os.Bundle
+import android.view.ContextMenu
+import android.view.ContextMenu.ContextMenuInfo
+import android.view.Gravity
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.google.android.catalog.framework.annotations.Sample
+import com.wintmain.foundation.R
+import org.xmlpull.v1.XmlPullParser
+import org.xmlpull.v1.XmlPullParserException
+import java.io.IOException
+
+@Sample(name = "ep5_1", description = "示例", tags = ["A-Self_demos"])
+class ep5_1 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+//        val linearLayout = LinearLayout(this)
+//        setContentView(linearLayout);
+//
+//        val textView1 = TextView(this)
+//        textView1.setText(this.getResources().getString(R.string.title2))
+//        textView1.setTextColor(this.getResources().getColor(R.color.title2))
+//        textView1.setTextSize(this.getResources().getDimension(R.dimen.title2))
+//        linearLayout.addView(textView1)
+        setContentView(R.layout.ep5_1)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "ep5_2", description = "示例", tags = ["A-Self_demos"])
+class ep5_2 : AppCompatActivity() {
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
+        setContentView(R.layout.ep5_2)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val tvID =
+            intArrayOf(
+                R.id.str1, R.id.str2, R.id.str3, R.id.str4, R.id.str5, R.id.str6, R.id.str7
+            ) // 定义TextView组件的id数组
+        val tvColor =
+            intArrayOf(
+                R.color.color1,
+                R.color.color2,
+                R.color.color3,
+                R.color.color4,
+                R.color.color5,
+                R.color.color6,
+                R.color.color7
+            ) // 使用颜色资源
+        for (i in 0..6) {
+            val tv = findViewById<View>(tvID[i]) as TextView // 根据id获取TextView组件
+            tv.gravity = Gravity.CENTER // 设置文字居中显示
+            tv.setBackgroundColor(resources.getColor(tvColor[i])) // 为TextView组件设置背景颜色
+            tv.height = (resources.getDimension(R.dimen.basic).toInt() * (i + 2)
+                / 2) // 为TextView组件设置高度
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "ep5_3", description = "示例", tags = ["A-Self_demos"])
+class ep5_3 : Fragment(R.layout.ep5_3)
+
+@Sample(name = "ep5_4", description = "示例", tags = ["A-Self_demos"])
+class ep5_4 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.ep5_4)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val button1 = findViewById<Button>(R.id.button1)
+        button1.setOnClickListener { view ->
+            val b = view as Button // 获取当前按钮
+            b.isEnabled = false // 当按钮变为不可用
+            b.text = "我是不可按钮"
+            Toast.makeText(this@ep5_4, "按钮变为不可用", Toast.LENGTH_SHORT).show()
+        }
+        val button2 = findViewById<Button>(R.id.button2)
+        button2.setOnClickListener {
+            button1.isEnabled = true // 当按钮变为不可用
+            button1.text = "我是可按钮"
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "ep5_5", description = "示例", tags = ["A-Self_demos"])
+class ep5_5 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this)
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val textView = TextView(this)
+        textView.textSize = 28f
+        textView.text = "正在读取文件..."
+        linearLayout.addView(textView)
+
+        val xmlResourceParser: XmlResourceParser = getResources().getXml(R.xml.customers) // 获取xml文档
+        val stringBuilder = StringBuilder("") // 创建一个空的字符串构造器
+
+        try {
+            // 如果没有到xml文档的结尾
+            while (xmlResourceParser.eventType != XmlPullParser.END_DOCUMENT) {
+                if (xmlResourceParser.eventType == XmlPullParser.START_TAG) {
+                    // 判断是否是开始标志
+                    val tagName = xmlResourceParser.name // 获取标记名
+                    if (tagName == "customer") {
+                        // 如果标记名是customer
+                        stringBuilder.append(
+                            "姓名：" + xmlResourceParser.getAttributeValue(1) + " "
+                        ) // 获取客户姓名
+                        stringBuilder.append(
+                            "联系电话：" + xmlResourceParser.getAttributeValue(2) + " "
+                        )
+                        stringBuilder.append("E-mail：" + xmlResourceParser.getAttributeValue(0))
+                        stringBuilder.append("\n")
+                    }
+                }
+                xmlResourceParser.next()
+            }
+            textView.text = stringBuilder.toString()
+        } catch (e: XmlPullParserException) {
+            e.printStackTrace()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "ep5_6", description = "示例", tags = ["A-Self_demos"])
+class ep5_6 : AppCompatActivity() {
+    private var textView: TextView? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val layout = LinearLayout(this)
+        setContentView(layout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        textView = TextView(this)
+        textView!!.textSize = 28f
+        textView!!.text = "打开菜单。。。"
+        layout.addView(textView)
+        registerForContextMenu(textView) // 为文本框注册上下文菜单
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
+    override fun onCreateContextMenu(
+        menu: ContextMenu, v: View, menuInfo: ContextMenuInfo
+    ) {
+        val inflater = MenuInflater(this) // 实例化一个MenuInflater对象
+        inflater.inflate(R.menu.contextmenu, menu) // 解析菜单文件
+        //        menu.setHeaderIcon(R.drawable.green1);//为菜单头设置图标
+        menu.setHeaderTitle("请选择文字颜色：") // 为菜单头设置标题
+    }
+
+    override fun onContextItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.color1 -> {
+                textView!!.setTextColor(Color.rgb(255, 0, 0))
+            }
+            R.id.color2 -> {
+                textView!!.setTextColor(Color.rgb(0, 255, 0))
+            }
+            R.id.color3 -> {
+                textView!!.setTextColor(Color.rgb(0, 0, 255))
+            }
+            R.id.color4 -> {
+                textView!!.setTextColor(Color.rgb(255, 180, 0))
+            }
+            else -> {
+                textView!!.setTextColor(Color.rgb(255, 255, 255))
+            }
+        }
+        return true
+    }
+}
+
+@Sample(name = "ep5_7", description = "示例", tags = ["A-Self_demos"])
+class ep5_7 : AppCompatActivity() {
+    private var textView: TextView? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.ep5_7)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        textView = findViewById<View>(R.id.tv) as TextView
+        //        registerForContextMenu(textView);
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val inflater = MenuInflater(this) // 实例化一个对象
+        inflater.inflate(R.menu.optionmenu, menu) // 解析菜单
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.groupId == R.id.setting) { // 判断是否选择了“参数设置”菜单项
+            if (item.isChecked) { // 若菜单项已经被选中
+                item.setChecked(false) // 设置菜单项不被选中
+            } else {
+                item.setChecked(true) // 设置菜单项被选中
+            }
+        }
+        if (item.itemId != R.id.item2) { // 弹出消息提示框显示选择的菜单项的标题
+            Toast.makeText(this@ep5_7, item.title, Toast.LENGTH_SHORT).show()
+        }
+        return true
+    }
+}
+
+@Sample(name = "ep5_8", description = "示例", tags = ["A-Self_demos"])
+class ep5_8 : Fragment(R.layout.ext_activity_main)
+
+@Sample(name = "ep5_9", description = "示例", tags = ["A-Self_demos"])
+class ep5_9 : Fragment(R.layout.ep5_9)
+
+@Sample(name = "ep5_10", description = "示例", tags = ["A-Self_demos"])
+class ep5_10 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this)
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val editText = EditText(this)
+        editText.setText(R.string.edittext)
+        linearLayout.addView(editText)
+        registerForContextMenu(editText) // 为编辑框注册上下文菜单
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
+    override fun onCreateContextMenu(
+        menu: ContextMenu, v: View, menuInfo: ContextMenuInfo
+    ) {
+        val inflater = MenuInflater(this)
+        inflater.inflate(R.menu.contextmenu2, menu)
+    }
+
+    override fun onContextItemSelected(item: MenuItem): Boolean {
+        Toast.makeText(this, item.title, Toast.LENGTH_SHORT).show()
+        return true
+    }
+}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep6_ContentResolver.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep6_ContentResolver.kt
new file mode 100644
index 0000000..47fed29
--- /dev/null
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/Ep6_ContentResolver.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2023-2024 wintmain
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.wintmain.foundation.prejob.extDemo
+
+import android.content.ContentResolver
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
+import android.provider.ContactsContract.CommonDataKinds.Phone
+import android.provider.ContactsContract.Contacts
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AutoCompleteTextView
+import android.widget.CursorAdapter
+import android.widget.Filterable
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.catalog.framework.annotations.Sample
+import com.wintmain.foundation.R
+
+// TODO 授予读取contacts权限
+@Sample(name = "ep6_1", description = "ContentResolver示例", tags = ["A-Self_demos"])
+class ep6_1 : AppCompatActivity() {
+    private val columns = arrayOf(
+        Contacts._ID,  // 希望获得ID值
+        Contacts.DISPLAY_NAME,  // 希望获得姓名
+    )
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.ep6_1)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val textView = findViewById<View>(R.id.result) as TextView
+        textView.text = queryData // 为标签设置数据
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
+    private val queryData: String
+        get() {
+            val stringBuilder = StringBuilder() // 用于保存字符串
+            val contentResolver = contentResolver // 获得ContentResolver对象
+            val cursor = contentResolver.query(
+                Contacts.CONTENT_URI, columns, null,
+                null, null
+            )
+            // 查询记录
+            val idIndex = cursor!!.getColumnIndex(columns[0]) // 获得ID记录的索引值
+            val displayNameIndex = cursor.getColumnIndex(columns[1]) // 获得姓名记录的索引值
+            cursor.moveToFirst()
+            while (!cursor.isAfterLast) {
+                // 迭代全部
+                val id = cursor.getInt(idIndex)
+                val displayName = cursor.getString(displayNameIndex)
+                stringBuilder.append("$id: $displayName\n")
+                cursor.moveToNext()
+            }
+            cursor.close() // 关闭Cursor
+            return stringBuilder.toString() // 返回查询结果
+        }
+}
+
+@Sample(name = "ep6_2", description = "ContentResolver示例", tags = ["A-Self_demos"])
+class ep6_2 : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val linearLayout = LinearLayout(this)
+        setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val textView = TextView(this)
+        textView.textSize = 25f
+
+        val columns = arrayOf(
+            Contacts._ID,
+            Contacts.DISPLAY_NAME,
+            Phone.NUMBER,
+            Phone.CONTACT_ID
+        )
+        val stringBuilder = java.lang.StringBuilder()
+        val contentResolver = contentResolver
+        val cursor =
+            contentResolver.query(
+                Contacts.CONTENT_URI, null, null, null, null
+            )
+
+        while (cursor!!.moveToNext()) {
+            val idIndex = cursor.getColumnIndex(columns[0])
+            val nameIndex = cursor.getColumnIndex(columns[1])
+            val id = cursor.getInt(idIndex)
+            val name = cursor.getString(nameIndex)
+            val phone =
+                contentResolver.query(
+                    Phone.CONTENT_URI,
+                    null,
+                    columns[3] + "=" + id,
+                    null,
+                    null
+                )
+            while (phone!!.moveToNext()) {
+                val phoneNumIndex = phone.getColumnIndex(columns[2])
+                val phoneNum = phone.getString(phoneNumIndex)
+                stringBuilder.append("$name: $phoneNum\n")
+            }
+        }
+        cursor.close()
+
+        textView.text = stringBuilder.toString()
+        linearLayout.addView(textView)
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+@Sample(name = "ep6_3", description = "ContentResolver示例", tags = ["A-Self_demos"])
+class ep6_3 : AppCompatActivity() {
+    private val columns = arrayOf(Contacts._ID, Contacts.DISPLAY_NAME)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.ep6_3)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        val resolver = contentResolver
+        val cursor = resolver.query(Contacts.CONTENT_URI, columns, null, null, null)
+        val adapter = ContactListAdapter(this, cursor)
+        val autoCompleteTextView = findViewById<View>(R.id.edit) as AutoCompleteTextView
+        autoCompleteTextView.setAdapter(adapter)
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+}
+
+class ContactListAdapter(context: Context, c: Cursor?) : CursorAdapter(context, c), Filterable {
+    private val resolver: ContentResolver = context.contentResolver // 初始化
+    private val columns = arrayOf(Contacts._ID, Contacts.DISPLAY_NAME)
+
+    override fun convertToString(cursor: Cursor): CharSequence {
+        return cursor.getString(1)
+    }
+
+    override fun runQueryOnBackgroundThread(constraint: CharSequence): Cursor {
+        val filter = filterQueryProvider
+        if (filter != null) {
+            return filter.runQuery(constraint)
+        }
+        val uri =
+            Uri.withAppendedPath(
+                Contacts.CONTENT_FILTER_URI,
+                Uri.encode(constraint.toString())
+            )
+        return resolver.query(uri, columns, null, null, null)!!
+    }
+
+    override fun newView(context: Context, cursor: Cursor, viewGroup: ViewGroup): View {
+        val inflater = LayoutInflater.from(context)
+        val view =
+            inflater.inflate(
+                android.R.layout.simple_dropdown_item_1line, viewGroup, false
+            ) as TextView
+        view.text = cursor.getString(1)
+        return view
+    }
+
+    override fun bindView(view: View, context: Context, cursor: Cursor) {
+        (view as TextView).text = cursor.getString(1)
+    }
+}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/MainActivity.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/MainActivity.java
deleted file mode 100644
index 09b8915..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/MainActivity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ext_activity_main);
-    }
-}
\ No newline at end of file
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1.java
deleted file mode 100644
index 02e1192..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep4_1 extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep4_1);
-
-        Button ok = findViewById(R.id.ok);
-        ok.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        EditText username = findViewById(R.id.username);
-                        EditText password = findViewById(R.id.password); // 获得用户名和密码
-
-                        Intent intent = new Intent(); // 创建一个Intent对象
-                        intent.putExtra("com.android.USERNAME", username.getText().toString());
-                        intent.putExtra(
-                                "com.android.PASSWORD", password.getText().toString()); // 封装信息
-                        intent.setClass(ep4_1.this, ep4_1second.class); // 指定传递对象
-                        startActivity(intent); // 将Intent传递给Activity
-                    }
-                });
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1second.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1second.java
deleted file mode 100644
index a3f93dc..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_1second.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep4_1second extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep4_1second); // 设置页面布局
-        Intent intent = getIntent(); // 获得Intent
-        String username = intent.getStringExtra("com.android.USERNAME");
-        String password = intent.getStringExtra("com.android.PASSWORD");
-
-        TextView usernameTV = findViewById(R.id.usr);
-        TextView passwordTV = findViewById(R.id.pwd);
-
-        // 设置文本框内容，首先获取控件
-        usernameTV.setText("用户名" + username);
-        passwordTV.setText("密码" + password);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_2.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_2.java
deleted file mode 100644
index 64ab658..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_2.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import androidx.annotation.Nullable;
-
-public class ep4_2 extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this); // 设置页面布局
-        setContentView(linearLayout);
-
-        Button button = new Button(this);
-        button.setText("Home");
-        linearLayout.addView(button);
-
-        button.setOnClickListener(
-                new View.OnClickListener() { // 为按钮添加事件监听器
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent();
-                        intent.setAction(Intent.ACTION_MAIN); // 设置Intent动作
-                        intent.addCategory(Intent.CATEGORY_HOME); // 设置Intent种类
-                        startActivity(intent); // 将Intent传递给Activity
-                    }
-                });
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3.java
deleted file mode 100644
index 5d3e33c..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import androidx.annotation.Nullable;
-
-public class ep4_3 extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this);
-        Button button = new Button(this);
-        button.setText("预定义intent点击");
-        linearLayout.addView(button);
-        setContentView(linearLayout);
-        button.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent();
-                        //                intent.setAction(Intent.ACTION_VIEW);
-                        //                ep4_4
-                        intent.setAction("test_action");
-                        startActivity(intent);
-                    }
-                });
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3second.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3second.java
deleted file mode 100644
index 2802651..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_3second.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-
-public class ep4_3second extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this);
-        setContentView(linearLayout);
-        TextView textView = new TextView(this);
-        textView.setText("使用预定义动作的隐式intent");
-        linearLayout.addView(textView);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_5.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_5.java
deleted file mode 100644
index 6b5d329..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_5.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import androidx.annotation.Nullable;
-
-public class ep4_5 extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this);
-        EditText editText = new EditText(this);
-        editText.setHint("输入电话号码");
-        final String s = editText.getText().toString();
-        Button button = new Button(this);
-        button.setText("拨打");
-        linearLayout.addView(editText);
-        linearLayout.addView(button);
-        linearLayout.setOrientation(LinearLayout.VERTICAL);
-        setContentView(linearLayout);
-
-        button.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent();
-                        intent.setAction(Intent.ACTION_CALL);
-                        intent.setData(Uri.parse("tel:" + s));
-                        startActivity(intent);
-                    }
-                });
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_6.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_6.java
deleted file mode 100644
index c148417..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep4_6.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import androidx.annotation.Nullable;
-
-public class ep4_6 extends Activity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this);
-        setContentView(linearLayout);
-        Button button = new Button(this);
-        button.setText("start uri test");
-        linearLayout.addView(button);
-
-        button.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Uri parse = Uri.parse("http://www.baidu.com");
-                        Intent intent = new Intent();
-                        intent.setAction(Intent.ACTION_VIEW);
-                        intent.setData(parse);
-                        startActivity(intent);
-                    }
-                });
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_1.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_1.java
deleted file mode 100644
index d78543b..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_1.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import com.wintmain.foundation.R;
-
-public class ep5_1 extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-//        LinearLayout linearLayout = new LinearLayout(this);
-//        setContentView(linearLayout);
-//
-//        TextView textView1 = new TextView(this);
-//        textView1.setText(this.getResources().getString(R.string.title2));
-//        textView1.setTextColor(this.getResources().getColor(R.color.title2));
-//        textView1.setTextSize(this.getResources().getDimension(R.dimen.title2));
-//        linearLayout.addView(textView1);
-        setContentView(R.layout.ep5_1);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_10.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_10.java
deleted file mode 100644
index 5a29038..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_10.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep5_10 extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this);
-        setContentView(linearLayout);
-        EditText editText = new EditText(this);
-        editText.setText(R.string.edittext);
-        linearLayout.addView(editText);
-        registerForContextMenu(editText); // 为编辑框注册上下文菜单
-    }
-
-    @Override
-    public void onCreateContextMenu(
-            ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-        MenuInflater inflater = new MenuInflater(this);
-        inflater.inflate(R.menu.contextmenu2, menu);
-    }
-
-    @Override
-    public boolean onContextItemSelected(@NonNull MenuItem item) {
-        Toast.makeText(this, item.getTitle(), Toast.LENGTH_SHORT).show();
-        return true;
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_2.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_2.java
deleted file mode 100644
index 83d41b1..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_2.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.os.Bundle;
-import android.view.Gravity;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep5_2 extends AppCompatActivity {
-    @Override
-    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        setContentView(R.layout.ep5_2);
-        int[] tvID =
-                new int[]{
-                        R.id.str1, R.id.str2, R.id.str3, R.id.str4, R.id.str5, R.id.str6, R.id.str7
-                }; // 定义TextView组件的id数组
-        int[] tvColor =
-                new int[]{
-                        R.color.color1,
-                        R.color.color2,
-                        R.color.color3,
-                        R.color.color4,
-                        R.color.color5,
-                        R.color.color6,
-                        R.color.color7
-                }; // 使用颜色资源
-        for (int i = 0; i < 7; i++) {
-            TextView tv = (TextView) findViewById(tvID[i]); // 根据id获取TextView组件
-            tv.setGravity(Gravity.CENTER); // 设置文字居中显示
-            tv.setBackgroundColor(getResources().getColor(tvColor[i])); // 为TextView组件设置背景颜色
-            tv.setHeight(
-                    (int) (getResources().getDimension(R.dimen.basic))
-                            * (i + 2)
-                            / 2); // 为TextView组件设置高度
-        }
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_3.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_3.java
deleted file mode 100644
index 504420e..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_3.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep5_3 extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep5_3);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_4.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_4.java
deleted file mode 100644
index 572f906..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_4.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.Toast;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep5_4 extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep5_4);
-        final Button button1 = findViewById(R.id.button1);
-        button1.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        Button b = (Button) view; // 获取当前按钮
-                        b.setEnabled(false); // 当按钮变为不可用
-                        b.setText("我是不可按钮");
-                        Toast.makeText(ep5_4.this, "按钮变为不可用", Toast.LENGTH_SHORT).show();
-                    }
-                });
-        Button button2 = findViewById(R.id.button2);
-        button2.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        button1.setEnabled(true); // 当按钮变为不可用
-                        button1.setText("我是可按钮");
-                    }
-                });
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_5.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_5.java
deleted file mode 100644
index 7d1d14f..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_5.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.content.res.XmlResourceParser;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-
-public class ep5_5 extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this);
-        setContentView(linearLayout);
-        TextView textView = new TextView(this);
-        textView.setTextSize(28);
-        textView.setText("正在读取文件...");
-        linearLayout.addView(textView);
-
-        XmlResourceParser xmlResourceParser = getResources().getXml(R.xml.customers); // 获取xml文档
-        StringBuilder stringBuilder = new StringBuilder(""); // 创建一个空的字符串构造器
-
-        try {
-            // 如果没有到xml文档的结尾
-            while (xmlResourceParser.getEventType() != XmlPullParser.END_DOCUMENT) {
-                if (xmlResourceParser.getEventType() == XmlPullParser.START_TAG) {
-                    // 判断是否是开始标志
-                    String tagName = xmlResourceParser.getName(); // 获取标记名
-                    if (tagName.equals("customer")) {
-                        // 如果标记名是customer
-                        stringBuilder.append(
-                                "姓名：" + xmlResourceParser.getAttributeValue(1) + " "); // 获取客户姓名
-                        stringBuilder.append(
-                                "联系电话：" + xmlResourceParser.getAttributeValue(2) + " ");
-                        stringBuilder.append("E-mail：" + xmlResourceParser.getAttributeValue(0));
-                        stringBuilder.append("\n");
-                    }
-                }
-                xmlResourceParser.next();
-            }
-            textView.setText(stringBuilder.toString());
-        } catch (XmlPullParserException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_6.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_6.java
deleted file mode 100644
index 9c37605..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_6.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep5_6 extends AppCompatActivity {
-    private TextView textView;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout layout = new LinearLayout(this);
-        setContentView(layout);
-        textView = new TextView(this);
-        textView.setTextSize(28);
-        textView.setText("打开菜单。。。");
-        layout.addView(textView);
-        registerForContextMenu(textView); // 为文本框注册上下文菜单
-    }
-
-    @Override
-    public void onCreateContextMenu(
-            ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-        MenuInflater inflater = new MenuInflater(this); // 实例化一个MenuInflater对象
-        inflater.inflate(R.menu.contextmenu, menu); // 解析菜单文件
-        //        menu.setHeaderIcon(R.drawable.green1);//为菜单头设置图标
-        menu.setHeaderTitle("请选择文字颜色："); // 为菜单头设置标题
-    }
-
-    @Override
-    public boolean onContextItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == R.id.color1) {
-            textView.setTextColor(Color.rgb(255, 0, 0));
-        } else if (item.getItemId() == R.id.color2) {
-            textView.setTextColor(Color.rgb(0, 255, 0));
-        } else if (item.getItemId() == R.id.color3) {
-            textView.setTextColor(Color.rgb(0, 0, 255));
-        } else if (item.getItemId() == R.id.color4) {
-            textView.setTextColor(Color.rgb(255, 180, 0));
-        } else {
-            textView.setTextColor(Color.rgb(255, 255, 255));
-        }
-        return true;
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_7.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_7.java
deleted file mode 100644
index c0c9254..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_7.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep5_7 extends AppCompatActivity {
-    private TextView textView;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep5_7);
-        textView = (TextView) findViewById(R.id.tv);
-        //        registerForContextMenu(textView);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = new MenuInflater(this); // 实例化一个对象
-        inflater.inflate(R.menu.optionmenu, menu); // 解析菜单
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getGroupId() == R.id.setting) { // 判断是否选择了“参数设置”菜单项
-            if (item.isChecked()) { // 若菜单项已经被选中
-                item.setChecked(false); // 设置菜单项不被选中
-            } else {
-                item.setChecked(true); // 设置菜单项被选中
-            }
-        }
-        if (item.getItemId() != R.id.item2) { // 弹出消息提示框显示选择的菜单项的标题
-            Toast.makeText(ep5_7.this, item.getTitle(), Toast.LENGTH_SHORT).show();
-        }
-        return true;
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_8.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_8.java
deleted file mode 100644
index 9a3fd78..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_8.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.wintmain.foundation.R;
-
-public class ep5_8 extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ext_activity_main);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_9.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_9.java
deleted file mode 100644
index b1af457..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep5_9.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import androidx.annotation.Nullable;
-import com.wintmain.foundation.R;
-
-public class ep5_9 extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep5_9);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_1.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_1.java
deleted file mode 100644
index 4100390..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_1.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-import com.wintmain.foundation.R;
-
-public class ep6_1 extends Activity {
-    private String[] columns = {
-            ContactsContract.Contacts._ID,//希望获得ID值
-            ContactsContract.Contacts.DISPLAY_NAME,//希望获得姓名
-    };
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep6_1);
-        TextView textView = (TextView) findViewById(R.id.result);
-        textView.setText(getQueryData());//为标签设置数据
-    }
-
-    private String getQueryData() {
-        StringBuilder stringBuilder = new StringBuilder();//用于保存字符串
-        ContentResolver contentResolver = getContentResolver();//获得ContentResolver对象
-        Cursor cursor = contentResolver.query(ContactsContract.Contacts.CONTENT_URI, columns, null,
-                null, null);
-        //查询记录
-        int idIndex = cursor.getColumnIndex(columns[0]);//获得ID记录的索引值
-        int displayNameIndex = cursor.getColumnIndex(columns[1]);//获得姓名记录的索引值
-        for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {//迭代全部
-            int id = cursor.getInt(idIndex);
-            String displayName = cursor.getString(displayNameIndex);
-            stringBuilder.append(id + ": " + displayName + "\n");
-        }
-        cursor.close();//关闭CUrsor
-        return stringBuilder.toString();//返回查询结果
-    }
-
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_2.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_2.java
deleted file mode 100644
index cc99b39..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_2.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-
-public class ep6_2 extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        LinearLayout linearLayout = new LinearLayout(this);
-        setContentView(linearLayout);
-        TextView textView = new TextView(this);
-        textView.setTextSize(25);
-
-        String[] columns = {
-                ContactsContract.Contacts._ID,
-                ContactsContract.Contacts.DISPLAY_NAME,
-                ContactsContract.CommonDataKinds.Phone.NUMBER,
-                ContactsContract.CommonDataKinds.Phone.CONTACT_ID
-        };
-        StringBuilder stringBuilder = new StringBuilder();
-        ContentResolver contentResolver = getContentResolver();
-        Cursor cursor =
-                contentResolver.query(
-                        ContactsContract.Contacts.CONTENT_URI, null, null, null, null);
-
-        while (cursor.moveToNext()) {
-            int idIndex = cursor.getColumnIndex(columns[0]);
-            int nameIndex = cursor.getColumnIndex(columns[1]);
-            int id = cursor.getInt(idIndex);
-            String name = cursor.getString(nameIndex);
-            Cursor phone =
-                    contentResolver.query(
-                            ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
-                            null,
-                            columns[3] + "=" + id,
-                            null,
-                            null);
-            while (phone.moveToNext()) {
-                int phoneNumIndex = phone.getColumnIndex(columns[2]);
-                String phoneNum = phone.getString(phoneNumIndex);
-                stringBuilder.append(name + ": " + phoneNum + "\n");
-            }
-        }
-        cursor.close();
-
-        textView.setText(stringBuilder.toString());
-        linearLayout.addView(textView);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_3.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_3.java
deleted file mode 100644
index f451ea5..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/ep6_3.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.widget.AutoCompleteTextView;
-import androidx.annotation.Nullable;
-import com.wintmain.foundation.R;
-
-public class ep6_3 extends Activity {
-    private String[] columns =
-            new String[]{ContactsContract.Contacts._ID, ContactsContract.Contacts.DISPLAY_NAME};
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ep6_3);
-        ContentResolver resolver = getContentResolver();
-        Cursor cursor =
-                resolver.query(ContactsContract.Contacts.CONTENT_URI, columns, null, null, null);
-        ContactListAdapter adapter = new ContactListAdapter(this, cursor);
-        AutoCompleteTextView autoCompleteTextView = (AutoCompleteTextView) findViewById(R.id.edit);
-        autoCompleteTextView.setAdapter(adapter);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/test.java b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/test.java
deleted file mode 100644
index 8990c5e..0000000
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/extDemo/test.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2023-2024 wintmain
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.wintmain.foundation.prejob.extDemo;
-
-public class test {
-    public static void main(String[] args) {
-        System.out.print(100 % 3);
-        System.out.print(",");
-        System.out.println(100 % 3.0);
-    }
-}
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt
index 05d2026..b61eef6 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep1_UI.kt
@@ -166,6 +166,10 @@ class RabbitLayout : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep1_4)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val frameLayout: FrameLayout = findViewById(R.id.mylayout)
         // Attention here.
@@ -184,6 +188,12 @@ class RabbitLayout : AppCompatActivity() {
         }
         frameLayout.addView(rabbit)
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 class RabbitView(context: Context) : View(context) {
@@ -263,6 +273,11 @@ class RegisterMember : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep1_12)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val button1 = findViewById<View>(R.id.button1) as Button
         button1.setOnClickListener {
             val nicknameET =
@@ -303,6 +318,12 @@ class RegisterMember : AppCompatActivity() {
             Toast.makeText(applicationContext, "Reset success...", Toast.LENGTH_LONG).show()
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 /*
@@ -369,6 +390,11 @@ class RadioGroupDemo : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep1_14)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val sex = findViewById<RadioGroup>(R.id.radiogroup1)
         // Parameter 'radioGroup' is never used, could be renamed to _
         sex.setOnCheckedChangeListener { _, i -> // i -> checkedId
@@ -383,6 +409,12 @@ class RadioGroupDemo : AppCompatActivity() {
         button1.setOnClickListener { selectClick() }
     }
 
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
     // 配合xml文件里的属性 android:onClick="selectClick"（kt有问题）
     private fun selectClick() {
         val sex2 = findViewById<RadioGroup>(R.id.radiogroup1)
@@ -454,6 +486,11 @@ class CheckBoxDemo : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep1_15)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val c1 = findViewById<CheckBox>(R.id.c1)
         val c2 = findViewById<CheckBox>(R.id.c2)
         val c3 = findViewById<CheckBox>(R.id.c3)
@@ -476,6 +513,12 @@ class CheckBoxDemo : AppCompatActivity() {
             toast.show()
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 /*
@@ -578,6 +621,10 @@ class CodeToCreateView : AppCompatActivity() {
 
         // 设置内容视图
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         listView.onItemClickListener =
             AdapterView.OnItemClickListener { parent, _, position, _ ->
@@ -585,6 +632,12 @@ class CodeToCreateView : AppCompatActivity() {
                 Toast.makeText(this, s, LENGTH_SHORT).show()
             }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 /*
@@ -632,6 +685,10 @@ class ListDemo : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_list_demo)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         var strings = arrayOf("测试 1")
         for (i in 2 until 50) {
@@ -647,6 +704,12 @@ class ListDemo : AppCompatActivity() {
             Toast.makeText(this, "选择了：$s", LENGTH_SHORT).show()
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 // 'ListActivity' is deprecated. Deprecated in Java
@@ -688,6 +751,11 @@ class TimeGetDemo : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep1_21)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val datePicker = findViewById<DatePicker>(R.id.date)
         val timePicker = findViewById<TimePicker>(R.id.time)
         timePicker.setIs24HourView(true)
@@ -714,6 +782,12 @@ class TimeGetDemo : AppCompatActivity() {
         }
     }
 
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
     private fun show(year: Int, month: Int, day: Int, hour: Int, minute: Int) {
         val str = (year.toString() + "年" + (month + 1) + "月" + day + "日" + hour + ":"
             + minute) // 获取拾取器设置的日期和时间
@@ -787,6 +861,11 @@ class TimeGetDemoExt : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep1_22)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val chronometer = findViewById<Chronometer>(R.id.chro)
         // 设置起始时间
         chronometer.setBase(SystemClock.elapsedRealtime())
@@ -799,6 +878,12 @@ class TimeGetDemoExt : AppCompatActivity() {
         end.setOnClickListener { chronometer.stop() }
         for0.setOnClickListener { chronometer.setBase(SystemClock.elapsedRealtime()) }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 /*
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt
index 50465bc..02df9c3 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep2_UIWidget.kt
@@ -64,6 +64,10 @@ class ep2_1 : AppCompatActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_1)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         // 获取自动完成文本框
         val textView =
@@ -84,6 +88,12 @@ class ep2_1 : AppCompatActivity() {
         }
     }
 
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
     companion object {
         private val COUNTRIES =
             arrayOf("android", "android app", "android开发", "开发应用", "开发者")
@@ -115,6 +125,10 @@ class ep2_2 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_2)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         horizonP = findViewById(R.id.progressBar1) // 获取进度条
         circleP = findViewById(R.id.progressBar2)
@@ -135,6 +149,12 @@ class ep2_2 : AppCompatActivity() {
         }.start() // 开启一个线程
     }
 
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
     // 模拟一个耗时操作
     private fun doWork(): Int {
         mProgressStatus = (mProgressStatus + (Math.random() * 10)).toInt() // 改变完成进度
@@ -154,6 +174,11 @@ class ep2_3 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_3)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val result = findViewById<View>(R.id.textView1) as TextView // 获取文本视图
         seekbar = findViewById<View>(R.id.seekBar1) as SeekBar // 获取拖动条
         seekbar!!.setOnSeekBarChangeListener(
@@ -171,6 +196,12 @@ class ep2_3 : AppCompatActivity() {
                 }
             })
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "RatingBar", description = "星级评分条展示", tags = ["A-Self_demos"])
@@ -180,6 +211,10 @@ class ep2_4 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_4)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         ratingbar = findViewById<View>(R.id.ratingBar1) as RatingBar // 获取星级评分条
         val button = findViewById<View>(R.id.button1) as Button // 获取“提交”按钮
@@ -198,6 +233,12 @@ class ep2_4 : AppCompatActivity() {
             ).show()
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Deprecated("通过添加上面的suppress允许调用")
@@ -208,6 +249,11 @@ class ep2_5 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_5)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         tabHost = findViewById<View>(android.R.id.tabhost) as android.widget.TabHost // 获取TabHost对象
         tabHost!!.setup() // 初始化TabHost组件
 
@@ -225,6 +271,12 @@ class ep2_5 : AppCompatActivity() {
                 .setContent(R.id.linearlayout02)
         ) // 添加第二个标签页
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "ImageSwitcher", description = "图像切换器展示", tags = ["A-Self_demos"])
@@ -243,6 +295,11 @@ class ep2_6 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_6)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         imageSwitcher = findViewById<View>(R.id.imageSwitcher1) as ImageSwitcher // 获取图像切换器
         // 设置动画效果
         imageSwitcher!!.inAnimation =
@@ -279,6 +336,12 @@ class ep2_6 : AppCompatActivity() {
             imageSwitcher!!.setImageResource(imageId[index]) // 显示当前图片
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "GridView", description = "网格视图展示", tags = ["A-Self_demos"])
@@ -286,6 +349,10 @@ class ep2_7 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_7)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val gridview = findViewById<View>(R.id.gridView1) as GridView // 获取GridView组件
         val imageId = intArrayOf(
@@ -317,6 +384,12 @@ class ep2_7 : AppCompatActivity() {
         ) // 创建适配器
         gridview.adapter = adapter // 将适配器与GridView关联
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "Gallery", description = "画廊展示", tags = ["A-Self_demos"])
@@ -333,6 +406,10 @@ class ep2_8 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_8)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val gallery = findViewById<View>(R.id.gallery1) as android.widget.Gallery
 
@@ -385,6 +462,12 @@ class ep2_8 : AppCompatActivity() {
                 ).show()
             }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "GalleryEXt", description = "画廊展示", tags = ["A-Self_demos"])
@@ -402,6 +485,10 @@ class ep2_10 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_10)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val gallery = findViewById<View>(R.id.galleryy10) as android.widget.Gallery // 获取Gallery组件
         imageSwitcher = findViewById<View>(R.id.imageSwitcherr10) as ImageSwitcher
@@ -471,6 +558,12 @@ class ep2_10 : AppCompatActivity() {
             }
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "Toast", description = "吐司展示", tags = ["A-Self_demos"])
@@ -478,6 +571,11 @@ class ep2_11 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_11)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         Toast.makeText(this, "Toast的第一种创建方式，通过makeText()", Toast.LENGTH_SHORT).show()
 
         val toast = Toast(this)
@@ -496,6 +594,12 @@ class ep2_11 : AppCompatActivity() {
         toast.view = ll
         toast.show() // 显示消息提示框
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "Notification Demo", description = "通知展示", tags = ["A-Self_demos"])
@@ -505,6 +609,10 @@ class ep2_12 : AppCompatActivity() {
 
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val button = Button(this)
         button.text = "生成通知"
@@ -578,6 +686,12 @@ class ep2_12 : AppCompatActivity() {
             manager.cancelAll() // 清除全部通知
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 class NotificationActivity : AppCompatActivity() {
@@ -585,9 +699,20 @@ class NotificationActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val tv = TextView(this)
         linearLayout.addView(tv)
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "AlertDialog", description = "弹框展示", tags = ["A-Self_demos"])
@@ -596,6 +721,11 @@ class ep2_13 : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val button1 = Button(this)
         val button2 = Button(this)
         val button3 = Button(this)
@@ -678,6 +808,12 @@ class ep2_13 : AppCompatActivity() {
             alertDialog.create().show()
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "AlertDialogExt", description = "弹框展示", tags = ["A-Self_demos"])
@@ -686,6 +822,10 @@ class ep2_14 : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val button = Button(this)
         button.text = "点击退出"
@@ -705,6 +845,12 @@ class ep2_14 : AppCompatActivity() {
             builder.create().show()
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "AlertDialogExt", description = "弹框展示", tags = ["A-Self_demos"])
@@ -712,7 +858,12 @@ class ep2_15 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.example2_15)
-        Log.d("ep2_15", "on Create")
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
+        Toast.makeText(this, "ep2_15 make...", Toast.LENGTH_LONG).show()
         // 定义并初始化保存图片id的数组
         val imageId = intArrayOf(
             R.drawable.icon_cycling,
@@ -754,4 +905,10 @@ class ep2_15 : AppCompatActivity() {
             }
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
diff --git a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt
index 714b672..09f83d1 100644
--- a/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt
+++ b/app-catalog/samples/foundation/src/main/java/com/wintmain/foundation/prejob/uiDemo/Ep3_UIInteraction.kt
@@ -50,23 +50,45 @@ class ep3_1 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep3_1)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val button = findViewById<Button>(R.id.button1)
         button.setOnClickListener {
             val intent = Intent(this@ep3_1, ep3_1second::class.java)
             startActivity(intent) // 启动Activity
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 class ep3_1second : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep3_1second)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val button = findViewById<Button>(R.id.button2)
         val tv = findViewById<TextView>(R.id.textv)
         tv.text = "详细内容。。。"
         button.setOnClickListener { finish() }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "Activity跳转Ext", description = "跳转示例", tags = ["A-Self_demos"])
@@ -75,6 +97,11 @@ class ep3_2 : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val button = Button(this)
         button.text = "获取对话框"
         linearLayout.addView(button)
@@ -84,6 +111,12 @@ class ep3_2 : AppCompatActivity() {
             startActivity(intent)
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "startActivityForResult", description = "跳转示例", tags = ["A-Self_demos"])
@@ -91,6 +124,10 @@ class ep3_3 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep3_3)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val reg = findViewById<Button>(R.id.reg)
         val re = findViewById<Button>(R.id.re)
@@ -135,6 +172,12 @@ class ep3_3 : AppCompatActivity() {
             }
         }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 class ep3_3second : AppCompatActivity() {
@@ -142,6 +185,10 @@ class ep3_3second : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         linearLayout.orientation = LinearLayout.VERTICAL
         val intent = intent
@@ -169,6 +216,12 @@ class ep3_3second : AppCompatActivity() {
         linearLayout.addView(textView3)
         linearLayout.addView(button)
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "3_5startActivity", description = "跳转示例", tags = ["A-Self_demos"])
@@ -177,6 +230,11 @@ class ep3_5 : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         linearLayout.orientation = LinearLayout.VERTICAL
 
         val group = RadioGroup(this)
@@ -220,6 +278,12 @@ class ep3_5 : AppCompatActivity() {
                 startActivity(intent)
             })
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 class Person : Serializable {
@@ -236,6 +300,11 @@ class ep3_5second : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         val linearLayout = LinearLayout(this)
         setContentView(linearLayout)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         linearLayout.orientation = LinearLayout.VERTICAL
 
         val textView = TextView(this)
@@ -247,6 +316,12 @@ class ep3_5second : AppCompatActivity() {
         linearLayout.addView(textView)
     }
 
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
     private fun getWeight(sex: String, height: Float): String {
         val decimalFormat = DecimalFormat()
         if (sex == "男") {
@@ -264,6 +339,10 @@ class ep3_6 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep3_6)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
 
         val choose = findViewById<Button>(R.id.button1)
 
@@ -273,6 +352,12 @@ class ep3_6 : AppCompatActivity() {
         }
     }
 
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == 0x777 && resultCode == 0x888) {
@@ -295,6 +380,11 @@ class ep3_6second : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep3_6second)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+
         val gridView = findViewById<GridView>(R.id.gridview)
         val baseAdapter: BaseAdapter =
             object : BaseAdapter() {
@@ -338,6 +428,12 @@ class ep3_6second : AppCompatActivity() {
                 finish()
             }
     }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
+    }
 }
 
 @Sample(name = "Fragment", description = "fragment示例", tags = ["A-Self_demos"])
@@ -345,16 +441,29 @@ class ep3_7 : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.ep3_7)
+        if (supportActionBar != null) {
+            supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+            supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+        }
+    }
+
+    // 处理返回键事件
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed() // 或者你可以 finish() 当前 Activity
+        return true
     }
 
     class DetailActivity : AppCompatActivity() {
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
             setContentView(R.layout.ep3_7_detail)
+            if (supportActionBar != null) {
+                supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 显示返回箭头
+                supportActionBar!!.setHomeButtonEnabled(true) // 设置返回键可点击
+            }
+
             // 如果为横屏，结束当前Activity，准备使用Fragment显示内容
-            if (resources.configuration.orientation
-                == Configuration.ORIENTATION_LANDSCAPE
-            ) {
+            if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
                 finish() // 结束当前Activity
                 return
             }
@@ -369,6 +478,12 @@ class ep3_7 : AppCompatActivity() {
                     .commit() // 添加一个显示详细内容的Fragment
             }
         }
+
+        // 处理返回键事件
+        override fun onSupportNavigateUp(): Boolean {
+            onBackPressed() // 或者你可以 finish() 当前 Activity
+            return true
+        }
     }
 }