Explorar el Código

1.完成一元捐基本的界面逻辑开发,接入支付宝,完成支付宝相关功能
2.移除测试数据
3.添加异常处理,提交测试

Bitliker hace 8 años
padre
commit
5df7648dd5

+ 30 - 0
app_modular/apputils/src/main/java/com/modular/apputils/adapter/BaseRecyclerAdapter.java

@@ -0,0 +1,30 @@
+package com.modular.apputils.adapter;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.ViewGroup;
+
+/**
+ * Created by Bitlike on 2017/11/22.
+ */
+
+public class BaseRecyclerAdapter extends RecyclerView.Adapter {
+    private Context context;
+    private int layoutId;
+
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return null;
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return 0;
+    }
+}

+ 2 - 1
app_modular/appworks/src/main/AndroidManifest.xml

@@ -166,7 +166,8 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity android:name=".OA.platform.activity.CharitSearchActivity" />
-        <activity android:name=".OA.platform.activity.JoinCharitActivity"></activity>
+        <activity android:name=".OA.platform.activity.JoinCharitActivity" />
+        <activity android:name=".CRM.erp.activity.DeviceManageActivity"></activity>
     </application>
 
 </manifest>

+ 28 - 0
app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceManageActivity.java

@@ -0,0 +1,28 @@
+package com.uas.appworks.CRM.erp.activity;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.RecyclerView;
+
+import com.core.base.BaseActivity;
+import com.uas.appworks.R;
+
+public class DeviceManageActivity extends BaseActivity {
+
+    private RecyclerView contantRv;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_device_manage);
+        initView();
+    }
+
+    private void initView() {
+        contantRv = (RecyclerView)  findViewById(R.id.contantRv);
+
+
+
+
+    }
+}

+ 61 - 0
app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/DeviceManageAdapter.java

@@ -0,0 +1,61 @@
+package com.uas.appworks.CRM.erp.adapter;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.common.data.ListUtils;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appworks.CRM.erp.model.DeviceManage;
+import com.uas.appworks.R;
+
+import java.util.List;
+
+/**
+ * Created by Bitlike on 2017/11/22.
+ */
+
+public class DeviceManageAdapter extends RecyclerView.Adapter<DeviceManageAdapter.ViewHolder> {
+
+    private Context ct;
+    private List<DeviceManage> models;
+
+
+    public DeviceManageAdapter(Context ct, List<DeviceManage> models) {
+        this.ct = ct;
+        this.models = models;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ViewHolder(LayoutInflater.from(ct).inflate(R.layout.item_devicemanage_adapter, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        DeviceManage model=models.get(position);
+        holder.contentTv.setText(model.getName());
+        holder.contentTv.setText(model.getName());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return ListUtils.getSize(models);
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+        TextView contentTv;
+        ImageView contentImag;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            contentImag=(ImageView)itemView.findViewById(R.id.contentImag);
+            contentTv=(TextView)itemView.findViewById(R.id.contentTv);
+        }
+    }
+}

+ 36 - 0
app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/model/DeviceManage.java

@@ -0,0 +1,36 @@
+package com.uas.appworks.CRM.erp.model;
+
+/**
+ * Created by Bitlike on 2017/11/22.
+ */
+
+public class DeviceManage {
+    private int id;
+    private int reId;
+    private String name;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getReId() {
+        return reId;
+    }
+
+    public void setReId(int reId) {
+        this.reId = reId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

+ 8 - 5
app_modular/appworks/src/main/java/com/uas/appworks/widget/SelectPlayPop.java

@@ -41,7 +41,7 @@ public class SelectPlayPop {
         View view = LayoutInflater.from(ct).inflate(R.layout.pop_play_select, null);
         window.setContentView(view);
         window.getContentView().measure(0, 0);
-        int height = DisplayUtil.dip2px(ct, 270);
+        int height = DisplayUtil.dip2px(ct, 290);
         window.setHeight(height);
         window.setWidth(DisplayUtil.getSreechWidth(ct));
         initView(ct, window, view, model, onSureListener);
@@ -79,10 +79,13 @@ public class SelectPlayPop {
                     String payStr = editable.toString();
                     double num = Double.valueOf(payStr);
                     payNumTv.setText(StringUtil.getMessage(R.string.new_select_pay) + " " + num);
-                    int position = payStr.length() - payStr.indexOf(".") - 1;
-                    LogUtil.i("position=" + position);
-                    if (position > 2) {
-                        payNumTv.setText(R.string.input_two_double);
+                    int dd = payStr.indexOf(".");
+                    int ll = payStr.length();
+                    if (dd != -1) {
+                        int position = ll - dd - 1;
+                        if (position > 2) {
+                            payNumTv.setText(R.string.input_two_double);
+                        }
                     }
                 } catch (Exception e) {
 

+ 13 - 0
app_modular/appworks/src/main/res/layout/activity_device_manage.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/base_bg"
+    tools:context="com.uas.appworks.CRM.erp.activity.DeviceManageActivity">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/contantRv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</RelativeLayout>

+ 23 - 0
app_modular/appworks/src/main/res/layout/item_devicemanage_adapter.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/padding">
+
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/contentImag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:src="@drawable/uuu" />
+
+    <TextView
+        android:id="@+id/contentTv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/contentImag"
+        android:layout_marginTop="@dimen/padding"
+        android:gravity="center_horizontal"
+        android:text="name" />
+</RelativeLayout>