Bladeren bron

问题修改

huyuguo 4 jaren geleden
bovenliggende
commit
7c745c835d

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

9
import android.graphics.Matrix;
9
import android.graphics.Matrix;
10
import android.os.Bundle;
10
import android.os.Bundle;
11
import android.os.Handler;
11
import android.os.Handler;
12
12
import androidx.appcompat.app.AppCompatActivity;
13
import androidx.appcompat.app.AppCompatActivity;
14
13
import android.util.Log;
15
import android.util.Log;
14
import android.view.KeyEvent;
16
import android.view.KeyEvent;
15
import android.view.View;
17
import android.view.View;
35
import com.electric.chargingpile.view.xrichtext.RichTextEditor;
37
import com.electric.chargingpile.view.xrichtext.RichTextEditor;
36
import com.electric.chargingpile.view.xrichtext.SDCardUtil;
38
import com.electric.chargingpile.view.xrichtext.SDCardUtil;
37
import com.umeng.analytics.MobclickAgent;
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
import com.zhy.http.okhttp.OkHttpUtils;
44
import com.zhy.http.okhttp.OkHttpUtils;
39
import com.zhy.http.okhttp.callback.StringCallback;
45
import com.zhy.http.okhttp.callback.StringCallback;
40
46
79
    private LinearLayout ll;
85
    private LinearLayout ll;
80
    public static android.view.animation.Animation animation;
86
    public static android.view.animation.Animation animation;
81
    private static final int RC_ALBUM_PERM = 123;
87
    private static final int RC_ALBUM_PERM = 123;
82
88
    public static final int REQUEST_CODE_CHOOSE = 339;
83
89
84
    @Override
90
    @Override
85
    protected void onCreate(Bundle savedInstanceState) {
91
    protected void onCreate(Bundle savedInstanceState) {
188
                    @Override
194
                    @Override
189
                    public void onError(Throwable e) {
195
                    public void onError(Throwable e) {
190
                        loadingDialog.dismiss();
196
                        loadingDialog.dismiss();
191
//                        ToastUtil.showToast(getApplicationContext(),"解析错误:图片不存在或已损坏",Toast.LENGTH_SHORT);
192
                    }
197
                    }
193
198
194
                    @Override
199
                    @Override
265
     */
270
     */
266
    private String getEditData() {
271
    private String getEditData() {
267
        List<RichTextEditor.EditData> editList = et_new_content.buildEditData();
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
        StringBuffer content = new StringBuffer();
273
        StringBuffer content = new StringBuffer();
272
        StringBuffer contentt = new StringBuffer();
274
        StringBuffer contentt = new StringBuffer();
273
        for (RichTextEditor.EditData itemData : editList) {
275
        for (RichTextEditor.EditData itemData : editList) {
274
            if (itemData.inputStr != null) {
276
            if (itemData.inputStr != null) {
275
                content.append(itemData.inputStr);
277
                content.append(itemData.inputStr);
276
                contentt.append(itemData.inputStr);
278
                contentt.append(itemData.inputStr);
277
                //Log.d("RichEditor", "commit inputStr=" + itemData.inputStr);
278
            } else if (itemData.imagePath != null) {
279
            } else if (itemData.imagePath != null) {
279
                Bitmap bitmap = BitmapFactory.decodeFile(itemData.imagePath);
280
                Bitmap bitmap = BitmapFactory.decodeFile(itemData.imagePath);
280
                int width = bitmap.getWidth();
281
                int width = bitmap.getWidth();
287
                        contentt.append("<cdz img src=\"").append(itemData.imagePath).append("\" width=" + "\"" + width + "\"" + " height=" + "\"" + height + "\" /cdz>");
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
        MainApplication.q_content = contentt.toString();
293
        MainApplication.q_content = contentt.toString();
358
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
356
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
359
                    //可以同时插入多张图片
357
                    //可以同时插入多张图片
360
                    for (String imagePath : photos) {
358
                    for (String imagePath : photos) {
361
                        //Log.i("NewActivity", "###path=" + imagePath);
362
                        Bitmap bitmap = ImageUitl.getSmallBitmap(imagePath, width, height);//压缩图片
359
                        Bitmap bitmap = ImageUitl.getSmallBitmap(imagePath, width, height);//压缩图片
363
364
//                        Bitmap bitmap = BitmapFactory.decodeFile(imagePath);//压缩图片
365
                        if (com.electric.chargingpile.util.ImageUtils.readPictureDegree(imagePath) != 0) {
360
                        if (com.electric.chargingpile.util.ImageUtils.readPictureDegree(imagePath) != 0) {
366
                            bitmap = imageZoom(com.electric.chargingpile.util.ImageUtils.toturn(bitmap));
361
                            bitmap = imageZoom(com.electric.chargingpile.util.ImageUtils.toturn(bitmap));
367
                        } else {
362
                        } else {
368
                            bitmap = imageZoom(bitmap);
363
                            bitmap = imageZoom(bitmap);
369
                        }
364
                        }
370
//                        Log.e(TAG, "call: "+imagePath );
371
                        c_path = imagePath;
365
                        c_path = imagePath;
372
                        //bitmap = BitmapFactory.decodeFile(imagePath);
373
                        imagePath = SDCardUtil.saveToSdCard(bitmap);
366
                        imagePath = SDCardUtil.saveToSdCard(bitmap);
374
                        u_path = imagePath;
367
                        u_path = imagePath;
375
//                        Log.e(TAG, "call: "+imagePath );
376
                        //Log.i("NewActivity", "###imagePath="+imagePath);
377
                        subscriber.onNext(imagePath);
368
                        subscriber.onNext(imagePath);
378
                    }
369
                    }
379
                    subscriber.onComplete();
370
                    subscriber.onComplete();
513
     * 调用图库选择
504
     * 调用图库选择
514
     */
505
     */
515
    private void callGallery() {
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
    @Override
517
    @Override
529
            if (data != null) {
521
            if (data != null) {
530
                if (requestCode == 1) {
522
                if (requestCode == 1) {
531
                    //处理调用系统图库
523
                    //处理调用系统图库
532
                } else if (requestCode == PhotoPicker.REQUEST_CODE) {
524
                } else if (requestCode == REQUEST_CODE_CHOOSE) {
533
                    //异步方式插入图片
525
                    //异步方式插入图片
534
                    insertImagesSync(data);
526
                    insertImagesSync(data);
535
                }
527
                }
681
    public void permissionTask() {
673
    public void permissionTask() {
682
        if (isPermissionOK()) {
674
        if (isPermissionOK()) {
683
            callGallery();
675
            callGallery();
684
            // Have permission, do the thing!
685
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
686
//            ifTimeout();
687
        } else {
676
        } else {
688
            // Ask for one permission
689
            EasyPermissions.requestPermissions(
677
            EasyPermissions.requestPermissions(
690
                    this, "充电桩想要获取您的图片读取权限,是否允许?",
678
                    this, "充电桩想要获取您的图片读取权限,是否允许?",
691
                    RC_ALBUM_PERM,
679
                    RC_ALBUM_PERM,
692
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
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
    private boolean isPermissionOK() {
687
    private boolean isPermissionOK() {
698
        return EasyPermissions.hasPermissions(this,
688
        return EasyPermissions.hasPermissions(this,
699
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
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
                finish();
217
                finish();
218
                overridePendingTransition(0, 0);
218
                overridePendingTransition(0, 0);
219
                break;
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
            case R.id.rl_icon:
529
            case R.id.rl_icon:
530
                MobclickAgent.onEvent(getApplicationContext(), "0802", new HashMap<String, String>().put("type", "头像"));
530
                MobclickAgent.onEvent(getApplicationContext(), "0802", new HashMap<String, String>().put("type", "头像"));
531
                cameraTask();
531
                cameraTask();
532
//                callGallery();
533
                break;
532
                break;
534
533
535
            case R.id.tv_make_sure:
534
            case R.id.tv_make_sure:
543
                    }).start();
542
                    }).start();
544
                    dialog.show();
543
                    dialog.show();
545
                }
544
                }
546
547
                break;
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
    private boolean checkText() {
549
    private boolean checkText() {
568
        String nickName = et_nickName.getText().toString().trim();
550
        String nickName = et_nickName.getText().toString().trim();
569
        String isBuy = tv_buy.getText().toString().trim();
551
        String isBuy = tv_buy.getText().toString().trim();
584
            }
566
            }
585
        }
567
        }
586
568
587
588
        return true;
569
        return true;
589
    }
570
    }
590
571

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

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

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

126
        switch (v.getId()) {
126
        switch (v.getId()) {
127
            case R.id.iv_ask:
127
            case R.id.iv_ask:
128
                startActivity(new Intent(getActivity(), StaggeredRecyclerViewActivity.class));
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
                break;
129
                break;
137
        }
130
        }
138
    }
131
    }