Browse Source

删除错误依赖

Pq 1 year ago
parent
commit
2658bc1a34

BIN
classRoom/src/main/res/drawable-xxhdpi/ic_live_teaching_close.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_change_camera.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_change_camera_disable.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_hangup_pressed.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_member.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_member_disable.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_member_pressed.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_message.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_message_disable.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_message_pressed.png


BIN
classRoom/src/main/res/drawable-xxhdpi/ic_top_operate_refresh.png


+ 3 - 3
classRoom/src/main/res/layout/tt_text_message_item.xml

@@ -8,7 +8,7 @@
     android:paddingEnd="8dp"
     android:paddingTop="6dp"
     android:paddingBottom="6dp"
-    android:textColor="@color/rc_text_main_color"
-    android:textColorLink="@color/rc_main_theme"
-    android:textSize="@dimen/rc_font_secondary_size"
+    android:textColor="@color/color_1a1a1a"
+    android:textColorLink="@color/color_01c1b5"
+    android:textSize="@dimen/sp_15"
     android:maxWidth="223dp" />

+ 1 - 0
classRoom/src/main/res/values/colors.xml

@@ -29,5 +29,6 @@
     <color name="color_e6f3f5f5">#e6f3f5f5</color>
     <color name="color_ccffffff">#ccffffff</color>
     <color name="color_FF999999">#999999</color>
+    <color name="live_text_green">#00FFEF</color>
 
 </resources>

+ 2 - 0
classRoom/src/main/res/values/strings.xml

@@ -74,4 +74,6 @@
     <string name="rc_date_noon">中午</string>
     <string name="rc_date_pm">下午</string>
     <string name="rc_date_night">晚上</string>
+
+    <string name="rc_cancel">取消</string>
 </resources>

+ 3 - 3
live_teaching/build.gradle

@@ -76,9 +76,9 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.1.0-alpha04'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'com.github.netless-io:whiteboard-android:2.15.18'
-    implementation project(path: ':rong_im:kit')
-    implementation project(path: ':rong_im:live')
-    implementation project(path: ':rong_im:sight')
+//    implementation project(path: ':rong_im:kit')
+//    implementation project(path: ':rong_im:live')
+//    implementation project(path: ':rong_im:sight')
     implementation project(path: ':usercenter')
     implementation project(path: ':BaseLibrary')
     implementation 'com.h6ah4i.android.widget.verticalseekbar:verticalseekbar:1.0.0'

+ 1 - 1
metronome/build.gradle

@@ -61,7 +61,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     implementation project(':BaseLibrary')
-    implementation project(':live_teaching')
+    implementation project(':classRoom')
     //ARouter
     annotationProcessor("com.alibaba:arouter-compiler:$rootProject.ext.android.arouter_api_version")
     implementation 'com.alibaba:arouter-api:1.5.2'

+ 2 - 2
metronome/src/main/java/com/cooleshow/metronome/MetronomeActivity.java

@@ -248,8 +248,8 @@ public class MetronomeActivity extends BaseActivity<ActivityMetronomeLayoutBindi
 
         soundPool = builder.build();
 
-        tickVoiceId = soundPool.load(this, com.daya.live_teaching.R.raw.tick, 0);
-        tockVoiceId = soundPool.load(this, com.daya.live_teaching.R.raw.tock, 0);
+        tickVoiceId = soundPool.load(this, com.dayayuemeng.classroom.R.raw.tick, 0);
+        tockVoiceId = soundPool.load(this, com.dayayuemeng.classroom.R.raw.tock, 0);
     }
 
     private int lastProgress = 0;

+ 32 - 0
student/src/main/res/xml/rc_file_path.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <paths>
+        <external-path
+            name="rc_external_path"
+            path="." />
+        <root-path
+            name="rc_root_path"
+            path="" />
+        <external-path
+            name="camera_photos"
+            path="" />
+        <root-path
+            name="camera_photos"
+            path="" />
+<!--        新浪-->
+        <root-path
+            name="share_files"
+            path="."
+            />
+<!--        qq-->
+        <root-path
+            name="opensdk_root"
+            path=""
+            />
+<!--        友盟-->
+        <root-path
+            name="umeng_cache"
+            path="umeng_cache"
+            />
+    </paths>
+</resources>

+ 23 - 0
tclive/src/main/res/drawable/shape_live_video_progress.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<animated-rotate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pivotX="50%" android:pivotY="50%"
+    android:fromDegrees="0"
+    android:toDegrees="360">
+
+    <shape
+        android:shape="ring"
+        android:innerRadiusRatio="3"
+        android:thicknessRatio="8"
+        android:useLevel="false">
+        <gradient
+            android:type="sweep"
+            android:useLevel="false"
+            android:startColor="@color/white_translucent"
+            android:centerColor="@color/white_50"
+            android:centerY="0.50"
+            android:endColor="@color/transparent" />
+    </shape>
+
+</animated-rotate>

+ 32 - 0
teacher/src/main/res/xml/rc_file_path.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <paths>
+        <external-path
+            name="rc_external_path"
+            path="." />
+        <root-path
+            name="rc_root_path"
+            path="" />
+        <external-path
+            name="camera_photos"
+            path="" />
+        <root-path
+            name="camera_photos"
+            path="" />
+<!--        新浪-->
+        <root-path
+            name="share_files"
+            path="."
+            />
+<!--        qq-->
+        <root-path
+            name="opensdk_root"
+            path=""
+            />
+<!--        友盟-->
+        <root-path
+            name="umeng_cache"
+            path="umeng_cache"
+            />
+    </paths>
+</resources>