Merge branch 'czq'

# Conflicts:
#	app/src/main/AndroidManifest.xml

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\crius\.android\avd\Nexus_7_API_31.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-09-26T08:19:12.505635600Z" />
-  </component>
-</project>

.idea/misc.xml

@@ -3,15 +3,18 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_class_list.xml" value="0.17604166666666668" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_config.xml" value="0.18020833333333333" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_congratulations.xml" value="0.1" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_count_down.xml" value="0.25" />
+        <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_drag.xml" value="0.17604166666666668" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_drag_select.xml" value="0.12708333333333333" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_enty_anim.xml" value="0.11979166666666667" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_gsxy_video.xml" value="0.1" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_ijkplay.xml" value="0.1390625" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_lottie.xml" value="0.1" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_main.xml" value="0.1375" />
+        <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_map_challenge.xml" value="0.17604166666666668" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_progress.xml" value="0.22" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_quxian.xml" value="0.13645833333333332" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_sequential_drag.xml" value="0.12092391304347826" />
@@ -27,8 +30,8 @@
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_web.xml" value="0.1816123188405797" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/demo_activity.xml" value="0.18020833333333333" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/fragment_video_demand.xml" value="0.12291666666666666" />
+        <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/item_class.xml" value="0.17604166666666668" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/item_word_sound.xml" value="0.10190217391304347" />
-        <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/drawable/drag_error_bg.xml" value="0.174" />
         <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/layout/activity_map_challenge.xml" value="0.36886005560704355" />
         <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/layout/activity_role_play.xml" value="0.5324675324675324" />
         <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/layout/activity_video_play.xml" value="0.11399443929564411" />

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?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.xunao.effectdemo">
+    package="com.xunao.effectdemo" >
 
     <uses-sdk tools:overrideLibrary="com.qmuiteam.qmui" />
 
@@ -31,8 +31,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".activity.MainActivity">
+        android:usesCleartextTraffic="true" >
+        <activity android:name=".activity.MainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -77,7 +77,7 @@
             android:name=".receiver.MyService"
             android:enabled="true"
             android:exported="false"
-            android:process=":pushcore">
+            android:process=":pushcore" >
             <intent-filter>
                 <action android:name="cn.jiguang.user.service.action" />
             </intent-filter>
@@ -86,7 +86,7 @@
         <receiver
             android:name=".receiver.PushMessageReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
 
@@ -98,7 +98,7 @@
             android:name="cn.jiguang.union.ads.service.JAdFileProvider"
             android:authorities="${applicationId}.JAdFileProvider"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true" >
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/jpush_file_paths" />
@@ -144,10 +144,7 @@
         <activity
             android:name=".activity.DragActivity"
             android:screenOrientation="landscape" />
-        <activity
-            android:name=".activity.VideoPlayActivity"
-            android:screenOrientation="landscape"  />
-        <activity android:name=".activity.NewSongLyricActivity" />
+        <activity android:name=".activity.NewSongLyricActivity"/>
     </application>
 
 </manifest>

app/src/main/java/com/xunao/effectdemo/activity/InClassActivity.java

@@ -1,5 +1,18 @@
 package com.xunao.effectdemo.activity;
 
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.xunao.effectdemo.R;
+import com.xunao.effectdemo.adapter.ClassItemAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * author : 程中强
  * e-mail : 740479946@qq.com
@@ -7,5 +20,25 @@ package com.xunao.effectdemo.activity;
  * desc :
  * version: 1.0
  */
-public class InClassActivity {
+public class InClassActivity extends Activity {
+	ClassItemAdapter adapter;
+	private RecyclerView rv;
+	private List<String> list = new ArrayList<>();
+
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_class_list);
+		rv = findViewById(R.id.rl_list);
+		init();
+	}
+
+	void init(){
+		for (int i = 0; i < 10; i++) {
+			list.add(i+"");
+		}
+		adapter = new ClassItemAdapter(this,list);
+		rv.setLayoutManager(new LinearLayoutManager(this,LinearLayoutManager.HORIZONTAL, false));
+		rv.setAdapter(adapter);
+	}
 }

app/src/main/java/com/xunao/effectdemo/activity/MapChallengeActivity.java

@@ -31,7 +31,7 @@ import java.util.Map;
  */
 public class MapChallengeActivity extends Activity {
     private static final String TAG = "MapChallengeActivity";
-    Button btnMap1, btnMap2, btnMap3, btnMap4, btnMap5, btnMap6;
+    Button btnMap1, btnMap2, btnMap3, btnMap4, btnMap5, btnMap6 , btnMap7;
 
     Intent intent;
 
@@ -95,6 +95,12 @@ public class MapChallengeActivity extends Activity {
             startActivity(intent);
         });
 
+        btnMap7 = findViewById(R.id.btn_map_7);
+        btnMap7.setOnClickListener(v -> {
+            intent = new Intent(MapChallengeActivity.this, InClassActivity.class);
+            startActivity(intent);
+        });
+
     }
 
     void login(){

app/src/main/java/com/xunao/effectdemo/adapter/ClassItemAdapter.java

@@ -0,0 +1,71 @@
+package com.xunao.effectdemo.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.hpplay.sdk.source.browse.api.LelinkServiceInfo;
+import com.xunao.effectdemo.R;
+
+import java.util.List;
+
+/**
+ * author : 程中强
+ * e-mail : 740479946@qq.com
+ * date : 2022/9/2617:36
+ * desc :
+ * version: 1.0
+ */
+public class ClassItemAdapter extends RecyclerView.Adapter<ClassItemAdapter.ViewHolder> {
+
+	private List<String> data;
+	private Context context;
+
+	public ClassItemAdapter(Context context, @Nullable List<String> data) {
+
+		this.context = context;
+		this.data = data;
+	}
+
+	@NonNull
+	@Override
+	public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+		View view = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.item_class,parent,false);
+		ViewHolder holder = new ViewHolder(view);
+		return holder;
+
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+		if (position%2==0){
+			holder.v.setVisibility(View.GONE);
+		}else{
+			holder.v.setVisibility(View.VISIBLE);
+		}
+	}
+
+	@Override
+	public int getItemCount() {
+		return data.isEmpty()?null:data.size();
+	}
+
+
+	public static class ViewHolder extends RecyclerView.ViewHolder {
+
+		private View v;
+
+		public ViewHolder(@NonNull View itemView) {
+			super(itemView);
+			v = itemView.findViewById(R.id.view);
+		}
+	}
+}

app/src/main/res/layout/activity_class_list.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rl_list"
+        android:layout_centerInParent="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>

app/src/main/res/layout/activity_map_challenge.xml

@@ -51,6 +51,12 @@
             android:text="角色扮演"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
+
+        <Button
+            android:id="@+id/btn_map_7"
+            android:text="课程列表"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
     </LinearLayout>
 
 

app/src/main/res/layout/item_class.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_centerInParent="true"
+        android:orientation="vertical"
+        android:layout_width="120dp"
+        android:layout_margin="20dp"
+        android:layout_height="wrap_content">
+
+        <View
+            android:id="@+id/view"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"/>
+
+        <com.xuexiang.xui.widget.imageview.RadiusImageView
+            android:id="@+id/imv"
+            android:src="@color/colorAccent"
+            app:riv_corner_radius="100dp"
+            android:layout_width="120dp"
+            android:layout_height="120dp"/>
+
+        <TextView
+            android:text="吉的堡"
+            android:layout_marginTop="20dp"
+            android:textSize="25sp"
+            android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</RelativeLayout>