Showing
2 changed files
with
5 additions
and
5 deletions
| @@ -57,8 +57,8 @@ public class SocketService extends Service { | @@ -57,8 +57,8 @@ public class SocketService extends Service { | ||
| 57 | // public static final int PORT = 9501; | 57 | // public static final int PORT = 9501; |
| 58 | 58 | ||
| 59 | public static final String HOST = "10.10.4.6";// "192.168.1.21";// | 59 | public static final String HOST = "10.10.4.6";// "192.168.1.21";// |
| 60 | - // public static final int PORT = 8899; | ||
| 61 | - public static final int PORT = 9501; | 60 | + public static final int PORT = 8899; |
| 61 | +// public static final int PORT = 9501; | ||
| 62 | 62 | ||
| 63 | public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容 | 63 | public static final String END_SYMBOL = "\\r\\n\\r\\n";//心跳包内容 |
| 64 | // public String testRoomSn = "R170413034374"; | 64 | // public String testRoomSn = "R170413034374"; |
| @@ -284,8 +284,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen | @@ -284,8 +284,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen | ||
| 284 | } | 284 | } |
| 285 | if (!LeBluetooth.getInstance().isSupport(getApplicationContext())) { | 285 | if (!LeBluetooth.getInstance().isSupport(getApplicationContext())) { |
| 286 | Toast.makeText(this, "ble not support", Toast.LENGTH_SHORT).show(); | 286 | Toast.makeText(this, "ble not support", Toast.LENGTH_SHORT).show(); |
| 287 | - finish(); | ||
| 288 | - return; | 287 | +// finish(); |
| 288 | +// return; | ||
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | if (!LeBluetooth.getInstance().isEnabled()) { | 291 | if (!LeBluetooth.getInstance().isEnabled()) { |
| @@ -983,7 +983,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen | @@ -983,7 +983,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen | ||
| 983 | } | 983 | } |
| 984 | if (!TextUtils.isEmpty(roomStatusInfo.getData().getFilm_hash())) { | 984 | if (!TextUtils.isEmpty(roomStatusInfo.getData().getFilm_hash())) { |
| 985 | LocalMovieMessage lmm = new NewDBManager(this).queryPlayMovie(roomStatusInfo.getData().getFilm_hash()); | 985 | LocalMovieMessage lmm = new NewDBManager(this).queryPlayMovie(roomStatusInfo.getData().getFilm_hash()); |
| 986 | - if (!mApplication.getCurrentPlayUrl().equals(lmm.getPlayPath())) { | 986 | + if (!roomStatusInfo.getData().getFilm_hash().equals(lmm.getMd5())) { |
| 987 | //当前播放电影信息不正确正在重新拉取 | 987 | //当前播放电影信息不正确正在重新拉取 |
| 988 | show("当前播放电影信息不正确正在重新拉取"); | 988 | show("当前播放电影信息不正确正在重新拉取"); |
| 989 | presenter.getOrderInfo(); | 989 | presenter.getOrderInfo(); |
Please
register
or
login
to post a comment