Browse Source

修改bug

Pq 2 years ago
parent
commit
bbe44bc89a

+ 1 - 1
BaseLibrary/src/main/java/com/cooleshow/base/common/BaseApplication.kt

@@ -29,7 +29,7 @@ abstract class BaseApplication : Application() {
      */
     companion object {
         var isTeacherClient = false
-        var registrationId: String? = null
+        lateinit var registrationId: String
         lateinit var context: Application
     }
 

+ 3 - 0
build.gradle

@@ -8,6 +8,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
         maven {url "https://maven.aliyun.com/nexus/content/repositories/releases"}
         maven { url 'https://repo1.maven.org/maven2/'}
+        maven {url 'https://developer.huawei.com/repo/'}
         //微博
 //        maven { url "https://dl.bintray.com/thelasterstar/maven/" }
 
@@ -22,6 +23,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
+        classpath 'com.huawei.agconnect:agcp:1.6.0.300'
     }
 }
 
@@ -35,6 +37,7 @@ allprojects {
         }
         maven { url 'https://maven.aliyun.com/repository/jcenter/' }
         maven { url 'https://repo1.maven.org/maven2/'}
+        maven {url 'https://developer.huawei.com/repo/'}
         //微博
 //        maven { url "https://dl.bintray.com/thelasterstar/maven/" }
     }

+ 92 - 0
student/agconnect-services.json

@@ -0,0 +1,92 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"890086000300075951",
+		"product_id":"99536292102459090",
+		"client_id":"930917118826802304",
+		"client_secret":"A3D73ECCF4A7C4686D91301F497C84C3F69316343D31055DEB29B4407C4E1C86",
+		"project_id":"99536292102459090",
+		"app_id":"106640053",
+		"api_key":"DAEDAKeTTEged4qd78KGMfb7pRvlD8jFsAZMSdRjhBOluUd+Cw/rcDa4k8XLHAGP1Heid4ULkVuDdgUqnb0cpiJ/dIBfyXCythQuYg==",
+		"package_name":"com.cooleshow.student"
+	},
+	"oauth_client":{
+		"client_id":"106640053",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"106640053",
+		"package_name":"com.cooleshow.student"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.cooleshow.student",
+			"client":{
+				"app_id":"106640053"
+			},
+			"app_info":{
+				"package_name":"com.cooleshow.student",
+				"app_id":"106640053"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"106640053"
+			}
+		}
+	]
+}

+ 3 - 3
teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java

@@ -19,6 +19,7 @@ import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.PianoRoomCourseStudentListAdapter;
 import com.cooleshow.teacher.bean.PianoRoomCourseInfoBean;
 import com.cooleshow.teacher.constants.CourseConstants;
+import com.cooleshow.teacher.constants.TeacherConfig;
 import com.cooleshow.teacher.contract.PianoRoomCourseDetailContract;
 import com.cooleshow.teacher.databinding.ActivityPianoRoomDetailLayoutBinding;
 import com.cooleshow.teacher.presenter.course.PianoRoomDetailPresenter;
@@ -35,7 +36,6 @@ import io.rong.imkit.utils.helper.OpenChatHelper;
 /**
  * Author by pq, Date on 2022/6/24.
  * 琴房课详情页面
- *
  */
 @Route(path = RouterPath.CourseCenter.PIANO_ROOM_COURSE_DETAIL)
 public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPianoRoomDetailLayoutBinding, PianoRoomDetailPresenter> implements PianoRoomCourseDetailContract.PianoRoomCourseDetailView, View.OnClickListener {
@@ -92,8 +92,8 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
             if (position < mAdapter.getData().size()) {
                 PianoRoomCourseInfoBean.StudentHomeworkListBean.RecordsBean recordsBean = mAdapter.getData().get(position);
                 ARouter.getInstance().build(RouterPath.WorkCenter.TEACHER_WORK_ASSIGN_HOMEWORK)
-                        .withString("studentId", recordsBean.studentId)
-                        .withString("course_id", mCourseId)
+                        .withString(TeacherConfig.STUDENT_ID, recordsBean.studentId)
+                        .withString(TeacherConfig.COURSE_ID, mCourseId)
                         .navigation();
             }
         });