正在显示
13 个修改的文件
包含
13 行增加
和
3 行删除
| @@ -58,7 +58,7 @@ public class LiveModel extends BaseModel<ServiceManager, CacheManager> | @@ -58,7 +58,7 @@ public class LiveModel extends BaseModel<ServiceManager, CacheManager> | ||
| 58 | .add("userId", userId) | 58 | .add("userId", userId) |
| 59 | .body(); | 59 | .body(); |
| 60 | 60 | ||
| 61 | - sdkContainer.loadUrlWithNativeApi(init, doNothingCallBack); | 61 | + sdkContainer.loadUrlWithNativeApi(init,doNothingCallBack); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | /* | 64 | /* |
| @@ -3,6 +3,7 @@ package com.xdy.home.ui; | @@ -3,6 +3,7 @@ package com.xdy.home.ui; | ||
| 3 | import android.Manifest; | 3 | import android.Manifest; |
| 4 | import android.annotation.SuppressLint; | 4 | import android.annotation.SuppressLint; |
| 5 | import android.content.DialogInterface; | 5 | import android.content.DialogInterface; |
| 6 | +import android.os.Build; | ||
| 6 | import android.os.Bundle; | 7 | import android.os.Bundle; |
| 7 | import android.os.Handler; | 8 | import android.os.Handler; |
| 8 | import android.os.Message; | 9 | import android.os.Message; |
| @@ -286,8 +287,13 @@ public class LiveFragment extends AppBaseFragment<LivePresenter> implements Live | @@ -286,8 +287,13 @@ public class LiveFragment extends AppBaseFragment<LivePresenter> implements Live | ||
| 286 | super.onPageFinished(view, url); | 287 | super.onPageFinished(view, url); |
| 287 | LogUtil.i(TAG, "SDK IS OK"); | 288 | LogUtil.i(TAG, "SDK IS OK"); |
| 288 | sdkIsOk = true; | 289 | sdkIsOk = true; |
| 290 | + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { | ||
| 291 | + hideLoading(); | ||
| 292 | + showErrorDialog(R.string.home_unsupportos); | ||
| 293 | + } else { | ||
| 289 | mPresenter.init(replay, classId, portal, role, userId); | 294 | mPresenter.init(replay, classId, portal, role, userId); |
| 290 | } | 295 | } |
| 296 | + } | ||
| 291 | }); | 297 | }); |
| 292 | xdyJsInterface = new XDYJsInterface(mPresenter); | 298 | xdyJsInterface = new XDYJsInterface(mPresenter); |
| 293 | //添加js2native的回调方法 | 299 | //添加js2native的回调方法 |
| @@ -161,7 +161,10 @@ public interface LiveContract { | @@ -161,7 +161,10 @@ public interface LiveContract { | ||
| 161 | 161 | ||
| 162 | void renderDeleteDocId(String itemIdx); | 162 | void renderDeleteDocId(String itemIdx); |
| 163 | 163 | ||
| 164 | - //返回的更新标注 | 164 | + /** |
| 165 | + * //返回的更新标注 | ||
| 166 | + * @param entity | ||
| 167 | + */ | ||
| 165 | void renderUpdateAnnotation(WhiteboardUpdateEntity entity); | 168 | void renderUpdateAnnotation(WhiteboardUpdateEntity entity); |
| 166 | 169 | ||
| 167 | /** | 170 | /** |
| @@ -28,4 +28,5 @@ | @@ -28,4 +28,5 @@ | ||
| 28 | <string name="home_class_is_over">课堂已结束</string> | 28 | <string name="home_class_is_over">课堂已结束</string> |
| 29 | <string name="home_pwd_mention">密码错误</string> | 29 | <string name="home_pwd_mention">密码错误</string> |
| 30 | <string name="home_pwd_wrong">请输入正确密码</string> | 30 | <string name="home_pwd_wrong">请输入正确密码</string> |
| 31 | + <string name="home_unsupportos">抱歉,暂不支持Android4.4及以下版本</string> | ||
| 31 | </resources> | 32 | </resources> |
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | <application | 40 | <application |
| 41 | android:name=".core.RealApplication" | 41 | android:name=".core.RealApplication" |
| 42 | android:allowBackup="true" | 42 | android:allowBackup="true" |
| 43 | - android:icon="@mipmap/main_ic_launcher" | 43 | + android:icon="@mipmap/widget_logo" |
| 44 | android:label="@string/main_app_name" | 44 | android:label="@string/main_app_name" |
| 45 | android:supportsRtl="true" | 45 | android:supportsRtl="true" |
| 46 | android:theme="@style/main_AppTheme" | 46 | android:theme="@style/main_AppTheme" |
3.3 KB
2.2 KB
4.7 KB
5.5 KB
7.5 KB
7.8 KB
10.2 KB
10.4 KB
-
请 注册 或 登录 后发表评论