首页面跳转更改

app/src/main/java/com/electric/chargingpile/activity/FindActivity.java

@@ -269,7 +269,8 @@ public class FindActivity extends AppCompatActivity implements View.OnClickListe
                break;
            case R.id.tab_qa:
                MobclickAgent.onEvent(getApplicationContext(), "0103");
                Intent i = new Intent(getApplication(), QaActivity.class);
//                Intent i = new Intent(getApplication(), QaActivity.class);
                Intent i = new Intent(getApplication(), TalkActivity.class);
                i.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                startActivity(i);
//                finish();

app/src/main/java/com/electric/chargingpile/activity/GalleryActivityFeedback.java

@@ -9,6 +9,7 @@ import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
@@ -40,6 +41,7 @@ public class GalleryActivityFeedback extends Activity {
    private int position;
    //当前的位置
    private int location = 0;
    private String type;
    private ArrayList<View> listViews = null;
    private ZoomingViewpager pager;
@@ -68,6 +70,7 @@ public class GalleryActivityFeedback extends Activity {
        intent = getIntent();
        Bundle bundle = intent.getExtras();
        position = Integer.parseInt(intent.getStringExtra("position"));
        type = getIntent().getStringExtra("type");
        isShowOkBt();
        // 为发送按钮设置文字
        pager = (ZoomingViewpager) findViewById(Res.getWidgetID("gallery01"));
@@ -126,7 +129,10 @@ public class GalleryActivityFeedback extends Activity {
            if (listViews.size() == 1) {
                Bimp.tempSelectBitmap.clear();
                Bimp.max = 0;
                send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
                if (TextUtils.isEmpty(type))
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
                else
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
                Intent intent = new Intent("data.broadcast.action");
                sendBroadcast(intent);
                finish();
@@ -136,7 +142,10 @@ public class GalleryActivityFeedback extends Activity {
                pager.removeAllViews();
                listViews.remove(location);
                adapter.setListViews(listViews);
                send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
                if (TextUtils.isEmpty(type))
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + PublicWay.num + ")");
                else
                    send_bt.setText(Res.getString("finish") + "(" + Bimp.tempSelectBitmap.size() + "/" + 9 + ")");
                adapter.notifyDataSetChanged();
            }
        }

app/src/main/java/com/electric/chargingpile/activity/MainScanActivity.java

@@ -371,7 +371,8 @@ public class MainScanActivity extends AppCompatActivity implements View.OnClickL
                break;
            case R.id.tab_qa:
                MobclickAgent.onEvent(getApplicationContext(), "0103");
                Intent intent6 = new Intent(getApplication(), QaActivity.class);
                Intent intent6 = new Intent(getApplication(), TalkActivity.class);
//                Intent intent6 = new Intent(getApplication(), QaActivity.class);
                intent6.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                startActivity(intent6);
                finish();

app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@@ -90,7 +90,7 @@ import rx.schedulers.Schedulers;
 * */
public class PublishPicTopicActivity extends Activity implements OnClickListener ,EasyPermissions.PermissionCallbacks{
    private static final String TAG = "PublishPicTopicActivity";
    private static final int PIC_NUM = 3;
    private static final int PIC_NUM = 9;
    private ImageView ivBack;
    private TextView tv_right;
    private static String PHOTO_FILE_NAME = "";
@@ -398,6 +398,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                    Intent intent = new Intent(PublishPicTopicActivity.this,
                            GalleryActivityFeedback.class);
                    intent.putExtra("position", "1");
                    intent.putExtra("type", "1");
                    intent.putExtra("ID", arg2);
                    startActivity(intent);
                }
@@ -531,8 +532,8 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
        }
        public int getCount() {
            if (Bimp.tempSelectBitmap.size() == 3) {
                return 3;
            if (Bimp.tempSelectBitmap.size() == 9) {
                return 9;
            }
            return (Bimp.tempSelectBitmap.size() + 1);
        }
@@ -569,7 +570,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            if (position == Bimp.tempSelectBitmap.size()) {
                holder.image.setImageBitmap(BitmapFactory.decodeResource(
                        getResources(), R.drawable.icon_feedback_upload));
                if (position == 3) {
                if (position == 9) {
                    holder.image.setVisibility(View.GONE);
                }
            } else {
@@ -650,28 +651,6 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
        }
    }
    private void crop(Uri uri, Uri cutImgUri) {
        // �ü�ͼƬ��ͼ
        Intent intent = new Intent("com.android.camera.action.CROP");
        intent.setDataAndType(getImageContentUri(this, tempFile), "image/*");
        intent.putExtra("crop", "true");
        // �ü���ı�����1��1
//        intent.putExtra("aspectX", 16);
//        intent.putExtra("aspectY", 9);
//        // �ü������ͼƬ�ijߴ��С
//        intent.putExtra("outputX", 900);
//        intent.putExtra("outputY", 540);
//        intent.putExtra("scale", false);
        // ͼƬ��ʽ
        intent.putExtra("outputFormat", "JPEG");
        intent.putExtra("noFaceDetection", true);// ȡ������ʶ��
        intent.putExtra("return-data", false);// true:������uri��false������uri
        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(tempFile));//д���ȡ��ͼƬ
        startActivityForResult(intent, PHOTO_REQUEST_CUT);
    }
    public Bitmap decodeUriAsBitmap(Uri uri) {
        Bitmap bitmap = null;
        try {

app/src/main/java/com/electric/chargingpile/activity/UserCenterActivity.java

@@ -716,7 +716,8 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                @Override
                public void onClick(View v) {
                    MobclickAgent.onEvent(getApplicationContext(), "0802");
                    startActivity(new Intent(getApplicationContext(), UserInfoActivity.class));
                    startActivity(new Intent(getApplicationContext(), PersonalPageActivity.class));
//                    startActivity(new Intent(getApplicationContext(), UserInfoActivity.class));
                }
            });
            ll_userLogin.setVisibility(View.INVISIBLE);
@@ -854,7 +855,8 @@ public class UserCenterActivity extends Activity implements View.OnClickListener
                break;
            case R.id.tab_qa:
                MobclickAgent.onEvent(getApplicationContext(), "0103");
                Intent intent7 = new Intent(getApplication(), QaActivity.class);
                Intent intent7 = new Intent(getApplication(), TalkActivity.class);
//                Intent intent7 = new Intent(getApplication(), QaActivity.class);
                intent7.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                startActivity(intent7);
                finish();

app/src/main/res/layout/activity_publish_picture_content.xml

@@ -95,7 +95,7 @@
        android:layout_below="@+id/et_context"
        android:layout_marginBottom="50dp"
        android:layout_marginLeft="15dp"
        android:layout_marginRight="70dp"
        android:layout_marginRight="15dp"
        android:numColumns="3"
        android:scrollbars="none"
        android:verticalSpacing="5dp" >