Browse Source

照片编辑修改完成

huyuguo 6 years ago
parent
commit
f644d2ce31

+ 5 - 4
app/src/main/AndroidManifest.xml

854
            android:name=".activity.TLDLoadingActivity"
854
            android:name=".activity.TLDLoadingActivity"
855
            android:screenOrientation="portrait" />
855
            android:screenOrientation="portrait" />
856
        <!--<activity-->
856
        <!--<activity-->
857
            <!--android:name=".activity.MyCaptureActivity"-->
858
            <!--android:launchMode="singleTask"-->
859
            <!--android:screenOrientation="portrait" />-->
857
        <!--android:name=".activity.MyCaptureActivity"-->
858
        <!--android:launchMode="singleTask"-->
859
        <!--android:screenOrientation="portrait" />-->
860
        <activity
860
        <activity
861
            android:name=".activity.MemberCoinRecordActivity"
861
            android:name=".activity.MemberCoinRecordActivity"
862
            android:screenOrientation="portrait" />
862
            android:screenOrientation="portrait" />
988
            android:screenOrientation="portrait" />
988
            android:screenOrientation="portrait" />
989
        <activity
989
        <activity
990
            android:name=".activity.VideoDetaislActivity"
990
            android:name=".activity.VideoDetaislActivity"
991
            android:screenOrientation="portrait"
992
            android:keepScreenOn="true"
991
            android:keepScreenOn="true"
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.PublishTopicActivity"
1004
            android:screenOrientation="portrait" />
1004
            android:screenOrientation="portrait" />
1005
        <activity
1005
        <activity
1006
            android:name=".activity.PublishPicTopicActivity"
1006
            android:name=".activity.PublishPicTopicActivity"
1007
            android:launchMode="singleTask"
1007
            android:screenOrientation="portrait" />
1008
            android:screenOrientation="portrait" />
1008
        <activity
1009
        <activity
1009
            android:name=".activity.PersonalPageActivity"
1010
            android:name=".activity.PersonalPageActivity"

+ 20 - 8
app/src/main/java/com/electric/chargingpile/activity/GalleryActivityFeedback.java

129
            if (listViews.size() == 1) {
129
            if (listViews.size() == 1) {
130
                Bimp.tempSelectBitmap.clear();
130
                Bimp.tempSelectBitmap.clear();
131
                Bimp.max = 0;
131
                Bimp.max = 0;
132
                if (TextUtils.isEmpty(type))
133
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
134
                else
132
                if (!TextUtils.isEmpty(type) && "1".equals(type)) {
135
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
133
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
134
                } else {
135
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
136
                }
137
136
                Intent intent = new Intent("data.broadcast.action");
138
                Intent intent = new Intent("data.broadcast.action");
137
                sendBroadcast(intent);
139
                sendBroadcast(intent);
138
                finish();
140
                finish();
142
                pager.removeAllViews();
144
                pager.removeAllViews();
143
                listViews.remove(location);
145
                listViews.remove(location);
144
                adapter.setListViews(listViews);
146
                adapter.setListViews(listViews);
145
                if (TextUtils.isEmpty(type))
146
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
147
                else
147
                if (!TextUtils.isEmpty(type) && "1".equals(type)) {
148
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
148
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
149
                } else {
150
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
151
                }
149
                adapter.notifyDataSetChanged();
152
                adapter.notifyDataSetChanged();
150
            }
153
            }
151
        }
154
        }
155
    private class GallerySendListener implements View.OnClickListener {
158
    private class GallerySendListener implements View.OnClickListener {
156
        public void onClick(View v) {
159
        public void onClick(View v) {
157
            finish();
160
            finish();
158
            intent.setClass(GalleryActivityFeedback.this, FeedbackActivity.class);
161
            if (!TextUtils.isEmpty(type) && "1".equals(type)) {
162
                intent.setClass(GalleryActivityFeedback.this, PublishPicTopicActivity.class);
163
            } else {
164
                intent.setClass(GalleryActivityFeedback.this, FeedbackActivity.class);
165
            }
159
            startActivity(intent);
166
            startActivity(intent);
160
        }
167
        }
161
168
163
170
164
    public void isShowOkBt() {
171
    public void isShowOkBt() {
165
        if (Bimp.tempSelectBitmap.size() > 0) {
172
        if (Bimp.tempSelectBitmap.size() > 0) {
166
            send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
173
            if (!TextUtils.isEmpty(type) && "1".equals(type)) {
174
                send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + "9" + ")");
175
            } else {
176
                send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
177
            }
178
167
            send_bt.setPressed(true);
179
            send_bt.setPressed(true);
168
            send_bt.setClickable(true);
180
            send_bt.setClickable(true);
169
            send_bt.setTextColor(getResources().getColor(R.color.lvse));
181
            send_bt.setTextColor(getResources().getColor(R.color.lvse));

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

893
                if ("1000".equals(code)) {
893
                if ("1000".equals(code)) {
894
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
894
                    ToastUtil.showToast(getApplicationContext(), "发布成功", Toast.LENGTH_SHORT);
895
                } else {
895
                } else {
896
897
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
896
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_SHORT);
898
                }
897
                }
899
            }
898
            }