浏览代码

用户发布内容规则选择同意按钮添加

huyuguo 6 年之前
父节点
当前提交
4e75c284ba

+ 12 - 12
app/build.gradle

@ -143,18 +143,18 @@ android {
143 143
144 144
    productFlavors {
145 145
        wandoujia {}
146
        baidu {}
147
        c360 {}
148
        yingyongbao {}
149
        xiaomi {}
150
        anzhi {}
151
        pp {}
152
        vivo {}
153
        huawei {}
154
        oppo {}
155
        meizu {}
156
        cdz {}
157
        sougou {}
146
//        baidu {}
147
//        c360 {}
148
//        yingyongbao {}
149
//        xiaomi {}
150
//        anzhi {}
151
//        pp {}
152
//        vivo {}
153
//        huawei {}
154
//        oppo {}
155
//        meizu {}
156
//        cdz {}
157
//        sougou {}
158 158
        productFlavors.all { flavor ->
159 159
            flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
160 160
        }

+ 59 - 22
app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java

@ -1,11 +1,16 @@
1 1
package com.electric.chargingpile.activity;
2 2
3
import android.app.AlertDialog;
4
import android.content.DialogInterface;
3 5
import android.content.Intent;
6
import android.graphics.drawable.Drawable;
4 7
import android.os.Bundle;
5 8
import android.support.v7.app.AppCompatActivity;
9
import android.util.Log;
6 10
import android.view.View;
7 11
import android.widget.ImageView;
8 12
import android.widget.LinearLayout;
13
import android.widget.RadioButton;
9 14
import android.widget.RelativeLayout;
10 15
import android.widget.TextView;
11 16
import android.widget.Toast;
@ -14,6 +19,8 @@ import com.electric.chargingpile.R;
14 19
import com.electric.chargingpile.application.MainApplication;
15 20
import com.electric.chargingpile.util.BarColorUtil;
16 21
import com.electric.chargingpile.util.ToastUtil;
22
import com.google.zxing.client.android.FinishListener;
23
import com.google.zxing.client.android.PreferencesFragment;
17 24
import com.umeng.analytics.MobclickAgent;
18 25
19 26
/**
@ -21,6 +28,7 @@ import com.umeng.analytics.MobclickAgent;
21 28
 * 发布类型选择页
22 29
 */
23 30
public class PublishItemsActivity extends AppCompatActivity implements View.OnClickListener {
31
    private static final String TAG = "PublishItemsActivity";
24 32
25 33
    private RelativeLayout mBottomView;
26 34
    private TextView mRulePublish;
@ -30,6 +38,8 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
30 38
    private LinearLayout mPublishQa;
31 39
    private ImageView mShareScanIcon;
32 40
    private TextView mShareScanIconInfo;
41
    private ImageView publish_radio;
42
    private boolean publishRadioSelected = true;
33 43
34 44
    @Override
35 45
    protected void onCreate(Bundle savedInstanceState) {
@ -49,50 +59,77 @@ public class PublishItemsActivity extends AppCompatActivity implements View.OnCl
49 59
        mPublishQa = (LinearLayout) findViewById(R.id.publish_qa);
50 60
        mShareScanIcon = (ImageView) findViewById(R.id.share_scan_icon);
51 61
        mShareScanIconInfo = (TextView) findViewById(R.id.share_scan_icon_info);
62
        publish_radio = findViewById(R.id.publish_radio);
52 63
53 64
        mSharePublishClose.setOnClickListener(this);
54 65
        mPublishPicture.setOnClickListener(this);
55 66
        mRulePublish.setOnClickListener(this);
56 67
        mPublishVideo.setOnClickListener(this);
57 68
        mPublishQa.setOnClickListener(this);
69
        publish_radio.setOnClickListener(this);
58 70
    }
59 71
60
    Intent intent = new Intent();
61
62 72
    @Override
63 73
    public void onClick(View v) {
64
        if (!MainApplication.isLogin()){
65
            startActivity(new Intent(this.getApplicationContext(),LoginActivity.class));
66
            ToastUtil.showToast(this.getApplicationContext(),"请先登录", Toast.LENGTH_SHORT);
67
            return;
68
        }
74
        Intent intent = new Intent();
69 75
        switch (v.getId()) {
70
            case R.id.publish_qa:
71
                if (MainApplication.isLogin()){
72
                    MobclickAgent.onEvent(this.getApplicationContext(),"0502");
73
                    startActivity(new Intent(this.getApplicationContext(),EditQuestionOneActivity.class));
74
                }else {
75
                    startActivity(new Intent(this.getApplicationContext(),LoginActivity.class));
76
                    ToastUtil.showToast(this.getApplicationContext(),"请先登录", Toast.LENGTH_SHORT);
76
            case R.id.publish_qa: // 提问
77
                if (checkPublishRadio()) {
78
                    MobclickAgent.onEvent(this.getApplicationContext(), "0502");
79
                    intent.setClass(this, EditQuestionOneActivity.class);
80
                    startActivity(intent);
77 81
                }
78 82
                break;
79
            case R.id.publish_picture:
80
                intent.setClass(this,PublishPicTopicActivity.class);
81
                startActivity(intent);
83
            case R.id.publish_picture: // 图文
84
                if (checkPublishRadio()) {
85
                    intent.setClass(this, PublishPicTopicActivity.class);
86
                    startActivity(intent);
87
                }
82 88
                break;
83
            case R.id.publish_video:
84
                intent.setClass(this,PublishTopicActivity.class);
85
                startActivity(intent);
89
            case R.id.publish_video: // 视频
90
                if (checkPublishRadio()) {
91
                    intent.setClass(this, PublishTopicActivity.class);
92
                    startActivity(intent);
93
                }
86 94
                break;
87
            case R.id.rule_publish:
88
                intent.setClass(this, MyWebViewActivity.class).putExtra("url", MainApplication.urlNew+"/topic/rule.do");
95
            case R.id.rule_publish: // 用户发布内容规则
96
                intent.setClass(this, MyWebViewActivity.class).putExtra("url", MainApplication.urlNew + "/topic/rule.do");
89 97
                startActivity(intent);
90 98
                break;
91 99
            case R.id.share_publish_close:
92 100
                finish();
93 101
                break;
102
            case R.id.publish_radio: // 用户发布内容规则radio
103
                publishRadioClick();
104
                break;
94 105
            default:
95 106
                break;
96 107
        }
97 108
    }
109
110
    private boolean checkPublishRadio() {
111
        if (!publishRadioSelected) {
112
            AlertDialog.Builder builder = new AlertDialog.Builder(this);
113
            builder.setMessage("请先阅读《用户发布内容规则》,再分享内容,勾选后,默认同意该规则。");
114
            builder.setCancelable(false);
115
            builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
116
                @Override
117
                public void onClick(DialogInterface dialogInterface, int i) {
118
                }
119
            });
120
            builder.show();
121
            return false;
122
        }
123
124
        return true;
125
    }
126
127
    private void publishRadioClick() {
128
        publishRadioSelected = !publishRadioSelected;
129
        if (publishRadioSelected) {
130
            publish_radio.setImageDrawable(getResources().getDrawable(R.drawable.radio_selected));
131
        } else {
132
            publish_radio.setImageDrawable(getResources().getDrawable(R.drawable.radio_unselected));
133
        }
134
    }
98 135
}

二进制
app/src/main/res/drawable-hdpi/radio_selected.png


二进制
app/src/main/res/drawable-hdpi/radio_unselected.png


二进制
app/src/main/res/drawable-mdpi/radio_selected.png


二进制
app/src/main/res/drawable-mdpi/radio_unselected.png


二进制
app/src/main/res/drawable-xhdpi/radio_selected.png


二进制
app/src/main/res/drawable-xhdpi/radio_unselected.png


二进制
app/src/main/res/drawable-xxhdpi/radio_selected.png


二进制
app/src/main/res/drawable-xxhdpi/radio_unselected.png


二进制
app/src/main/res/drawable-xxxhdpi/radio_selected.png


二进制
app/src/main/res/drawable-xxxhdpi/radio_unselected.png


+ 66 - 37
app/src/main/res/layout/activity_publish_items.xml

@ -8,19 +8,43 @@
8 8
        android:layout_width="match_parent"
9 9
        android:layout_height="wrap_content"
10 10
        android:layout_alignParentBottom="true"
11
        android:minHeight="180dp"
12
        android:background="@color/white">
11
        android:background="@color/white"
12
        android:minHeight="180dp">
13 13

14 14
        <TextView
15 15
            android:id="@+id/rule_publish"
16 16
            android:layout_width="wrap_content"
17 17
            android:layout_height="wrap_content"
18
            android:layout_alignParentBottom="true"
18 19
            android:layout_centerHorizontal="true"
20
            android:paddingTop="20dp"
21
            android:paddingRight="5dp"
22
            android:paddingBottom="20dp"
23
            android:text="同意《用户发布内容规则》"
24
            android:textColor="@color/color_0088f6"
25
            android:textSize="14sp" />
26
        <ImageView
27
            android:id="@+id/publish_radio"
28
            android:layout_alignTop="@+id/rule_publish"
19 29
            android:layout_alignParentBottom="true"
20
            android:padding="20dp"
21
            android:text="用户发布内容规则"
22
            android:textSize="15sp"
23
            android:textColor="@color/color_0088f6"/>
30
            android:layout_toLeftOf="@+id/rule_publish"
31
            android:src="@drawable/radio_selected"
32
            android:padding="5dp"
33
            android:layout_width="wrap_content"
34
            android:layout_height="wrap_content" />
35

36
        <!--<RadioButton-->
37
            <!--android:id="@+id/publish_radio_btn"-->
38
            <!--android:layout_width="wrap_content"-->
39
            <!--android:layout_height="wrap_content"-->
40
            <!--android:layout_alignTop="@+id/rule_publish"-->
41
            <!--android:layout_alignParentBottom="true"-->
42
            <!--android:layout_toLeftOf="@+id/rule_publish"-->
43
            <!--android:button="@null"-->
44
            <!--android:checked="true"-->
45
            <!--android:drawableLeft="@drawable/radio_selected"-->
46
            <!--android:padding="5dp"-->
47
            <!--android:text="" />-->
24 48

25 49
        <ImageView
26 50
            android:id="@+id/share_publish_close"
@ -28,81 +52,89 @@
28 52
            android:layout_height="28dp"
29 53
            android:layout_above="@+id/rule_publish"
30 54
            android:layout_centerHorizontal="true"
31
            android:background="@drawable/app_publish_item_cancel"/>
55
            android:layout_margin="10dp"
56
            android:background="@drawable/app_publish_item_cancel" />
32 57

33 58
        <LinearLayout
34 59
            android:id="@+id/publish_picture"
35 60
            android:layout_width="50dp"
36 61
            android:layout_height="wrap_content"
37
            android:minHeight="60dp"
38
            android:layout_marginBottom="40dp"
62
            android:layout_above="@+id/share_publish_close"
39 63
            android:layout_centerHorizontal="true"
40 64
            android:layout_marginTop="40dp"
41
            android:layout_above="@+id/share_publish_close"
65
            android:layout_marginBottom="40dp"
42 66
            android:gravity="center"
67
            android:minHeight="60dp"
43 68
            android:orientation="vertical">
69

44 70
            <ImageView
45 71
                android:layout_width="50dp"
46 72
                android:layout_height="50dp"
47
                android:background="@drawable/app_publish_item_pic"/>
73
                android:background="@drawable/app_publish_item_pic" />
74

48 75
            <TextView
49 76
                android:layout_width="wrap_content"
50 77
                android:layout_height="wrap_content"
51 78
                android:layout_marginTop="10dp"
52 79
                android:text="图文"
53
                android:textSize="15sp"
54
                android:textColor="@color/color_222222" />
80
                android:textColor="@color/color_222222"
81
                android:textSize="15sp" />
55 82
        </LinearLayout>
56 83

57 84
        <LinearLayout
58 85
            android:id="@+id/publish_video"
59 86
            android:layout_width="50dp"
60 87
            android:layout_height="wrap_content"
61
            android:minHeight="60dp"
62
            android:layout_toLeftOf="@+id/publish_picture"
88
            android:layout_above="@+id/share_publish_close"
89
            android:layout_marginTop="40dp"
63 90
            android:layout_marginRight="30dp"
64 91
            android:layout_marginBottom="40dp"
65
            android:layout_marginTop="40dp"
66
            android:layout_above="@+id/share_publish_close"
92
            android:layout_toLeftOf="@+id/publish_picture"
67 93
            android:gravity="center"
94
            android:minHeight="60dp"
68 95
            android:orientation="vertical">
96

69 97
            <ImageView
70 98
                android:layout_width="50dp"
71 99
                android:layout_height="50dp"
72
                android:background="@drawable/app_publish_item_video"/>
100
                android:background="@drawable/app_publish_item_video" />
101

73 102
            <TextView
74 103
                android:layout_width="wrap_content"
75 104
                android:layout_height="wrap_content"
76 105
                android:layout_marginTop="10dp"
77 106
                android:text="视频"
78
                android:textSize="15sp"
79
                android:textColor="@color/color_222222" />
107
                android:textColor="@color/color_222222"
108
                android:textSize="15sp" />
80 109
        </LinearLayout>
81 110

82 111
        <LinearLayout
83 112
            android:id="@+id/publish_qa"
84 113
            android:layout_width="50dp"
85 114
            android:layout_height="wrap_content"
86
            android:minHeight="60dp"
87
            android:layout_toRightOf="@+id/publish_picture"
115
            android:layout_above="@+id/share_publish_close"
88 116
            android:layout_marginLeft="30dp"
89
            android:layout_marginBottom="40dp"
90 117
            android:layout_marginTop="40dp"
91
            android:layout_above="@+id/share_publish_close"
118
            android:layout_marginBottom="40dp"
119
            android:layout_toRightOf="@+id/publish_picture"
92 120
            android:gravity="center"
121
            android:minHeight="60dp"
93 122
            android:orientation="vertical">
123

94 124
            <ImageView
95 125
                android:layout_width="50dp"
96 126
                android:layout_height="50dp"
97
                android:background="@drawable/app_publish_item_qa"/>
127
                android:background="@drawable/app_publish_item_qa" />
128

98 129
            <TextView
99 130
                android:layout_width="wrap_content"
100 131
                android:layout_height="wrap_content"
101
                android:text="提问"
102 132
                android:layout_marginTop="10dp"
103
                android:textSize="15sp"
104
                android:textColor="@color/color_222222" />
133
                android:text="提问"
134
                android:textColor="@color/color_222222"
135
                android:textSize="15sp" />
105 136
        </LinearLayout>
137

106 138
    </RelativeLayout>
107 139

108 140
    <RelativeLayout
@ -113,24 +145,21 @@
113 145
            android:id="@+id/share_scan_icon"
114 146
            android:layout_width="160dp"
115 147
            android:layout_height="160dp"
116
            android:layout_marginTop="90dp"
117 148
            android:layout_centerHorizontal="true"
118
            android:background="@drawable/app_publish_items_bg"/>
149
            android:layout_marginTop="90dp"
150
            android:background="@drawable/app_publish_items_bg" />
119 151

120 152
        <TextView
121 153
            android:id="@+id/share_scan_icon_info"
122 154
            android:layout_width="wrap_content"
123 155
            android:layout_height="wrap_content"
124
            android:layout_marginBottom="60dp"
125 156
            android:layout_below="@+id/share_scan_icon"
126
            android:layout_marginTop="21dp"
127 157
            android:layout_centerHorizontal="true"
158
            android:layout_marginTop="21dp"
159
            android:layout_marginBottom="60dp"
128 160
            android:text="分享你的电动车与生活"
129
            android:textSize="15sp"
130
            android:textColor="@color/color_222222"/>
161
            android:textColor="@color/color_222222"
162
            android:textSize="15sp" />
131 163
    </RelativeLayout>
132 164

133

134
    <!--</LinearLayout>-->
135

136 165
</RelativeLayout>