浏览代码

问题修改

huyuguo 4 年之前
父节点
当前提交
7c745c835d

+ 21 - 30
app/src/main/java/com/electric/chargingpile/activity/EditQuestionTwoActivity.java

@ -9,7 +9,9 @@ import android.graphics.BitmapFactory;
9 9
import android.graphics.Matrix;
10 10
import android.os.Bundle;
11 11
import android.os.Handler;
12
12 13
import androidx.appcompat.app.AppCompatActivity;
14
13 15
import android.util.Log;
14 16
import android.view.KeyEvent;
15 17
import android.view.View;
@ -35,6 +37,10 @@ import com.electric.chargingpile.view.CarTypeDialog;
35 37
import com.electric.chargingpile.view.xrichtext.RichTextEditor;
36 38
import com.electric.chargingpile.view.xrichtext.SDCardUtil;
37 39
import com.umeng.analytics.MobclickAgent;
40
import com.zhihu.matisse.Matisse;
41
import com.zhihu.matisse.MimeType;
42
import com.zhihu.matisse.engine.impl.GlideEngine;
43
import com.zhihu.matisse.internal.entity.CaptureStrategy;
38 44
import com.zhy.http.okhttp.OkHttpUtils;
39 45
import com.zhy.http.okhttp.callback.StringCallback;
40 46
@ -79,7 +85,7 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
79 85
    private LinearLayout ll;
80 86
    public static android.view.animation.Animation animation;
81 87
    private static final int RC_ALBUM_PERM = 123;
82
88
    public static final int REQUEST_CODE_CHOOSE = 339;
83 89
84 90
    @Override
85 91
    protected void onCreate(Bundle savedInstanceState) {
@ -188,7 +194,6 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
188 194
                    @Override
189 195
                    public void onError(Throwable e) {
190 196
                        loadingDialog.dismiss();
191
//                        ToastUtil.showToast(getApplicationContext(),"解析错误:图片不存在或已损坏",Toast.LENGTH_SHORT);
192 197
                    }
193 198
194 199
                    @Override
@ -265,16 +270,12 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
265 270
     */
266 271
    private String getEditData() {
267 272
        List<RichTextEditor.EditData> editList = et_new_content.buildEditData();
268
//        for (int i=0;i<editList.size();i++){
269
//            Log.e(TAG, "getEditData"+i+": "+editList.get(i).imagePath );
270
//        }
271 273
        StringBuffer content = new StringBuffer();
272 274
        StringBuffer contentt = new StringBuffer();
273 275
        for (RichTextEditor.EditData itemData : editList) {
274 276
            if (itemData.inputStr != null) {
275 277
                content.append(itemData.inputStr);
276 278
                contentt.append(itemData.inputStr);
277
                //Log.d("RichEditor", "commit inputStr=" + itemData.inputStr);
278 279
            } else if (itemData.imagePath != null) {
279 280
                Bitmap bitmap = BitmapFactory.decodeFile(itemData.imagePath);
280 281
                int width = bitmap.getWidth();
@ -287,9 +288,6 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
287 288
                        contentt.append("<cdz img src=\"").append(itemData.imagePath).append("\" width=" + "\"" + width + "\"" + " height=" + "\"" + height + "\" /cdz>");
288 289
                    }
289 290
                }
290
291
                //Log.d("RichEditor", "commit imgePath=" + itemData.imagePath);
292
                //imageList.add(itemData.imagePath);
293 291
            }
294 292
        }
295 293
        MainApplication.q_content = contentt.toString();
@ -358,22 +356,15 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
358 356
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
359 357
                    //可以同时插入多张图片
360 358
                    for (String imagePath : photos) {
361
                        //Log.i("NewActivity", "###path=" + imagePath);
362 359
                        Bitmap bitmap = ImageUitl.getSmallBitmap(imagePath, width, height);//压缩图片
363
364
//                        Bitmap bitmap = BitmapFactory.decodeFile(imagePath);//压缩图片
365 360
                        if (com.electric.chargingpile.util.ImageUtils.readPictureDegree(imagePath) != 0) {
366 361
                            bitmap = imageZoom(com.electric.chargingpile.util.ImageUtils.toturn(bitmap));
367 362
                        } else {
368 363
                            bitmap = imageZoom(bitmap);
369 364
                        }
370
//                        Log.e(TAG, "call: "+imagePath );
371 365
                        c_path = imagePath;
372
                        //bitmap = BitmapFactory.decodeFile(imagePath);
373 366
                        imagePath = SDCardUtil.saveToSdCard(bitmap);
374 367
                        u_path = imagePath;
375
//                        Log.e(TAG, "call: "+imagePath );
376
                        //Log.i("NewActivity", "###imagePath="+imagePath);
377 368
                        subscriber.onNext(imagePath);
378 369
                    }
379 370
                    subscriber.onComplete();
@ -513,13 +504,14 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
513 504
     * 调用图库选择
514 505
     */
515 506
    private void callGallery() {
516
        //调用第三方图库选择
517
        PhotoPicker.builder()
518
                .setPhotoCount(1)//可选择图片数量
519
                .setShowCamera(true)//是否显示拍照按钮
520
                .setShowGif(true)//是否显示动态图
521
                .setPreviewEnabled(true)//是否可以预览
522
                .start(this, PhotoPicker.REQUEST_CODE);
507
        Matisse.from(EditQuestionTwoActivity.this)
508
                .choose(MimeType.of(MimeType.JPEG, MimeType.PNG, MimeType.GIF))
509
                .countable(true)
510
                .maxSelectable(1)
511
                .capture(true)
512
                .captureStrategy(new CaptureStrategy(true, "com.electric.chargingpile.provider"))
513
                .imageEngine(new GlideEngine())
514
                .forResult(REQUEST_CODE_CHOOSE);
523 515
    }
524 516
525 517
    @Override
@ -529,7 +521,7 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
529 521
            if (data != null) {
530 522
                if (requestCode == 1) {
531 523
                    //处理调用系统图库
532
                } else if (requestCode == PhotoPicker.REQUEST_CODE) {
524
                } else if (requestCode == REQUEST_CODE_CHOOSE) {
533 525
                    //异步方式插入图片
534 526
                    insertImagesSync(data);
535 527
                }
@ -681,23 +673,22 @@ public class EditQuestionTwoActivity extends AppCompatActivity implements View.O
681 673
    public void permissionTask() {
682 674
        if (isPermissionOK()) {
683 675
            callGallery();
684
            // Have permission, do the thing!
685
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
686
//            ifTimeout();
687 676
        } else {
688
            // Ask for one permission
689 677
            EasyPermissions.requestPermissions(
690 678
                    this, "充电桩想要获取您的图片读取权限,是否允许?",
691 679
                    RC_ALBUM_PERM,
692 680
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
693
                    Manifest.permission.READ_EXTERNAL_STORAGE);
681
                    Manifest.permission.READ_EXTERNAL_STORAGE,
682
                    Manifest.permission.CAMERA
683
            );
694 684
        }
695 685
    }
696 686
697 687
    private boolean isPermissionOK() {
698 688
        return EasyPermissions.hasPermissions(this,
699 689
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
700
                Manifest.permission.READ_EXTERNAL_STORAGE
690
                Manifest.permission.READ_EXTERNAL_STORAGE,
691
                Manifest.permission.CAMERA
701 692
        );
702 693
    }
703 694
}

+ 0 - 9
app/src/main/java/com/electric/chargingpile/activity/TalkActivity.java

@ -217,15 +217,6 @@ public class TalkActivity extends AppCompatActivity implements View.OnClickListe
217 217
                finish();
218 218
                overridePendingTransition(0, 0);
219 219
                break;
220
//            case R.id.iv_ask:
221
//                if (MainApplication.isLogin()){
222
//                    MobclickAgent.onEvent(getApplicationContext(),"0502");
223
//                    startActivity(new Intent(getApplicationContext(),EditQuestionOneActivity.class));
224
//                }else {
225
//                    startActivity(new Intent(getApplicationContext(),LoginActivity.class));
226
//                    ToastUtil.showToast(getApplicationContext(),"请先登录",Toast.LENGTH_SHORT);
227
//                }
228
//                break;
229 220
        }
230 221
    }
231 222

+ 0 - 19
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java

@ -529,7 +529,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
529 529
            case R.id.rl_icon:
530 530
                MobclickAgent.onEvent(getApplicationContext(), "0802", new HashMap<String, String>().put("type", "头像"));
531 531
                cameraTask();
532
//                callGallery();
533 532
                break;
534 533
535 534
            case R.id.tv_make_sure:
@ -543,27 +542,10 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
543 542
                    }).start();
544 543
                    dialog.show();
545 544
                }
546
547 545
                break;
548
549 546
        }
550 547
    }
551 548
552
    /**
553
     * 调用图库选择
554
     */
555
    private void callGallery() {
556
        //调用第三方图库选择
557
        PhotoPicker.builder()
558
                .setPhotoCount(1)//可选择图片数量
559
                .setShowCamera(true)//是否显示拍照按钮
560
                .setShowGif(true)//是否显示动态图
561
                .setPreviewEnabled(true)//是否可以预览
562
                .start(this, PhotoPicker.REQUEST_CODE);
563
564
565
    }
566
567 549
    private boolean checkText() {
568 550
        String nickName = et_nickName.getText().toString().trim();
569 551
        String isBuy = tv_buy.getText().toString().trim();
@ -584,7 +566,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
584 566
            }
585 567
        }
586 568
587
588 569
        return true;
589 570
    }
590 571

+ 0 - 2
app/src/main/java/com/electric/chargingpile/fragment/QaActivityFragment.java

@ -151,7 +151,6 @@ public class QaActivityFragment extends Fragment implements View.OnClickListener
151 151
152 152
    private void getQAData(final boolean isClear) {
153 153
        String url = MainApplication.url + "/zhannew/basic/web/index.php/question/list?";
154
//        Log.e(TAG, "getQAData: "+url );
155 154
        Map<String, String> map = new HashMap<>();
156 155
        map.put("page", index + "");
157 156
        if (MainApplication.isLogin()) {
@ -174,7 +173,6 @@ public class QaActivityFragment extends Fragment implements View.OnClickListener
174 173
                        datas.clear();
175 174
                    }
176 175
                    ArrayList<QAData> qadata = (ArrayList<QAData>) JsonUtils.parseToObjectList(rtnMsg, QAData.class);
177
//                    Log.e(TAG, "onResponse: qadata"+qadata.size() );
178 176
                    for (int i = 0; i < qadata.size(); i++) {
179 177
                        datas.add(qadata.get(i));
180 178
                    }

+ 0 - 7
app/src/main/java/com/electric/chargingpile/fragment/TalkFragment.java

@ -126,13 +126,6 @@ public class TalkFragment extends Fragment implements View.OnClickListener, Easy
126 126
        switch (v.getId()) {
127 127
            case R.id.iv_ask:
128 128
                startActivity(new Intent(getActivity(), StaggeredRecyclerViewActivity.class));
129
//                if (MainApplication.isLogin()){
130
//                    MobclickAgent.onEvent(getApplicationContext(),"0502");
131
//                    startActivity(new Intent(getApplicationContext(),EditQuestionOneActivity.class));
132
//                }else {
133
//                    startActivity(new Intent(getApplicationContext(),LoginActivity.class));
134
//                    ToastUtil.showToast(getApplicationContext(),"请先登录",Toast.LENGTH_SHORT);
135
//                }
136 129
                break;
137 130
        }
138 131
    }