更新优化
This commit is contained in:
+19
-2
@@ -99,6 +99,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import cn.shangyu.gdxzExpert.R;
|
||||
import cn.shangyu.gdxzExpert.application.BaseApplication;
|
||||
import cn.shangyu.gdxzExpert.activity.EvaluateActivity;
|
||||
import cn.shangyu.gdxzExpert.activity.PayClassActivity;
|
||||
import cn.shangyu.gdxzExpert.adapter.BaseFragemetAdapter;
|
||||
@@ -140,8 +141,12 @@ import cn.shangyu.gdxzExpert.utils.UIUtils;
|
||||
import cn.shangyu.gdxzExpert.utils.UpdateVersionUtils;
|
||||
import cn.shangyu.gdxzExpert.utils.Url;
|
||||
import cn.shangyu.gdxzExpert.widget.SnapUpCountDownTimerView;
|
||||
import io.dcloud.feature.sdk.Interface.IUniMP;
|
||||
|
||||
import static cn.shangyu.gdxzExpert.utils.Constant.uniapp_mp_appid;
|
||||
|
||||
public class CourseDetailPolyvPlayerActivity extends AppCompatActivity implements View.OnClickListener, IntroduceDetailFragment.ChooseListener {
|
||||
private static final String EXTRA_FROM_UNIMP_GO_COURSE_DETAIL = "from_unimp_go_course_detail";
|
||||
private FrameLayout head;
|
||||
/**
|
||||
* 视频控制栏
|
||||
@@ -246,6 +251,7 @@ public class CourseDetailPolyvPlayerActivity extends AppCompatActivity implement
|
||||
private PolyvViceScreenLayout viceScreenLayout;
|
||||
private boolean isCalledStopOnPipModeChanged = false;
|
||||
private boolean isOnBackKeyPressed;
|
||||
private boolean fromUniMpGoCourseDetail = false;
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
@@ -257,6 +263,7 @@ public class CourseDetailPolyvPlayerActivity extends AppCompatActivity implement
|
||||
opencontents=getIntent().getStringExtra("opencontents");
|
||||
openid=getIntent().getStringExtra("openid");
|
||||
pinglun=getIntent().getStringExtra("pinglun");
|
||||
fromUniMpGoCourseDetail = getIntent().getBooleanExtra(EXTRA_FROM_UNIMP_GO_COURSE_DETAIL, false);
|
||||
initnormalview();
|
||||
initPolyview();
|
||||
initView();
|
||||
@@ -1477,8 +1484,8 @@ public class CourseDetailPolyvPlayerActivity extends AppCompatActivity implement
|
||||
needreportSome("share","","");
|
||||
break;
|
||||
case R.id.top_back:
|
||||
finish();
|
||||
break;
|
||||
handleBackAction();
|
||||
break;
|
||||
case R.id.r_buy:
|
||||
MobclickAgent.onEvent(CourseDetailPolyvPlayerActivity.this,EXPERT_CLASS_QUALITY_PAY);
|
||||
Intent intent=new Intent(CourseDetailPolyvPlayerActivity.this, PayClassActivity.class);
|
||||
@@ -1494,6 +1501,16 @@ public class CourseDetailPolyvPlayerActivity extends AppCompatActivity implement
|
||||
|
||||
}
|
||||
|
||||
private void handleBackAction() {
|
||||
if (fromUniMpGoCourseDetail) {
|
||||
IUniMP uniappMP = BaseApplication.getUniMPCaches().get(uniapp_mp_appid);
|
||||
if (uniappMP != null && uniappMP.isRunning()) {
|
||||
uniappMP.showUniMP();
|
||||
}
|
||||
}
|
||||
finish();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
|
||||
@@ -12,6 +12,7 @@ import cn.shangyu.gdxzExpert.base.BaseActivity;
|
||||
import cn.shangyu.gdxzExpert.utils.CommonUtil;
|
||||
import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
|
||||
import cn.shangyu.gdxzExpert.utils.UIUtils;
|
||||
import cn.shangyu.gdxzExpert.utils.UniappUtil;
|
||||
import cn.shangyu.gdxzExpert.widget.LoadingPage;
|
||||
|
||||
/**
|
||||
@@ -82,7 +83,7 @@ public class MyDownLoadVideoActivity extends BaseActivity {
|
||||
break;
|
||||
case R.id.rl_3:
|
||||
//跳到uniapp 的视频缓存页面
|
||||
MyUserIconUtil.showUniMp(MyDownLoadVideoActivity.this, "/pages_app/downLoadVideo/downLoadVideo", null);
|
||||
UniappUtil.showUniMp(MyDownLoadVideoActivity.this, "/pages_app/downLoadVideo/downLoadVideo", null);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,8 +31,10 @@ import cn.shangyu.gdxzExpert.pulltorefreshview.PullToRefreshListView;
|
||||
import cn.shangyu.gdxzExpert.ui.CustomProgressDialog;
|
||||
import cn.shangyu.gdxzExpert.utils.CommonUtil;
|
||||
import cn.shangyu.gdxzExpert.utils.LogUtil;
|
||||
import cn.shangyu.gdxzExpert.utils.MyUserIconUtil;
|
||||
import cn.shangyu.gdxzExpert.utils.ToastUtil;
|
||||
import cn.shangyu.gdxzExpert.utils.UIUtils;
|
||||
import cn.shangyu.gdxzExpert.utils.UniappUtil;
|
||||
import cn.shangyu.gdxzExpert.utils.Url;
|
||||
import cn.shangyu.gdxzExpert.view.RollViewPager;
|
||||
import cn.shangyu.gdxzExpert.widget.LoadingPage;
|
||||
@@ -202,8 +204,10 @@ public class QualityCourseActivity extends BaseActivity implements OnCallBackFro
|
||||
}
|
||||
else
|
||||
{
|
||||
Intent intent3 = new Intent(QualityCourseActivity.this, PointsMallActivity.class);
|
||||
startActivity(intent3);
|
||||
// Intent intent3 = new Intent(QualityCourseActivity.this, PointsMallActivity.class);
|
||||
// startActivity(intent3);
|
||||
|
||||
UniappUtil.showUniMp(QualityCourseActivity.this, "/pages_goods/pointMall/pointMall", null);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
+1
-1
@@ -1902,7 +1902,7 @@ public class PolyvPlayerMediaController extends PolyvBaseMediaController impleme
|
||||
videoActivity,
|
||||
requestCode,
|
||||
new Intent("media_control").putExtra("control_type", controlType),
|
||||
0);
|
||||
PendingIntent.FLAG_IMMUTABLE);
|
||||
final Icon icon = Icon.createWithResource(videoActivity, iconId);
|
||||
actions.add(new RemoteAction(icon, title, title, intent));
|
||||
|
||||
|
||||
+2
-1
@@ -66,7 +66,8 @@ public class PolyvBackgroundPlayService extends Service {
|
||||
|
||||
public Notification createNotification(String title, String text, int icon) {
|
||||
Intent intent = new Intent(this, CourseDetailPolyvPlayerActivity.class);
|
||||
PendingIntent pendingIntent = PendingIntent.getActivity(this, REQUEST_CODE_PLAY_ACTIVITY, intent, PendingIntent.FLAG_UPDATE_CURRENT);
|
||||
PendingIntent pendingIntent = PendingIntent.getActivity(this, REQUEST_CODE_PLAY_ACTIVITY, intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
|
||||
NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID);
|
||||
builder.setContentIntent(pendingIntent);
|
||||
builder.setShowWhen(false);
|
||||
|
||||
Reference in New Issue
Block a user