Browse Source

发布视频代码优化

huyuguo 6 years ago
parent
commit
277acf8a80

+ 1 - 1
app/src/main/AndroidManifest.xml

992
            android:screenOrientation="portrait"
992
            android:screenOrientation="portrait"
993
            android:windowSoftInputMode="adjustPan" />
993
            android:windowSoftInputMode="adjustPan" />
994
        <activity
994
        <activity
995
            android:name=".activity.PublishTopicActivity"
995
            android:name=".activity.PublishVideoTopicActivity"
996
            android:screenOrientation="portrait"
996
            android:screenOrientation="portrait"
997
            android:windowSoftInputMode="stateVisible|adjustResize" />
997
            android:windowSoftInputMode="stateVisible|adjustResize" />
998
        <activity
998
        <activity

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java

88
                break;
88
                break;
89
            case R.id.publish_video: // 视频
89
            case R.id.publish_video: // 视频
90
                if (checkPublishRadio()) {
90
                if (checkPublishRadio()) {
91
                    intent.setClass(this, PublishTopicActivity.class);
91
                    intent.setClass(this, PublishVideoTopicActivity.class);
92
                    startActivity(intent);
92
                    startActivity(intent);
93
                }
93
                }
94
                break;
94
                break;

+ 35 - 5
app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

61
import com.electric.chargingpile.util.BarColorUtil;
61
import com.electric.chargingpile.util.BarColorUtil;
62
import com.electric.chargingpile.util.Bimp;
62
import com.electric.chargingpile.util.Bimp;
63
import com.electric.chargingpile.util.CommonParams;
63
import com.electric.chargingpile.util.CommonParams;
64
import com.electric.chargingpile.util.DensityUtil;
64
import com.electric.chargingpile.util.ImageItem;
65
import com.electric.chargingpile.util.ImageItem;
65
import com.electric.chargingpile.util.JsonUtils;
66
import com.electric.chargingpile.util.JsonUtils;
66
import com.electric.chargingpile.util.LoadingDialog;
67
import com.electric.chargingpile.util.LoadingDialog;
68
import com.electric.chargingpile.util.Res;
69
import com.electric.chargingpile.util.Res;
69
import com.electric.chargingpile.util.SystemTypeUtil;
70
import com.electric.chargingpile.util.SystemTypeUtil;
70
import com.electric.chargingpile.util.ToastUtil;
71
import com.electric.chargingpile.util.ToastUtil;
72
import com.luck.picture.lib.tools.ScreenUtils;
71
import com.umeng.analytics.MobclickAgent;
73
import com.umeng.analytics.MobclickAgent;
72
import com.upyun.library.common.ParallelUploader;
74
import com.upyun.library.common.ParallelUploader;
73
import com.upyun.library.common.UploadEngine;
75
import com.upyun.library.common.UploadEngine;
130
    LoadingDialog dialog;
132
    LoadingDialog dialog;
131
    private ProgressDialog insertDialog;
133
    private ProgressDialog insertDialog;
132
    private static final int RC_ALBUM_PERM = 123;
134
    private static final int RC_ALBUM_PERM = 123;
135
    private int screenWidth;
136
    private int itemWidth;
133
137
134
138
135
    private TextView publishtopic_choose_topic, mPublishtopicChooseTopic, publishtopic_word_num;
139
    private TextView publishtopic_choose_topic, mPublishtopicChooseTopic, publishtopic_word_num;
149
        super.onCreate(savedInstanceState);
153
        super.onCreate(savedInstanceState);
150
        setContentView(R.layout.activity_publish_picture_content);
154
        setContentView(R.layout.activity_publish_picture_content);
151
        BarColorUtil.initStatusBarColor(PublishPicTopicActivity.this);
155
        BarColorUtil.initStatusBarColor(PublishPicTopicActivity.this);
156
152
        initView();
157
        initView();
153
        Res.init(this);
158
        Res.init(this);
154
        PublicWay.activityList.add(this);
159
        PublicWay.activityList.add(this);
180
    }
185
    }
181
186
182
    private void initView() {
187
    private void initView() {
188
        screenWidth = ScreenUtils.getScreenWidth(this);
189
        itemWidth = (int) ((screenWidth - DensityUtil.dip2px(this, 15 * 2 + 10 * 2)) / 3f);
190
183
        uploadDialog = new ProgressDialog(this);
191
        uploadDialog = new ProgressDialog(this);
184
        uploadDialog.setMessage("正在提交...");
192
        uploadDialog.setMessage("正在提交...");
185
        uploadDialog.setCanceledOnTouchOutside(false);
193
        uploadDialog.setCanceledOnTouchOutside(false);
629
            return selectedPosition;
637
            return selectedPosition;
630
        }
638
        }
631
639
632
        public View getView(int position, View convertView, ViewGroup parent) {
640
        public View getView(final int position, View convertView, ViewGroup parent) {
633
            GridAdapter.ViewHolder holder = null;
641
            GridAdapter.ViewHolder holder = null;
634
            if (convertView == null) {
642
            if (convertView == null) {
635
                convertView = inflater.inflate(R.layout.item_feedback_gridview,
643
                convertView = inflater.inflate(R.layout.item_publish_picture,
636
                        parent, false);
644
                        parent, false);
637
                holder = new GridAdapter.ViewHolder();
645
                holder = new GridAdapter.ViewHolder();
638
                holder.image = (ImageView) convertView
646
                holder.image = (ImageView) convertView
639
                        .findViewById(R.id.item_grida_image);
647
                        .findViewById(R.id.item_publish_image);
648
                holder.imageDelete = convertView.findViewById(R.id.item_publish_image_delete);
640
                convertView.setTag(holder);
649
                convertView.setTag(holder);
641
            } else {
650
            } else {
642
                holder = (GridAdapter.ViewHolder) convertView.getTag();
651
                holder = (GridAdapter.ViewHolder) convertView.getTag();
643
            }
652
            }
644
653
654
655
            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) holder.image.getLayoutParams();
656
            params.width = itemWidth;
657
            params.height = itemWidth;
658
            if (position % 3 != 0) {
659
                params.leftMargin = DensityUtil.dip2px(getApplicationContext(), 10);
660
            }
661
            holder.image.setLayoutParams(params);
662
645
            if (position == Bimp.tempSelectBitmap.size()) {
663
            if (position == Bimp.tempSelectBitmap.size()) {
664
                holder.imageDelete.setVisibility(View.GONE);
646
                holder.image.setImageResource(R.drawable.add_picture);
665
                holder.image.setImageResource(R.drawable.add_picture);
647
                holder.image.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
666
                holder.image.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
648
                holder.image.setBackgroundColor(Color.parseColor("#f5f5f5"));
667
                holder.image.setBackgroundColor(Color.parseColor("#f5f5f5"));
649
//                holder.image.setImageBitmap(BitmapFactory.decodeResource(
650
//                        getResources(), R.drawable.icon_feedback_upload));
651
                if (position == 9) {
668
                if (position == 9) {
652
                    holder.image.setVisibility(View.GONE);
669
                    holder.image.setVisibility(View.GONE);
653
                }
670
                }
654
            } else {
671
            } else {
672
                holder.imageDelete.setVisibility(View.VISIBLE);
655
                holder.image.setImageBitmap(Bimp.tempSelectBitmap.get(position).getBitmap());
673
                holder.image.setImageBitmap(Bimp.tempSelectBitmap.get(position).getBitmap());
656
                holder.image.setScaleType(ImageView.ScaleType.CENTER_CROP);
674
                holder.image.setScaleType(ImageView.ScaleType.CENTER_CROP);
657
                holder.image.setBackgroundColor(Color.WHITE);
675
                holder.image.setBackgroundColor(Color.WHITE);
658
            }
676
            }
659
677
678
            holder.imageDelete.setOnClickListener(new OnClickListener() {
679
                @Override
680
                public void onClick(View view) {
681
                    Bimp.tempSelectBitmap.remove(position);
682
                    Bimp.max--;
683
                    Message message = new Message();
684
                    message.what = 1;
685
                    handler.sendMessage(message);
686
                }
687
            });
688
660
            return convertView;
689
            return convertView;
661
        }
690
        }
662
691
663
        public class ViewHolder {
692
        public class ViewHolder {
664
            public ImageView image;
693
            public ImageView image;
694
            public ImageView imageDelete;
665
        }
695
        }
666
696
667
        Handler handler = new Handler() {
697
        Handler handler = new Handler() {

+ 3 - 3
app/src/main/java/com/electric/chargingpile/activity/PublishTopicActivity.java

56
56
57
import okhttp3.Call;
57
import okhttp3.Call;
58
58
59
public class PublishTopicActivity extends Activity implements OnClickListener {
59
public class PublishVideoTopicActivity extends Activity implements OnClickListener {
60
    Context mContext;
60
    Context mContext;
61
    private ImageView mPublishtopicBack;
61
    private ImageView mPublishtopicBack;
62
    private TextView mPublishtopicPublish;
62
    private TextView mPublishtopicPublish;
86
        mContext = this;
86
        mContext = this;
87
        loadingDialog = new LoadingDialog(this);
87
        loadingDialog = new LoadingDialog(this);
88
        loadingDialog.setCanceledOnTouchOutside(false);
88
        loadingDialog.setCanceledOnTouchOutside(false);
89
        BarColorUtil.initStatusBarColor(PublishTopicActivity.this);
89
        BarColorUtil.initStatusBarColor(PublishVideoTopicActivity.this);
90
        initView();
90
        initView();
91
    }
91
    }
92
92
418
    }
418
    }
419
419
420
    private void showDialogToExit() {
420
    private void showDialogToExit() {
421
        AlertDialog.Builder builder = new AlertDialog.Builder(PublishTopicActivity.this);
421
        AlertDialog.Builder builder = new AlertDialog.Builder(PublishVideoTopicActivity.this);
422
        builder.setTitle("提示");
422
        builder.setTitle("提示");
423
        builder.setMessage("是否离开发布页?");
423
        builder.setMessage("是否离开发布页?");
424
        builder.setCancelable(false);
424
        builder.setCancelable(false);

+ 3 - 5
app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java

172
    private void loginSign() {
172
    private void loginSign() {
173
        String url = MainApplication.urlNew + "/topic/sign.do";
173
        String url = MainApplication.urlNew + "/topic/sign.do";
174
        final Map<String, String> map = new HashMap<>();
174
        final Map<String, String> map = new HashMap<>();
175
        map.put("fileNames", "xxx");
175
        map.put("fileNames", "android");
176
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
176
        map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
177
        map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(getContext()));
178
        CommonParams.addCommonParams(map);
177
        CommonParams.addCommonParams(map);
179
        Log.d(TAG, "loginSign: " + map);
180
        loadingDialog.show();
178
        loadingDialog.show();
179
181
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
180
        OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
182
            @Override
181
            @Override
183
            public void onError(Call call, Exception e) {
182
            public void onError(Call call, Exception e) {
196
                    startActivity(new Intent(getActivity(), PublishItemsActivity.class));
195
                    startActivity(new Intent(getActivity(), PublishItemsActivity.class));
197
                } else if ("8010".equals(code)) {
196
                } else if ("8010".equals(code)) {
198
                    startActivity(new Intent(getContext(), LoginActivity.class));
197
                    startActivity(new Intent(getContext(), LoginActivity.class));
199
                    ToastUtil.showToast(getContext(), desc + map, Toast.LENGTH_LONG);
198
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);
200
                } else  {
199
                } else  {
201
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
200
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
202
                }
201
                }
219
        Map<String, String> map = new HashMap<>();
218
        Map<String, String> map = new HashMap<>();
220
        map.put("selected", "1");
219
        map.put("selected", "1");
221
        CommonParams.addCommonParams(map);
220
        CommonParams.addCommonParams(map);
222
        Log.d(TAG, "requestHeaderData: " + map);
223
221
224
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
222
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
225
            @Override
223
            @Override

+ 2 - 1
app/src/main/java/com/electric/chargingpile/util/CommonParams.java

14
    public static void addCommonParams(Map<String, String> map) {
14
    public static void addCommonParams(Map<String, String> map) {
15
        if (MainApplication.isLogin()) {
15
        if (MainApplication.isLogin()) {
16
            map.put("userId", MainApplication.userId);
16
            map.put("userId", MainApplication.userId);
17
            // map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(getContext()));
18
            map.put("appToken", ProfileManager.getInstance().getKeyMessageToken(MainApplication.context));
17
        }
19
        }
18
20
19
        map.put("deviceOs", "android");
21
        map.put("deviceOs", "android");
20
        map.put("appVer", BuildConfig.VERSION_NAME);
22
        map.put("appVer", BuildConfig.VERSION_NAME);
21
//        map.put("appToken", "");
22
        map.put("deviceOsVer", Build.VERSION.RELEASE);
23
        map.put("deviceOsVer", Build.VERSION.RELEASE);
23
        map.put("deviceId", JPushInterface.getUdid(MainApplication.context));
24
        map.put("deviceId", JPushInterface.getUdid(MainApplication.context));
24
//            map.put("tpToken", "");
25
//            map.put("tpToken", "");

+ 1 - 1
app/src/main/res/layout/activity_publish_picture_content.xml

98
        android:layout_marginBottom="50dp"
98
        android:layout_marginBottom="50dp"
99
        android:numColumns="3"
99
        android:numColumns="3"
100
        android:scrollbars="none"
100
        android:scrollbars="none"
101
        android:verticalSpacing="5dp"></GridView>
101
        android:verticalSpacing="10dp"></GridView>
102

102

103
    <View
103
    <View
104
        android:layout_width="match_parent"
104
        android:layout_width="match_parent"

+ 0 - 1
app/src/main/res/layout/item_feedback_gridview.xml

8
        android:id="@+id/item_grida_image"
8
        android:id="@+id/item_grida_image"
9
        android:layout_width="81dp"
9
        android:layout_width="81dp"
10
        android:layout_height="81dp"
10
        android:layout_height="81dp"
11
        android:background="#ff0000"
12
        android:scaleType="centerCrop">
11
        android:scaleType="centerCrop">
13
    </ImageView>
12
    </ImageView>
14
13

+ 21 - 0
app/src/main/res/layout/item_publish_picture.xml

1
<?xml version="1.0" encoding="utf-8"?>
2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="wrap_content"
4
    android:layout_height="wrap_content"
5
    android:background="@color/white">
6
7
    <ImageView
8
        android:id="@+id/item_publish_image"
9
        android:layout_width="81dp"
10
        android:layout_height="81dp"
11
        android:scaleType="centerCrop"></ImageView>
12
13
    <ImageView
14
        android:id="@+id/item_publish_image_delete"
15
        android:layout_width="30dp"
16
        android:layout_height="30dp"
17
        android:layout_alignEnd="@+id/item_publish_image"
18
        android:padding="5dp"
19
        android:src="@drawable/delete_picture" />
20
21
</RelativeLayout>