Merge pull request #450 from okcaptain/dev

Dev
pull/451/head
okcaptain 2 years ago committed by GitHub
commit 9baec21cb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      app/proguard-rules.pro
  2. 7
      app/src/mobile/java/com/fongmi/android/tv/ui/dialog/TransmitDialog.java
  3. 6
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java

@ -41,6 +41,7 @@
# EXO
-keep class org.xmlpull.v1.** { *; }
-keep class androidx.media3.** { *; }
# IJK
-keep class tv.danmaku.ijk.media.player.** { *; }

@ -11,7 +11,6 @@ import androidx.viewbinding.ViewBinding;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.Constant;
import com.fongmi.android.tv.R;
import com.fongmi.android.tv.bean.Device;
import com.fongmi.android.tv.cast.ScanEvent;
import com.fongmi.android.tv.cast.ScanTask;
@ -113,8 +112,8 @@ public class TransmitDialog extends BaseDialog implements DeviceAdapter.OnClickL
Notify.dismiss();
}
private void onError() {
Notify.show(R.string.device_offline);
private void onError(Exception e) {
Notify.show(e.getMessage());
Notify.dismiss();
}
@ -150,7 +149,7 @@ public class TransmitDialog extends BaseDialog implements DeviceAdapter.OnClickL
@Override
public void onFailure(@NonNull Call call, @NonNull IOException e) {
App.post(() -> onError());
App.post(() -> onError(e));
}
};
}

@ -354,7 +354,11 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
}
private void onTransmit(View view) {
TransmitActionDialog.create(this).show();
PermissionX.init(this).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> {
if (allGranted) {
TransmitActionDialog.create(this).show();
}
});
}
private void initConfig() {

Loading…
Cancel
Save