Parcourir la Source

首页面跳转更改

dxh 6 ans auparavant
Parent
commit
c670c0d3bc

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

269
                break;
269
                break;
270
            case R.id.tab_qa:
270
            case R.id.tab_qa:
271
                MobclickAgent.onEvent(getApplicationContext(), "0103");
271
                MobclickAgent.onEvent(getApplicationContext(), "0103");
272
                Intent i = new Intent(getApplication(), QaActivity.class);
272
//                Intent i = new Intent(getApplication(), QaActivity.class);
273
                Intent i = new Intent(getApplication(), TalkActivity.class);
273
                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
274
                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
274
                startActivity(i);
275
                startActivity(i);
275
//                finish();
276
//                finish();

+ 11 - 2
app/src/main/java/com/electric/chargingpile/activity/GalleryActivityFeedback.java

9
import android.os.Bundle;
9
import android.os.Bundle;
10
import android.support.v4.view.PagerAdapter;
10
import android.support.v4.view.PagerAdapter;
11
import android.support.v4.view.ViewPager;
11
import android.support.v4.view.ViewPager;
12
import android.text.TextUtils;
12
import android.view.View;
13
import android.view.View;
13
import android.view.ViewGroup;
14
import android.view.ViewGroup;
14
import android.widget.RelativeLayout;
15
import android.widget.RelativeLayout;
40
    private int position;
41
    private int position;
41
    //当前的位置
42
    //当前的位置
42
    private int location = 0;
43
    private int location = 0;
44
    private String type;
43
45
44
    private ArrayList<View> listViews = null;
46
    private ArrayList<View> listViews = null;
45
    private ZoomingViewpager pager;
47
    private ZoomingViewpager pager;
68
        intent = getIntent();
70
        intent = getIntent();
69
        Bundle bundle = intent.getExtras();
71
        Bundle bundle = intent.getExtras();
70
        position = Integer.parseInt(intent.getStringExtra("position"));
72
        position = Integer.parseInt(intent.getStringExtra("position"));
73
        type = getIntent().getStringExtra("type");
71
        isShowOkBt();
74
        isShowOkBt();
72
        // 为发送按钮设置文字
75
        // 为发送按钮设置文字
73
        pager = (ZoomingViewpager) findViewById(Res.getWidgetID("gallery01"));
76
        pager = (ZoomingViewpager) findViewById(Res.getWidgetID("gallery01"));
126
            if (listViews.size() == 1) {
129
            if (listViews.size() == 1) {
127
                Bimp.tempSelectBitmap.clear();
130
                Bimp.tempSelectBitmap.clear();
128
                Bimp.max = 0;
131
                Bimp.max = 0;
129
                send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
132
                if (TextUtils.isEmpty(type))
133
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
134
                else
135
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
130
                Intent intent = new Intent("data.broadcast.action");
136
                Intent intent = new Intent("data.broadcast.action");
131
                sendBroadcast(intent);
137
                sendBroadcast(intent);
132
                finish();
138
                finish();
136
                pager.removeAllViews();
142
                pager.removeAllViews();
137
                listViews.remove(location);
143
                listViews.remove(location);
138
                adapter.setListViews(listViews);
144
                adapter.setListViews(listViews);
139
                send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
145
                if (TextUtils.isEmpty(type))
146
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
147
                else
148
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
140
                adapter.notifyDataSetChanged();
149
                adapter.notifyDataSetChanged();
141
            }
150
            }
142
        }
151
        }

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

371
                break;
371
                break;
372
            case R.id.tab_qa:
372
            case R.id.tab_qa:
373
                MobclickAgent.onEvent(getApplicationContext(), "0103");
373
                MobclickAgent.onEvent(getApplicationContext(), "0103");
374
                Intent intent6 = new Intent(getApplication(), QaActivity.class);
374
                Intent intent6 = new Intent(getApplication(), TalkActivity.class);
375
//                Intent intent6 = new Intent(getApplication(), QaActivity.class);
375
                intent6.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
376
                intent6.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
376
                startActivity(intent6);
377
                startActivity(intent6);
377
                finish();
378
                finish();

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

90
 * */
90
 * */
91
public class PublishPicTopicActivity extends Activity implements OnClickListener ,EasyPermissions.PermissionCallbacks{
91
public class PublishPicTopicActivity extends Activity implements OnClickListener ,EasyPermissions.PermissionCallbacks{
92
    private static final String TAG = "PublishPicTopicActivity";
92
    private static final String TAG = "PublishPicTopicActivity";
93
    private static final int PIC_NUM = 3;
93
    private static final int PIC_NUM = 9;
94
    private ImageView ivBack;
94
    private ImageView ivBack;
95
    private TextView tv_right;
95
    private TextView tv_right;
96
    private static String PHOTO_FILE_NAME = "";
96
    private static String PHOTO_FILE_NAME = "";
398
                    Intent intent = new Intent(PublishPicTopicActivity.this,
398
                    Intent intent = new Intent(PublishPicTopicActivity.this,
399
                            GalleryActivityFeedback.class);
399
                            GalleryActivityFeedback.class);
400
                    intent.putExtra("position", "1");
400
                    intent.putExtra("position", "1");
401
                    intent.putExtra("type", "1");
401
                    intent.putExtra("ID", arg2);
402
                    intent.putExtra("ID", arg2);
402
                    startActivity(intent);
403
                    startActivity(intent);
403
                }
404
                }
531
        }
532
        }
532
533
533
        public int getCount() {
534
        public int getCount() {
534
            if (Bimp.tempSelectBitmap.size() == 3) {
535
                return 3;
535
            if (Bimp.tempSelectBitmap.size() == 9) {
536
                return 9;
536
            }
537
            }
537
            return (Bimp.tempSelectBitmap.size() + 1);
538
            return (Bimp.tempSelectBitmap.size() + 1);
538
        }
539
        }
569
            if (position == Bimp.tempSelectBitmap.size()) {
570
            if (position == Bimp.tempSelectBitmap.size()) {
570
                holder.image.setImageBitmap(BitmapFactory.decodeResource(
571
                holder.image.setImageBitmap(BitmapFactory.decodeResource(
571
                        getResources(), R.drawable.icon_feedback_upload));
572
                        getResources(), R.drawable.icon_feedback_upload));
572
                if (position == 3) {
573
                if (position == 9) {
573
                    holder.image.setVisibility(View.GONE);
574
                    holder.image.setVisibility(View.GONE);
574
                }
575
                }
575
            } else {
576
            } else {
650
        }
651
        }
651
    }
652
    }
652
653
653
    private void crop(Uri uri, Uri cutImgUri) {
654
        // �ü�ͼƬ��ͼ
655
        Intent intent = new Intent("com.android.camera.action.CROP");
656
        intent.setDataAndType(getImageContentUri(this, tempFile), "image/*");
657
658
        intent.putExtra("crop", "true");
659
        // �ü���ı�����1��1
660
//        intent.putExtra("aspectX", 16);
661
//        intent.putExtra("aspectY", 9);
662
//        // �ü������ͼƬ�ijߴ��С
663
//        intent.putExtra("outputX", 900);
664
//        intent.putExtra("outputY", 540);
665
//        intent.putExtra("scale", false);
666
667
        // ͼƬ��ʽ
668
        intent.putExtra("outputFormat", "JPEG");
669
        intent.putExtra("noFaceDetection", true);// ȡ������ʶ��
670
        intent.putExtra("return-data", false);// true:������uri��false������uri
671
        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(tempFile));//д���ȡ��ͼƬ
672
        startActivityForResult(intent, PHOTO_REQUEST_CUT);
673
    }
674
675
    public Bitmap decodeUriAsBitmap(Uri uri) {
654
    public Bitmap decodeUriAsBitmap(Uri uri) {
676
        Bitmap bitmap = null;
655
        Bitmap bitmap = null;
677
        try {
656
        try {

+ 4 - 2
app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java

716
                @Override
716
                @Override
717
                public void onClick(View v) {
717
                public void onClick(View v) {
718
                    MobclickAgent.onEvent(getApplicationContext(), "0802");
718
                    MobclickAgent.onEvent(getApplicationContext(), "0802");
719
                    startActivity(new Intent(getApplicationContext(), UserInfoActivity.class));
719
                    startActivity(new Intent(getApplicationContext(), PersonalPageActivity.class));
720
//                    startActivity(new Intent(getApplicationContext(), UserInfoActivity.class));
720
                }
721
                }
721
            });
722
            });
722
            ll_userLogin.setVisibility(View.INVISIBLE);
723
            ll_userLogin.setVisibility(View.INVISIBLE);
854
                break;
855
                break;
855
            case R.id.tab_qa:
856
            case R.id.tab_qa:
856
                MobclickAgent.onEvent(getApplicationContext(), "0103");
857
                MobclickAgent.onEvent(getApplicationContext(), "0103");
857
                Intent intent7 = new Intent(getApplication(), QaActivity.class);
858
                Intent intent7 = new Intent(getApplication(), TalkActivity.class);
859
//                Intent intent7 = new Intent(getApplication(), QaActivity.class);
858
                intent7.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
860
                intent7.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
859
                startActivity(intent7);
861
                startActivity(intent7);
860
                finish();
862
                finish();

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

95
        android:layout_below="@+id/et_context"
95
        android:layout_below="@+id/et_context"
96
        android:layout_marginBottom="50dp"
96
        android:layout_marginBottom="50dp"
97
        android:layout_marginLeft="15dp"
97
        android:layout_marginLeft="15dp"
98
        android:layout_marginRight="70dp"
98
        android:layout_marginRight="15dp"
99
        android:numColumns="3"
99
        android:numColumns="3"
100
        android:scrollbars="none"
100
        android:scrollbars="none"
101
        android:verticalSpacing="5dp" >
101
        android:verticalSpacing="5dp" >