From a88ead0f04649733e2c1dd6d2ceed9300679c106 Mon Sep 17 00:00:00 2001
From: zhangqing8 <zhangqing8@staff.weibo.com>
Date: Wed, 28 Sep 2022 00:51:42 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../androidtest/designModel/DesignMain.java   |  4 ++
 .../createModel/SingletonContainer.java       | 52 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 app/src/test/java/com/guiguzi/androidtest/designModel/DesignMain.java
 create mode 100644 app/src/test/java/com/guiguzi/androidtest/designModel/createModel/SingletonContainer.java

diff --git a/app/src/test/java/com/guiguzi/androidtest/designModel/DesignMain.java b/app/src/test/java/com/guiguzi/androidtest/designModel/DesignMain.java
new file mode 100644
index 0000000..32fee0f
--- /dev/null
+++ b/app/src/test/java/com/guiguzi/androidtest/designModel/DesignMain.java
@@ -0,0 +1,4 @@
+package com.guiguzi.androidtest.designModel;
+
+public class DesignMain {
+}
diff --git a/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/SingletonContainer.java b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/SingletonContainer.java
new file mode 100644
index 0000000..cd8bbdf
--- /dev/null
+++ b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/SingletonContainer.java
@@ -0,0 +1,52 @@
+package com.guiguzi.androidtest.designModel.createModel;
+
+/**
+ * 单例模式
+ */
+public class SingletonContainer {
+
+
+    /**
+     * 1. 双重检锁单例
+     */
+    public static class SingletonA {
+        private static volatile SingletonA mInstance;
+        private SingletonA() {
+        }
+
+        public static SingletonA getInstance() {
+            if (mInstance == null) {
+                synchronized (SingletonA.class) {
+                    if (mInstance == null) {
+                        mInstance = new SingletonA();
+                    }
+                }
+            }
+            return mInstance;
+        }
+    }
+
+    /**
+     * 2. 枚举单例
+     * */
+    public static enum SingletonB{
+        INSTANCE;
+    }
+
+    /**
+     * 3. 静态内部类
+     * */
+    public static class SingletonC{
+
+        private SingletonC(){}
+
+        private static class Holder{
+         private static final SingletonC INSTANCE = new SingletonC();
+        }
+
+        public static SingletonC getInstance(){
+            return Holder.INSTANCE;
+        }
+    }
+
+}
-- 
Gitee


From 13962cad85ec288566cb7276b44fda31464c87ce Mon Sep 17 00:00:00 2001
From: zhangqing8 <zhangqing8@staff.weibo.com>
Date: Wed, 28 Sep 2022 01:10:16 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=BD=E8=B1=A1?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../createModel/AbsFactoryContainer.java      | 131 ++++++++++++++++++
 .../createModel/FactoryContainer.java         |  51 +++++++
 2 files changed, 182 insertions(+)
 create mode 100644 app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java
 create mode 100644 app/src/test/java/com/guiguzi/androidtest/designModel/createModel/FactoryContainer.java

diff --git a/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java
new file mode 100644
index 0000000..ebd79b1
--- /dev/null
+++ b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java
@@ -0,0 +1,131 @@
+package com.guiguzi.androidtest.designModel.createModel;
+
+/**
+ * 抽象工厂方法
+ */
+public class AbsFactoryContainer {
+
+
+    public class FactoryProducer {
+        public AbstractFactory getFactory(String choice) {
+            if (choice.equalsIgnoreCase("SHAPE")) {
+                return new ShapeFactory();
+            } else if (choice.equalsIgnoreCase("COLOR")) {
+                return new ColorFactory();
+            }
+            return null;
+        }
+    }
+
+    public abstract class AbstractFactory {
+        public abstract Color getColor(String color);
+
+        public abstract Shape getShape(String shape);
+    }
+
+    public class ShapeFactory extends AbstractFactory {
+
+        public ShapeFactory() {
+        }
+
+        @Override
+        public Shape getShape(String shapeType) {
+            if (shapeType == null) {
+                return null;
+            }
+            if (shapeType.equalsIgnoreCase("CIRCLE")) {
+                return new Circle();
+            } else if (shapeType.equalsIgnoreCase("RECTANGLE")) {
+                return new Rectangle();
+            } else if (shapeType.equalsIgnoreCase("SQUARE")) {
+                return new Square();
+            }
+            return null;
+        }
+
+        @Override
+        public Color getColor(String color) {
+            return null;
+        }
+    }
+
+    public class ColorFactory extends AbstractFactory {
+
+        @Override
+        public Shape getShape(String shapeType) {
+            return null;
+        }
+
+        @Override
+        public Color getColor(String color) {
+            if (color == null) {
+                return null;
+            }
+            if (color.equalsIgnoreCase("RED")) {
+                return new Red();
+            } else if (color.equalsIgnoreCase("GREEN")) {
+                return new Green();
+            } else if (color.equalsIgnoreCase("BLUE")) {
+                return new Blue();
+            }
+            return null;
+        }
+    }
+
+    public interface Shape {
+        void draw();
+    }
+
+    public class Rectangle implements Shape {
+
+        @Override
+        public void draw() {
+            System.out.println("Inside Rectangle::draw() method.");
+        }
+    }
+
+    public class Square implements Shape {
+
+        @Override
+        public void draw() {
+            System.out.println("Inside Square::draw() method.");
+        }
+    }
+
+    public class Circle implements Shape {
+
+        @Override
+        public void draw() {
+            System.out.println("Inside Circle::draw() method.");
+        }
+    }
+
+    public interface Color {
+        void fill();
+    }
+
+    public class Red implements Color {
+
+        @Override
+        public void fill() {
+            System.out.println("Inside Red::fill() method.");
+        }
+    }
+
+    public class Green implements Color {
+
+        @Override
+        public void fill() {
+            System.out.println("Inside Green::fill() method.");
+        }
+    }
+
+    public class Blue implements Color {
+
+        @Override
+        public void fill() {
+            System.out.println("Inside Blue::fill() method.");
+        }
+    }
+
+}
diff --git a/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/FactoryContainer.java b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/FactoryContainer.java
new file mode 100644
index 0000000..757d05f
--- /dev/null
+++ b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/FactoryContainer.java
@@ -0,0 +1,51 @@
+package com.guiguzi.androidtest.designModel.createModel;
+
+/**
+ * 工厂模式
+ * */
+public class FactoryContainer {
+
+    public class ShapeFactory {
+
+        //使用 getShape 方法获取形状类型的对象
+        public Shape getShape(String shapeType){
+            if(shapeType == null){
+                return null;
+            }
+            if(shapeType.equalsIgnoreCase("CIRCLE")){
+                return new Circle();
+            } else if(shapeType.equalsIgnoreCase("RECTANGLE")){
+                return new Rectangle();
+            } else if(shapeType.equalsIgnoreCase("SQUARE")){
+                return new Square();
+            }
+            return null;
+        }
+    }
+
+    public interface Shape {
+        void draw();
+    }
+
+    public class Rectangle implements Shape {
+        @Override
+        public void draw() {
+            System.out.println("Inside Rectangle::draw() method.");
+        }
+    }
+
+    public class Square implements Shape {
+        @Override
+        public void draw() {
+            System.out.println("Inside Square::draw() method.");
+        }
+    }
+
+    public class Circle implements Shape {
+        @Override
+        public void draw() {
+            System.out.println("Inside Circle::draw() method.");
+        }
+    }
+
+}
-- 
Gitee


From 821272cf22e204594c7c2d4ddabbba4d97c86ead Mon Sep 17 00:00:00 2001
From: zhangqing8 <zhangqing8@staff.weibo.com>
Date: Thu, 29 Sep 2022 08:57:22 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../createModel/AbsFactoryContainer.java      |   3 -
 .../createModel/BuilderContainer.java         | 168 ++++++++++++++++++
 .../createModel/PrototypeContainer.java       |  23 +++
 3 files changed, 191 insertions(+), 3 deletions(-)
 create mode 100644 app/src/test/java/com/guiguzi/androidtest/designModel/createModel/BuilderContainer.java
 create mode 100644 app/src/test/java/com/guiguzi/androidtest/designModel/createModel/PrototypeContainer.java

diff --git a/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java
index ebd79b1..15f7c06 100644
--- a/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java
+++ b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/AbsFactoryContainer.java
@@ -25,9 +25,6 @@ public class AbsFactoryContainer {
 
     public class ShapeFactory extends AbstractFactory {
 
-        public ShapeFactory() {
-        }
-
         @Override
         public Shape getShape(String shapeType) {
             if (shapeType == null) {
diff --git a/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/BuilderContainer.java b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/BuilderContainer.java
new file mode 100644
index 0000000..1a44c6d
--- /dev/null
+++ b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/BuilderContainer.java
@@ -0,0 +1,168 @@
+package com.guiguzi.androidtest.designModel.createModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 建造者模式
+ */
+public class BuilderContainer {
+
+    public void test() {
+        MealBuilder mealBuilder = new MealBuilder();
+
+        Meal vegMeal = mealBuilder.prepareVegMeal();
+        System.out.println("Veg Meal");
+        vegMeal.showItems();
+        System.out.println("Total Cost: " + vegMeal.getCost());
+
+        Meal nonVegMeal = mealBuilder.prepareNonVegMeal();
+        System.out.println("\n\nNon-Veg Meal");
+        nonVegMeal.showItems();
+        System.out.println("Total Cost: " + nonVegMeal.getCost());
+    }
+
+    public class MealBuilder {
+
+        public Meal prepareVegMeal() {
+            Meal meal = new Meal();
+            meal.addItem(new VegBurger());
+            meal.addItem(new Coke());
+            return meal;
+        }
+
+        public Meal prepareNonVegMeal() {
+            Meal meal = new Meal();
+            meal.addItem(new ChickenBurger());
+            meal.addItem(new Pepsi());
+            return meal;
+        }
+    }
+
+    public interface Item {
+        public String name();
+
+        public Packing packing();
+
+        public float price();
+    }
+
+    public interface Packing {
+        public String pack();
+    }
+
+    public abstract class Burger implements Item {
+
+        @Override
+        public Packing packing() {
+            return new Wrapper();
+        }
+
+        @Override
+        public abstract float price();
+    }
+
+    public abstract class ColdDrink implements Item {
+
+        @Override
+        public Packing packing() {
+            return new Bottle();
+        }
+
+        @Override
+        public abstract float price();
+    }
+
+    public class VegBurger extends Burger {
+
+        @Override
+        public float price() {
+            return 25.0f;
+        }
+
+        @Override
+        public String name() {
+            return "Veg Burger";
+        }
+    }
+
+    public class ChickenBurger extends Burger {
+
+        @Override
+        public float price() {
+            return 50.5f;
+        }
+
+        @Override
+        public String name() {
+            return "Chicken Burger";
+        }
+    }
+
+    public class Coke extends ColdDrink {
+
+        @Override
+        public float price() {
+            return 30.0f;
+        }
+
+        @Override
+        public String name() {
+            return "Coke";
+        }
+    }
+
+    public class Pepsi extends ColdDrink {
+
+        @Override
+        public float price() {
+            return 35.0f;
+        }
+
+        @Override
+        public String name() {
+            return "Pepsi";
+        }
+    }
+
+    public class Wrapper implements Packing {
+
+        @Override
+        public String pack() {
+            return "Wrapper";
+        }
+    }
+
+    public class Bottle implements Packing {
+
+        @Override
+        public String pack() {
+            return "Bottle";
+        }
+    }
+
+    public class Meal {
+        private List<Item> items = new ArrayList<Item>();
+
+        public void addItem(Item item) {
+            items.add(item);
+        }
+
+        public float getCost() {
+            float cost = 0.0f;
+            for (Item item : items) {
+                cost += item.price();
+            }
+            return cost;
+        }
+
+        public void showItems() {
+            for (Item item : items) {
+                System.out.print("Item : " + item.name());
+                System.out.print(", Packing : " + item.packing().pack());
+                System.out.println(", Price : " + item.price());
+            }
+        }
+    }
+
+}
diff --git a/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/PrototypeContainer.java b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/PrototypeContainer.java
new file mode 100644
index 0000000..04f59b7
--- /dev/null
+++ b/app/src/test/java/com/guiguzi/androidtest/designModel/createModel/PrototypeContainer.java
@@ -0,0 +1,23 @@
+package com.guiguzi.androidtest.designModel.createModel;
+
+/**
+ * 原型创建模式
+ * 用原型实例指定创建对象的种类，并且通过拷贝这些原型创建新的对象
+ */
+public class PrototypeContainer {
+
+    public class Student {
+        private int id;
+        private String name;
+        private int score;
+
+        public Student copy() {
+            Student std = new Student();
+            std.id = this.id;
+            std.name = this.name;
+            std.score = this.score;
+            return std;
+        }
+    }
+
+}
-- 
Gitee


From 1a45263a14cc3cab1256dc69ad5c1ccdf35ac67d Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Fri, 11 Nov 2022 19:53:28 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  4 +++
 .../androidtest/activity/Sum1Activity.kt      | 34 +++++++++++++++++++
 .../androidtest/activity/Sum2Activity.kt      | 31 +++++++++++++++++
 .../fragments/HomeChannelFragment.kt          |  1 +
 .../com/guiguzi/androidtest/ui/MyAdapter.java | 16 +++++++++
 5 files changed, 86 insertions(+)
 create mode 100644 app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt
 create mode 100644 app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a28f42..c5f6ace 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -138,6 +138,10 @@
 
         <activity android:name=".activity.RelativeLayoutActivity"/>
 
+        <activity android:name=".activity.Sum1Activity"/>
+
+        <activity android:name=".activity.Sum2Activity"/>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt
new file mode 100644
index 0000000..944532b
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt
@@ -0,0 +1,34 @@
+package com.guiguzi.androidtest.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Button
+import android.widget.LinearLayout
+
+class Sum1Activity : Activity() {
+
+    lateinit var mButton: Button
+    lateinit var mRootView: LinearLayout
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initView()
+    }
+
+    fun initView() {
+        mRootView = LinearLayout(this)
+        mRootView.orientation = LinearLayout.VERTICAL
+        setContentView(mRootView)
+
+        mButton = Button(this)
+        mButton.setText("Sum1启动Activity")
+        mRootView.addView(mButton)
+        mButton.setOnClickListener {
+            finish()
+            val intent = Intent(this, Sum2Activity::class.java)
+            startActivity(intent)
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt
new file mode 100644
index 0000000..c33eb20
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt
@@ -0,0 +1,31 @@
+package com.guiguzi.androidtest.activity
+
+import android.app.Activity
+import android.os.Bundle
+import android.widget.Button
+import android.widget.LinearLayout
+
+class Sum2Activity : Activity() {
+
+    lateinit var mButton: Button
+    lateinit var mRootView: LinearLayout
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initView()
+    }
+
+    fun initView() {
+        mRootView = LinearLayout(this)
+        mRootView.orientation = LinearLayout.VERTICAL
+        setContentView(mRootView)
+
+        mButton = Button(this)
+        mButton.setText("Sum2启动Activity")
+        mRootView.addView(mButton)
+        mButton.setOnClickListener {
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt b/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt
index def0ffb..0428576 100644
--- a/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/fragments/HomeChannelFragment.kt
@@ -106,6 +106,7 @@ class HomeChannelFragment : Fragment {
         dataList.add("Blur学习")
         dataList.add("Blur2学习")
         dataList.add("OEM学习")
+        dataList.add("Activity启动学习")
         dataList.add("RelativeLayout学习")
 
         val gridLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
diff --git a/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java b/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
index 81722ed..3816ce3 100644
--- a/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
+++ b/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
@@ -593,6 +593,22 @@ public class MyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     }
                 });
                 break;
+
+            case "Activity启动学习":
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Intent intent = new Intent();
+                        if (mContext instanceof Activity) {
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        }
+                        ComponentName componentName = new ComponentName(mContext, Sum1Activity.class);
+                        intent.setComponent(componentName);
+                        mContext.startActivity(intent);
+                    }
+                });
+                break;
+
             case "RelativeLayout学习":
                 holder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
-- 
Gitee


From 85c2efa919368c54ae8e9997ea6744bbf603da76 Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Mon, 14 Nov 2022 10:56:26 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 --
 .../androidtest/activity/Sum1Activity.kt      |  9 ++----
 .../androidtest/activity/Sum2Activity.kt      | 31 -------------------
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5f6ace..b66809f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -140,8 +140,6 @@
 
         <activity android:name=".activity.Sum1Activity"/>
 
-        <activity android:name=".activity.Sum2Activity"/>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt
index 944532b..253bca2 100644
--- a/app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/activity/Sum1Activity.kt
@@ -8,25 +8,22 @@ import android.widget.LinearLayout
 
 class Sum1Activity : Activity() {
 
-    lateinit var mButton: Button
-    lateinit var mRootView: LinearLayout
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         initView()
     }
 
     fun initView() {
-        mRootView = LinearLayout(this)
+        var mRootView: LinearLayout = LinearLayout(this)
         mRootView.orientation = LinearLayout.VERTICAL
         setContentView(mRootView)
 
-        mButton = Button(this)
+        var mButton = Button(this)
         mButton.setText("Sum1启动Activity")
         mRootView.addView(mButton)
         mButton.setOnClickListener {
             finish()
-            val intent = Intent(this, Sum2Activity::class.java)
+            val intent = Intent(this, AActivity::class.java)
             startActivity(intent)
         }
 
diff --git a/app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt b/app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt
deleted file mode 100644
index c33eb20..0000000
--- a/app/src/main/java/com/guiguzi/androidtest/activity/Sum2Activity.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.guiguzi.androidtest.activity
-
-import android.app.Activity
-import android.os.Bundle
-import android.widget.Button
-import android.widget.LinearLayout
-
-class Sum2Activity : Activity() {
-
-    lateinit var mButton: Button
-    lateinit var mRootView: LinearLayout
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        initView()
-    }
-
-    fun initView() {
-        mRootView = LinearLayout(this)
-        mRootView.orientation = LinearLayout.VERTICAL
-        setContentView(mRootView)
-
-        mButton = Button(this)
-        mButton.setText("Sum2启动Activity")
-        mRootView.addView(mButton)
-        mButton.setOnClickListener {
-
-        }
-
-    }
-}
\ No newline at end of file
-- 
Gitee


From 61954f570290e5aed0a670ed72a5ce9a504b7557 Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Thu, 1 Dec 2022 13:18:40 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0view=E5=8F=AF=E8=A7=81?=
 =?UTF-8?q?=E6=80=A7=E7=9B=91=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guiguzi/androidtest/ui/CustomTextView.kt  | 28 +++++++++++++++++++
 .../com/guiguzi/androidtest/ui/MyAdapter.java |  4 +--
 .../main/res/layout/layout_channel_item.xml   | 14 +++++-----
 3 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/guiguzi/androidtest/ui/CustomTextView.kt

diff --git a/app/src/main/java/com/guiguzi/androidtest/ui/CustomTextView.kt b/app/src/main/java/com/guiguzi/androidtest/ui/CustomTextView.kt
new file mode 100644
index 0000000..1f8c316
--- /dev/null
+++ b/app/src/main/java/com/guiguzi/androidtest/ui/CustomTextView.kt
@@ -0,0 +1,28 @@
+package com.guiguzi.androidtest.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import androidx.appcompat.widget.AppCompatTextView
+
+class CustomTextView : AppCompatTextView {
+
+    companion object {
+        const val TAG = "GgzCustomTextView"
+    }
+
+    constructor(context: Context) : super(context) {}
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
+
+    constructor(context: Context, attrs: AttributeSet, def: Int) : super(context, attrs, def) {}
+
+    override fun onWindowVisibilityChanged(visibility: Int) {
+        super.onWindowVisibilityChanged(visibility)
+        var isVisibility = false
+        isVisibility = visibility == View.VISIBLE
+
+        Log.d(TAG, "内容：${text}; visibility = ${isVisibility}")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java b/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
index 3816ce3..bd1cae5 100644
--- a/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
+++ b/app/src/main/java/com/guiguzi/androidtest/ui/MyAdapter.java
@@ -649,7 +649,7 @@ public class MyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     static class MyViewHolder extends RecyclerView.ViewHolder {
 
-        TextView textView;
+        CustomTextView textView;
 
         MyViewHolder(View itemView) {
             super(itemView);
@@ -659,7 +659,7 @@ public class MyAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     static class MyViewHolderA extends RecyclerView.ViewHolder {
 
-        TextView textView;
+        CustomTextView textView;
 
         public MyViewHolderA(View itemView) {
             super(itemView);
diff --git a/app/src/main/res/layout/layout_channel_item.xml b/app/src/main/res/layout/layout_channel_item.xml
index a2ca006..db444a6 100644
--- a/app/src/main/res/layout/layout_channel_item.xml
+++ b/app/src/main/res/layout/layout_channel_item.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/colorWhite"
-    android:orientation="horizontal">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@color/colorWhite"
+              android:orientation="horizontal">
 
-    <TextView
+    <com.guiguzi.androidtest.ui.CustomTextView
         android:id="@+id/text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -15,6 +15,6 @@
         android:gravity="center"
         android:textColor="@color/colorAccent"
         android:textSize="22dp"
-        tools:text="@string/hello_world" />
+        tools:text="@string/hello_world"/>
 
 </LinearLayout>
\ No newline at end of file
-- 
Gitee


From def1f1db92255f241f918e5072918ac2e0a4589a Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Thu, 1 Dec 2022 14:29:50 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0gradle=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 30 +++++++++---------------------
 build.gradle     | 13 +++++++++++--
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8278353..2faeab1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,15 +9,13 @@ plugins {
 /*apply from '../gradlescript/config.gradle'*/
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
         applicationId "com.guiguzi.androidtest"
-        minSdkVersion 26
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -57,11 +55,6 @@ android {
         compose true          // 启用Jetpack Compose组件特性
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     composeOptions {
 //        kotlinCompilerVersion kotlin_version
         kotlinCompilerExtensionVersion compose_version
@@ -84,8 +77,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation project(path: ':AutoViewPager')
 
     /*测试用的包*/
     testImplementation 'junit:junit:4.13.2'
@@ -125,8 +116,9 @@ dependencies {
     implementation "androidx.activity:activity-compose:$compose_activity_version"
 
     implementation "androidx.appcompat:appcompat:$appcompat"
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    /*配置kotlin版本*/
+    implementation "androidx.core:core-ktx:$core_ktx"
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     /*引入recyclerView*/
     implementation "androidx.recyclerview:recyclerview:$recyclerVersion"
@@ -195,19 +187,15 @@ dependencies {
     implementation "com.yuyh.json:jsonviewer:1.0.6"
 
     kapt project(':apt')
-
+    implementation project(path: ':AutoViewPager')
     implementation project(':network')
-
     /*引入推送的api*/
     implementation project(':pushbase:jiguangpush')
     implementation project(':pushbase:mipush')
-
     /*引入长图组件*/
     implementation project(':LongImage')
-
     /*引入JsonViewer*/
     implementation project(':JsonViewer')
-
     /*引入AutoViewPager*/
     implementation project(':AutoViewPager')
 }
diff --git a/build.gradle b/build.gradle
index ee44ef7..44f3101 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,18 @@
 buildscript {
 
     ext {
+        /*android中基础配置*/
+        android = [
+                compileSdk      : 32,
+                minSdkVersion   : 26,
+                targetSdkVersion: 30,
+                versionCode     : 1,
+                versionName     : "1.0.0"
+        ]
+
         /*gralde tool de 版本号*/
         gradle_tool_version = '7.0.0'
+        core_ktx = '1.7.0'
         kotlin_version = '1.5.31'
         kotlin_gradle_version = '1.5.31'
         appCompatVersion = "1.1.0"
@@ -31,12 +41,11 @@ buildscript {
         rxjava_android = '3.0.0'
 
         /*Gson*/
-        gson = '2.8.9'
+        gson = '2.9.0'
 
         /*kotlin*/
         kotlinx_coroutines_android = '1.5.1'
 
-
         glide = '4.12.0'
         eventbus = '3.3.1'
         greendao = '3.3.0'
-- 
Gitee


From dcf3bcf9d044f65ac1dfbd11ea58e87fd7bf2a8c Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Thu, 1 Dec 2022 14:47:37 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97guild=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AutoViewPager/build.gradle                    |  7 +++----
 H264/build.gradle                             | 15 +++++++------
 JsonViewer/build.gradle                       |  8 +++----
 LongImage/build.gradle                        | 21 ++++++++-----------
 .../main/java/com/ggz/picture/LongImage.kt    |  2 +-
 annotation/build.gradle                       |  4 ++--
 code_h264/build.gradle                        | 17 +++++++--------
 network/build.gradle                          | 11 ++++------
 player/build.gradle                           |  8 +++----
 pushbase/jiguangpush/build.gradle             |  8 +++----
 pushbase/mipush/build.gradle                  |  9 +++-----
 router/build.gradle                           | 15 ++++++-------
 util/build.gradle                             | 13 +++++-------
 13 files changed, 57 insertions(+), 81 deletions(-)

diff --git a/AutoViewPager/build.gradle b/AutoViewPager/build.gradle
index d98773d..a08b2d6 100644
--- a/AutoViewPager/build.gradle
+++ b/AutoViewPager/build.gradle
@@ -4,12 +4,11 @@ plugins {
 
 android {
     namespace 'com.ggz.autoviewpager'
-    compileSdk 31
 
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdk 24
-        targetSdk 31
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/H264/build.gradle b/H264/build.gradle
index ffc6637..46718cc 100644
--- a/H264/build.gradle
+++ b/H264/build.gradle
@@ -4,15 +4,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
     }
 
     buildTypes {
diff --git a/JsonViewer/build.gradle b/JsonViewer/build.gradle
index 13c42b5..07b487b 100644
--- a/JsonViewer/build.gradle
+++ b/JsonViewer/build.gradle
@@ -4,12 +4,10 @@ plugins {
 }
 
 android {
-    compileSdk 30
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdk 24
-        targetSdk 30
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/LongImage/build.gradle b/LongImage/build.gradle
index 1ebe4fa..1bdab4e 100644
--- a/LongImage/build.gradle
+++ b/LongImage/build.gradle
@@ -4,15 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 30
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdk 23
-        targetSdk 30
-        versionCode 1
-        versionName "1.0"
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
@@ -22,17 +19,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
     implementation "androidx.appcompat:appcompat:$appcompat"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.5.0'
 }
\ No newline at end of file
diff --git a/LongImage/src/main/java/com/ggz/picture/LongImage.kt b/LongImage/src/main/java/com/ggz/picture/LongImage.kt
index 3c81d13..6d0ab64 100644
--- a/LongImage/src/main/java/com/ggz/picture/LongImage.kt
+++ b/LongImage/src/main/java/com/ggz/picture/LongImage.kt
@@ -59,7 +59,7 @@ class LongImageView : androidx.appcompat.widget.AppCompatImageView {
         }
 
         //显示区域图片
-        mBitmapRegionDecoder = BitmapRegionDecoder.newInstance(longImageInput, false)
+        mBitmapRegionDecoder = BitmapRegionDecoder.newInstance(longImageInput, false)!!
         var options: BitmapFactory.Options = BitmapFactory.Options()
         options.inPreferredConfig = Bitmap.Config.RGB_565
         var bitmap: Bitmap = mBitmapRegionDecoder.decodeRegion(
diff --git a/annotation/build.gradle b/annotation/build.gradle
index e493c42..17d99ee 100644
--- a/annotation/build.gradle
+++ b/annotation/build.gradle
@@ -3,6 +3,6 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
\ No newline at end of file
diff --git a/code_h264/build.gradle b/code_h264/build.gradle
index 628b022..9a2299c 100644
--- a/code_h264/build.gradle
+++ b/code_h264/build.gradle
@@ -4,15 +4,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
     }
 
     buildTypes {
@@ -22,11 +21,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 }
 
diff --git a/network/build.gradle b/network/build.gradle
index ed962d2..59cc0fa 100644
--- a/network/build.gradle
+++ b/network/build.gradle
@@ -2,15 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
+        consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
diff --git a/player/build.gradle b/player/build.gradle
index d10d648..586c396 100644
--- a/player/build.gradle
+++ b/player/build.gradle
@@ -4,12 +4,10 @@ plugins {
 }
 
 android {
-    compileSdk 31
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdk 26
-        targetSdk 31
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/pushbase/jiguangpush/build.gradle b/pushbase/jiguangpush/build.gradle
index 9449eb0..b082ab7 100644
--- a/pushbase/jiguangpush/build.gradle
+++ b/pushbase/jiguangpush/build.gradle
@@ -8,13 +8,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
 
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
diff --git a/pushbase/mipush/build.gradle b/pushbase/mipush/build.gradle
index 0487997..b2d81eb 100644
--- a/pushbase/mipush/build.gradle
+++ b/pushbase/mipush/build.gradle
@@ -3,13 +3,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
diff --git a/router/build.gradle b/router/build.gradle
index 599b184..96410be 100644
--- a/router/build.gradle
+++ b/router/build.gradle
@@ -10,15 +10,12 @@ plugins{
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
-    /* applicationId "com.guiguzi.router"*/
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
@@ -28,8 +25,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility "1.8"
-        targetCompatibility "1.8"
+        sourceCompatibility "11"
+        targetCompatibility "11"
     }
 
 }
diff --git a/util/build.gradle b/util/build.gradle
index 4695804..40254c4 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -3,13 +3,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
+    compileSdk rootProject.ext.android.compileSdk
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 30
-
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -21,8 +18,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
-- 
Gitee


From 92ed692362ea24b1670e9ecab2b2c20950fc874d Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Thu, 1 Dec 2022 17:02:06 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97gradle=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 H264/build.gradle                             |   2 +-
 JsonViewer/build.gradle                       |   2 +-
 LongImage/build.gradle                        |   1 +
 .../jetpack/NavigationExtensions.kt           |   2 +-
 code_h264/build.gradle                        |   4 +-
 network/build.gradle                          |   2 +-
 pushbase/jiguangpush/build.gradle             |   2 +-
 .../jiguangpush/src/main/AndroidManifest.xml  | 141 +++++++++---------
 router/build.gradle                           |   3 +-
 9 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/H264/build.gradle b/H264/build.gradle
index 46718cc..cee5eeb 100644
--- a/H264/build.gradle
+++ b/H264/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
     implementation "androidx.appcompat:appcompat:$appcompat"
     implementation 'com.google.android.material:material:1.4.0'
 
diff --git a/JsonViewer/build.gradle b/JsonViewer/build.gradle
index 07b487b..ade2f69 100644
--- a/JsonViewer/build.gradle
+++ b/JsonViewer/build.gradle
@@ -29,7 +29,7 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
     implementation "androidx.appcompat:appcompat:$appcompat"
     implementation 'com.google.android.material:material:1.4.0'
 }
diff --git a/LongImage/build.gradle b/LongImage/build.gradle
index 1bdab4e..d10c895 100644
--- a/LongImage/build.gradle
+++ b/LongImage/build.gradle
@@ -32,4 +32,5 @@ dependencies {
     implementation "androidx.core:core-ktx:$core_ktx"
     implementation "androidx.appcompat:appcompat:$appcompat"
     implementation 'com.google.android.material:material:1.5.0'
+    testImplementation 'org.testng:testng:7.1.0'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/guiguzi/androidtest/jetpack/NavigationExtensions.kt b/app/src/main/java/com/guiguzi/androidtest/jetpack/NavigationExtensions.kt
index e858217..76f5a54 100644
--- a/app/src/main/java/com/guiguzi/androidtest/jetpack/NavigationExtensions.kt
+++ b/app/src/main/java/com/guiguzi/androidtest/jetpack/NavigationExtensions.kt
@@ -174,7 +174,7 @@ private fun BottomNavigationView.setupItemReselected(
         val navController = selectedFragment.navController
         // Pop the back stack to the start destination of the current navController graph
         navController.popBackStack(
-            navController.graph.startDestination, false
+            navController.graph.getStartDestination(), false
         )
     }
 }
diff --git a/code_h264/build.gradle b/code_h264/build.gradle
index 9a2299c..01f9a53 100644
--- a/code_h264/build.gradle
+++ b/code_h264/build.gradle
@@ -10,8 +10,6 @@ android {
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
-        versionCode rootProject.ext.android.versionCode
-        versionName rootProject.ext.android.versionName
     }
 
     buildTypes {
@@ -32,7 +30,7 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
     implementation "androidx.appcompat:appcompat:$appcompat"
     implementation 'com.google.android.material:material:1.4.0'
 
diff --git a/network/build.gradle b/network/build.gradle
index 59cc0fa..7e78435 100644
--- a/network/build.gradle
+++ b/network/build.gradle
@@ -23,5 +23,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 //    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.appcompat:appcompat:$appcompat"
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
 }
diff --git a/pushbase/jiguangpush/build.gradle b/pushbase/jiguangpush/build.gradle
index b082ab7..75011d0 100644
--- a/pushbase/jiguangpush/build.gradle
+++ b/pushbase/jiguangpush/build.gradle
@@ -49,7 +49,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
     implementation "androidx.appcompat:appcompat:$appcompat"
     implementation 'com.google.android.material:material:1.4.0'
 }
\ No newline at end of file
diff --git a/pushbase/jiguangpush/src/main/AndroidManifest.xml b/pushbase/jiguangpush/src/main/AndroidManifest.xml
index 064ba64..9783814 100644
--- a/pushbase/jiguangpush/src/main/AndroidManifest.xml
+++ b/pushbase/jiguangpush/src/main/AndroidManifest.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.wzq.jiguangpush">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.wzq.jiguangpush">
 
     <uses-permission
         android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
-        tools:ignore="ProtectedPermissions" />
+        tools:ignore="ProtectedPermissions"/>
 
     <!-- Required -->
     <permission
         android:name="com.guiguzi.androidtest.permission.JPUSH_MESSAGE"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature"/>
     <uses-permission android:name="com.guiguzi.androidtest.permission.JPUSH_MESSAGE"/>
 
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
     <!-- Required  一些系统要求的权限，如访问网络等-->
-    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+        tools:ignore="ScopedStorage"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission
         android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-        tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+        tools:ignore="ProtectedPermissions"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 
     <!--华为角标-->
-    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" />
+    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
 
     <!-- Optional for location -->
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 用于开启 debug 版本的应用在6.0 系统上 层叠窗口权限 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /><!-- Android Q后台定位权限-->
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <!-- 用于开启 debug 版本的应用在6.0 系统上 层叠窗口权限 -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/><!-- Android Q后台定位权限-->
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.GET_TASKS"/>
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
+        tools:ignore="QueryAllPackagesPermission"/>
 
     <!-- for androidR targetSdkVersion >=30 -->
     <!--    <queries >-->
@@ -59,22 +59,22 @@
         <!-- For test only 测试的主程序-->
         <activity
             android:name="com.wzq.jiguangpush.JiGuangPushMainActivity"
-            android:label="@string/app_name" />
+            android:label="@string/app_name"/>
         <!-- For test only 测试高级功能 -->
         <activity
             android:name="com.wzq.jiguangpush.PushSetActivity"
-            android:label="@string/app_name" />
+            android:label="@string/app_name"/>
         <!-- For test only 测试设置 -->
         <activity
             android:name="com.wzq.jiguangpush.SettingActivity"
-            android:label="@string/app_name" />
+            android:label="@string/app_name"/>
         <!-- For test only 测试状态通知栏，需要打开的Activity -->
         <activity
             android:name="com.wzq.jiguangpush.TestActivity"
             android:exported="false">
             <intent-filter>
-                <action android:name="jpush.testAction" />
-                <category android:name="jpush.testCategory" />
+                <action android:name="jpush.testAction"/>
+                <category android:name="jpush.testCategory"/>
             </intent-filter>
         </activity>
 
@@ -82,7 +82,7 @@
         <activity
             android:name="cn.jpush.android.ui.PopWinActivity"
             android:exported="false"
-            android:theme="@style/MyDialogStyle" />
+            android:theme="@style/MyDialogStyle"/>
 
         <!-- Required SDK核心功能-->
         <activity
@@ -91,10 +91,10 @@
             android:exported="false"
             android:theme="@android:style/Theme.NoTitleBar">
             <intent-filter>
-                <action android:name="cn.jpush.android.ui.PushActivity" />
+                <action android:name="cn.jpush.android.ui.PushActivity"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="com.guiguzi.androidtest" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="com.guiguzi.androidtest"/>
             </intent-filter>
         </activity>
 
@@ -102,12 +102,13 @@
         <!-- 可配置android:process参数将PushService放在其他进程中 -->
         <service
             android:name="cn.jpush.android.service.PushService"
+            android:exported="true"
             android:process=":pushcore">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.REGISTER" />
-                <action android:name="cn.jpush.android.intent.REPORT" />
-                <action android:name="cn.jpush.android.intent.PushService" />
-                <action android:name="cn.jpush.android.intent.PUSH_TIME" />
+                <action android:name="cn.jpush.android.intent.REGISTER"/>
+                <action android:name="cn.jpush.android.intent.REPORT"/>
+                <action android:name="cn.jpush.android.intent.PushService"/>
+                <action android:name="cn.jpush.android.intent.PUSH_TIME"/>
             </intent-filter>
         </service>
 
@@ -116,7 +117,7 @@
             android:name="cn.jpush.android.service.DataProvider"
             android:authorities="com.guiguzi.androidtest.DataProvider"
             android:exported="false"
-            android:process=":pushcore" />
+            android:process=":pushcore"/>
 
         <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
         <!-- 若不启用该功能可删除该组件，或把 enabled 设置成 false ；App 不会被其他 App 拉起，但会拉起其他的 App。 -->
@@ -125,8 +126,8 @@
             android:enabled="true"
             android:exported="true">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.DaemonService" />
-                <category android:name="com.guiguzi.androidtest" />
+                <action android:name="cn.jpush.android.intent.DaemonService"/>
+                <category android:name="com.guiguzi.androidtest"/>
             </intent-filter>
 
         </service>
@@ -139,8 +140,8 @@
             android:taskAffinity="jpush.custom"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.DActivity" />
-                <category android:name="com.guiguzi.androidtest" />
+                <action android:name="cn.jpush.android.intent.DActivity"/>
+                <category android:name="com.guiguzi.androidtest"/>
             </intent-filter>
         </activity>
 
@@ -148,60 +149,65 @@
         <provider
             android:name="cn.jpush.android.service.DownloadProvider"
             android:authorities="com.guiguzi.androidtest.DownloadProvider"
-            android:exported="true" />
+            android:exported="true"/>
 
         <!-- Required SDK核心功能-->
         <receiver
             android:name="cn.jpush.android.service.PushReceiver"
+            android:exported="true"
             android:enabled="true">
             <intent-filter android:priority="1000">
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />   <!--Required  显示通知栏 -->
-                <category android:name="com.guiguzi.androidtest" />
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>   <!--Required  显示通知栏 -->
+                <category android:name="com.guiguzi.androidtest"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT" />
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+                <action android:name="android.intent.action.USER_PRESENT"/>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
             <!-- Optional -->
             <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+                <action android:name="android.intent.action.PACKAGE_ADDED"/>
+                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
 
-                <data android:scheme="package" />
+                <data android:scheme="package"/>
             </intent-filter>
         </receiver>
 
         <!-- Required SDK核心功能-->
         <receiver
             android:name="cn.jpush.android.service.AlarmReceiver"
-            android:exported="false" />
+            android:exported="false"/>
 
         <!-- 3.5.0新增，用于定时展示功能 -->
         <receiver
             android:name="cn.jpush.android.service.SchedulerReceiver"
-            android:exported="false" />
+            android:exported="false"/>
 
         <!-- User defined.  For test only  用户自定义的广播接收器-->
         <receiver
             android:name="com.wzq.jiguangpush.MyReceiver"
+            android:exported="true"
             android:enabled="true">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.REGISTRATION" /> <!--Required  用户注册SDK的intent-->
-                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" /> <!--Required  用户接收SDK消息的intent-->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" /> <!--Required  用户接收SDK通知栏信息的intent-->
-                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" /> <!--Required  用户打开自定义通知栏的intent-->
-                <action android:name="cn.jpush.android.intent.CONNECTION" /><!-- 接收网络变化 连接/断开 since 1.6.3 -->
-                <category android:name="com.guiguzi.androidtest" />
+                <action android:name="cn.jpush.android.intent.REGISTRATION"/> <!--Required  用户注册SDK的intent-->
+                <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED"/> <!--Required  用户接收SDK消息的intent-->
+                <action
+                    android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED"/> <!--Required  用户接收SDK通知栏信息的intent-->
+                <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/> <!--Required  用户打开自定义通知栏的intent-->
+                <action android:name="cn.jpush.android.intent.CONNECTION"/><!-- 接收网络变化 连接/断开 since 1.6.3 -->
+                <category android:name="com.guiguzi.androidtest"/>
             </intent-filter>
         </receiver>
 
 
         <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
         <!--since 3.3.0 接收JPush相关事件-->
-        <receiver android:name="com.wzq.jiguangpush.JiGuangPushMessageReceiver">
+        <receiver
+            android:name="com.wzq.jiguangpush.JiGuangPushMessageReceiver"
+            android:exported="true">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
-                <category android:name="com.guiguzi.androidtest" />
+                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE"/>
+                <category android:name="com.guiguzi.androidtest"/>
             </intent-filter>
         </receiver>
 
@@ -212,8 +218,8 @@
             android:taskAffinity="jpush.custom"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.JNotifyActivity" />
-                <category android:name="com.guiguzi.androidtest" />
+                <action android:name="cn.jpush.android.intent.JNotifyActivity"/>
+                <category android:name="com.guiguzi.androidtest"/>
             </intent-filter>
         </activity>
 
@@ -222,19 +228,20 @@
         <!--User defined.  For test only 继承自cn.jpush.android.service.JCommonService-->
         <service
             android:name="com.wzq.jiguangpush.PushService"
+            android:exported="true"
             android:process=":pushcore">
             <intent-filter>
-                <action android:name="cn.jiguang.user.service.action" />
+                <action android:name="cn.jiguang.user.service.action"/>
             </intent-filter>
         </service>
         <!-- since 3.5.6 新增华硕通道  -->
-        <receiver android:name="cn.jpush.android.asus.AsusPushMessageReceiver" />
+        <receiver android:name="cn.jpush.android.asus.AsusPushMessageReceiver"/>
         <!-- Required  . Enable it you can get statistics data with channel -->
         <meta-data
             android:name="JPUSH_CHANNEL"
-            android:value="${JPUSH_CHANNEL}" />
+            android:value="${JPUSH_CHANNEL}"/>
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="${JPUSH_APPKEY}" />  <!--  </>值来自开发者平台取得的AppKey-->
+            android:value="${JPUSH_APPKEY}"/>  <!--  </>值来自开发者平台取得的AppKey-->
     </application>
 </manifest>
\ No newline at end of file
diff --git a/router/build.gradle b/router/build.gradle
index 96410be..0721d63 100644
--- a/router/build.gradle
+++ b/router/build.gradle
@@ -33,8 +33,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.appcompat:appcompat:$appcompat"
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
-- 
Gitee


From 03df171974d7c2bced6b38661c8d9c1cc9c1224e Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Thu, 1 Dec 2022 17:02:51 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97gradle=20v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle    |  6 +++---
 build.gradle        | 21 ++++++++++++---------
 player/build.gradle |  6 +++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2faeab1..56cf9d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -107,10 +107,10 @@ dependencies {
 
     /*Jetpack引入包*/
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
 
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation "com.google.android.material:material:$material"
     /***********Jetpack End*************/
 
     implementation "androidx.activity:activity-compose:$compose_activity_version"
diff --git a/build.gradle b/build.gradle
index 44f3101..c0b19a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         android = [
                 compileSdk      : 32,
                 minSdkVersion   : 26,
-                targetSdkVersion: 30,
+                targetSdkVersion: 32,
                 versionCode     : 1,
                 versionName     : "1.0.0"
         ]
@@ -15,23 +15,28 @@ buildscript {
         /*gralde tool de 版本号*/
         gradle_tool_version = '7.0.0'
         core_ktx = '1.7.0'
-        kotlin_version = '1.5.31'
-        kotlin_gradle_version = '1.5.31'
+        kotlin_version = '1.6.10'
+        kotlin_plugin_version = '1.7.10'
+        kotlin_gradle_version = '1.6.10'
         appCompatVersion = "1.1.0"
         recyclerVersion = "1.2.1"
         materialVersion = "1.1.0-beta01"
         navigationVersion = "2.1.0"
         constraintLayoutVersion = "2.0.0-beta3"
+        material = '1.5.0'
 
-        appcompat = "1.3.1"
+        appcompat = "1.4.1"
 
         swiperefreshlayout = "1.1.0"
         viewpager2 = '1.0.0'
 
+        /*jatpack版本*/
+        lifecycle = '2.4.1'
+
         /*navagiton版本号*/
-        navagition_version = "2.3.5"
+        navagition_version = "2.4.1"
         /*compose版本号*/
-        compose_version = '1.0.5'
+        compose_version = '1.1.1'
         compose_activity_version = '1.3.1'
 
         data_store = '1.0.0'
@@ -44,7 +49,7 @@ buildscript {
         gson = '2.9.0'
 
         /*kotlin*/
-        kotlinx_coroutines_android = '1.5.1'
+        kotlinx_coroutines_android = '1.6.2'
 
         glide = '4.12.0'
         eventbus = '3.3.1'
@@ -75,8 +80,6 @@ buildscript {
         classpath "com.android.tools.build:gradle:$gradle_tool_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_gradle_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navagition_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
 
         classpath "org.aspectj:aspectjtools:$aspectj"
         classpath "org.aspectj:aspectjweaver:$aspectj"
diff --git a/player/build.gradle b/player/build.gradle
index 586c396..4738e7a 100644
--- a/player/build.gradle
+++ b/player/build.gradle
@@ -19,8 +19,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = '1.8'
@@ -29,7 +29,7 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_ktx"
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.13.2'
-- 
Gitee


From 76a93de04d4164892ca8168b8977ae8791581ee8 Mon Sep 17 00:00:00 2001
From: zhangqing8 <wangbingfusui@163.com>
Date: Thu, 1 Dec 2022 17:33:19 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9gralde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 2 --
 build.gradle     | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 56cf9d2..e1435ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,12 +51,10 @@ android {
 
     buildFeatures {
         dataBinding = true
-        // viewBinding = true
         compose true          // 启用Jetpack Compose组件特性
     }
 
     composeOptions {
-//        kotlinCompilerVersion kotlin_version
         kotlinCompilerExtensionVersion compose_version
     }
 
diff --git a/build.gradle b/build.gradle
index c0b19a5..dfab43b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         gradle_tool_version = '7.0.0'
         core_ktx = '1.7.0'
         kotlin_version = '1.6.10'
-        kotlin_plugin_version = '1.7.10'
+        //kotlin版本
         kotlin_gradle_version = '1.6.10'
         appCompatVersion = "1.1.0"
         recyclerVersion = "1.2.1"
@@ -37,7 +37,7 @@ buildscript {
         navagition_version = "2.4.1"
         /*compose版本号*/
         compose_version = '1.1.1'
-        compose_activity_version = '1.3.1'
+        compose_activity_version = '1.4.0'
 
         data_store = '1.0.0'
 
-- 
Gitee