修改部分编译问题

BaseLibrary/src/main/java/com/cooleshow/base/common/BaseConstant.java

@@ -22,6 +22,7 @@ public class BaseConstant {
     public final static String KEY_SP_TOKEN = "token";
     public final static String STUDENT_ID = "student_id";
     public final static String CHECK_ADDRESS = "check_address";
+    public static final String CLIENT_API_GROUP_NAME = "";
 
     /**
      * 获取图片验证码地址

BaseLibrary/src/main/java/com/cooleshow/base/utils/LOG.java

@@ -0,0 +1,51 @@
+package com.cooleshow.base.utils;
+
+import android.util.Log;
+
+import com.cooleshow.base.BuildConfig;
+
+
+/**
+ * Author by pq, Date on 2023/6/25.
+ */
+public class LOG {
+    public static final String TAG = "pq_log";
+
+    private static final boolean DEBUG = BuildConfig.DEBUG;
+
+    public static void d(String msg) {
+        if (DEBUG) {
+            Log.d(TAG, msg);
+        }
+    }
+
+    public static void e(String msg) {
+        if (DEBUG) {
+            Log.e(TAG, msg);
+        }
+    }
+
+    public static void i(String msg) {
+        if (DEBUG) {
+            Log.i(TAG, msg);
+        }
+    }
+
+    public static void i(String tag,String msg) {
+        if (DEBUG) {
+            Log.i(tag, msg);
+        }
+    }
+
+    public static void v( String msg) {
+        if (DEBUG) {
+            Log.v(TAG, msg);
+        }
+    }
+
+    public static void w(String msg) {
+        if (DEBUG) {
+            Log.w(TAG, msg);
+        }
+    }
+}

BaseLibrary/src/main/java/com/cooleshow/base/widgets/ClearEditText.java

@@ -0,0 +1,129 @@
+package com.cooleshow.base.widgets;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.cooleshow.base.R;
+import com.cooleshow.base.utils.SizeUtils;
+
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+/**
+ * Author by pq, Date on 2023/2/15.
+ */
+public class ClearEditText extends AppCompatEditText implements View.OnTouchListener, View.OnFocusChangeListener, TextWatcher {
+
+    private Drawable mClearTextIcon;
+    private OnFocusChangeListener mOnFocusChangeListener;
+    private OnTouchListener mOnTouchListener;
+
+    public ClearEditText(final Context context) {
+        super(context);
+        init(context);
+    }
+
+    public ClearEditText(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public ClearEditText(final Context context, final AttributeSet attrs, final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    private void init(final Context context) {
+        final Drawable drawable = ContextCompat.getDrawable(context, R.drawable.icon_clear_edit_content);
+        final Drawable wrappedDrawable = DrawableCompat.wrap(drawable); //Wrap the drawable so that it can be tinted pre Lollipop
+        DrawableCompat.setTint(wrappedDrawable, getCurrentHintTextColor());
+        mClearTextIcon = wrappedDrawable;
+        mClearTextIcon.setBounds(0, 0, mClearTextIcon.getIntrinsicWidth(), mClearTextIcon.getIntrinsicHeight());
+        setClearIconVisible(false);
+        super.setOnTouchListener(this);
+        super.setOnFocusChangeListener(this);
+        addTextChangedListener(this);
+        setCompoundDrawablePadding(SizeUtils.dp2px(5));
+        setPadding(getPaddingLeft(),getPaddingTop(),getPaddingRight()+SizeUtils.dp2px(5),getPaddingBottom());
+    }
+
+    @Override
+    public void setOnFocusChangeListener(OnFocusChangeListener l) {
+        mOnFocusChangeListener = l;
+    }
+
+    @Override
+    public void setOnTouchListener(OnTouchListener l) {
+        mOnTouchListener = l;
+    }
+
+    @Override
+    public void onFocusChange(View v, boolean hasFocus) {
+        if (hasFocus) {
+            setClearIconVisible(getText().length() > 0);
+        } else {
+            setClearIconVisible(false);
+        }
+        if (mOnFocusChangeListener != null) {
+            mOnFocusChangeListener.onFocusChange(v, hasFocus);
+        }
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent motionEvent) {
+        final int x = (int) motionEvent.getX();
+        if (mClearTextIcon.isVisible() && x > getWidth() - getPaddingRight() - mClearTextIcon.getIntrinsicWidth()) {
+            if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+                setError(null);
+                setText("");
+            }
+            return true;
+        }
+        return mOnTouchListener != null && mOnTouchListener.onTouch(view, motionEvent);
+    }
+
+    @Override
+    public final void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+        if (isFocused()) {
+            setClearIconVisible(text.length() > 0);
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        if (mTextWatchListener != null) {
+            mTextWatchListener.afterTextChanged(s);
+        }
+    }
+
+    private void setClearIconVisible(final boolean visible) {
+        mClearTextIcon.setVisible(visible, false);
+        final Drawable[] compoundDrawables = getCompoundDrawables();
+        setCompoundDrawables(
+                compoundDrawables[0],
+                compoundDrawables[1],
+                visible ? mClearTextIcon : null,
+                compoundDrawables[3]);
+    }
+
+    private OnTextWatchListener mTextWatchListener;
+
+    public void setTextWatchListener(OnTextWatchListener textWatchListener) {
+        mTextWatchListener = textWatchListener;
+    }
+
+    public interface OnTextWatchListener{
+        void afterTextChanged(Editable s);
+    }
+}

BaseLibrary/src/main/java/com/cooleshow/base/widgets/CustomLoadMoreView.java

@@ -0,0 +1,46 @@
+package com.cooleshow.base.widgets;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.chad.library.adapter.base.loadmore.BaseLoadMoreView;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.cooleshow.base.R;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Author by pq, Date on 2023/2/28.
+ */
+public class CustomLoadMoreView extends BaseLoadMoreView {
+    @NonNull
+    @Override
+    public View getLoadComplete(@NonNull BaseViewHolder baseViewHolder) {
+        return baseViewHolder.getView(R.id.load_more_load_complete_view);
+    }
+
+    @NonNull
+    @Override
+    public View getLoadEndView(@NonNull BaseViewHolder baseViewHolder) {
+        return baseViewHolder.getView(R.id.load_more_load_end_view);
+    }
+
+    @NonNull
+    @Override
+    public View getLoadFailView(@NonNull BaseViewHolder baseViewHolder) {
+        return baseViewHolder.getView(R.id.load_more_load_fail_view);
+    }
+
+    @NonNull
+    @Override
+    public View getLoadingView(@NonNull BaseViewHolder baseViewHolder) {
+        return baseViewHolder.getView(R.id.load_more_loading_view);
+    }
+
+    @NonNull
+    @Override
+    public View getRootView(@NonNull ViewGroup viewGroup) {
+        return LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.view_custom_loadmore_layout, viewGroup, false);
+    }
+}

BaseLibrary/src/main/java/com/cooleshow/base/widgets/CustomSuspensionDecoration.java

@@ -0,0 +1,24 @@
+package com.cooleshow.base.widgets;
+
+import android.content.Context;
+import android.graphics.Canvas;
+
+import com.mcxtzhang.indexlib.suspension.ISuspensionInterface;
+import com.mcxtzhang.indexlib.suspension.SuspensionDecoration;
+
+import java.util.List;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Author by pq, Date on 2023/3/27.
+ */
+public class CustomSuspensionDecoration extends SuspensionDecoration {
+    public CustomSuspensionDecoration(Context context, List<? extends ISuspensionInterface> datas) {
+        super(context, datas);
+    }
+
+    @Override
+    public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {
+    }
+}

BaseLibrary/src/main/res/layout/view_custom_loadmore_layout.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_40">
+
+    <LinearLayout
+        android:id="@+id/load_more_loading_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <ProgressBar
+            android:id="@+id/loading_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_marginRight="@dimen/dp_4"/>
+
+        <TextView
+            android:id="@+id/loading_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_4"
+            android:text="@string/brvah_loading"
+            android:textSize="@dimen/sp_12"
+            android:textColor="@color/color_aaaaaa" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/load_more_load_fail_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+
+        <TextView
+            android:text="加载失败"
+            android:id="@+id/tv_prompt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textSize="@dimen/sp_12"
+            android:textColor="@color/color_aaaaaa"/>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/load_more_load_complete_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="加载完成"
+            android:textSize="@dimen/sp_12"
+            android:textColor="@color/color_aaaaaa"/>
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/load_more_load_end_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="已经全部加载完毕"
+            android:textSize="@dimen/sp_12"
+            android:textColor="@color/color_aaaaaa"/>
+    </FrameLayout>
+</FrameLayout>

BaseLibrary/src/main/res/values/colors.xml

@@ -165,6 +165,8 @@
     <color name="color_ffebd3">#FFEBD3</color>
     <color name="color_ffd5aa">#FFD5AA</color>
     <color name="color_ff8000">#FF8000</color>
+    <color name="color_aaaaaa">#aaaaaa</color>
+
 
     <color name="color_25292e">#25292E</color>
     <color name="color_F8F8F8">#F8F8F8</color>

build.gradle

@@ -21,8 +21,8 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
+        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
         classpath 'com.huawei.agconnect:agcp:1.6.0.300'
     }
 }

config.gradle

@@ -8,7 +8,7 @@ ext {
             stuApplicationId        : 'com.cooleshow.student',
             teapplicationId         : 'com.cooleshow.teacher',
             compileSdkVersion       : 30,
-            buildToolsVersion       : "29.0.0",
+            buildToolsVersion       : "30.0.3",
             minSdkVersion           : 21,
             targetSdkVersion        : 29,
 
@@ -17,7 +17,7 @@ ext {
             teacherVersionName      : "3.5.7",
 
 
-            kotlin_version          : '1.5.31',
+            kotlin_version          : '1.7.10',
             anko_version            : '0.10.8',
             rx_lifecycle_version    : '2.2.1',
             glide_version           : "3.7.0",

gradle.properties

@@ -27,6 +27,8 @@ kapt.incremental.apt=false
 
 isUserModule = true
 android.injected.testOnly=false
+android.useDeprecatedNdk=true
+
 
 
 TEST_BASE_URL ="https://dev.colexiu.com/"

teacher/build.gradle

@@ -126,6 +126,7 @@ dependencies {
     implementation project(path: ':metronome')
     implementation project(path: ':musictuner')
     implementation project(path: ':ffmpegCmd')
+    implementation project(path: ':chatModule')
     implementation "com.alibaba:arouter-api:$rootProject.ext.android.arouter_api_version"
     kapt "com.alibaba:arouter-compiler:$rootProject.ext.android.arouter_api_version"
     //融云美颜库 //cn.rongcloud.sdk:rtc_lib:5.2.1

teacher/src/main/AndroidManifest.xml

@@ -37,7 +37,8 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:allowBackup">
 
         <meta-data
             android:name="design_width_in_dp"

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseActivity.java

@@ -54,7 +54,7 @@ public class MineLiveCourseActivity extends BaseMVPActivity<ActivityMineLiveCour
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right_text:
                 int teacherLiveFlag = UserHelper.getTeacherLiveFlag();
                 if (teacherLiveFlag == 0) {
                     ToastUtil.getInstance().showShort("您还未开通直播权限,开通后才可创建\n直播课哦");

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseActivity.java

@@ -48,7 +48,7 @@ public class MineVideoCourseActivity extends BaseMVPActivity<ActivityMineVideoCo
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right_text:
                 if (!teacherIsCert) {
                     ToastUtil.getInstance().showShort("您还没有完成达人认证,认证后才可创建\n视频课哦");
                     return;

teacher/src/main/java/com/cooleshow/teacher/ui/income/MineIncomeActivity.java

@@ -64,7 +64,7 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right_text:
                 ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                         .withString(WebConstants.WEB_URL, WebConstants.TEACHER_INCOME)
                         .navigation();

teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java

@@ -41,7 +41,7 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right_text:
                 ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_MINE_WITHDRAWAL_RECORD)
                         .navigation();
                 break;

teacher/src/main/java/com/cooleshow/teacher/ui/main/CourseTableFragment.kt

@@ -315,10 +315,10 @@ class CourseTableFragment :
         if (isDetached) {
             return;
         }
-        adapter?.data.clear()
+        adapter?.data?.clear()
         if (data?.studentList?.size != 0) {
             //更新日历表,显示有课字样
-            adapter.data.addAll(data?.studentList);
+            adapter.data.addAll(data?.studentList!!);
             adapter?.notifyDataSetChanged()
         } else {
             //show空视图

teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -32,6 +32,7 @@ import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.UpdateAppHelper;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.widgets.TabAnimationView;
+import com.cooleshow.chatmodule.ui.ChatFragment;
 import com.cooleshow.teacher.App;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomePageAdapter;
@@ -164,12 +165,13 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         CourseTableFragment courseTableFragment = new CourseTableFragment();
         mMessageFragment = new MessageFragment();
         shopMallFragment = new MallFragment();
+        ChatFragment chatFragment =new ChatFragment();
         mMineFragment = new MineFragment();
         mHomeFragment = new NewHomeFragment();
         mFragments.add(mHomeFragment);
         mFragments.add(courseTableFragment);
         mFragments.add(mMessageFragment);
-        mFragments.add(shopMallFragment);
+        mFragments.add(chatFragment);
         mFragments.add(mMineFragment);
         homePageAdapter.setFragments(mFragments);
         getViewBinding().viewPager.setAdapter(homePageAdapter);

teacher/src/main/java/com/cooleshow/teacher/ui/message/MessageBoxActivity.java

@@ -85,8 +85,8 @@ public class MessageBoxActivity extends BaseMVPActivity<ActivityMessageBoxBindin
                 currentPage = 1;
                 queryList(true);
                 break;
-            case R.id.tv_right:
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right:
+            case com.cooleshow.base.R.id.tv_right_text:
                 presenter.batchSetRead();
                 break;
         }

teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyNickNameActivity.java

@@ -37,7 +37,7 @@ public class ModifyNickNameActivity extends BaseMVPActivity<ActivityModifyNickna
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right_text:
                 String userName = viewBinding.etNickname.getText().toString().trim();
                 if (TextUtils.isEmpty(userName)) {
                     ToastUtil.getInstance().showShort("请输入昵称！");

teacher/src/main/java/com/cooleshow/teacher/ui/mine/MyBankCardActivity.java

@@ -39,7 +39,7 @@ public class MyBankCardActivity extends BaseMVPActivity<ActivityMyBankCardBindin
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right_text:
                 ARouter.getInstance().build(RouterPath.MineCenter.MINE_BIND_BANKCARD)
                         .navigation();
                 break;
@@ -51,10 +51,10 @@ public class MyBankCardActivity extends BaseMVPActivity<ActivityMyBankCardBindin
                 CommonTipDialog.getInstance(this)
                         .setTitle("解绑银行卡")
                         .setContent("解绑后将无法将收入提现，请确认是否继续解绑")
-                        .setCancel(getString(R.string.cancel), v -> {
+                        .setCancel(getString(com.cooleshow.base.R.string.cancel), v -> {
                             CommonTipDialog.dismissDialog();
                         })
-                        .setConfirm(getString(R.string.sure), v -> {
+                        .setConfirm(getString(com.cooleshow.base.R.string.sure), v -> {
                             CommonTipDialog.dismissDialog();
                             ARouter.getInstance().build(RouterPath.MineCenter.MINE_UNBIND_BANKCARD)
                                     .withString(TeacherConfig.BANK_CARD_ID, String.valueOf(rowsBean.id))

teacher/src/main/java/com/cooleshow/teacher/ui/mine/SettingActivity.java

@@ -47,9 +47,9 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
                 is_detection=!is_detection;
                 SPUtils.getInstance().put("IS_DETECTION",is_detection);
                 if (is_detection) {
-                    viewBinding.imSelect.setImageResource(R.drawable.icon_switch_off);
+                    viewBinding.imSelect.setImageResource(com.cooleshow.base.R.drawable.icon_switch_off);
                 } else {
-                    viewBinding.imSelect.setImageResource(R.drawable.icon_switch_open);
+                    viewBinding.imSelect.setImageResource(com.cooleshow.base.R.drawable.icon_switch_open);
                 }
                 break;
             case R.id.cl_user_private:
@@ -99,9 +99,9 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
 
         is_detection = SPUtils.getInstance().getBoolean("IS_DETECTION");
         if (is_detection) {
-            viewBinding.imSelect.setImageResource(R.drawable.icon_switch_off);
+            viewBinding.imSelect.setImageResource(com.cooleshow.base.R.drawable.icon_switch_off);
         } else {
-            viewBinding.imSelect.setImageResource(R.drawable.icon_switch_open);
+            viewBinding.imSelect.setImageResource(com.cooleshow.base.R.drawable.icon_switch_open);
         }
 
     }

teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/MineStylePageActivity.java

@@ -118,7 +118,7 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
                         .withBundle("bundle", bundle)
                         .navigation(this, SELECT_RESULT);
                 break;
-            case R.id.tv_right_text:
+            case com.cooleshow.base.R.id.tv_right_text:
             case R.id.tv_save:
                 myStyleInfoBean.styleVideo.clear();
                 for (TeacherSelfStyleInfoBean.StyleVideoBean styleVideoBean : videoBeanList) {

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -89,7 +89,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.tv_right:
+            case com.cooleshow.base.R.id.tv_right:
                 String teacherCertificationStatus = UserHelper.getTeacherCertificationStatus();
                 if (!TextUtils.equals(teacherCertificationStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
                     ToastUtil.getInstance().show(this, "您还未通过达人认证");