Browse Source

话题发布传值问题解决

huyuguo 5 years ago
parent
commit
b16a6ccfc0

+ 2 - 0
app/src/main/AndroidManifest.xml

@ -948,6 +948,7 @@
948 948
            android:windowSoftInputMode="adjustPan" />
949 949
        <activity
950 950
            android:name=".activity.PublishVideoTopicActivity"
951
            android:launchMode="singleTask"
951 952
            android:screenOrientation="portrait"
952 953
            android:windowSoftInputMode="stateVisible|adjustResize" />
953 954
        <activity
@ -966,6 +967,7 @@
966 967
            android:screenOrientation="portrait" />
967 968
        <activity
968 969
            android:name=".activity.TopicDetailActivity"
970
            android:launchMode="singleTask"
969 971
            android:screenOrientation="portrait" />
970 972
    </application>
971 973

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

@ -59,7 +59,7 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
59 59
    }
60 60
61 61
    private void initView() {
62
        intentData = (PublishItemSerializable)getIntent().getSerializableExtra("intent_data");
62
        intentData = (PublishItemSerializable) getIntent().getSerializableExtra("intent_data");
63 63
64 64
        mBottomView = (RelativeLayout) findViewById(R.id.bottom_view);
65 65
        mRulePublish = (TextView) findViewById(R.id.rule_publish);
@ -67,6 +67,11 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
67 67
        mPublishPicture = (LinearLayout) findViewById(R.id.publish_picture);
68 68
        mPublishVideo = (LinearLayout) findViewById(R.id.publish_video);
69 69
        mPublishQa = (LinearLayout) findViewById(R.id.publish_qa);
70
71
        if (intentData.getFrom().equals(FROM_TOPIC_DETAIL)) {
72
            mPublishQa.setVisibility(View.GONE);
73
        }
74
70 75
        mShareScanIcon = (ImageView) findViewById(R.id.share_scan_icon);
71 76
        mShareScanIconInfo = (TextView) findViewById(R.id.share_scan_icon_info);
72 77
        publish_radio = findViewById(R.id.publish_radio);
@ -102,12 +107,14 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
102 107
            case R.id.publish_picture: // 图文
103 108
                if (checkPublishRadio()) {
104 109
                    intent.setClass(this, PublishPicTopicActivity.class);
110
                    intent.putExtra("intent_data", intentData);
105 111
                    startActivity(intent);
106 112
                }
107 113
                break;
108 114
            case R.id.publish_video: // 视频
109 115
                if (checkPublishRadio()) {
110 116
                    intent.setClass(this, PublishVideoTopicActivity.class);
117
                    intent.putExtra("intent_data", intentData);
111 118
                    startActivity(intent);
112 119
                }
113 120
                break;

+ 20 - 10
app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@ -53,6 +53,7 @@ import com.electric.chargingpile.R;
53 53
import com.electric.chargingpile.application.MainApplication;
54 54
import com.electric.chargingpile.data.AuthSignBean;
55 55
import com.electric.chargingpile.data.ChatRecommendBean;
56
import com.electric.chargingpile.data.PublishItemSerializable;
56 57
import com.electric.chargingpile.data.UploadPic;
57 58
import com.electric.chargingpile.manager.ProfileManager;
58 59
import com.electric.chargingpile.util.BarColorUtil;
@ -143,6 +144,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
143 144
    @SuppressLint("SdCardPath")
144 145
    private ParallelUploader parallelUploader;
145 146
    private ProgressDialog uploadDialog;
147
    private PublishItemSerializable intentData;
146 148
147 149
148 150
    @Override
@ -182,13 +184,12 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
182 184
    }
183 185
184 186
    private void initView() {
187
        intentData = (PublishItemSerializable) getIntent().getSerializableExtra("intent_data");
185 188
        screenWidth = ScreenUtils.getScreenWidth(this);
186 189
        itemWidth = (int) ((screenWidth - DensityUtil.dip2px(this, 15 * 2 + 10 * 2)) / 3f);
187
188 190
        uploadDialog = new ProgressDialog(this);
189 191
        uploadDialog.setMessage("图片上传中...");
190 192
        uploadDialog.setCanceledOnTouchOutside(false);
191
192 193
        mPublishTopicDe = (ImageView) findViewById(R.id.publishtopic_choose_topic_de);
193 194
        mPublishTopicDe.setOnClickListener(this);
194 195
        mPublishtopicChooseTopic = (TextView) findViewById(R.id.publishtopic_choose_topic);
@ -270,6 +271,13 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
270 271
            }
271 272
        });
272 273
        imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
274
275
        if (intentData.getFrom().equals(PublishItemsActivity.FROM_TOPIC_DETAIL)) {
276
            chatRecommendBean = new ChatRecommendBean();
277
            chatRecommendBean.topicId = Long.parseLong(intentData.getTopicId());
278
            mPublishtopicChooseTopic.setText(intentData.getName());
279
            mPublishTopicDe.setVisibility(View.VISIBLE);
280
        }
273 281
    }
274 282
275 283
    private void getYouPaiData() {
@ -414,12 +422,9 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
414 422
415 423
416 424
        final RelativeLayout parent = (RelativeLayout) view.findViewById(R.id.parent);
417
        Button bt1 = (Button) view
418
                .findViewById(R.id.item_popupwindows_camera);
419
        Button bt2 = (Button) view
420
                .findViewById(R.id.item_popupwindows_Photo);
421
        Button bt3 = (Button) view
422
                .findViewById(R.id.item_popupwindows_cancel);
425
        Button bt1 = (Button) view.findViewById(R.id.item_popupwindows_camera);
426
        Button bt2 = (Button) view.findViewById(R.id.item_popupwindows_Photo);
427
        Button bt3 = (Button) view.findViewById(R.id.item_popupwindows_cancel);
423 428
        parent.setOnClickListener(new OnClickListener() {
424 429
425 430
            @Override
@ -921,9 +926,14 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
921 926
                publishCount = 0;
922 927
                String code = JsonUtils.getKeyResult(response, "code");
923 928
                String desc = JsonUtils.getKeyResult(response, "desc");
924
                if ("1000".equals(code)) {
929
                if ("1000".equals(code)) { // 图文发布成功
925 930
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
926
                    startActivity(new Intent(getApplicationContext(), ChatActivity.class));
931
                    if (intentData.getFrom().equals(PublishItemsActivity.FROM_CHAT_HOME)) {
932
                        startActivity(new Intent(getApplicationContext(), ChatActivity.class));
933
                    } else {
934
                        startActivity(new Intent(getApplicationContext(), TopicDetailActivity.class));
935
                    }
936
927 937
                } else {
928 938
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
929 939
                }

+ 17 - 4
app/src/main/java/com/electric/chargingpile/activity/PublishVideoTopicActivity.java

@ -32,6 +32,7 @@ import com.electric.chargingpile.adapter.TopicAdapter;
32 32
import com.electric.chargingpile.application.MainApplication;
33 33
import com.electric.chargingpile.data.AuthSignBean;
34 34
import com.electric.chargingpile.data.ChatRecommendBean;
35
import com.electric.chargingpile.data.PublishItemSerializable;
35 36
import com.electric.chargingpile.data.TalkRecommendBean;
36 37
import com.electric.chargingpile.manager.ProfileManager;
37 38
import com.electric.chargingpile.util.BarColorUtil;
@ -83,6 +84,7 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
83 84
    public static final String IMAGE_CACHE = CACHE_DIR + "/cache/image/";
84 85
    LocalMedia media;
85 86
    ProgressDialog uploadDialog;
87
    private PublishItemSerializable intentData;
86 88
87 89
    @Override
88 90
    protected void onCreate(Bundle savedInstanceState) {
@ -98,6 +100,7 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
98 100
    }
99 101
100 102
    private void initView() {
103
        intentData = (PublishItemSerializable) getIntent().getSerializableExtra("intent_data");
101 104
        mPublishtopicBack = (ImageView) findViewById(R.id.publishtopic_back);
102 105
        mPublishtopicPublish = (TextView) findViewById(R.id.publishtopic_publish);
103 106
        mPublishtopicCon = (EditText) findViewById(R.id.publishtopic_con);
@ -111,6 +114,13 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
111 114
        mItemVideo = (ImageView) findViewById(R.id.item_video);
112 115
        mItemVideoDelete = (View) findViewById(R.id.item_video_delete);
113 116
117
        if (intentData.getFrom().equals(PublishItemsActivity.FROM_TOPIC_DETAIL)) {
118
            chatRecommendBean = new ChatRecommendBean();
119
            chatRecommendBean.topicId = Long.parseLong(intentData.getTopicId());
120
            mPublishtopicChooseTopic.setText(intentData.getName());
121
            mPublishTopicDe.setVisibility(View.VISIBLE);
122
        }
123
114 124
115 125
        mPublishtopicCon.addTextChangedListener(new TextWatcher() {
116 126
            @Override
@ -322,12 +332,15 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
322 332
            @Override
323 333
            public void onResponse(String response) {
324 334
                String code = JsonUtils.getKeyResult(response, "code");
325
                String desc = JsonUtils.getKeyResult(response, "desc");
326
                Log.d(TAG, "onResponse: " + response);
327
                if ("1000".equals(code)) {
335
                if ("1000".equals(code)) { // 视频发布成功
328 336
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
329
                    startActivity(new Intent(getApplicationContext(), ChatActivity.class));
337
                    if (intentData.getFrom().equals(PublishItemsActivity.FROM_CHAT_HOME)) {
338
                        startActivity(new Intent(getApplicationContext(), ChatActivity.class));
339
                    } else {
340
                        startActivity(new Intent(getApplicationContext(), TopicDetailActivity.class));
341
                    }
330 342
                } else {
343
                    String desc = JsonUtils.getKeyResult(response, "desc");
331 344
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
332 345
                }
333 346
                uploadDialog.dismiss();

+ 66 - 68
app/src/main/res/layout/activity_publish_items.xml

@ -40,89 +40,87 @@
40 40
            android:layout_height="wrap_content"
41 41
            android:layout_above="@+id/rule_publish"
42 42
            android:layout_centerHorizontal="true"
43
            android:padding="10dp"
44
            android:background="@drawable/app_publish_close_icon" />
43
            android:background="@drawable/app_publish_close_icon"
44
            android:padding="10dp" />
45 45

46
        <LinearLayout
47
            android:id="@+id/publish_picture"
48
            android:layout_width="wrap_content"
49
            android:layout_height="wrap_content"
50
            android:layout_above="@+id/share_publish_close"
51
            android:layout_centerHorizontal="true"
52
            android:layout_marginTop="40dp"
53
            android:layout_marginBottom="40dp"
54
            android:gravity="center"
55
            android:minHeight="60dp"
56
            android:orientation="vertical">
57

58
            <ImageView
59
                android:layout_width="wrap_content"
60
                android:layout_height="wrap_content"
61
                android:background="@drawable/app_publish_pic_icon" />
62

63
            <TextView
64
                android:layout_width="wrap_content"
65
                android:layout_height="wrap_content"
66
                android:layout_marginTop="10dp"
67
                android:text="图文"
68
                android:textColor="@color/color_222222"
69
                android:textSize="15sp" />
70
        </LinearLayout>
71 46

72 47
        <LinearLayout
73
            android:id="@+id/publish_video"
74
            android:layout_width="wrap_content"
48
            android:layout_width="match_parent"
75 49
            android:layout_height="wrap_content"
76 50
            android:layout_above="@+id/share_publish_close"
77
            android:layout_marginTop="40dp"
78
            android:layout_marginRight="40dp"
79
            android:layout_marginBottom="40dp"
80
            android:layout_toLeftOf="@+id/publish_picture"
51
            android:layout_marginBottom="0dp"
81 52
            android:gravity="center"
82
            android:minHeight="60dp"
83
            android:orientation="vertical">
53
            android:orientation="horizontal">
84 54

85
            <ImageView
55
            <LinearLayout
56
                android:id="@+id/publish_picture"
86 57
                android:layout_width="wrap_content"
87 58
                android:layout_height="wrap_content"
88
                android:background="@drawable/app_publish_video_icon" />
89

90
            <TextView
59
                android:layout_centerHorizontal="true"
60
                android:gravity="center"
61
                android:orientation="vertical"
62
                android:padding="20dp">
63

64
                <ImageView
65
                    android:layout_width="wrap_content"
66
                    android:layout_height="wrap_content"
67
                    android:background="@drawable/app_publish_pic_icon" />
68

69
                <TextView
70
                    android:layout_width="wrap_content"
71
                    android:layout_height="wrap_content"
72
                    android:layout_marginTop="10dp"
73
                    android:text="图文"
74
                    android:textColor="@color/color_222222"
75
                    android:textSize="15sp" />
76
            </LinearLayout>
77

78
            <LinearLayout
79
                android:id="@+id/publish_video"
91 80
                android:layout_width="wrap_content"
92 81
                android:layout_height="wrap_content"
93
                android:layout_marginTop="10dp"
94
                android:text="视频"
95
                android:textColor="@color/color_222222"
96
                android:textSize="15sp" />
97
        </LinearLayout>
98

99
        <LinearLayout
100
            android:id="@+id/publish_qa"
101
            android:layout_width="wrap_content"
102
            android:layout_height="wrap_content"
103
            android:layout_above="@+id/share_publish_close"
104
            android:layout_marginLeft="40dp"
105
            android:layout_marginTop="40dp"
106
            android:layout_marginBottom="40dp"
107
            android:layout_toRightOf="@+id/publish_picture"
108
            android:gravity="center"
109
            android:minHeight="60dp"
110
            android:orientation="vertical">
111

112
            <ImageView
113
                android:layout_width="wrap_content"
114
                android:layout_height="wrap_content"
115
                android:background="@drawable/app_publish_qa_icon" />
116

117
            <TextView
82
                android:gravity="center"
83
                android:orientation="vertical"
84
                android:padding="20dp">
85

86
                <ImageView
87
                    android:layout_width="wrap_content"
88
                    android:layout_height="wrap_content"
89
                    android:background="@drawable/app_publish_video_icon" />
90

91
                <TextView
92
                    android:layout_width="wrap_content"
93
                    android:layout_height="wrap_content"
94
                    android:layout_marginTop="10dp"
95
                    android:text="视频"
96
                    android:textColor="@color/color_222222"
97
                    android:textSize="15sp" />
98
            </LinearLayout>
99

100
            <LinearLayout
101
                android:id="@+id/publish_qa"
118 102
                android:layout_width="wrap_content"
119 103
                android:layout_height="wrap_content"
120
                android:layout_marginTop="10dp"
121
                android:text="提问"
122
                android:textColor="@color/color_222222"
123
                android:textSize="15sp" />
104
                android:padding="20dp"
105
                android:gravity="center"
106
                android:orientation="vertical">
107

108
                <ImageView
109
                    android:layout_width="wrap_content"
110
                    android:layout_height="wrap_content"
111
                    android:background="@drawable/app_publish_qa_icon" />
112

113
                <TextView
114
                    android:layout_width="wrap_content"
115
                    android:layout_height="wrap_content"
116
                    android:layout_marginTop="10dp"
117
                    android:text="提问"
118
                    android:textColor="@color/color_222222"
119
                    android:textSize="15sp" />
120
            </LinearLayout>
124 121
        </LinearLayout>
125 122

123

126 124
    </RelativeLayout>
127 125

128 126
    <RelativeLayout