发布视频代码优化

app/src/main/AndroidManifest.xml

@@ -992,7 +992,7 @@
            android:screenOrientation="portrait"
            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name=".activity.PublishTopicActivity"
            android:name=".activity.PublishVideoTopicActivity"
            android:screenOrientation="portrait"
            android:windowSoftInputMode="stateVisible|adjustResize" />
        <activity

app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java

@@ -88,7 +88,7 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
                break;
            case R.id.publish_video: // 视频
                if (checkPublishRadio()) {
                    intent.setClass(this, PublishTopicActivity.class);
                    intent.setClass(this, PublishVideoTopicActivity.class);
                    startActivity(intent);
                }
                break;

app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@@ -61,6 +61,7 @@ import com.electric.chargingpile.manager.ProfileManager;
import com.electric.chargingpile.util.BarColorUtil;
import com.electric.chargingpile.util.Bimp;
import com.electric.chargingpile.util.CommonParams;
import com.electric.chargingpile.util.DensityUtil;
import com.electric.chargingpile.util.ImageItem;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
@@ -68,6 +69,7 @@ import com.electric.chargingpile.util.PublicWay;
import com.electric.chargingpile.util.Res;
import com.electric.chargingpile.util.SystemTypeUtil;
import com.electric.chargingpile.util.ToastUtil;
import com.luck.picture.lib.tools.ScreenUtils;
import com.umeng.analytics.MobclickAgent;
import com.upyun.library.common.ParallelUploader;
import com.upyun.library.common.UploadEngine;
@@ -130,6 +132,8 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    LoadingDialog dialog;
    private ProgressDialog insertDialog;
    private static final int RC_ALBUM_PERM = 123;
    private int screenWidth;
    private int itemWidth;
    private TextView publishtopic_choose_topic, mPublishtopicChooseTopic, publishtopic_word_num;
@@ -149,6 +153,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_publish_picture_content);
        BarColorUtil.initStatusBarColor(PublishPicTopicActivity.this);
        initView();
        Res.init(this);
        PublicWay.activityList.add(this);
@@ -180,6 +185,9 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    }
    private void initView() {
        screenWidth = ScreenUtils.getScreenWidth(this);
        itemWidth = (int) ((screenWidth - DensityUtil.dip2px(this, 15 * 2 + 10 * 2)) / 3f);
        uploadDialog = new ProgressDialog(this);
        uploadDialog.setMessage("正在提交...");
        uploadDialog.setCanceledOnTouchOutside(false);
@@ -629,39 +637,61 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            return selectedPosition;
        }
        public View getView(int position, View convertView, ViewGroup parent) {
        public View getView(final int position, View convertView, ViewGroup parent) {
            GridAdapter.ViewHolder holder = null;
            if (convertView == null) {
                convertView = inflater.inflate(R.layout.item_feedback_gridview,
                convertView = inflater.inflate(R.layout.item_publish_picture,
                        parent, false);
                holder = new GridAdapter.ViewHolder();
                holder.image = (ImageView) convertView
                        .findViewById(R.id.item_grida_image);
                        .findViewById(R.id.item_publish_image);
                holder.imageDelete = convertView.findViewById(R.id.item_publish_image_delete);
                convertView.setTag(holder);
            } else {
                holder = (GridAdapter.ViewHolder) convertView.getTag();
            }
            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) holder.image.getLayoutParams();
            params.width = itemWidth;
            params.height = itemWidth;
            if (position % 3 != 0) {
                params.leftMargin = DensityUtil.dip2px(getApplicationContext(), 10);
            }
            holder.image.setLayoutParams(params);
            if (position == Bimp.tempSelectBitmap.size()) {
                holder.imageDelete.setVisibility(View.GONE);
                holder.image.setImageResource(R.drawable.add_picture);
                holder.image.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
                holder.image.setBackgroundColor(Color.parseColor("#f5f5f5"));
//                holder.image.setImageBitmap(BitmapFactory.decodeResource(
//                        getResources(), R.drawable.icon_feedback_upload));
                if (position == 9) {
                    holder.image.setVisibility(View.GONE);
                }
            } else {
                holder.imageDelete.setVisibility(View.VISIBLE);
                holder.image.setImageBitmap(Bimp.tempSelectBitmap.get(position).getBitmap());
                holder.image.setScaleType(ImageView.ScaleType.CENTER_CROP);
                holder.image.setBackgroundColor(Color.WHITE);
            }
            holder.imageDelete.setOnClickListener(new OnClickListener() {
                @Override
                public void onClick(View view) {
                    Bimp.tempSelectBitmap.remove(position);
                    Bimp.max--;
                    Message message = new Message();
                    message.what = 1;
                    handler.sendMessage(message);
                }
            });
            return convertView;
        }
        public class ViewHolder {
            public ImageView image;
            public ImageView imageDelete;
        }
        Handler handler = new Handler() {

app/src/main/java/com/electric/chargingpile/activity/PublishTopicActivity.java

@@ -56,7 +56,7 @@ import java.util.Map;
import okhttp3.Call;
public class PublishTopicActivity extends Activity implements OnClickListener {
public class PublishVideoTopicActivity extends Activity implements OnClickListener {
    Context mContext;
    private ImageView mPublishtopicBack;
    private TextView mPublishtopicPublish;
@@ -86,7 +86,7 @@ public class PublishTopicActivity extends Activity implements OnClickListener {
        mContext = this;
        loadingDialog = new LoadingDialog(this);
        loadingDialog.setCanceledOnTouchOutside(false);
        BarColorUtil.initStatusBarColor(PublishTopicActivity.this);
        BarColorUtil.initStatusBarColor(PublishVideoTopicActivity.this);
        initView();
    }
@@ -418,7 +418,7 @@ public class PublishTopicActivity extends Activity implements OnClickListener {
    }
    private void showDialogToExit() {
        AlertDialog.Builder builder = new AlertDialog.Builder(PublishTopicActivity.this);
        AlertDialog.Builder builder = new AlertDialog.Builder(PublishVideoTopicActivity.this);
        builder.setTitle("提示");
        builder.setMessage("是否离开发布页？");
        builder.setCancelable(false);

app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java

@@ -172,12 +172,11 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
    private void loginSign() {
        String url = MainApplication.urlNew + "/topic/sign.do";
        final Map<String, String> map = new HashMap<>();
        map.put("fileNames", "xxx");
        map.put("fileNames", "android");
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
        map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(getContext()));
        CommonParams.addCommonParams(map);
        Log.d(TAG, "loginSign: " + map);
        loadingDialog.show();
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
@@ -196,7 +195,7 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
                    startActivity(new Intent(getActivity(), PublishItemsActivity.class));
                } else if ("8010".equals(code)) {
                    startActivity(new Intent(getContext(), LoginActivity.class));
                    ToastUtil.showToast(getContext(), desc + map, Toast.LENGTH_LONG);
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);
                } else  {
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
                }
@@ -219,7 +218,6 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
        Map<String, String> map = new HashMap<>();
        map.put("selected", "1");
        CommonParams.addCommonParams(map);
        Log.d(TAG, "requestHeaderData: " + map);
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override

app/src/main/java/com/electric/chargingpile/util/CommonParams.java

@@ -14,11 +14,12 @@ public class CommonParams {
    public static void addCommonParams(Map<String, String> map) {
        if (MainApplication.isLogin()) {
            map.put("userId", MainApplication.userId);
            // map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(getContext()));
            map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(MainApplication.context));
        }
        map.put("deviceOs", "android");
        map.put("appVer", BuildConfig.VERSION_NAME);
//        map.put("appToken", "");
        map.put("deviceOsVer", Build.VERSION.RELEASE);
        map.put("deviceId", JPushInterface.getUdid(MainApplication.context));
//            map.put("tpToken", "");

app/src/main/res/layout/activity_publish_picture_content.xml

@@ -98,7 +98,7 @@
        android:layout_marginBottom="50dp"
        android:numColumns="3"
        android:scrollbars="none"
        android:verticalSpacing="5dp"></GridView>
        android:verticalSpacing="10dp"></GridView>
    <View
        android:layout_width="match_parent"

app/src/main/res/layout/item_feedback_gridview.xml

@@ -8,7 +8,6 @@
        android:id="@+id/item_grida_image"
        android:layout_width="81dp"
        android:layout_height="81dp"
        android:background="#ff0000"
        android:scaleType="centerCrop">
    </ImageView>

app/src/main/res/layout/item_publish_picture.xml

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:background="@color/white">
    <ImageView
        android:id="@+id/item_publish_image"
        android:layout_width="81dp"
        android:layout_height="81dp"
        android:scaleType="centerCrop"></ImageView>
    <ImageView
        android:id="@+id/item_publish_image_delete"
        android:layout_width="30dp"
        android:layout_height="30dp"
        android:layout_alignEnd="@+id/item_publish_image"
        android:padding="5dp"
        android:src="@drawable/delete_picture" />
</RelativeLayout>